gentoo auto-resync : 15:08:2022 - 14:28:19

author: V3n3RiX <venerix@koprulu.sector> 2022-08-15 14:28:19 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-15 14:28:19 +0100
commit: 1c3adf43f1b866276828623dd63f9e10d29421d3 (patch)
tree: 08af6cfc34a399a31fab99fe6691383651b7891c
parent: 49d7633bbfe37c8e50c9cd1815c4210ca0a38d49 (diff)
311 files changed, 369 insertions, 4649 deletions
diff --git a/Manifest b/Manifest
index 3a4e37ce0804..edc64bb92340 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29630 BLAKE2B c50468b968252a2e086b5be11b883041604a84bdc00b6f120c1424eaacf97f7f0d2fd5113dce6e326bf6c91198b6758269e6368c5656dd335f7661e8c1ec7875 SHA512 1bf566bbaf350e6754b63c2c6b11d15b275c4aaf04d9a974a57a3a032579b2acc6c5b28a126fd71cfbb24ec169c8a74c5b473e8d9b0c193fb8d8163818759376
-TIMESTAMP 2022-08-15T06:39:39Z
+MANIFEST Manifest.files.gz 29621 BLAKE2B c94673b7d2b35297778bde08d29948cf33ccbd5777a682d7047e885c700cbb19d520a78417f1297de66f3e3fd8683f39a1020f501c7cf59711f87ad0b5f27966 SHA512 3c88fe6ad3e46889d9617e60c73bfcdb44c665429ccb22d18c08d7c6d93d7f2d349a6791642ac36e20c529e8b9b8625c264a41df6283224669d4257e6b118311
+TIMESTAMP 2022-08-15T12:39:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL56itfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL6PolfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBQgw/+IcjoLUnhFAHWB9xIJaNsrga9ICVmXzzyN7dI/sn9atsJcS0bABIVliGw
-O8uUw+6c1iW/1YXvkJsI5Pi0TfYt5XJc3BmSqwA0vPj1Z1sUapCXSJX0hF0QeIGB
-t8mD7B6e2nfeHECy6F54l/axBzrTnSX2QYNG3ANlFeTshWuVIPYSzfqRyFUT0X7o
-RWDROAHCcB6QXRJpcCxr+BzpJW9CaWZhUDuj0pChbLoZg8sUx7N9HQc2XcGZxfez
-vCnXZncKi7jKlSEXcC9G6+GqZLtExPie2nUMzP2/jJ0qr96niTAz4sEgy7dYL/yE
-cNMUwkDExmgG6Zc+9O+Bs41+y7DRD5EnbsjThqYeFchrIRNAucEniy2542nJjnXn
-flyIsUeVGyPXXAkDnsqFvu0skSzlZqSqRJ6alCnBhULd84O4Ez6q7gkLjIjeZmpV
-vgoiyGYFYfpV6NGe242fE/djB5Sj9/Gjfa1UIxTGfhuLpp2euM7++GufkznPGs39
-jcZ6w09hV6H9e7zEBde1mn54cR5ZEuwMn4ycchKk6k0ilB5eobEuP+p0ErvV2E7N
-u/WB42745sI9HglzsMEgo3F2uNlbdTwb89SnpTweiOVCFcHacnMbSJBq9Tb9dQ3u
-GYDO320KKeoBNBXpus5H1iMt4el0npUljtusXOLvjOpIsVRNwg4=
-=QSHz
+klBNTg/+IpU/LHnOKZ3aWhregrzIh0HlJLl5rcxZZcSe0fGvIxKk7m5JKTfUSlAi
+1jcBFhL0A+iBgptjdXuyckXuD+khBZQcfjZQr0aSFs7E4BF4sQi2lvMeq8JccCUk
+deb7pUAL9WUOX/pBCEutZ6cS7PLmaP56ovkuBrIT740aBVPJcLKejhgf8W7Xgum2
+hnMmEjOq9Fohp1oyT+7xOkGg7/nEOnuZv3ktEHZSL7KgBz6VWzN17pVaGWFJkdmF
+CclDzCnH7vxArAiH0K4C1vB6dUv3aHQ0hX232Ojow/VpV/RX8a0N88Ccd8TFaIzZ
+rE6Smw40UGVeVW1X2fwr9GvejZRlTsm187RRymQdIy+AcfxSORa1L6DBxFOpXZQi
+9HcUxdREkkcVuQzofrvQgTLo7L1M37fuGvGkK54thLwx/w6CENtj5yzRo8g698qj
+I6gyNHObvmLBTRup7Hd54d/7tvl2r3P0VTR1XwyfiaReunxGCAxDn8LQMskJ6ePF
+oN68Q6Z3Qqlq83yILSQVIjUI0cL1FuUkw1hj9fh4R5tydA02fVd/OfnyJBPBMysg
+sAt8V3Xo7/w+1lWRDX7CjnTzP6TbBjUig18L/6tup3AXgx6F2NntDHGfBSnQ4q2n
+0Lz/cyuxu6mHiaSrjGEKLRjMnSeMheKOyjY1gc02xZGQ4rVMKDE=
+=9TYO
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6dfac3c4455e..0449ef3deadb 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 458cfdcc9b28..5b8626f128f9 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 4b3d62b21713..994e0edb3ed1 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-1.29.5.tar.xz 1416952 BLAKE2B 4b1c9e1df9bb3fdb63c28890e7f9cfb8c4c628fd22b765d8265e63415b8feee0466f32fd6a87a5cd981d231f93a60c28c140c1efa7ea33c327b234f1a4d6b0cf SHA512 fbe395c47cf1bef800c162b8c44359dab173c636ec4d7e8e4629fa95b323731c7c3d8a9045dd77692b7beb8a3554cdce567f2285640a5b410262be69442fe99e
 DIST hcloud-1.30.1.tar.xz 1688764 BLAKE2B b1044a3d9e5dd28d6010763dd2c3322e56418bd2b8b48669fd2bfb4297a0a75def85a63c08f99f0bacb78bee976438af72feae2d8d38982cfc5ce2bd3a978569 SHA512 808eb06718f1e9e3ecc6de37683cc632b822e1ef9236011fba7b72ba3cd4be238c01ae66651bae304e5118d930898635116488517ca7ec3124e4bc2f987e24e6
-EBUILD hcloud-1.29.5.ebuild 725 BLAKE2B edcbd89bab62c808b5d21c0df6e3a5e2420163bc955ead8cfb156a693f84ecf6ab7bb6f1f546bd9b3bc95ea43536ccd9ace2e6fb22f15edd067e6ec84a362e6d SHA512 e32ce446972a048443945716eba008cefbd43e0d08ffbf381a20213675485472e5b6576677764a5aea9cac2ee096ad6990bbfd0f763849ceec508ebf1c577497
-EBUILD hcloud-1.30.1.ebuild 726 BLAKE2B 7d96a9012f4b897b54576a5dbedb9419e0fcaa34476e68d252b907132efe6bc638ad9598a034160bcff3dca5b86dfe3a9cc9b4380b8606db71c889bcbafa2e2d SHA512 78a825e2b55f7ffbf6c5e7e8096f788b26d9fc4205edf5dc05286d8bf9da17d5f17d266f6c990bb07154edd7ba635a4c332241ac225e6b3ab02ab9a9f82f68d3
+EBUILD hcloud-1.30.1.ebuild 725 BLAKE2B edcbd89bab62c808b5d21c0df6e3a5e2420163bc955ead8cfb156a693f84ecf6ab7bb6f1f546bd9b3bc95ea43536ccd9ace2e6fb22f15edd067e6ec84a362e6d SHA512 e32ce446972a048443945716eba008cefbd43e0d08ffbf381a20213675485472e5b6576677764a5aea9cac2ee096ad6990bbfd0f763849ceec508ebf1c577497
 MISC metadata.xml 338 BLAKE2B 6ba2cbe509581ac35dabd93abe166f960d69d1f14336779848483386d28e22dd06e5d196061312827b7a945369f05a466417a1636b607e138515957a75db6f84 SHA512 cc69ce0ab7ba3a9af94ef1918738074cdd725bef2ff70d6c19e46d07bb9514d05ef6415c7ba5b372e7a98902a8440cdb9f7b14a848c3ff2f054863356971ddde
diff --git a/app-admin/hcloud/hcloud-1.29.5.ebuild b/app-admin/hcloud/hcloud-1.29.5.ebuild
deleted file mode 100644
index 33ffb7d83afa..000000000000
--- a/app-admin/hcloud/hcloud-1.29.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/internal/version.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.30.1.ebuild b/app-admin/hcloud/hcloud-1.30.1.ebuild
index 82ba00ab5dca..33ffb7d83afa 100644
--- a/app-admin/hcloud/hcloud-1.30.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.30.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index eeea9fba024c..50030a19538d 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index ed90b086dde7..a6e788a00e93 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -12,5 +12,5 @@ DIST xar-487.100.1.tar.gz 224108 BLAKE2B 2fa5c44b46a9e37e49be03d05d6d06ab706b520
 EBUILD xar-1.8-r2.ebuild 1511 BLAKE2B f3985ed17c6fae99e56094532f4b80b08cf366e1b2d1f757341ad7ad1a4a5f77b1fee9e760c6a652814140f4292d523584642e5dddbab657cdd4bd18267e52e2 SHA512 ff409a3d7448b7a0c374d811fa90ea937c9e9356d0a10299a2f5c6ef219154555a8040ade702c93c792607a39ed332ef2bdbd612908bb3fb51b8c0aec47a0ef2
 EBUILD xar-1.8-r4.ebuild 2410 BLAKE2B 5478a841cda7ba6adb41306f10675ed06b15a22472e9500e57040bd79a5bcc9df2e8aa01c7bcc11bdcdd055bd8b5e58bcfcff9f96bee73e693e2d7945f38df7b SHA512 22b6191519f146154b056a0f10e7ad6f2a474cc1dcf610c5324eb91edcde6952e257ce8d009c8738669b15ad99004428bff7b3b3782e027adcaf7c502b28e995
 EBUILD xar-1.8.0.0.452.ebuild 2574 BLAKE2B a45a6c12bc0cf03827adf0811af328d4a01b05083fbb216f956b83884ac248a8426fce5d8ac8f9e0f277e0aaefb4d093c0149074cc6754530229292a1a6bbe7e SHA512 a1a628ec80b2b73430074086050c622bd062c43b86efb6be2822a22cdb4bb9de9334534515d418562f9f97c3cf5e96708a44815863196d55934c08e88d8c814f
-EBUILD xar-1.8.0.0.487.100.1.ebuild 2769 BLAKE2B 9ebe8c86833f68664388f423b6550a14897887aa7c639ed02192b7f525ef26b3fc1d71513a954a27429f539b02c812e2e8486772b0c12a8d9daeeb98a9a3a6ac SHA512 163a43d4e0efedd43639d9eb7e50b18d726773a62196eb3978dc9c36530e9538a9911c61e70a401434060f6765a953bf7a7102aa3c9a5c31c50dad241b8c3bf6
+EBUILD xar-1.8.0.0.487.100.1.ebuild 2766 BLAKE2B 9949a0c95728f78d1f448627f95294d8866a339a659db2e6b9791b10bc45dd17f9a4e018fc4140a35aa5092fffa8488bbf89199b1d8cc395d450a31383727633 SHA512 738eeedcc992454f1bbdf347713449f20428d890ebec575aa4db915b0231ccb04dbe39500e819166f25c5c3981d5066c8fe0d209d9b52ad6e822d24df85f4c45
 MISC metadata.xml 896 BLAKE2B 6276428173e9e59e3bd792a6df84b865eb695bf2591a8586b9903d1eb275af3a10d2295c9e37f452e911aa771f30a902c7b1361c83a1c5280f442a6652437c59 SHA512 7088753baae558cf466eb6a3af584d406ea09c5065f235d1e44d891731055fb88acd8957e764554b41d86d8fbf7cea21deaacdd2b38d9f8b05744202252ec271
diff --git a/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
index f8047a7ebbb1..e764f31e6d49 100644
--- a/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
+++ b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apple-oss-distributions/xar/archive/xar-${APPLE_PV}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	elibc_musl? ( sys-libs/fts-standalone )
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index bb93f24e698d..8788621904c6 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 214b83298d78..bdfa347369c1 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,9 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
 DIST borgmatic-1.6.1.tar.gz 300375 BLAKE2B b56c31da62591b8bfd3c0146e77cab7ab28f942c59ca0f6cf7342d80bc31249dfcbd59fae13025a0fe464de326b6758169be983d2b741ecc37062961541fb892 SHA512 c48fb89167ce188feeb9d51ae9caabf985f9c583d09840d3dd4aaf772a4acbd3c22399958740820b9fbf61603769a604dc92b72448e2c7196fae855549f3c6d5
-DIST borgmatic-1.6.5.tar.gz 322857 BLAKE2B 8d342800ad92a9bddae95eb7b0ee8aabdf792f4b36e696ae15c7dd1318f18c983dad4984c7a7a0a0aeab21760533655d97bc199cd3066dbb01f329cc1c7d15d2 SHA512 26438886b9b22760c12565a58e2337a45fad5d54e3fb061119c73b2a2ac36b3decdff656303796649107a74de8a5a09f8edd70b4e1d94533a662a67d2f124b95
 DIST borgmatic-1.6.6.tar.gz 323601 BLAKE2B b40d8f00e3b7bbd343336cf4c6992e34d8289de451c184717827e8e43519b84d4bb9b8cff6a835a7cc502d2e93045f0196d744e4b6ad800de1276e11c3189cec SHA512 f1a6dfa344ebee89e88f1aa6b43d8493c80815c637d8e0f7f6314462fd511b576e62246d957023ab2f9a68875d2818e2b8ef00cbf3339dc35a93d6ebad0bed19
 EBUILD borgmatic-1.6.1.ebuild 1904 BLAKE2B 7b8c6ec7ce028a24d68d7ff2e27bbc5bcacb8df2e73c557b7ddd403205bcdb732e63e2188566af5f7db23e68dbbc073aec584023e8e0406543c95df6bf64093a SHA512 00b517d74bbc68b814b039492e92ac36b7d96f1626ae6f7187cff72b2387b657bec4d4d3c7f6c777d74ad2e07231b5d72c878ac88c7dece7ebdb2c6a61b3efbc
-EBUILD borgmatic-1.6.5.ebuild 1905 BLAKE2B 10224bb4e213836832f4485be1aa572062d4e840c0c74fe45791020f99153315eb1459febeb57e790ad8f73f4f1102cc6f7919147ca967fa5aeb71e725d3f44b SHA512 7c1f1d3a5b05bda5581e1a6fc81af6763a0e1094373bd0476cd19de3537602191b9d60154c9f170207fcff28d89ede7b1ec189c07265718dc469bd928a55c439
 EBUILD borgmatic-1.6.6.ebuild 1905 BLAKE2B 10224bb4e213836832f4485be1aa572062d4e840c0c74fe45791020f99153315eb1459febeb57e790ad8f73f4f1102cc6f7919147ca967fa5aeb71e725d3f44b SHA512 7c1f1d3a5b05bda5581e1a6fc81af6763a0e1094373bd0476cd19de3537602191b9d60154c9f170207fcff28d89ede7b1ec189c07265718dc469bd928a55c439
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.6.5.ebuild b/app-backup/borgmatic/borgmatic-1.6.5.ebuild
deleted file mode 100644
index 502919f25ae7..000000000000
--- a/app-backup/borgmatic/borgmatic-1.6.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
-)
-
-# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
-# executable so making it work would require passing --install
-# to distutils_enable_tests. Given that this is the only test requiring
-# this and that all it does is make sure the NEWS file has been updated
-# for the current version, just skip it.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index a7188a0012b7..9be5ddb0cede 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,6 +1,5 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
 AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae1f9509e3b454459499fa457119c75a9e5fecb85d5530caaab340cea7f4deba0f155ac9e31706ab3899372c45e381cf77 SHA512 e0e1a4ed7c9ef069bc0bc5449f784c2deda1ce6851e98ca6d04c03988361f00e06b6a4f347671ee905f496dba19f8dffa64e5bdcba89f547292fc9c8d276ecd7
-AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
 DIST snapper-0.10.2.tar.gz 407857 BLAKE2B f59ee95612a66397f9cb1bec4a3a20fec41f12324d1a778d5bbdac2bd3359b6719d16fba5c50b3753e416681e83780180fe8965757b810165bebef8c4bed6634 SHA512 bdda67908b054beee7285bb3ac97ce28276449d7719369135a7ffa74bce40000ebc89f4f059abe44f8cc7c3a09c46af446e812229290ddd10b2af053fefbc568
 EBUILD snapper-0.10.2.ebuild 2009 BLAKE2B 148ba5f979e5591d011ec5be16c38133f050504d4aa61cd807bd95e0d187fc37f90e16633ff8875b70725f589c8bbb148dab8aaaffc0b1dd33b9b575a36aaf78 SHA512 3a3b93cb0989e48230845d678d0119c4039778729032534eea9ba1fa05d1cd480d3cc5ffb4983587727539c41d631a8bb4b0d74cf5a5f885347382bf51852a2b
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/files/snapper.bash b/app-backup/snapper/files/snapper.bash
deleted file mode 100644
index e5ca4134342a..000000000000
--- a/app-backup/snapper/files/snapper.bash
+++ /dev/null
@@ -1,200 +0,0 @@
-_snapper()
-{
-    local configdir="/etc/snapper/configs"
-    local cur prev words cword
-    _init_completion || return
-
-    local GLOGAL_SNAPPER_OPTIONS='
-        -q --quiet
-        -v --verbose
-        --utc
-        --iso
-        -t --table-style
-        -c --config
-        -r --root
-        --no-dbus
-        --version
-        --help
-    '
-
-    # see if the user selected a command already
-    local COMMANDS=(
-        "list-configs" "create-config" "delete-config" "set-config"
-        "list" "ls"
-        "create" "modify" "delete" "remove" "rm"
-        "mount" "umount"
-        "status" "diff" "xadiff"
-        "undochange" "rollback"
-        "setup-quota"
-        "cleanup")
-
-    local command i
-    for (( i=0; i < ${#words[@]}-1; i++ )); do
-        if [[ ${COMMANDS[@]} =~ ${words[i]} ]]; then
-            command=${words[i]}
-            break
-        fi
-    done
-
-    case $prev in
-        --version|--help)
-            return 0
-            ;;
-    esac
-
-    # supported options per command
-    if [[ "$cur" == -* ]]; then
-        case $command in
-            create-config)
-                COMPREPLY=( $( compgen -W '--fstype -f
-                  --templete -t' -- "$cur" ) )
-                return 0
-                ;;
-            list|ls)
-                COMPREPLY=( $( compgen -W '--type -t
-                  --all-configs -a' -- "$cur" ) )
-                return 0
-                ;;
-            create)
-                COMPREPLY=( $( compgen -W '--type -t
-                  --pre-number
-                  --print-number -p
-                  --description -d
-                  --cleanup-algorithm -c
-                  --userdata -u
-                  --command' -- "$cur" ) )
-                return 0
-                ;;
-            modify)
-                COMPREPLY=( $( compgen -W '--description -d
-                  --cleanup-algorithm -c
-                  --userdata -u' -- "$cur" ) )
-                return 0
-                ;;
-            delete|remove|rm)
-                COMPREPLY=( $( compgen -W '--sync -s
-                  ' -- "$cur" ) )
-                return 0
-                ;;
-            status)
-                COMPREPLY=( $( compgen -W '--output -o
-                    ' -- "$cur" ) )
-                return 0
-                ;;
-            diff)
-                COMPREPLY=( $( compgen -W '--input -i
-                    --diff-cmd
-                    --extensions -x' -- "$cur" ) )
-                return 0
-                ;;
-            undochange)
-                COMPREPLY=( $( compgen -W '--input -i
-                    ' -- "$cur" ) )
-                return 0
-                ;;
-            rollback)
-                COMPREPLY=( $( compgen -W '--print-number -p
-                    --description -d
-                    --cleanup-algorithm -c
-                    --userdata -u' -- "$cur" ) )
-                return 0
-                ;;
-            *)
-                COMPREPLY=( $( compgen -W "$GLOGAL_SNAPPER_OPTIONS" -- "$cur" ) )
-                return 0
-                ;;
-        esac
-    fi
-
-    # specific command arguments
-    if [[ -n $command ]]; then
-        case $command in
-            create-config)
-                case "$prev" in
-                     --fstype|-f)
-                        COMPREPLY=( $( compgen -W 'btrfs ext4 lvm(xfs) lvm(ext4)
-                        ' -- "$cur" ) )
-                        ;;
-                esac
-                return 0
-                ;;
-            list)
-                case "$prev" in
-                    --type|-t)
-                        COMPREPLY=( $( compgen -W 'all single pre-post
-                        ' -- "$cur" ) )
-                        ;;
-                esac
-                return 0
-                ;;
-            create)
-                case "$prev" in
-                    --type|-t)
-                        COMPREPLY=( $( compgen -W 'single pre post
-                        ' -- "$cur" ) )
-                        ;;
-                    --pre-number)
-                        COMPREPLY=( $( compgen -W '
-                        ' -- "$cur" ) )
-                        ;;
-                    --cleanup-algorithm|-c)
-                        COMPREPLY=( $( compgen -W 'empty-pre-post timeline number
-                        ' -- "$cur" ) )
-                        ;;
-                esac
-                return 0
-                ;;
-            modify)
-                case "$prev" in
-                    --cleanup-algorithm|-c)
-                        COMPREPLY=( $( compgen -W 'empty-pre-post timeline number
-                        ' -- "$cur" ) )
-                        ;;
-                esac
-                return 0
-                ;;
-            status)
-                case "$prev" in
-                    --output|-o)
-                        COMPREPLY=( $( compgen -f -- "$cur" ) )
-                        ;;
-                esac
-                return 0
-                ;;
-            cleanup)
-                case "$prev" in
-                    empty-pre-post|timeline|number)
-                    ;;
-                    *)
-                    COMPREPLY=( $( compgen -W 'empty-pre-post timeline number
-                    ' -- "$cur" ) )
-                    ;;
-                esac
-                return 0
-                ;;
-            diff)
-                return 0
-                ;;
-            undochange)
-                return 0
-                ;;
-            rollback)
-                case "$prev" in
-                    --cleanup-algorithm|-c)
-                        COMPREPLY=( $( compgen -W 'empty-pre-post timeline number
-                        ' -- "$cur" ) )
-                        ;;
-                esac
-                return 0
-                ;;
-        esac
-    fi
-
-    # no command yet, show what commands we have
-    if [ "$command" = "" ]; then
-        COMPREPLY=( $( compgen -W '${COMMANDS[@]} ${GLOGAL_SNAPPER_OPTIONS[@]}' -- "$cur" ) )
-    fi
-
-    return 0
-} &&
-complete -F _snapper snapper
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 9af863e6bd27..23090300ca96 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index c13c3cef7f7c..56725308fbbd 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -9,5 +9,5 @@ DIST containerd-1.6.8.tar.gz 8663866 BLAKE2B 4b1473febb738ce46d435a687971058f4bf
 EBUILD containerd-1.5.11.ebuild 1905 BLAKE2B 660c443a3de0f9c280ebc8bda5b049dc9803a35ea0d1fd6826338705f7d94b6d7f7bcaf987be92c458fa624a3b4aab6b19479aab90798f504ca7445f2c848821 SHA512 5c1f0c09f89743438924f2c012b9bce173844e4e5d3cfd9312eee576ee087ff01c532daabbe63502b9a39fd423825f198cf4f66c3c18a9786aadbb58d8ab45b7
 EBUILD containerd-1.6.2.ebuild 1975 BLAKE2B 3ebbd30a63d3e4fc89491332ac27e0441a611d275746b5fe9dd0ba627ac57af9bf6d71d6ed2b1fbc7bbfa1bedc16fc329cbd9264eee14bd8803c313185b4930c SHA512 49e8aff2be3f9196047f7e502033048de00ea1a4dc8e53b033e0014d22a57755b0156ea21df7efdf307a26344ded7cd2bd1a6f439abce9dbf47b35eb9cb6d80e
 EBUILD containerd-1.6.4.ebuild 1975 BLAKE2B ee2badba1a884e9fc2eb03ee26fcb7f27335910e6ac1cdf127d2ca1bde4017420e9ff5e064183a1fbb31f287d746b9bad31bd2b67d8d3c0f987ae8dc7ae682be SHA512 89eea35b99149e4aad2cdb9025006d9a774bdb676ef00133d532f4834a18560313b5d05478355d10d3d9b9e5de48d0ba80df4d22874142c0396d09e0cefb95e4
-EBUILD containerd-1.6.8.ebuild 1975 BLAKE2B 83edc55008b89563a15ab71d155139ef24fb5b9b66215ef041f3544bc3913e56ad5be1e290dea1fa45ba963742a925c30bb3c72c4caccc8d4e542edea8fffd4e SHA512 1ca96dce200ad68ee010e86d04828d392a128177d0849bda4de4f47a52988876d6ac991014caafc87f195d972ba1f29de7feb445632acee7ff4eadf7e4074212
+EBUILD containerd-1.6.8.ebuild 1973 BLAKE2B 09aa4bcda7026235380bc185a78f1aeab4e6d079548e8ad4fed352e9182bcc65ddfce7908e8607610a679c739ed14af9dd789474e9dbd4db2eac49c57677e8e9 SHA512 1440591ed1bc4dffde63fed58303a846e41686a4469c88942fed9a469acb8c2c9f7e7b61d240a5d04d556b6490077806f2b06a4aaadef034e0b29037251c9043
 MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982
diff --git a/app-containers/containerd/containerd-1.6.8.ebuild b/app-containers/containerd/containerd-1.6.8.ebuild
index 6b3b86530b0f..b17ef614cd19 100644
--- a/app-containers/containerd/containerd-1.6.8.ebuild
+++ b/app-containers/containerd/containerd-1.6.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 31283339ad47..5ed3f4dadb06 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -5,5 +5,5 @@ DIST docker-cli-20.10.17.tar.gz 7636087 BLAKE2B 2777ca5c310ffeca75a07f2667703a3f
 EBUILD docker-cli-20.10.12.ebuild 1844 BLAKE2B 315897c0bb0930e2b3ac72ff73581700c66ed8130a26f5ac573e9820c56947e80f44b5478fdb8dab4013407acbc1c7706fc7fdef876d511dc3433cbaf6b96f9d SHA512 1e576548e6697d51cf7a681a97910dcd01d04073f18222e0d467d7c4f8100479bcb998d547da16cb574fb92db36d86c2e58ea512003015ce805b64cfc1a9373a
 EBUILD docker-cli-20.10.14.ebuild 1895 BLAKE2B ca302b1f195f6cb90bf16e3eb636110052d191e3d8833949dcca8af421cd87853d8d946340a88e5ed5b9aff2d6b5251b6ac372286ba58d08154fcc70306a6f2b SHA512 fc4a83b6a8531cb6272be1726b2ae139e045251848aa7237b81f27e3e343b6c0cc901541889c79248cd6f534acd66e07aa81d59952aa6c720870a9fb0ba43d32
 EBUILD docker-cli-20.10.16.ebuild 1895 BLAKE2B c5dabb17515c9b9e76fa173b6db5f7e2466a35eb3633003563d742108c9760dac6f88650fe512690eb6bbfe96c3f1e9c9d61b7cf9327c3446bbf33bc4087a06b SHA512 939fec07f7bcd4f583b8f1ecd135f360ac9b4b7757f59e014504189c2310c8f003a5f83fe8ce468dc9be254f3e92472efe85fcccc89ecc83ee545844cfc5b566
-EBUILD docker-cli-20.10.17.ebuild 1895 BLAKE2B caf09b20840a0b5ca5313677386c85b780b9a81ad4952b1776ebff46edf314531ce2a673980804dc7560d7baf376c0cd1cfe197237216b82f7336eb9e5fff24f SHA512 41da77df19ccf87f75084144662848b12723576d72f48fc68eda8560b774d3a9e8c45998feafb64f650d4fc361d6ab8b7f055363a48b0e9ca3d388630b41aa57
+EBUILD docker-cli-20.10.17.ebuild 1893 BLAKE2B 316e4b3137cf3a91a6d1fd47ccff03d29c6d56847cfc9882cbf98ce9031c0e1a95b3d49a87b7d98334f37bd4227d7f0c10f0924910b2f5d86d2ee9325eb291af SHA512 fc4850101106e9ef373f636d5f6953608f8e5b080cba073a3ba11ea5e6e969c458ade7608c25a80c74592239266c294da2a192c63de00f4c6eeb53ae9bdd52ca
 MISC metadata.xml 689 BLAKE2B 45f4a07f9d949ad4e0175908af936140573bd257f7b11f9b9cc25cdd52bb821a294036635fd81662bcd348aa21e69b5582ab2dc8efaf94dbbdc9608b131414f4 SHA512 efe37f3ae8bc6b26433b7bacfda203ea3b480f419b343921214f19a4ad4e25b2cca5f0426a27348902f51ef15f558e81599ccdadcab6504f9d22314bb472d80c
diff --git a/app-containers/docker-cli/docker-cli-20.10.17.ebuild b/app-containers/docker-cli/docker-cli-20.10.17.ebuild
index 75170202112d..3e831c97220d 100644
--- a/app-containers/docker-cli/docker-cli-20.10.17.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="hardened selinux"
 
 RDEPEND="!<app-containers/docker-20.10.1
diff --git a/app-containers/docker-proxy/Manifest b/app-containers/docker-proxy/Manifest
index c1f02b0769c0..4411210363ed 100644
--- a/app-containers/docker-proxy/Manifest
+++ b/app-containers/docker-proxy/Manifest
@@ -3,5 +3,5 @@ DIST docker-proxy-0.8.0_p20220315.tar.gz 3154501 BLAKE2B 1078db00c0206542740736f
 DIST docker-proxy-0.8.0_p20220601.tar.gz 3154283 BLAKE2B 7651e1862acf60988f6a8bdf3c0befc9b01a388aebda2b86610109bb6affe0d9c64d2750a911f0d1856be0dba970e9e92de2a0d393cc5c3a581d4253c574a623 SHA512 d3d9888f39a9247b6e773b0bfe63e6d248c5c155e7032cdbdd5cfacf995cb6b4cf2f0fb51e09c4554a4b994e3c3d7fc9cd2fde6cf8dda34fba6aa07218ac959c
 EBUILD docker-proxy-0.8.0_p20210525.ebuild 813 BLAKE2B 376f4657a6a0b0a16a0f11243727d6df09b77a92b2f17f1841f58b36f2b2def2caf1e5033418d2627ef4c02dceb18514cf60ddba78b81fdb2d51b141e68a1f41 SHA512 142541cfc5e44ba8fc580777e5aaaccb91d5585b6364d1114f10e0c00b1449caba29c5a104e978277f1c0024b0c331bcc3645a468f5a5be8e056b0f9f96e1b5b
 EBUILD docker-proxy-0.8.0_p20220315.ebuild 748 BLAKE2B ac008769d81682299258cb3530ed2be91f384f3da051666e4d6966e8b7a5e60115c36b950ded5b4138d6cef0c8e76943a7598170dcc72eeeedceb9ad10c5b820 SHA512 c9ac1375edd16d05929a0ad44d266484dbdb39449ec1de36b2c5dec99685b54b4582dd17af6518457de4d80fcfc5c1e767a6538ce2ed3aa6202937737ec59d1a
-EBUILD docker-proxy-0.8.0_p20220601.ebuild 748 BLAKE2B edb073affaac6a4381330e7d5297622cb4d5cc1646a41318d13382be316fbe344256106e70a831dc9a21ae24085920042263c84afda98dce1729c2bb2142a7de SHA512 fefa9703c8dcd443adc518d5757f6e32a7ce5c72bc303ff56617482f28386930ba942522b5616c9feef8e97cc39b77ab56f6a44ffbd880c2d6fe63090834065b
+EBUILD docker-proxy-0.8.0_p20220601.ebuild 746 BLAKE2B 98094a84864d081f0fa9bd45dc26148db5873b777447245d8aade163d831de0f0311c506f50197cbe121dedb7798acbfb0b2050f451bce49b70baf2fcb0fea8a SHA512 27882601288e726ed200865f8083c67ee75b4d04c10644d45f9049f2541180068527bd20ab0a163c37b2d836036262f230c4545317fbd1565c3eb48eedd2453c
 MISC metadata.xml 443 BLAKE2B b641498e7f0a6670f6c902d1432dd7ae97dcce870b2d43d5ed7b1a96b483f2f1b70a1b625d27cd786c25cf4b86c80200f3668d94b5852985d366194fc1dbc77f SHA512 bb2ffc7c2d8ea17a8dcb28554fb505885596589b9bc886dfd30ec889d8b46926a9141aea354b929793b55cfbe0f28cc31a6d656943d865e1552187f4fa9f9f5b
diff --git a/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild b/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild
index a384cf3a615d..f88cdf3ea7ca 100644
--- a/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild
+++ b/app-containers/docker-proxy/docker-proxy-0.8.0_p20220601.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/moby/libnetwork/archive/${GIT_COMMIT}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index cabca6c35a0a..12882cf8c821 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -8,5 +8,5 @@ DIST docker-20.10.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e
 EBUILD docker-20.10.12-r1.ebuild 7898 BLAKE2B f6edbcda89a4002d96fb9b94aee212556f38eeb275a7824347bf6fad71d218adf303221657569318451b29f8d23577f37dac82bd2b84a06b13f3b43f413cd1aa SHA512 329a8dfd8842c0bb931ab7adbf08580e1d4ed4eacdb30e3931cde7d83b0ad6ebe787a65a921593da188f4150d6b9f60b31b45decc302694d6c4fdcb9821c4f6f
 EBUILD docker-20.10.14.ebuild 7909 BLAKE2B 49bd4f27f8e6717db6f615d1b96ac66ae1687651e3161e2f7e45968af7ae726e68d18ca886d8899e0c897bb8048af79a5821b8d739ad3f32a9a39909a9904b64 SHA512 86085b41ac3207691c8d00cb62e7a8bbe939b7eab1b3e348344e46253c7eb8a00a952594733e07724c298ebd96172233aa461d0f11ccdc8b742be56de36f5568
 EBUILD docker-20.10.16.ebuild 7908 BLAKE2B 56a9459e3caed8a7a570c3dbc9f7c83039fc032596e8b6e306183fc3f84d4c472d6b0dddec0c40a2a992d309d2320b5e6975864a1c17e46b885ef6a598462d15 SHA512 8dcfcc7daf73ea0cc79d6e2cc62963d63f763934c688bc28bc7b07a704b765aa0c8c05098e9f972f5bd053e144d67e442353f5318b0a73e7e336a95608d90efd
-EBUILD docker-20.10.17.ebuild 8005 BLAKE2B 7f0ae6f30adcbc75cf9fff6c7389e93c39bbc6f2950fa289431ee2dd7604cc71bbd999a221be99f563ed3d6637b371af98a5715013e5de3b0c862376d33ab57c SHA512 3e821e87b1aff4de21c8ce6e84750e60e2aaea3b62f8d37cc09d21872ae70ef12a0cf408e806191eb4733ccd42cc99993bb2fe19066cebece03fa9ca5aed9c07
+EBUILD docker-20.10.17.ebuild 8003 BLAKE2B c045aaebcc4ce7ee9b6116bf90cea652e64e82c70e2670857a6b8e90f96fd01826d35866b2c7223e7ac2f3e8ac972b8c2b6352ea44cc08b93fcccc68c4262f6d SHA512 4bf9635015c494e4e244fd5e789c69e91551ba1f4eca7faf859c215c2e0f7f645275daae367aa475eca462ab2407ccb46260902872253d518b65707c6b6906f0
 MISC metadata.xml 1732 BLAKE2B d6c517445cd06bb18759cad0a8923bde800bd6f87ad532e632ad6a0a02eba10905f1022297115a92457d38f795fbcd50ec75d1a2f7dcb017dc15282bf55cc046 SHA512 93a93425296ec98ac52d5b8bbf5784747df9f25da586b6f016cbe946ad01089e75d0571ed8690a051e919571c4ca3be01fc0ba6ef8c5fc5b8a01f87a5ca5e21b
diff --git a/app-containers/docker/docker-20.10.17.ebuild b/app-containers/docker/docker-20.10.17.ebuild
index 6569a4e8895e..8d9c81d55596 100644
--- a/app-containers/docker/docker-20.10.17.ebuild
+++ b/app-containers/docker/docker-20.10.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened
 overlay seccomp selinux"
 
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 664c1bd2bd56..1f677e0ce30f 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -7,5 +7,5 @@ EBUILD runc-1.0.3.ebuild 1793 BLAKE2B f92e4d3fe0fb2125fdf5a2d3ef4cc9418c6cfb1cf8
 EBUILD runc-1.1.0.ebuild 1795 BLAKE2B 0df960fc7c3bf58ac6d271d61838416e229a200d2a948aaf392d65fec701c4e5718dd924ade42ef85620e95c3fa291b54f8de3cfefe75ec52fdcf0a27d829570 SHA512 9fdfb92e462491d95e208eeef50c3bc09c8d560c86d5f254574b7facf5d59028ac9b1e780de6c2dab6f96ba99e804dcd9b3a3bcd95d0a49b98320d9615187db2
 EBUILD runc-1.1.1.ebuild 1846 BLAKE2B 3e7caa50bcd158e59043db753ec64aea99dfa26f6ecb693cda011606dc9649248e76e154efe13852b10c0f256accd78674f3eac12f4e259897820e567d35bcf8 SHA512 250d42b4f01bd6e610b7247a7b88d934f8b3765eec7e882cab9d3e0a7bb7eb6006a4ef018c8e3c15b462b1c5b58f767a7ab1dac57b510f23066d611aad93bd32
 EBUILD runc-1.1.2.ebuild 1846 BLAKE2B 759f30c6f805ebeb5efdfd925158ce86a06f5fdd9dd0c2f36e96af0ee31c897abbeadbc0a21b2021d942f3a233ace86db1513abaa1ec31c35e90687f62be7d26 SHA512 543e51005552723ae7f4b0b65cf7946d57bf0460889fe27f53c26786052faed9fff2b82169cd5d2a957dcc6c9d93898e61ebe90f6e91020efa4949e9f46c3fd0
-EBUILD runc-1.1.3.ebuild 1846 BLAKE2B bb316be78ad749a42b023b80be861077d1159249779dd20f29aed493b2c3d2cb42d1149cf235795efb468302cb69e426a1a8550235a5c1eb00adb3bdae2b29f2 SHA512 7a38fef5b3bba229224a29ce99097530c1fd1ed11eab9cbeef69ab8df7a37687f722e1b8164dbccf85d0a546b9c0bbcf2ddfe338d9e940fa9ab389a5ce3f80c4
+EBUILD runc-1.1.3.ebuild 1844 BLAKE2B ed03bfb9f1e81c38280ea3011f1fc62499f556b2d7f0958a52856d81637e205aa0209971cbe79aac5d3a303e3debf7f9414a6959f319789c6b513284561ba8bc SHA512 9709b5b91e2a69f08f2b0f1fecb4fc2e051206b06310f91d24e438ee50a1959ab63b083971a8397891d1a3d60df4ae0745aff9f466a95488b4fcc35ce4a21564
 MISC metadata.xml 822 BLAKE2B 2029743d60c9a6197e3db4ca27c3ee48bc86f624a50d7caa9bfb7f958383a1736d8817f2f977ac0e673229bd61f341a00f266dbce35dcd9633ecc27b182478d5 SHA512 f80b366f7fc8f4ff5bd46245aa80871748800a557440af3aa45bd1a508732cf634b6f21a3445135450eefbac91ab16f7b344c3f557af8ef69fdd8120ca6cf4e5
diff --git a/app-containers/runc/runc-1.1.3.ebuild b/app-containers/runc/runc-1.1.3.ebuild
index e17a2001f385..b4a730d82449 100644
--- a/app-containers/runc/runc-1.1.3.ebuild
+++ b/app-containers/runc/runc-1.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="apparmor hardened +kmem +seccomp selinux test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 68d14448c2f8..e07922b8b009 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 0eb036ae4cf2..5458438869bd 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,6 +9,6 @@ DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b
 EBUILD gvim-8.2.4586.ebuild 10692 BLAKE2B 6cfe421fbb3cd2ea0132f8d1b2f6bcccdf575eb6527dc056c8a35549ed4bcdb06056188c383186d0a41bf375dab44cc35f9ee97f156b1ac4fa245a54c892a60f SHA512 6e134cdca1e03729cfc4400850ce8c74ad3bc9ccb08f8afaf48f7998fe238098993c6f18fe26e553d0930c4507e5ad6f3c52df1b17e580f24a7c59df698ca767
 EBUILD gvim-8.2.5066.ebuild 10752 BLAKE2B 03bffa111a79f704377ca932f852a887244f2d0177a159cafc03d77fc0c687e513555d0d88b041f27a8fafb612bdf54bdf7730b84f93d0f3e12f7b4a94091e8e SHA512 1b5185359767eb6a792fd68ebe3ab37ba7a9a681a19811259f0058078fd81e44a056ab23b1768d48a2a43ebd3438fa223e8505a682480ee98842824b1f60ba99
 EBUILD gvim-9.0.0049.ebuild 10603 BLAKE2B d49a0bf661f62bb0748bdcdca8491e93dfa0f5e860279109a693cad52c4e58145cf20d1156adfe975d45778a36bbbf9dc3cf636437ee662345efe835ee155742 SHA512 770deaed448b51e6c4a19cdfd9c07f2514fbaa23254cdcb3fbbb9d2c2eb5466ac117579f21d2cc362036c51af41e61ad28c93f962ecb3ef1c8c037f49ca0f6c2
-EBUILD gvim-9.0.0099.ebuild 9879 BLAKE2B 3458c0050993bdcc8f45161b51e09607da93fe58977f508608e94a050f9f5f32abaaf0ae9d678cea8828ca53e38df802a1feb0ab0bba66494c9cffa957969606 SHA512 b75b0b4c62cf08055e88e545f611ef0853d95fc0976ac951155bd1d8c61915ccf27e62f39ab3007e054960e5eb72a4c308cf8603d9894dde8a619fc658feb163
+EBUILD gvim-9.0.0099.ebuild 9878 BLAKE2B fb14309a36d865861fda4a1ceb870a080d95f508bcfb440568af3a233270ed49c14dcd0f38f34f9553ef7271290b63109248680c098b3cdd11befd9adf0a2edf SHA512 1eca7ecb8f9c8a328bab9c6515eb513ed37166206d080ed5234bc45694d662396c0ff06c4bad81bd563c783d8ad64b624cd731ba8594f217a3dc72ecc4d818c0
 EBUILD gvim-9999.ebuild 9879 BLAKE2B 3458c0050993bdcc8f45161b51e09607da93fe58977f508608e94a050f9f5f32abaaf0ae9d678cea8828ca53e38df802a1feb0ab0bba66494c9cffa957969606 SHA512 b75b0b4c62cf08055e88e545f611ef0853d95fc0976ac951155bd1d8c61915ccf27e62f39ab3007e054960e5eb72a4c308cf8603d9894dde8a619fc658feb163
 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-9.0.0099.ebuild b/app-editors/gvim/gvim-9.0.0099.ebuild
index bc764c8a6675..e433087ee177 100644
--- a/app-editors/gvim/gvim-9.0.0099.ebuild
+++ b/app-editors/gvim/gvim-9.0.0099.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 815e33903e1a..8b6992c38b9d 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -11,6 +11,6 @@ DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b
 EBUILD vim-core-8.2.4586-r1.ebuild 6932 BLAKE2B c68dabf5622f757054b43501f5f01610a237736fb29d26c65f79e2e2edbb45e08651114c2f1563ac91e80d26edded1d33e139dfb9b31dca5a5550d8b14bb391b SHA512 ec8ec83e16c023db06a0f8e33e4cda656c10da8c475fc316f175c18dc26d70066e74e1e9dc9ed7ca68112ee6e82c7c3acdccbe50e7287cbcf23aa1ad1c410d67
 EBUILD vim-core-8.2.5066-r3.ebuild 7002 BLAKE2B 853cfa96f312cbabb2513f4dece34987af22d6ddcea6a41f47aa5ee37798dfd6c00dc97d26dc5729ee546dff2b287081ee885cfa6aa556f6c20962dfb4196210 SHA512 f21c04836f1664602c529c84507d24776b833baff0c224abf237b7a1505424a2ebf2d23dcd7cf56a4534204df85dd058271f0c2d0e89d6f3be0e83cb1c3a5b52
 EBUILD vim-core-9.0.0049-r2.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
-EBUILD vim-core-9.0.0099.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
+EBUILD vim-core-9.0.0099.ebuild 6924 BLAKE2B 2e6016b940fccc2989c7c8bbb84a6e3aff599f7e5702b29ba3b0737bd25955d6d35bab1b4ffc87c942f37b5148f4a88f823d46c72fed5f916a5b50c1c3a72b85 SHA512 09e91cafc90e09a61c6cb279bd1136a7ddcbb6b6325dbb464675f58283e466db438a0ea24508e78bfd0d68621ef76f6897cc137d0233f4bfb6c9ee34ce1cdf87
 EBUILD vim-core-9999.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild b/app-editors/vim-core/vim-core-9.0.0099.ebuild
index 17a02fa52a3c..021b1e8c1654 100644
--- a/app-editors/vim-core/vim-core-9.0.0099.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0099.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}/vim-${PV}"
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 967605992dad..fea6c0fd1c93 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -9,6 +9,6 @@ DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b
 EBUILD vim-8.2.4586.ebuild 10091 BLAKE2B 9073b2cdbd5e910154e4f5ecf845d46b10407e1b363a05d98dd0e688071abfe5d67209efece7997f48197de5951f8a1369ca3b424cb44d69a1d532ff7167ee2b SHA512 3907db9b383f43378ce0c87c8abcbf64aa64212462be5873595a796a562af34e8875a5f38b9bc55363c94d0a9eae9ed9f58f386062ab2a73e1fa7dcee5479478
 EBUILD vim-8.2.5066-r1.ebuild 10420 BLAKE2B 04e5471f93e5883fb3d6a4177b1a09937ce247bf227c71f0056d912554aa64676e66e86aee044cd2f31c90b0544b1033988e159811b3188a41a05537084878f3 SHA512 78aaecc2b156e8fbe304a3d3af5bcbf4b5d8806b199d12221bf2203035cfbdb0d2c497f9c28ea7d2f5100c58f2d5e205c1bd2990aa4aeee955ba662d6c80f07e
 EBUILD vim-9.0.0049.ebuild 10353 BLAKE2B 2a17dd40451b1da566d846146f870e4890d031127dac21778a808fe5767f47e5dcbe3c2262125aeb31e88347f214e1d5f695bc76fa94a6863d3d6bd3ae385626 SHA512 e5941d993cb16375b2f5a4879fe3019345922b14a53ad3ae6b27b000eb5f03113a5c538c3c61a31e88fae1bfbc2e8f97fb5c197ae176607364c13c9ead092bf8
-EBUILD vim-9.0.0099.ebuild 10365 BLAKE2B 350338f1399c303991a8f38acebb576a949cac4b75df99cc4a94e9045dc09778cdc5aa241c3e95f826604bc27f03c86f643e75db118d4164af302bd19cb8b618 SHA512 795464190b0e861877f92a93e44fbf649279c96a261330293a0569dbaf544bf1ff03054369c89612529223497d381cf84cdec00bb15bb4f33adf8159ee3b879f
+EBUILD vim-9.0.0099.ebuild 10364 BLAKE2B 6495a6fccf98d36c3156eff67206985caf855f1cd5f398ad153f77333fad206243690d7296c9e4794dc12089f0cec37069a43c29978935a2a0a2ee3ab84afedc SHA512 0c2f9e310b4d49bcff842a1c9adb16896d52dd0b0ef328d2c2d113ceba656487d961dbe771cb0dca9ab7af145d03bbce6d6f6bbeda6ab275bfa37ec4d256859c
 EBUILD vim-9999.ebuild 10365 BLAKE2B 350338f1399c303991a8f38acebb576a949cac4b75df99cc4a94e9045dc09778cdc5aa241c3e95f826604bc27f03c86f643e75db118d4164af302bd19cb8b618 SHA512 795464190b0e861877f92a93e44fbf649279c96a261330293a0569dbaf544bf1ff03054369c89612529223497d381cf84cdec00bb15bb4f33adf8159ee3b879f
 MISC metadata.xml 891 BLAKE2B 00a55660fecbeca3df9b50e7400510fb92bbcdd42ba588725580c153d74a4731b31dd0ebaade4f60a4db88c695a7f60663773d63046c1b38aab0363520b8858d SHA512 76eebfe4d34eb609b29946b724ae450916eeab2573edf0f5aa87325f1e9abc8a2ca45d7abe3bfa9d996670d90e7cde17cb84662f69502a4b4a5b44b14b4c8890
diff --git a/app-editors/vim/vim-9.0.0099.ebuild b/app-editors/vim/vim-9.0.0099.ebuild
index 8ed0739b5988..ba6b54736cef 100644
--- a/app-editors/vim/vim-9.0.0099.ebuild
+++ b/app-editors/vim/vim-9.0.0099.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e26335a2bf39..156bdf6e6573 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index bfdb661192e0..31cc64943d22 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,5 +1,5 @@
 DIST protontricks-1.8.2.tar.gz 153142 BLAKE2B c0757973f7e1c442ab0bba27c2c739a7b24d45bab31ec308ec195290e35392d222369dbfe64f558e21ed1b61d13bdae629c0ba8b2f81b9af2b4f2f94c30ba9ea SHA512 9b83c34847e8ea8ae86f77330f626748a8ef5682c99619d90fea0c52de3ccd5b4285e5dfc676b8c046b9deec996847dbb0586596428507e162e255a852b28cd1
 DIST protontricks-1.9.0.tar.gz 154202 BLAKE2B e998bd899ec953ed7ee0bb0f3944da0212b71f2d0eef6c6996040e4d9c607f7bc73b52df4cbc6a70480b308473fa8c0978415a6202f498247bf91662761adf5c SHA512 43ffd2a5cd4d58c44696a2a66da0223a93d553822fdc92a476c661d69f7522d2aef12787bfc33610751bc1171fb1a3da169e3d40a2b60863a9f37ed205771835
 EBUILD protontricks-1.8.2.ebuild 1561 BLAKE2B 8e363eb3c10b00c76e33654b1435d0e94d27941d53f17666dfa8450e9bf9a40f913fa9c66bd7d1f9d8f35e625c46ab0c50b20953734c370dfd770004c7a2c4d8 SHA512 dc3a8f17876d26da53bb9a8018aa6b754e503782bdde6b464e3353ba67ea51c9405f1b93c3d3f63f9aaa91cb7bf6542318ed3eba7bd111cd54ea58108d88882e
-EBUILD protontricks-1.9.0.ebuild 1562 BLAKE2B 301f4eb1b8aa3ca6801a560614f1eaee2f917791a74eeaf173a1f3373a9768c87d2308bd8089dcd7448c3658f580476063dbffc637a2b9aac82dadb2d55f761b SHA512 5152a113f79b6788996dceebe23a64ee3ff8db232c6d89fa02500e4f18013c96079e2aa58a441636d4286232a581744504a0c08e3b9338fac3fb7b7b590e4cb2
+EBUILD protontricks-1.9.0.ebuild 1561 BLAKE2B 8e363eb3c10b00c76e33654b1435d0e94d27941d53f17666dfa8450e9bf9a40f913fa9c66bd7d1f9d8f35e625c46ab0c50b20953734c370dfd770004c7a2c4d8 SHA512 dc3a8f17876d26da53bb9a8018aa6b754e503782bdde6b464e3353ba67ea51c9405f1b93c3d3f63f9aaa91cb7bf6542318ed3eba7bd111cd54ea58108d88882e
 MISC metadata.xml 809 BLAKE2B dc0506e6f3224adc867438699359c4eafc389041846c644818732036e04bcb9c789e358a08effdb4b9ff4430521f7fe8ff6800b75aa93d6313e3d85395467741 SHA512 351bb79dc7921e6c62100b3354546185d31578b044393ea5e5b5fea089eb47164882ff4ede30d8a575dea31ec9d0927793f8109d9e63ca4ad6954c1affdbe6f4
diff --git a/app-emulation/protontricks/protontricks-1.9.0.ebuild b/app-emulation/protontricks/protontricks-1.9.0.ebuild
index d33c17e8e46a..78ec733bccc6 100644
--- a/app-emulation/protontricks/protontricks-1.9.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 02058fe19ea8..2bb4cdd4d26a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 6aa4a56f21b9..8dc5d4e47435 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,21 +1,11 @@
-DIST amd64-debug-libreoffice-7.3.3.2-r3.tar.xz 1497663004 BLAKE2B 50a3083f4faf1b10887f41cdfb0f263751d3e35ad8bece5df1a30e04a18d9b9cb04593bdf514a59600eaa3912f44d6699be0ad41e8317372c0b8b8605a3a2f0e SHA512 20b727e7912026248a5de940bf3072b00ad668be5501f54a2d93afa13e9bc4bace004771e7137dfabe94a789a6591323e06938b247d8ed5124b243f0acce8d7e
 DIST amd64-debug-libreoffice-7.3.4.2.tar.xz 1497883572 BLAKE2B 079fbc4e59aaf3b9ff613194f7c17122046c5389f344be5a504a94781e882ce94079686fda5c399868abe10da9f757fb953a4f90d77ac6337397e0244b56c632 SHA512 9e71642bff4086cb5f63d1088768e6a55e1090c3bfad2da019942be08f396780e7945803a7f6ad9d265a7f16d83b233daa685bfb1e80ccca6513368dedc54797
-DIST amd64-debug-libreoffice-gnome-7.3.3.2-r3.xd3 1426942 BLAKE2B 4065ec4424c66cecb63a2c565e7622e822d0111d7791810ba7611626c188202b6213b5d61ac51e053b7a9b149de265b28d2a97891aa90269821fac780567a190 SHA512 470acdf23a0a63f5e3e70c050df421693674196019ef2f4f7e4238c8d8aca489b33748bc8ab3682b5b63a773c30c124219e1017ff58552ead31ca9091015c289
 DIST amd64-debug-libreoffice-gnome-7.3.4.2.xd3 1426754 BLAKE2B 81e61d78f1943cdbae2ed7b4ffb5baa3144dfae8a3b8b9aeb9b893b020a85dc5ee2472548958df98c5b628674e73fcd6624884d394a0251bedcf19b321896e20 SHA512 ef77b52a56753225b7d31f63705af90cf5f693de595383e93d4731d10f654ed3135b50d7f582d968c359c75a3348937e45089e7e47aa1e76025e266fc07b120c
-DIST amd64-debug-libreoffice-gnome-java-7.3.3.2-r3.xd3 781950066 BLAKE2B 9029d5962874b841b331449809b89ef0e7558bd5c7417953c460489697b8eb3892e66d9d66c19906a76dd94f203e9e81b41e9df4a90f62fe4453c56f7c16d1cd SHA512 87099de1886084f238fa85bbfdeec4057fb8d59e9d6284b46d9a9a3f5abbf2c5715b2b685af3d2198fb1be0b2ada0c5f350b9cc26faf98094acb363d3f38a5e9
 DIST amd64-debug-libreoffice-gnome-java-7.3.4.2.xd3 782367431 BLAKE2B 1cb5e9812164d3069c2196b3d52e3b871114789fb1d1e24599a0b12e51ce7bef4d5902ed7589e77df1c1271f25c00192e1742ce43b6ce3a3796fa5448241de27 SHA512 1068effa4b0b0eaa9fb03c06f556a9dc89c22f1702e6aa20690e16a787a557f794e6de726ba2d2280498a7d71e75c67d648f6e7bb36473a4504acba951b1f7c1
-DIST amd64-debug-libreoffice-java-7.3.3.2-r3.xd3 780540993 BLAKE2B d684f08931576e798847ccd8eeda1b2c9f46fd9af89d1b5c3b1c3d6b27e086d11e86946c6c628348666a19af23f11bdea6b4159fba400bbe2341ea2b52baf02b SHA512 a5c742c60d380585759ee5710c86559fe5e0b777f6b54e1c3b5fee0c6888b9a905f4272ca584765212d082aeae787ad4868d556d604047a63a494adb8eda8174
 DIST amd64-debug-libreoffice-java-7.3.4.2.xd3 780949590 BLAKE2B 17bc92b792c19fa89331f2d232888c52bf1c5ee7310143b7ecf3839bd3c9af2406662869c6208d5a99b9506b128fc9fc03bfb889d2c76671f7627d4d1c7f935a SHA512 409d42e47e01f33850616d9bc8aed06e3ab6b19240abab7774e82680fcc7b22f9818d8a037a12d0f9a311a471920bbbf974ae64231395018329232cf6b71ed4a
-DIST amd64-debug-libreoffice-kde-7.3.3.2-r3.xd3 475252964 BLAKE2B f201b68122d03628110f71b6b6ccbb9281e9efc023c0034b2ed620667c7f51156ca3c7f13609faca4e5e0bc8ba13612f8d7b2ca5867dfa6f1a3ff82c524c9af1 SHA512 f2f737a627226ce80c1ccb12a69d8eacc762cba52eba77c3017efdb4bf4a609956626024e4cd9a15dee3aa0090ac7a47795c3b01c0723eb6584f3c12753ded5e
 DIST amd64-debug-libreoffice-kde-7.3.4.2.xd3 474987720 BLAKE2B 1c1aa0ff471339655f376cfc711bfe2c18ade7eebedd89e2157927a06567892687d5281318097b939b9f21e67dd4a9661a2ef3880f7071cadf484e838f2802e1 SHA512 15dc56a6980795898217b0698931b7abc3abc45e766791eb22f1800f1771e29d41719d7fed0a2afad556704db2cea531a2eb743ea1e4886a7ebc14e30630ea62
-DIST amd64-debug-libreoffice-kde-java-7.3.3.2-r3.xd3 785272796 BLAKE2B 6c4678af64da1913b52733fedce5ef544f18f78616d056eb42793e2fad17a1d5c4ec331dd4c9d1a5c0f5d65e59237d41cdcad324b6adda7bf1ff5c22ad28b3d6 SHA512 fac9fbf9a3185035a2132a9bcb8f0fb57bc2540b3f1758ad043563c74b51ad17b42d760a61b1fe07826a25d0c9e2e59be3fc607c3e9e80e16fe4e7d7e2934c82
 DIST amd64-debug-libreoffice-kde-java-7.3.4.2.xd3 785653723 BLAKE2B e99cc01dd938e4a84b71e0597bebd1d14ab452051c5f4f0c4a582266fcaa0af8fb52c9f4ecfb7ce157a622c0a676e996160c43b3a5b82c14b954615bdf4e0db3 SHA512 4ce0fcc0f093a18448773a5342e114635461f42ab3517957f507d061e9e84ff34ef75bc28b6b42886fe61f1f6d5ace2a81229c4b62ceefb644910e7ab1003807
-DIST x86-debug-libreoffice-7.3.3.2-r3.tar.xz 1466296624 BLAKE2B 2978c81e86af058a583b97992de6a8e453f7c1825eeb7b71354dbc11b115803234dce7df88996372e8f1c317bfda9f3b0c3cda563af71b6c6cd66177cabd1978 SHA512 28c9d2a25661c066178559569e00966b277f78776762b4ff104c3ee4e6eeffe59683b1c17f4a102cedb0ab88b1311b5d70cb991376b08102c2c811ecf37cb612
 DIST x86-debug-libreoffice-7.3.4.2.tar.xz 1466311484 BLAKE2B fe6dd69d7475e9b8df48667ed904d694204d6f4a8172c0c7f361031b19356c573a7d72b89e09726257d02ff3e15157ac17dc82d5be04be646032a2d4bc2d982d SHA512 ab3c7fdb00cf235ed0a10898589ed23819ba450ac52d5bda65be92af22a0541994fb178ae6cd478ca0d512b9853f7fa8abae8c5e49cb4914104e006d47eb854f
-DIST x86-debug-libreoffice-gnome-7.3.3.2-r3.xd3 1385520 BLAKE2B 6275a12d860f493d0838e8cac518cd0a2a840a6be99d89b7964a44f81f26312c87bded4e67d33e4e6e4223ce14b4428e399da60b25f96e24085eef618cddd43b SHA512 ef35204b09b0ea62620950dd7f17cc012a31508963c6442fae2b36d39d468223d28fd251ac82ba26416b17bb3f89c3b4ed38165942da5b271192b525f08eb37b
 DIST x86-debug-libreoffice-gnome-7.3.4.2.xd3 1385099 BLAKE2B 078b2d57f31ac2a78304ff84d97e6dc27d05905652c5e5430f833987a3967c9322765767ccc56a88d3656b2e84a06d99d5902fcfc65d047537182fb33b3d7a4c SHA512 03b03497bfa7edd180e2f501f16a48f8100eb74f9e5d324d9b998b22304ae6273868a848697c923dafbaba6e93c77d91bb90c69c1a4e69a25b92d330a97e7887
-DIST x86-debug-libreoffice-kde-7.3.3.2-r3.xd3 452781808 BLAKE2B 7f4ec8aa2723949aa56170803e451639a3e6608449e465c817166ff8ffc9552a111186bccdd835449090786a7add2898445559368fb5a8c71b600f30a31ed968 SHA512 853a9cfd782077a86d9e34f1df9ae1718e36f628877a6aa7b311e82e56beca86322959d95beceaa2a4b760fc28bb1191fd4d9d8a4063acc648165e786f58033c
 DIST x86-debug-libreoffice-kde-7.3.4.2.xd3 452751390 BLAKE2B 503af0a857842f7654f775c0775d5ccfbcfba6e7367e0b73abe9dd62c4ff74126d73e51ed8ad4dfce44376bb999dd066cb346220072044d40d7288d11743a88b SHA512 f39a58170fef3ab7044327298a8033e62856c23ca5632107a6ca6614111a9bf2a2dd22818f2696359bb3d5981dd641f153d44e433d47ef6ab1f71e83403ed4e8
-EBUILD libreoffice-bin-debug-7.3.3.2-r3.ebuild 2536 BLAKE2B 5f503b15d77b316ec45399e6c6cc3d2dcc8b8960b83daa623bf7028808c6fc28b2ce0fc29f25a44ab10b8dca6332581126ce437310001787baadb6a9a8fb8246 SHA512 6aeb4fa56ea0620ced999b3fb231b2b3c133c9729a90933ca3a498ee9763112b34bb674e3cabb173e6adb71316a76245a727358b9ec11d085fb19fd3c8b1750d
 EBUILD libreoffice-bin-debug-7.3.4.2.ebuild 2536 BLAKE2B 5f503b15d77b316ec45399e6c6cc3d2dcc8b8960b83daa623bf7028808c6fc28b2ce0fc29f25a44ab10b8dca6332581126ce437310001787baadb6a9a8fb8246 SHA512 6aeb4fa56ea0620ced999b3fb231b2b3c133c9729a90933ca3a498ee9763112b34bb674e3cabb173e6adb71316a76245a727358b9ec11d085fb19fd3c8b1750d
 MISC metadata.xml 482 BLAKE2B 94bf0468867227f0b085d6ca86359e9ae852fb874ed95ffa6d9926cfcdc7173d5db4dfe1a0ed86daec746a4f867d42534465bb03402c5bd4d9ac6bb8101932d7 SHA512 d4f6a8f90659676fa509690059e462c1755e22792efeff0a571d8f04f9f167cbed22d5ce34928a4afbf2fc01bf7ea2b5e8f1a70d4a652a3df9153ed0ccbe1905
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild
deleted file mode 100644
index 7fcfcf3bd910..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.3.3.2-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-# the = is correct, the debug info needs to fit the exact binary
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index d0325999c956..7c5a13543be9 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,22 +1,12 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
-DIST amd64-bin-libreoffice-7.3.3.2-r3.tar.xz 142385916 BLAKE2B a46f7f3efa4db9a3a341cd69d445a4a82806880e6e14eec5bcc621fd9396f7d3ca68c05be6651169099f553412192ffeb7e3d5f127cd926ac408e465bb82036e SHA512 400a7d08907f86d48d28c392377ad02790f79bbe4b1147de70b21622cb622118e9e62c90ccc8f750e63f7efdc67209c789f63df49d7a388066ff4b5a375d54b3
 DIST amd64-bin-libreoffice-7.3.4.2.tar.xz 142347312 BLAKE2B 0db00b707b7c7bd86ef4406eb36958fc7425a1ea1e2783a0e1d2ff0ace9da2633f2e2ea6f6fe1c363f2e31f11cdd1d897da941c5af8133598ad7fedf944d9ea6 SHA512 60559fbcadb97429b9e5b982317ed22bd2501462ad73ad9dd38e32beb197b590898d417fa224288cc8910a6e2701c2ab61ae37d44649612de0f74c9521c7a744
-DIST amd64-bin-libreoffice-gnome-7.3.3.2-r3.xd3 1485486 BLAKE2B 617fd8ae2496353cee690336fc3cfb5f5fbaf497d35d50b1bc26cd6cbb29a9e2f5b461157e8da8e3cec15d9dba9519dd388acd90144f25d46590b052b10cd394 SHA512 81dcd57dae4a20b8d629825155bb4c024bb9796e5e1deb44caaf4bc7aed4447a19eb396c33c96a1b04ebd908d69e24820e0415de46d1999331f70d4cfe18935b
 DIST amd64-bin-libreoffice-gnome-7.3.4.2.xd3 1483443 BLAKE2B 400a147efa62b6caef172785ec83a6767ab0a1d0faacf86f063e2dbd5f7eaca1258d5f7467943cb89bb1678de9ddc04a0c49884938d554897ebd3eaa5ee1bb57 SHA512 7325a943ec884a4b4048788c5417f380ee4f3130f142a38084c07014dde338bc9fc352eb4a36cd744d3ddb1acdd0e3c59b73751413df6897e7e940a18f93e2c8
-DIST amd64-bin-libreoffice-gnome-java-7.3.3.2-r3.xd3 30886601 BLAKE2B 469e1f72bb8bc8a5707edf33fd5e67cd717d4a540d48598c165376a67e039bde84e5756ba4eafe3246e1755777e82cb9c55012a8d57dd2ae28003a280f3bb9f7 SHA512 e2816bcfb63d0602f0f4a840c9ddecf23868aca277efa59e74e60aa478236e93332b743ea4185a9c27f8d5f43db3874051f1bbbfc183d1c245b004e24e6a993b
 DIST amd64-bin-libreoffice-gnome-java-7.3.4.2.xd3 30944697 BLAKE2B 60af115380b3a0edde5b9ae0efec431b02f4f63e869fc2542c4cf8732b504f6881c0c13cd9c5d9c1e9f4611b3756aba162a07ec3a95022917b587fdede12436f SHA512 937a08b3aa145c794514752082a09037303c3bf5be2e3c4d2da4f0cd6c5e45f627921e814701317f3f7b38dcf9c76e722512268be09ebcf2488563a3403cd95f
-DIST amd64-bin-libreoffice-java-7.3.3.2-r3.xd3 30751415 BLAKE2B 325deb2c13dff85682f4927cfd04c9699ec9c79564e602646f68e89a3b6e72c76aad972a60dd70b36ba7f20455964f670ad0673a408fc95a59aee8961888d547 SHA512 f5d696c984c2eaf4f28b7e44eeab199bc294b323d5215d71b9dff73797726ec24d20d18fac146d79d2e306868d8e8bd6773956a43dd7f3c03cb5ffd82b938f9b
 DIST amd64-bin-libreoffice-java-7.3.4.2.xd3 30817504 BLAKE2B 5769439f397ee2917efc700d9d576d1a4429a3b60bc11470141b5e38e31f47b4c17ce3d867d76fccd5c16f3e789eb985e0b916a036f63609b477f0abcb8b01d7 SHA512 705738589b069e392551ae93509a1be7c97f0b0a8b13232a2fd60a1dc01b905b4db1eaada349a79b0529994b117dd1ffd402da14de28bdd32c959d5023a16c54
-DIST amd64-bin-libreoffice-kde-7.3.3.2-r3.xd3 20923444 BLAKE2B 1f50b67b66f21a3e83012ba6a203cd75003ef13e33d820e921ff3e91ead6df72b2f8bc0adddd61401deba647748e5d2f8b490e673f9bb5bc8eb5d0f64a62c588 SHA512 bf55af25bf7ac82b126c1be243c4e64b23d9b836c173a65c986cc8d09431f270cf99cb377228bd96407be36d365aa19014a2d19a003c99bc20c043b00f2c0859
 DIST amd64-bin-libreoffice-kde-7.3.4.2.xd3 20934862 BLAKE2B 201b250685d2b936ab158db74d4a136aba4cd48c1432da8574b6be2d64d7bdab08605f3903fe9611ca604e4cbaf72b5a9639184dcf2e6de0f30b63619a9a4264 SHA512 90827fcba878a1f5168e7a0d97ad7825b9d8fa2d1b15c0eb050ff13f35f3a8539f9df511a7bb1006974893cad936f5470308314d522c4d8da3ebef9ec2b219e4
-DIST amd64-bin-libreoffice-kde-java-7.3.3.2-r3.xd3 30867686 BLAKE2B 352c47ec2b1b4b528cc727fb24fc8ebaa5c94339d8a9d2fae97f103d6ed6485485b1e61fdac6a1ed6958c658ee9ee92e636caf33e65d9417c871cf85f653f968 SHA512 e397779754c2a0e95d7cc1d3575774810d968d0b1ce5906cb374b0e7e534127b342636666b83dc29bf52e0eb049c2fd93da80c312f0470b39befd6bd5e0812c9
 DIST amd64-bin-libreoffice-kde-java-7.3.4.2.xd3 30964144 BLAKE2B fb98d727cf9d8479e44f48148d06bd956eafcaec4f0f06ff62f50a8297d20adabb8a076979986326dbe9882ad2ec17eb97f7abadc47d523153c85ad8f874c215 SHA512 178b4583c63eff69a384f7a1805e029199a066c70aa8488fffde2e61242a45e1cec99f7c02c57087b66df029db7968e5f3c56ecc81282cd75faedbf6aac06a79
-DIST x86-bin-libreoffice-7.3.3.2-r3.tar.xz 144159236 BLAKE2B 2987cfb61eaa37c7c0eec8f58efaf0c464c1e6311dc207cf9aaee85790930eacd12d38ca83684714392f20954fb07d427b3a994b61c2ecb50096f9ba22079e8d SHA512 3bbd3624d7381cc8e09035098901214dceb2c6ab985eedb219cd333b32faf80e9b12cf6bfe3e3cd148cb21d868cab276f400816f45d8b19c4fc539b42f47705a
 DIST x86-bin-libreoffice-7.3.4.2.tar.xz 144147140 BLAKE2B 8505f1e18bad0c63b16a1663947c27d336525b92d307279bc705f814d8ee93183153b487fb2373788d4147d73fdd6ef9995ff6a3046145bca1a0293b3376b4fe SHA512 34e446882e87fe049056e7bfc5e9ead8bfa3c07823dcdfebba61e2b589ffac0f1797d49bea7f19c462ccfd36bb654653b58cdcee2cb596a9ef3253b4ed08f3a7
-DIST x86-bin-libreoffice-gnome-7.3.3.2-r3.xd3 1446875 BLAKE2B 4d2c700c42c81422ec9834d119d141c8a255578245bb74eecaf3a785e874b20ef0dec98544ac9fb9d28bd7e2bd35e3b822793f7e86c61e04c1953cf52cba327c SHA512 b33eefe0233f7f68ca1706eacc92631fa9f45e639615449d877ef7f3716db60bf3d3166525cb298881c5c80d387ced6f19a2b87b9e295bc48669bc5998855763
 DIST x86-bin-libreoffice-gnome-7.3.4.2.xd3 1448866 BLAKE2B da76f7fb0503e8cd8c074ef07a84a11b43363d4be75ff287a3a87e53d8185d31e4ca206c5161b989722f7f4e8e6c385380532ecf33a499fc5d38da9687bb9baa SHA512 a391be42e12afb2c78df70e20875433846f19183bc598674d099dc8d4d57f47b455d33f6911822bc4dd0028655d2dbbc8e592085144128ae7a4ee2d4bee10439
-DIST x86-bin-libreoffice-kde-7.3.3.2-r3.xd3 18547991 BLAKE2B 09d3f38a7592ab487a241c2c4a427fa57405d95796f5ba5e1ca8036cb89630edcdab902308f89e616d1d3a0981200626c465d0465800b334c3d9f5886d09d3f6 SHA512 1fbfe49bd25f219d7ec9168aeaa9c0c8aef9303027fcc8491c5a69ce7d2ea582e02445b644a3db6f3cc3964aafda8ec6f08292617e7983680f448cd1dfffb336
 DIST x86-bin-libreoffice-kde-7.3.4.2.xd3 18531900 BLAKE2B e3ed162a68a6fef8b2be6adb0be68a015290ec7c8ec1ba3cdd1a2a33f88a69f3100d1beb89c7dc0b9e4bbc78097316d8a0f7d4edf8294154ebd98cf51836d2b3 SHA512 467e661741fa40643c7a53f7980b44872a6c9bdf654456fecc66d38828928f745922a8dcccc835aa722bd0814cdbd99e4e5e51f4d35c29263e44269574d6a49d
-EBUILD libreoffice-bin-7.3.3.2-r3.ebuild 6298 BLAKE2B 1206f19151ad381bf70ad815c6ee992844e6b4d1d0d3996d775b66186bc0218f9a99db2d0cff8060b7fe74de4685958b81ac2f6b9bbec22ddbf5c5518681e1eb SHA512 4fc8487ca1c8186e32b05e7e56ee5d83d7e5fde2bab6f3387a595a1823df3110b27ae4aa5d7445cbefed82ff574833bb872ae0a9b41c1b49defe2c136e9dc08d
 EBUILD libreoffice-bin-7.3.4.2.ebuild 6326 BLAKE2B 8268248e93e9ad0220934a47b65c0eb2e1bc2a12db799049b745d04d3e4409f8ce8f70e21e410a8070c6060dc8045425afd9b9ae933f931de8234946c59633f4 SHA512 047fa0261f51300a35b33a76dfc58d1009bb7a35b149d102f59e8a379274b509c90e10075528024c8b49f62cddd77abf8f0aa2aad503a2e08b50756c202d5daf
 MISC metadata.xml 511 BLAKE2B 3ebaebf19d7db6a7e64093e54ae4ce86f14f528dfbc0987c027bfd7dde5de6ce8e7bfdd815e437aff272b7201d298568fa032cfd3292523c00a1c2bef5bc984c SHA512 01ae7e196fa4b7fbca6190fda6ac2e2667b36a284e828f6b329593b517379f3f4575f96a2eecc4a1d74764fac19ba8d7a756a54c04190f2aa17c578705c9708d
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild
deleted file mode 100644
index 519af383f2da..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.3.3.2-r3.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_10 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-cpp/abseil-cpp:0/20211102
-	dev-libs/boost:0/1.79.0
-	dev-libs/icu:0/71.1
-	dev-libs/liborcus:0/0.17
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/4.0.0[icu]
-	media-libs/libjpeg-turbo:0/0.2
-	media-libs/libpng:0/16
-	media-libs/openjpeg:2/7
-	>=sys-devel/gcc-11.2.1
-	>=sys-libs/glibc-2.34
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	dev-cpp/abseil-cpp:=
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.17.2:0/0.17
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	media-libs/openjpeg:=
-	media-libs/zxing-cpp
-	>=net-libs/neon-0.31.1:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus[X]
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/libreoffice
-	acct-user/libreoffice
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( virtual/jre:11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 62ee272c8f5c..efc91ddc9995 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9ea9f7555e1d..6025d1006aa4 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,16 +1,10 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
-AUX poppler-22.05.0-missing-include.patch 518 BLAKE2B 7ade72f27a3d0b9fd32fb83113b71e74a0cb6dad42c6c79648edd7fffbe4c20fb716e3fb87e4e130620c63e7b5326a9d76ee24feaf074bd0ffef4f9007d89ea0 SHA512 d6a0d5f466f3af935bcf78b6f87f3b078076dbf7da9c3c7296f9731e14a197e7bf87057fb4dfbf1746790d9e02e485d762595dab70ad78b4ecf6e5913dc8b2db
-DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737
-DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3
-DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5
 DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02
 DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d
 DIST poppler-22.08.0.tar.xz 1840700 BLAKE2B 7e27eb1e41afb83633288d2d923a58e94590780f6f558e403928582de11c742781a12df11dcd7d9aadbfcbdae2662c83ae23f683552fba9e1984d3a0c4577f53 SHA512 bbff6d51eaafe58891357069c83e43ea25b4077755fa715a17b38660cd3cd546fa21d2e17a272d9b375f7e440e6e3661e84a20f18d445e0f28d06971abc04666
 DIST poppler-22.08.0.tar.xz.sig 833 BLAKE2B 8f6476068a78a0d145b2c43826ad3a73175a5506aaaecd14f837deb21b7a247154ba41e87877e35f249229871f006930c5849649a4310820020dc4cd7284497d SHA512 3c5350e5b9ddd872c4cf61e7463897298fbd4233be45241d6720e0debb6a0577dd45d663ba863bcc6ebb457197ade1093d518a363f3d277e382947c75a897ebb
-EBUILD poppler-22.05.0.ebuild 3397 BLAKE2B 69946eb58b8b7844de29734e327cdc8c912fa535c3281f908739e68901fc99ac6ca92c437f771bc3e328fcd48fb76b522146941f76df9fe414fc8305d8b23c86 SHA512 e1130a9e67d32e1fe3052c8fa9dd0f43c96024c69cb6ec44c8a103c8fcd8b98d7e29e7f2ecf05384f6bf582f0efd8757d04801024ec8d284f752c5f1b0d873b8
-EBUILD poppler-22.06.0.ebuild 3621 BLAKE2B 8dfd3ec8744b01a482b29b7583c609e5fd0bf7923b3a776316f0e0b87e73eba67b88f44507e8a5ef8a474c247172b360037c1a712a264e2471dffc939c695dd5 SHA512 8762203dd2a883850fdbad102bdd33a5749ec6cc67a45c328a48ddac62e87c67fb205f3cf9d3adc6eb5462611c1b7a7a2c0cab6e30cea9d6387890cc01c4f169
 EBUILD poppler-22.07.0.ebuild 3648 BLAKE2B d8a3eaa2e381a1a7e047e0cd475f18a00234e602a0c2e2d4e8fe30a95499dff0ef0770ba83a6b2fc0e533419625a47753ff757bf109e540b32dc7c65cb07a9ea SHA512 0059fc5a203855c2139bb56fc379b4f8d4679a81049e253344ddde27d6b0b978ef5a3e0263e0b6c3a93f6cc600284a2f2c433e004931e9a2ce5500fe8b319371
 EBUILD poppler-22.08.0.ebuild 3656 BLAKE2B 6026baa71b89b2e8150a2e2f9024da315555e0f3f367355654c00dce0c7de90ffdf34fb442f9006d16dce68e4057b314161597470ab007916c2e891ea80b5d33 SHA512 a44f7052d8d26b9feda589f33fe27a27b983de561cfbbfe02b126551282ac6594a59fc25e2515aaf941573d5c7099f55c63272c61051cfa2824d249ef63fb457
 EBUILD poppler-9999.ebuild 3656 BLAKE2B 6026baa71b89b2e8150a2e2f9024da315555e0f3f367355654c00dce0c7de90ffdf34fb442f9006d16dce68e4057b314161597470ab007916c2e891ea80b5d33 SHA512 a44f7052d8d26b9feda589f33fe27a27b983de561cfbbfe02b126551282ac6594a59fc25e2515aaf941573d5c7099f55c63272c61051cfa2824d249ef63fb457
diff --git a/app-text/poppler/files/poppler-22.05.0-missing-include.patch b/app-text/poppler/files/poppler-22.05.0-missing-include.patch
deleted file mode 100644
index 9dfdcfa12406..000000000000
--- a/app-text/poppler/files/poppler-22.05.0-missing-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/freedesktop/poppler/commit/5d543e801d304e4cdbe12506f62c340d509f12f3
-
-From: "Tobias C. Berner" <tcberner@gmail.com>
-Date: Thu, 5 May 2022 04:59:42 +0000
-Subject: [PATCH] Fix c_time usage
-
-In 2656d986d01da5aea4f51c75e4deee569ca88064 the time type was switched
-to time_t, without including the necessary ctime header.
---- a/cpp/poppler-global.h
-+++ b/cpp/poppler-global.h
-@@ -25,6 +25,7 @@
- 
- #include "poppler_cpp_export.h"
- 
-+#include <ctime>
- #include <iosfwd>
- #include <string>
- #include <vector>
diff --git a/app-text/poppler/poppler-22.05.0.ebuild b/app-text/poppler/poppler-22.05.0.ebuild
deleted file mode 100644
index 6bd8c9f87f88..000000000000
--- a/app-text/poppler/poppler-22.05.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2005-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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"
-	SLOT="0/121"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-DEPEND="
-	media-libs/fontconfig
-	>=media-libs/freetype-2.8
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND+="
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-	"${FILESDIR}/${P}-missing-include.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-22.06.0.ebuild b/app-text/poppler/poppler-22.06.0.ebuild
deleted file mode 100644
index a45c4fcca60f..000000000000
--- a/app-text/poppler/poppler-22.06.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2005-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	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"
-	SLOT="0/122"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-DEPEND="
-	media-libs/fontconfig
-	>=media-libs/freetype-2.8
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND+="
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 51586bdecdc8..430efded6876 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -3,6 +3,6 @@ DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd
 DIST scdoc-1.11.2.tar.gz 12746 BLAKE2B f4cb2c400103c1f2247a2bee79dca9ae5c50b8397c65edbdf4d70265a4596f85e0c47aab014699c4d63929b258db8ae3ff6728a9b95f212be9db1fa657e5b93a SHA512 3fbf1a74b222dd88410636124e4b6ca73f7e77f67d512cf430a878fefcaa5c6c13a1e9f6c0c9654de15353f94bb1bd528665acebc2293bebb325501d1eb6cda3
 EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
 EBUILD scdoc-1.11.1.ebuild 1192 BLAKE2B 8021b8570d9004ba4960f5770d0582a339ec49f9ed83f75ba66698c9d524031946aecd9f22f952264456b26e85cc6f3482fc75193f806f0a61174dd87ad9d020 SHA512 56f2c2a50b62b138e7b9f1c6b48e8abbd849a5a34061f0b7b9079d54efbdbfd002808c7ab56fd12ce528ba2ce6f68243bb31c8ddb918c90d8995d938c9870b0d
-EBUILD scdoc-1.11.2-r1.ebuild 1200 BLAKE2B 030ac0f4ccbeb4f4b440a9f5c6207d5afb7db0361feaa7368f094ef9e626a773448307173d8798c1120a85299c0ee67ce2bf85a9f642702b07ff4b51c2c7cfdf SHA512 f716f83e7877b404f65d41b4919268dca9f94745331c844856e5a4497d819c5c403f8b01b97cfbdad457aa0bc356dff25b1efd7eba0eeb187c61e1d9df007e1e
+EBUILD scdoc-1.11.2-r1.ebuild 1198 BLAKE2B 21ae4dcfdada285ffd9ce7feba1d3c4424f83413bf1856fe77f01f0e811fe5efe2143232601e815059c219ed0c6da28627b6840551fc032682dbf3aa38b0b070 SHA512 3e4ece3dc1eaf04714a00b4af8bbe00f5c957fa9cbd432eb69716e69cf71058dd2ec1ae641f5a23fd6efdf41b50251bfbe8ca79c66f939da9b52db8381c89391
 EBUILD scdoc-9999.ebuild 1202 BLAKE2B 0972ad055c8abf9b80bc10cd3c53b5ac9fd01e66eec24f17ffb1d8f559d9b612d70fe7f05fa6d57e8b72987131828b095c986353ef1394370d92f0819aacd4a0 SHA512 3c03e8aebc5c6bacb3deab5be04eb34fbe6cd756aafae575f690be98b41b86a3ea970e8b1d6c1dd42a4de77aefab4b0429107ec3a048d69d2658a715f171f608
 MISC metadata.xml 334 BLAKE2B b4dfa2cd4f88781ab650e1f2514c98d4ff7122703b2a5fdf4ea68a6deab002222fac5c17f80b4f11260b2c22853f98846b2064b38d4c8297fdce9dda5030569d SHA512 e4161c4d0c51306cd1e93ff43390534f1bb4f5393a77b360762619884a8b057a75e1da784cf5f28c092c035f1681469b38b2f0871c70c027fad9b1902fe28c9c
diff --git a/app-text/scdoc/scdoc-1.11.2-r1.ebuild b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
index 45903c199466..9ac80ff7b904 100644
--- a/app-text/scdoc/scdoc-1.11.2-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 8a78da73d209..c3f0120f895c 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index aecb02966e24..ebec678f3fae 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,9 +1,7 @@
 AUX odbcinst.ini 82 BLAKE2B 7c752f9500f2141886c798d9be4aa2e84ecb089589394c4f473712aba0279f2ff853ebc1ea75b7f007abea18e46289bf06c7408d3d69026faa6b638755c13e70 SHA512 40c056bac44dc5e521ec2e66dd046566f50fd8b2fe0d0d2beacc29a68d9ddbe75f8dfe012ee6957c4e2874d4365dbb096e20faebb2b26371b060c0a9fec205b2
 AUX odbcinst2.ini 90 BLAKE2B 8070ddb3460799429fc9a80f5c54317381f3fc79a9b98766bb7c5db325ace3ed5f558df70386c2249f8a1f5a373cde51f0a28140421a00d3599f75994c28cbbf SHA512 00634eab33d08650cd19128bfd9d2187b4e5d38a866d08690d0b1e2224af7dcfefcb45f13a83f4a774beee322e6c5f3152c0f967399aea2893f8e857451aba8a
-DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121 SHA512 9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb
 DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f SHA512 b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
 DIST mariadb-connector-odbc-3.1.14-src.tar.gz 549698 BLAKE2B 612879086805c57b42036bb224b14ef1ab287d2ff288a5ec5ec6db7334fc8b82acd648476eca1dee282393486d117cadf1bbdcb0e78eae52bab26a0c05cb1fbe SHA512 bb3cb74ccd17a8df39456ccf3091579bbdfc56431954a978f488928df54e3f9ad1c5b67cb411be4b661ba0e0bdd69ccd4d00ea4bfd72c3f448b560031830512d
-EBUILD mariadb-connector-odbc-3.1.12.ebuild 1964 BLAKE2B f3b21e95afc009c1e776588e76bf5890ab20903c1e1421e16100c51b899f26b1cf2b18f05cf2f5ce7ba4e9ac638831a14f89092e360deb4658840a6c44ede069 SHA512 79ad69fafcb45808dd91dc6706e27d24fbab9b3d72be8c1431db0cc2bbdebb599756355e46c1582daacb2d046000228364b1e5eb5e23cb099989d951c5634867
 EBUILD mariadb-connector-odbc-3.1.13.ebuild 1966 BLAKE2B 62bee0a88209a20a36317276b9e100c90bcbf0e98beb56f117c5c5d87447a99143cb377b704019b0158e8612948d0efcafa1a8da45b4de997bcf24b865a56a2c SHA512 f950898e73b27c1bca10bebb042640bc30b13f225aa7a3819d10258f369acb59ba99586d7fdca80da01d538cc156923bad67a616fe1ed647fe021d7b916956f7
 EBUILD mariadb-connector-odbc-3.1.14.ebuild 1968 BLAKE2B bc1f3389357983266de27d00e566e73558facb24932dbebc5ae7a6b2af11affad64aede3bbf758531827ee603c0e99b00972f73a66e49c4b27e55d870e7dd0ef SHA512 413d0b806d9c9af4e368629eb4739aca6d79bcae1b40c687352ac34aa2068395f422c7866b9d7f640353153f96c4262dab550dc583b3a2bd04ffa8a98af6a8e3
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
deleted file mode 100644
index b40a50b0e93e..000000000000
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="MariaDB Connector/ODBC"
-HOMEPAGE="https://downloads.mariadb.org/connector-odbc/"
-SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3.1"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-S="${S}-src"
-
-# USE=ssl merely enables the configuration options (seemingly for interactive
-# sessions) and does not cause direct linking to any SSL libraries.  However,
-# it doesn't make sense enable these configuration options unless the
-# underlying mariadb-connector-c has ssl enabled, thus if we have USE=ssl,
-# require mariadb-connector-c to have it too.
-DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*[ssl?]
-	dev-db/unixODBC"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
-}
-
-multilib_src_configure() {
-	append-cppflags $(mariadb_config --cflags || die)
-	local mycmakeargs=(
-		-DWITH_SSL=$(usex ssl OPENSSL OFF)
-		-DMARIADB_LINK_DYNAMIC=YES
-		-DUSE_SYSTEM_INSTALLED_LIB=YES
-		-DINSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DINSTALL_LICENSEDIR="/usr/share/doc/${PF}"
-		#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/${PN}
-	doins odbcinst.ini
-}
-
-pkg_postinst() {
-	elog "Please remember to use emerge --config =${P} to install the ODBC ini files."
-	elog "Alternatively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini"
-}
-
-pkg_config() {
-	[[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported."
-
-	if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then
-		einfo "maodbc (MariaDB ODBC driver) has already been installed."
-	else
-		ebegin "Installing maodbc (MariaDB ODBC driver)"
-		/usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini
-		eend ${?} || die
-	fi
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7741e208a423..97a9531133a9 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index c55232b6f22b..e073d48e396b 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,5 +1,5 @@
 DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
 DIST postgresql-jdbc-42.4.1.src.tar.gz 969554 BLAKE2B 76035b2362c304d6263b9549b2ecbedc6e1cfedeba9c2c35f07d29dada39e5bce93e939abb8cb2232a428b0341c5cd5e6ae22de6106292c4d28243e3e0e6fc00 SHA512 a49c5b68a26ba6fd1b150c45da2ec58ea4435b7c36b8aa9bf6c3d33b6a265dabe7da51705e9d7234a640c8f6ccb5c3abb639db2d7bc38e6f4e26550b05b4a844
 EBUILD jdbc-postgresql-42.4.0.ebuild 2019 BLAKE2B 6b0ebf8b68d03d0adaa6cf3764b9ea65225b33f6d2538f45a02f620d7d4e0bc1f957e923609bb3bef17ed0b69d64c1fddd9bd9751d99e9b6756e50dc7f2f1d2f SHA512 9b9dfeb0b2afea956039c6677e1479e8837b9244607b6731ac3381815991a3035e53518a9ce9ea316a0913385a19df89aaa8382c533b8309ffeb179dfd9ea09f
-EBUILD jdbc-postgresql-42.4.1.ebuild 2065 BLAKE2B e6334377d0b0dbd25e56f12063553ddab639cf63ddb0407c3f12cf02c6f0b40039352ef52adc473694c3aae4357495e2ca87c7472fed21ddfbbfd3c13226826a SHA512 f0b8e31e0ad1d502d09c656b830b077e55c56140593c0433df5c10bfee32c07e40cde4f97f6588295500c8d897ea09dc4f91c8f15ce0592bca9209b23d80d9b8
+EBUILD jdbc-postgresql-42.4.1.ebuild 2064 BLAKE2B 47da7fdef9da4c19abd447d0f4edda5bf40da9c7c622588be0decc4c0edf37b6efe6a0bc0ee5e628b23d8138a841311d07cee725c028db01b6b885d15c929af6 SHA512 d430abc6537eba74347501353d82b7f46e083da875f69100e046fdb111812eebae0151817e7bd3d06abc7ed98dc8b857d1159735d54e64f2d7b0007372006d3f
 MISC metadata.xml 295 BLAKE2B 1c8987c0d6f65d4e3019c2d6b8a0f8fac5f06e9144b118d3a0351f4a0e9b76ac4bc5b5ad678d92a691da7e8e8bb8c33f12d17d9dcc8b0ff007057d80307ebd24 SHA512 6a38ee7d2287a20ab89d7a92c59e74437877c4271cb38f00fccde9753c3caa8dccc3261fad23f81ec3dd2155f429aa4c3437bda024353640f8ed90ca096f9318
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
index 4a3943552b65..ef8ca1586488 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 57672d19c31a..7df082b61b06 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 9185e1090c30..064ea944a83f 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -26,6 +26,6 @@ EBUILD erlang-23.3.4.15.ebuild 4556 BLAKE2B 814062c5bef24e854efcbecc84743aff6910
 EBUILD erlang-24.3.3-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-24.3.4.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
 EBUILD erlang-25.0-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
-EBUILD erlang-25.0.2.ebuild 4787 BLAKE2B d6772c009aad4d3b217c61cbde5e6f0631636108a22fc86705ffabfe012bb7a36e05aea5c5d41bb5d3fcbb92449925f2dc2a1ec93b4d31a97cbddd645729342c SHA512 ab87a3e26dc2b0325346633cdbbbfb82744d9ae6f93553aba461271e8dd9407583f6dbba297d20bcd235ca65e3927baacb0828c30f6ef13e0d1825a2648ba6cd
+EBUILD erlang-25.0.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-25.0.3.ebuild 4970 BLAKE2B a956aa549e09eed55901972ff211d542f6a6f51d330e42925fee1d028ccd2f97d4754d8bdcb6439df282c458e8854f87d8cc7122fc4d811c161c7c08f1ffacc2 SHA512 63b75adc44342017727236021034fc0ca198f6466627f85047794102937e1c598b6361c3ce59db2184b279b33aee173103a1c85148b25741907d9e769d946526
 MISC metadata.xml 735 BLAKE2B 6deb116831085a15f4a06368d1d1f3e9d57501799236c7d1fe9fa8aa9a72da0151e92fa13e14427177679c361f8849379784e9c0124f28468f71e2eb54b78bbc SHA512 8ac9f9f29494b5aa9ff023460009c8b69cc3dbc4cc88ab419b62f715066ea3789a4575eab545eed5a430a95f4d0709e069fd240f2cb256eca4dfca7ce3838ab8
diff --git a/dev-lang/erlang/erlang-25.0.2.ebuild b/dev-lang/erlang/erlang-25.0.2.ebuild
index b9b0b1c11632..1d539c7aa9b4 100644
--- a/dev-lang/erlang/erlang-25.0.2.ebuild
+++ b/dev-lang/erlang/erlang-25.0.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index eaae666760d2..e780c2b52e39 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index d883de1162c5..137f311e17a0 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,3 +1,3 @@
 DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
-EBUILD nanomsg-1.1.5.ebuild 1001 BLAKE2B b1867c300987bc9a1295bdfdd20d5cde6bd234fa98b951f07850661891091cc6f10468949f1a91119acc135b3b4d48ba5f25129fdc38be32a5328ae19c0ec4b6 SHA512 3c96673ccd78d734dc3f0b86bcf8f51f60a09e69c80c52ebf5a6841c0d7782945ddd0acbf56492f8a4409a693a3e429c32a2d96693061f8ab4daf0f58f7e28c4
+EBUILD nanomsg-1.1.5.ebuild 982 BLAKE2B 40657d5219d19d4574f5169b6a608733845695fc7d7019f5eec007d2c3d71fcabc66ea991552bc4ec66e96c9c6291fc520ecb62ad7d1a8841d25ec72f655d27b SHA512 f3b958aa1ef90473e42f79d09bd7ce7339052f371ad4c0bb53b09fe93bd61f6d37f318c93cc644e3bfc34e06700477e1248c1241838792d9ff0129affc79f66b
 MISC metadata.xml 248 BLAKE2B 491f849b48cddf6768cf7b8bf6914b5331c647f708bcd17372ea461b1d05e249aacef393f6641b7ee5c9da84d2e69588c340a72a426051cd2d29b28399416522 SHA512 f9cad9e1d46fe8f275a70a7e578de6dce7f1e705e599664a74af58a38791cddfa6446c8cceb018c1e77ef01c32ca5b8e8b18aebc22f9239d2f673441af0cfb6e
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
index cb84542b8ab5..43d543afa707 100644
--- a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="High-performance messaging interface for distributed applications"
@@ -18,12 +17,13 @@ IUSE="doc"
 DEPEND="doc? ( dev-ruby/asciidoctor )"
 
 multilib_src_prepare() {
-	eapply_user
 	# Old CPUs like HPPA fails test because of timeout
 	sed -i \
 		-e '/inproc_shutdown/s/5/80/' \
 		-e '/ws_async_shutdown/s/5/80/' \
 		-e '/ipc_shutdown/s/30/80/' CMakeLists.txt || die
+
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -37,8 +37,8 @@ multilib_src_configure() {
 	else
 		mycmakeargs+=(
 			-DNN_ENABLE_DOC=OFF
-			-DNN_ENABLE_TOOLS=OFF
-			-DNN_ENABLE-NANOCAT=OFF
+			-DNN_TOOLS=OFF
+			-DNN_ENABLE_NANOCAT=OFF
 		)
 	fi
 	cmake_src_configure
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7b439d1cd1cd..f55a323b0363 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 2c925f1401c5..2b30a8591fd2 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,20 +1,9 @@
 DIST PyPDF2-2.10.0.gh.tar.gz 6355180 BLAKE2B 1070e4989609cb1361f966f06a23a972ba0f53d6d02d2f489104a7198111d4e80573e2a54d7446bd85ccc8270ad8cb592c2131f0ba1433b3c1ca246bcd39c466 SHA512 dfc543a9cbc4c4e185abc928a64a8aeb5c69d833d3af0983bc994bb6a62b65732a6ea0a7b260bca4de8854639c0a03e0cc6398a5d9ec4df9125ccf7e4b3b264d
-DIST PyPDF2-2.4.2.gh.tar.gz 5327738 BLAKE2B 5343d5b7c2efe2ed664f896b030a60ad8570ae8f481376e4ad9c865144b66d912633e4f83294d7f6399230963c02dea262cc247b10ca3c146ab24f823c0d57f3 SHA512 84a13d5b624ca8ca2dc4c474309ffa47d1770e1681ccb527f7fc1df37698037c224939dd062da004cbf7b983744afd3ab9adc9a610bea3f2f297e1ed5b708dd2
-DIST PyPDF2-2.5.0.gh.tar.gz 5597332 BLAKE2B 40d4fa812f1a70c18d3b2907d83185cd79af3d722e762ec8dec9709cb5c70246c21fa124e419d8b12142b0ae22b1f13958835eaaa23e9f4cc9efbd05793db7ce SHA512 ec7560b4bb3737fe4c830f058f5303cb70c9ff660c3f40637b4b86c8c79bf11a246a3fcc425aa54b5ca160548311c7f93248a1001c75a7e1dbf3119245e3262f
-DIST PyPDF2-2.6.0.gh.tar.gz 5600718 BLAKE2B 13c8e485d0cbb1a6621e0769840a9894822aeda85fc63d98cd466628d4af0efe7e29ce400f7c71dfae63a6d8273dbceb14c115e14bbaea7592d8fa4aef552d24 SHA512 63ef0297b5b6151ed91d6cfc0e883e996561d9479e9d6bd0742711ffff12c2be173485b0ada052a038e7759d1d819850e0e1030031fdb0bc1df46fa4fa9f912b
-DIST PyPDF2-2.7.0.gh.tar.gz 5629582 BLAKE2B d6cdf3bdb974c4ffba4bf55a6acc9d8f2a30dd9f460c7ccad71bc836a0deea2ed1b3cc2743eaa0c5a377e7afe034a49412478635454bc6b846186ff3d77298ec SHA512 c04966e1d9175d729bec5f64300bbac41b9eee07ce881bf186faac9774b0a8e6f152c6213e75c81aae8e30ad90e04ed554596c3eba55526f6280e856d9556a4d
-DIST PyPDF2-2.8.0.gh.tar.gz 5872029 BLAKE2B 3bad15238079cf6e9940c9e8a1b2108e5e810ed8c1223b6dcebf2904ab3f655809a56c8d861743100dfc1267ea6a6e5b0605702d95f2b210820e68a93585ad03 SHA512 a6d258a4ac61acd59ba6f4fa683b080a3b4c70bb0405c2b041d0565319648358236c6cfcefacf1bbea5b3107b7f64a98057c82ac1816f359a5c6fb3b1ce76257
 DIST PyPDF2-2.8.1.gh.tar.gz 5872212 BLAKE2B 19224d1b38947ad14adfb9b33201e0223f6da43072c6bffb78fae939872d0a025e6d2fd6f1eed0c0b88754a359a5459a45a36130659d81089caa884025a922d1 SHA512 6414339017c154610dbb5affcbf94fcda7ab6d1ea78f35cc348a2b8e5fc8c60216c4f20ffc114cb3abd8245ad7a8b40b4cca6161e3a98caff896fb823acc7bea
 DIST PyPDF2-2.9.0.gh.tar.gz 5877910 BLAKE2B afea03f9ac21e4b39cd39ce03adf70a8e08b80315f7cdd81440e371396ba48939560a3835de9587be8020e1aab75726409ecec753ef0fb042d69fe7fc6755e80 SHA512 fefbc6e6eb7ac0a0154f662044acb66f1c034efc114e878ced109d54a3e5427bb73088cb88d765c4576c2d67459a2daf64415789f8efe9b66cf8ed2bb78ff297
 DIST PyPDF2-sample-files-200644f7219811c3930ad1732ef70c570ece2d16.gh.tar.gz 5513604 BLAKE2B 1bfccaf3b50431d32341c24ea7aa203060d40d60a4b3656df35274d056918e7fccf99e11ee2539f65e6de15741ce28acaccd0ddc771ca334a8ba18a8953aee05 SHA512 5d2e1aa06e240957e9ec230406208fc653384b45b9e4b6631580c2eb4f08327e192c6ef57c2310ef3ed0604c85015b15f5ade8ef7d9f525e73733e040fe37fe5
-DIST PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz 5443819 BLAKE2B 6eb440a2db3b58f7e195b8f24438552b2b414296b887cf44d75b14bda367e37ffef75b870152ac3b38e20e5a6f2c6a4cf374087b70daa9036821dd3ebdce2128 SHA512 de631f650098b6fe15830e5a816158d7f352c7a25d0c743b9e4bdf146e1ef2e3a6ea1751ed5d68f34e9a339a793bfb9dc217934595c7a8dffb854c0a4111b963
 DIST PyPDF2-sample-files-b6f4ff3de00745783d79f25cb8803901d1f20d28.gh.tar.gz 5522867 BLAKE2B 9a6cb3b92032f9ec697b972b1a257b2c2528d36cd4a7e40092ac6dbf0a4955c5b204b8c82d37f9bad4a19fccddf0070b095ee2f3b56de22d738ed3d8a3b555c0 SHA512 74aad38060f441ace87f6650de152a28f4a251e4f47574a8d46066857c8fbbb187cd3cd275caa198dce2c1557e90664b288f071995c2bbb9bf13a341210313e8
 EBUILD PyPDF2-2.10.0.ebuild 4733 BLAKE2B 5f901f05563a6ee94ba1aa7db40471ac8c82ccf2fbba6b28713b367316b82f6785322a6cc755b0089fb0bcffef3a113834ec81fc6a23895e80db2a56c08a63cf SHA512 3e7c659719398558d4ab9adae8c04d2af605abfbe78c7aa13065026914cc0d6d9aabbbee35f0ff2b7b8a66cd7146626b0fb3126544cd8a51157134925ca845ee
-EBUILD PyPDF2-2.4.2.ebuild 3852 BLAKE2B b4f0db756e82fccf51da50f995f197c9815da7f5f77257184094bc1e4fe677c9fceb5154a3de46d68c67226177f2c9ec68407d7bd00a6012ee98c3e732539125 SHA512 5635fa8e413ef5d3d266238ed20cda85326a4c5524f8470023c4dc20f1f2b568eee5f20037d0e4826b787bc01a0dad0dc3170ba258da4137adb784e0f85da257
-EBUILD PyPDF2-2.5.0.ebuild 4007 BLAKE2B 187f411a58db8c66fadbb7327bdbca018d62ba2bbe60b70fd10e807971483dcbf8b11863410a207d2ef1ac43acbd724e52c11f6881226c068228bf016490f285 SHA512 63050898595a7d5d7941d1691405465de26b42f31d0f7a598fa07c9f8ad7815d39907c0e9b1fe9a335800939bbab20217467b5c1a1b4bd5210205157eb82058c
-EBUILD PyPDF2-2.6.0.ebuild 4097 BLAKE2B cd9084d5646da17314d423f8ee9618b3125d88b0792bb3d23839c9b10ac379cd5ecf0b2adf34025bdccaf518e6b27b41447d3b19b939942b7030b83766869211 SHA512 1e48980180098c25bdd7461fe6c9ac655195abf46681e9a4b027335e9761dda7cc27523b4d51a75b419ec5ef7bf8c4dd1fc1a4494b16110abbf4f31c9988800f
-EBUILD PyPDF2-2.7.0.ebuild 4097 BLAKE2B cd9084d5646da17314d423f8ee9618b3125d88b0792bb3d23839c9b10ac379cd5ecf0b2adf34025bdccaf518e6b27b41447d3b19b939942b7030b83766869211 SHA512 1e48980180098c25bdd7461fe6c9ac655195abf46681e9a4b027335e9761dda7cc27523b4d51a75b419ec5ef7bf8c4dd1fc1a4494b16110abbf4f31c9988800f
-EBUILD PyPDF2-2.8.0.ebuild 4377 BLAKE2B 9f3e91c5aff361c7e024b5f2f45cdab2fd94b2fe221644a63e136d398e1153c815e3d337b585e4dcfca4186a5b86f7c8103831d55083dc0f9a6c6aab166790ff SHA512 85ac76a64952e9068f0372530c41b1ff959770ff7cc8a7f1328be42f9675ae342447c67dbb8cf763bafdc344cf3503823954fe1f6ce3563a4432661826e91d77
-EBUILD PyPDF2-2.8.1.ebuild 4480 BLAKE2B c9e80b2ef300a3cac71421423176f6f307be782ff8f5ff44c4feb163c7827411d79541b87687917be2fb01b7307eacf97ec6f9763f40dee0ab6e2e02f9c5568e SHA512 6f19250646d636aa9cdf4aeda65dbf0d317925299139944b98f8de500c811958f260e56e2879d31d943c6dd7ce74818ffb2567e18fcffbd754450e5aae3c5ceb
+EBUILD PyPDF2-2.8.1.ebuild 4478 BLAKE2B ad7692ee4de839b6f992958fb6f2120aaffb0ddedc0a1314fd94fa48fe702df0e9fd7d4c24692d83f2f740c78e6d8cd29f2adc5deeb80c4f1b220e3a8cf80306 SHA512 208d9161b35c0d4a4a6bb41fc360e54069a518e9c04d5ed2e142d7ee47fb9e228283259e12df08b5c61138a2101f9e027d28033ab74b4bfc3b6f03ab2d48a640
 EBUILD PyPDF2-2.9.0.ebuild 4694 BLAKE2B b9ecc04109e93902312dfa32b5425e9b5a29537933ec6c4a0562dfc84907ad5d6a6620ef0cbb3db7e0028aebcffa406196ccb4eee93b4a4ceef2a0caa2d7435a SHA512 9c2e31d3497ac6946da2cb27104b5f3392e39cd56f363754eb4d2ff16b6658d48c5d2853a23c9d06684e559747a52054ab82c203bf25b89d6a11094d17cfe4ba
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-2.4.2.ebuild b/dev-python/PyPDF2/PyPDF2-2.4.2.ebuild
deleted file mode 100644
index e069edd1b7c1..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.4.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_cmap.py
-	tests/test_filters.py::test_decompress_zlib_error
-	tests/test_filters.py::test_lzw_decode_neg1
-	tests/test_generic.py::test_dict_read_from_stream
-	tests/test_generic.py::test_parse_content_stream_peek_percentage
-	tests/test_generic.py::test_read_inline_image_no_has_q
-	tests/test_generic.py::test_read_inline_image_loc_neg_1
-	tests/test_generic.py::test_text_string_write_to_stream
-	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
-	tests/test_generic.py::test_bool_repr
-	tests/test_generic.py::test_issue_997
-	tests/test_merger.py::test1
-	tests/test_merger.py::test_bookmark
-	tests/test_merger.py::test_sweep_recursion1
-	tests/test_merger.py::test_sweep_recursion2
-	tests/test_merger.py::test_trim_outline
-	tests/test_merger.py::test_trim_outline_list
-	tests/test_merger.py::test_zoom
-	tests/test_merger.py::test_zoom_xyz_no_left
-	tests/test_page.py::test_extract_text_operator_t_star
-	tests/test_page.py::test_extract_text_page_pdf
-	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
-	tests/test_page.py::test_extract_text_single_quote_op
-	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
-	tests/test_reader.py::test_extract_text_pdf15
-	tests/test_reader.py::test_extract_text_xref_issue_2
-	tests/test_reader.py::test_extract_text_xref_issue_3
-	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
-	tests/test_reader.py::test_get_fields
-	tests/test_reader.py::test_get_fields_read_else_block
-	tests/test_reader.py::test_get_fields_read_else_block2
-	tests/test_reader.py::test_get_fields_read_else_block3
-	tests/test_reader.py::test_get_fields_read_write_report
-	tests/test_reader.py::test_iss925
-	tests/test_reader.py::test_metadata_is_none
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_xfa_non_empty
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_compress
-	tests/test_workflows.py::test_extract_text
-	tests/test_workflows.py::test_extract_textbench
-	tests/test_workflows.py::test_get_fields
-	tests/test_workflows.py::test_get_metadata
-	tests/test_workflows.py::test_merge
-	tests/test_workflows.py::test_merge_with_warning
-	tests/test_workflows.py::test_overlay
-	tests/test_workflows.py::test_scale_rectangle_indirect_object
-	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
-	tests/test_writer.py::test_write_bookmark_on_page_fitv
-	tests/test_xmp.py::test_custom_properties
-	tests/test_xmp.py::test_dc_creator
-	tests/test_xmp.py::test_dc_description
-	tests/test_xmp.py::test_dc_subject
-	tests/test_xmp.py::test_issue585
-	tests/test_xmp.py::test_xmpmm
-
-	# Broken test
-	tests/test_utils.py::test_deprecate_no_replacement
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild
deleted file mode 100644
index 00f40d10f306..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.5.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_cmap.py
-	tests/test_filters.py::test_decompress_zlib_error
-	tests/test_filters.py::test_lzw_decode_neg1
-	tests/test_generic.py::test_dict_read_from_stream
-	tests/test_generic.py::test_parse_content_stream_peek_percentage
-	tests/test_generic.py::test_read_inline_image_no_has_q
-	tests/test_generic.py::test_read_inline_image_loc_neg_1
-	tests/test_generic.py::test_text_string_write_to_stream
-	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
-	tests/test_generic.py::test_bool_repr
-	tests/test_generic.py::test_issue_997
-	tests/test_merger.py::test1
-	tests/test_merger.py::test_bookmark
-	tests/test_merger.py::test_sweep_indirect_list_newobj_is_None
-	tests/test_merger.py::test_sweep_recursion1
-	tests/test_merger.py::test_sweep_recursion2
-	tests/test_merger.py::test_trim_outline
-	tests/test_merger.py::test_trim_outline_list
-	tests/test_merger.py::test_zoom
-	tests/test_merger.py::test_zoom_xyz_no_left
-	tests/test_page.py::test_extract_text_operator_t_star
-	tests/test_page.py::test_extract_text_page_pdf
-	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
-	tests/test_page.py::test_extract_text_single_quote_op
-	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
-	tests/test_reader.py::test_extract_text_pdf15
-	tests/test_reader.py::test_extract_text_xref_issue_2
-	tests/test_reader.py::test_extract_text_xref_issue_3
-	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
-	tests/test_reader.py::test_get_fields
-	tests/test_reader.py::test_get_fields_read_else_block
-	tests/test_reader.py::test_get_fields_read_else_block2
-	tests/test_reader.py::test_get_fields_read_else_block3
-	tests/test_reader.py::test_get_fields_read_write_report
-	tests/test_reader.py::test_iss925
-	tests/test_reader.py::test_metadata_is_none
-	tests/test_reader.py::test_read_form_416
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_xfa_non_empty
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_compress
-	tests/test_workflows.py::test_extract_text
-	tests/test_workflows.py::test_extract_textbench
-	tests/test_workflows.py::test_get_fields
-	tests/test_workflows.py::test_get_metadata
-	tests/test_workflows.py::test_image_extraction
-	tests/test_workflows.py::test_merge
-	tests/test_workflows.py::test_merge_with_warning
-	tests/test_workflows.py::test_overlay
-	tests/test_workflows.py::test_scale_rectangle_indirect_object
-	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
-	tests/test_writer.py::test_write_bookmark_on_page_fitv
-	tests/test_xmp.py::test_custom_properties
-	tests/test_xmp.py::test_dc_creator
-	tests/test_xmp.py::test_dc_description
-	tests/test_xmp.py::test_dc_subject
-	tests/test_xmp.py::test_issue585
-	tests/test_xmp.py::test_xmpmm
-
-	# Broken test
-	tests/test_utils.py::test_deprecate_no_replacement
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.6.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.6.0.ebuild
deleted file mode 100644
index 40f9268b2e36..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.6.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=200644f7219811c3930ad1732ef70c570ece2d16
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_cmap.py
-	tests/test_filters.py::test_decompress_zlib_error
-	tests/test_filters.py::test_lzw_decode_neg1
-	tests/test_generic.py::test_dict_read_from_stream
-	tests/test_generic.py::test_parse_content_stream_peek_percentage
-	tests/test_generic.py::test_read_inline_image_no_has_q
-	tests/test_generic.py::test_read_inline_image_loc_neg_1
-	tests/test_generic.py::test_text_string_write_to_stream
-	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
-	tests/test_generic.py::test_bool_repr
-	tests/test_generic.py::test_issue_997
-	tests/test_merger.py::test1
-	tests/test_merger.py::test_bookmark
-	tests/test_merger.py::test_sweep_indirect_list_newobj_is_None
-	tests/test_merger.py::test_sweep_recursion1
-	tests/test_merger.py::test_sweep_recursion2
-	tests/test_merger.py::test_trim_outline
-	tests/test_merger.py::test_trim_outline_list
-	tests/test_merger.py::test_zoom
-	tests/test_merger.py::test_zoom_xyz_no_left
-	tests/test_page.py::test_extract_text_operator_t_star
-	tests/test_page.py::test_extract_text_page_pdf
-	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
-	tests/test_page.py::test_extract_text_single_quote_op
-	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
-	tests/test_reader.py::test_extract_text_pdf15
-	tests/test_reader.py::test_extract_text_xref_issue_2
-	tests/test_reader.py::test_extract_text_xref_issue_3
-	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
-	tests/test_reader.py::test_get_fields
-	tests/test_reader.py::test_get_fields_read_else_block
-	tests/test_reader.py::test_get_fields_read_else_block2
-	tests/test_reader.py::test_get_fields_read_else_block3
-	tests/test_reader.py::test_get_fields_read_write_report
-	tests/test_reader.py::test_iss925
-	tests/test_reader.py::test_metadata_is_none
-	tests/test_reader.py::test_outline_color
-	tests/test_reader.py::test_outline_font_format
-	tests/test_reader.py::test_read_form_416
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_xfa_non_empty
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_compress
-	tests/test_workflows.py::test_extract_text
-	tests/test_workflows.py::test_extract_textbench
-	tests/test_workflows.py::test_get_fields
-	tests/test_workflows.py::test_get_metadata
-	tests/test_workflows.py::test_image_extraction
-	tests/test_workflows.py::test_merge
-	tests/test_workflows.py::test_merge_with_warning
-	tests/test_workflows.py::test_overlay
-	tests/test_workflows.py::test_scale_rectangle_indirect_object
-	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
-	tests/test_writer.py::test_write_bookmark_on_page_fitv
-	tests/test_xmp.py::test_custom_properties
-	tests/test_xmp.py::test_dc_creator
-	tests/test_xmp.py::test_dc_description
-	tests/test_xmp.py::test_dc_subject
-	tests/test_xmp.py::test_issue585
-	tests/test_xmp.py::test_xmpmm
-
-	# Broken test
-	tests/test_utils.py::test_deprecate_no_replacement
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.7.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.7.0.ebuild
deleted file mode 100644
index 40f9268b2e36..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.7.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=200644f7219811c3930ad1732ef70c570ece2d16
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_cmap.py
-	tests/test_filters.py::test_decompress_zlib_error
-	tests/test_filters.py::test_lzw_decode_neg1
-	tests/test_generic.py::test_dict_read_from_stream
-	tests/test_generic.py::test_parse_content_stream_peek_percentage
-	tests/test_generic.py::test_read_inline_image_no_has_q
-	tests/test_generic.py::test_read_inline_image_loc_neg_1
-	tests/test_generic.py::test_text_string_write_to_stream
-	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
-	tests/test_generic.py::test_bool_repr
-	tests/test_generic.py::test_issue_997
-	tests/test_merger.py::test1
-	tests/test_merger.py::test_bookmark
-	tests/test_merger.py::test_sweep_indirect_list_newobj_is_None
-	tests/test_merger.py::test_sweep_recursion1
-	tests/test_merger.py::test_sweep_recursion2
-	tests/test_merger.py::test_trim_outline
-	tests/test_merger.py::test_trim_outline_list
-	tests/test_merger.py::test_zoom
-	tests/test_merger.py::test_zoom_xyz_no_left
-	tests/test_page.py::test_extract_text_operator_t_star
-	tests/test_page.py::test_extract_text_page_pdf
-	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
-	tests/test_page.py::test_extract_text_single_quote_op
-	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
-	tests/test_reader.py::test_extract_text_pdf15
-	tests/test_reader.py::test_extract_text_xref_issue_2
-	tests/test_reader.py::test_extract_text_xref_issue_3
-	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
-	tests/test_reader.py::test_get_fields
-	tests/test_reader.py::test_get_fields_read_else_block
-	tests/test_reader.py::test_get_fields_read_else_block2
-	tests/test_reader.py::test_get_fields_read_else_block3
-	tests/test_reader.py::test_get_fields_read_write_report
-	tests/test_reader.py::test_iss925
-	tests/test_reader.py::test_metadata_is_none
-	tests/test_reader.py::test_outline_color
-	tests/test_reader.py::test_outline_font_format
-	tests/test_reader.py::test_read_form_416
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_xfa_non_empty
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_compress
-	tests/test_workflows.py::test_extract_text
-	tests/test_workflows.py::test_extract_textbench
-	tests/test_workflows.py::test_get_fields
-	tests/test_workflows.py::test_get_metadata
-	tests/test_workflows.py::test_image_extraction
-	tests/test_workflows.py::test_merge
-	tests/test_workflows.py::test_merge_with_warning
-	tests/test_workflows.py::test_overlay
-	tests/test_workflows.py::test_scale_rectangle_indirect_object
-	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
-	tests/test_writer.py::test_write_bookmark_on_page_fitv
-	tests/test_xmp.py::test_custom_properties
-	tests/test_xmp.py::test_dc_creator
-	tests/test_xmp.py::test_dc_description
-	tests/test_xmp.py::test_dc_subject
-	tests/test_xmp.py::test_issue585
-	tests/test_xmp.py::test_xmpmm
-
-	# Broken test
-	tests/test_utils.py::test_deprecate_no_replacement
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.8.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.8.0.ebuild
deleted file mode 100644
index a3237a42f1d5..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.8.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=200644f7219811c3930ad1732ef70c570ece2d16
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_cmap.py
-	tests/test_filters.py::test_decompress_zlib_error
-	tests/test_filters.py::test_lzw_decode_neg1
-	tests/test_generic.py::test_dict_read_from_stream
-	tests/test_generic.py::test_parse_content_stream_peek_percentage
-	tests/test_generic.py::test_read_inline_image_no_has_q
-	tests/test_generic.py::test_read_inline_image_loc_neg_1
-	tests/test_generic.py::test_text_string_write_to_stream
-	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
-	tests/test_generic.py::test_bool_repr
-	tests/test_generic.py::test_issue_997
-	tests/test_merger.py::test1
-	tests/test_merger.py::test_bookmark
-	tests/test_merger.py::test_iss1145
-	tests/test_merger.py::test_sweep_indirect_list_newobj_is_None
-	tests/test_merger.py::test_sweep_recursion1
-	tests/test_merger.py::test_sweep_recursion2
-	tests/test_merger.py::test_trim_outline
-	tests/test_merger.py::test_trim_outline_list
-	tests/test_merger.py::test_zoom
-	tests/test_merger.py::test_zoom_xyz_no_left
-	tests/test_page.py::test_extract_text_operator_t_star
-	tests/test_page.py::test_extract_text_page_pdf
-	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
-	tests/test_page.py::test_extract_text_single_quote_op
-	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
-	tests/test_reader.py::test_extract_text_pdf15
-	tests/test_reader.py::test_extract_text_xref_issue_2
-	tests/test_reader.py::test_extract_text_xref_issue_3
-	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
-	tests/test_reader.py::test_get_fields
-	tests/test_reader.py::test_get_fields_read_else_block
-	tests/test_reader.py::test_get_fields_read_else_block2
-	tests/test_reader.py::test_get_fields_read_else_block3
-	tests/test_reader.py::test_get_fields_read_write_report
-	tests/test_reader.py::test_iss925
-	tests/test_reader.py::test_metadata_is_none
-	tests/test_reader.py::test_outline_color
-	tests/test_reader.py::test_outline_font_format
-	tests/test_reader.py::test_outline_with_empty_action
-	tests/test_reader.py::test_outline_with_missing_named_destination
-	tests/test_reader.py::test_read_form_416
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_reader.py::test_xfa_non_empty
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_compress
-	tests/test_workflows.py::test_extract_text
-	tests/test_workflows.py::test_extract_textbench
-	tests/test_workflows.py::test_get_fields
-	tests/test_workflows.py::test_get_fonts
-	tests/test_workflows.py::test_get_metadata
-	tests/test_workflows.py::test_get_outline
-	tests/test_workflows.py::test_image_extraction
-	tests/test_workflows.py::test_merge
-	tests/test_workflows.py::test_merge_with_warning
-	tests/test_workflows.py::test_overlay
-	tests/test_workflows.py::test_scale_rectangle_indirect_object
-	tests/test_workflows.py::test_get_xfa
-	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
-	tests/test_writer.py::test_write_bookmark_on_page_fitv
-	tests/test_xmp.py::test_custom_properties
-	tests/test_xmp.py::test_dc_creator
-	tests/test_xmp.py::test_dc_description
-	tests/test_xmp.py::test_dc_subject
-	tests/test_xmp.py::test_issue585
-	tests/test_xmp.py::test_xmpmm
-
-	# Broken test
-	tests/test_utils.py::test_deprecate_no_replacement
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.8.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.8.1.ebuild
index 7e51381424fd..56a398cc8777 100644
--- a/dev-python/PyPDF2/PyPDF2-2.8.1.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-2.8.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 77a662f40707..ce7da92eaaa7 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,3 @@
-DIST alembic-1.8.0.tar.gz 1252636 BLAKE2B dfe6130a08a8bfcdeb10e02187a9f597bb55de8194c91909ab06d72f5daaaaf4c7154570a141a82be8568195d8f5f76db661f1dd192b92a5991434ade1a389ed SHA512 601366f21bcadaef1a5b7f7d4a1edfd9c146340f8a5d07b41e3b381e1e00866e79520d8393330e4a80369664b36b549c9d5ab3ea13ad7aa8010b165e73038bcd
 DIST alembic-1.8.1.tar.gz 1255927 BLAKE2B dbf40f9ca12171d99ad46bec6bf1841799226887a55a815db5c7a69cbcb7d861ede774aa35e1018e1a57bec26a8ddf7ee311e0b4396ebddd5477c67a4ad11876 SHA512 51f210447172d08eb94c41a962ddecc593a665790aa6f5badb771dccc882e0d653dcf153ebb04b9824dabcaeb1ac08e3747c2e3c74d8584a24b35662778de8dd
-EBUILD alembic-1.8.0.ebuild 923 BLAKE2B edeacc8b0f178566fd2aa0d2dac803546333ac2075419163bb8eb263b4425775b45645b1c3269ff5b9d0fd863d4870353494c0e2d62cdd9de2edcd6c9fc4897b SHA512 c0a2850ebd134208a7a61bd7e2aa56f782f93e010e14927c2f35e639a816b7d729a3203af24a9468df8e5d302e976771174e28c471bdf2012cc41dc27de83a33
-EBUILD alembic-1.8.1.ebuild 964 BLAKE2B 8df7637bbf593fe7e7e7beeb86a44fdfa8f0050651a1926cf8eb400819bf44e331249158bac58edade634f14cfc8c5450c6516b999f90276f8e0477c984ab609 SHA512 96f96d1c751258584f6073f21204162314dfc37bed0d617ce55ddd39c71d3a57d06c80e99efc87337a5783939edda9c6f5ba4843dd007adcd97ff38b4ab8cc4a
+EBUILD alembic-1.8.1.ebuild 962 BLAKE2B 34b2e7ebb9a604b022c8daeac613da12f6c00f2e126ec2d47416548084b7f9607d49ee667435afe8fd6bca2a69a83897be17be5800d10ff4b8e3fa74c8ab11a8 SHA512 8b3064c27a0263061dc648334c3d3a4a665c4eff31aab5bf63570d6de137eadd37da4c6e26ebbb5b3370fc38d0a7a3dfb79c326677938020418205e8ac27fba1
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.8.0.ebuild b/dev-python/alembic/alembic-1.8.0.ebuild
deleted file mode 100644
index dbad78231a74..000000000000
--- a/dev-python/alembic/alembic-1.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="https://github.com/sqlalchemy/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/alembic/alembic-1.8.1.ebuild b/dev-python/alembic/alembic-1.8.1.ebuild
index be24ef80d028..5f64796c198f 100644
--- a/dev-python/alembic/alembic-1.8.1.ebuild
+++ b/dev-python/alembic/alembic-1.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 2b75342ed01e..0397b3940db5 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,7 +1,3 @@
-DIST coverage-6.4.1.tar.gz 719971 BLAKE2B 047c57ffae092a9e04470a64d090ee7c3274c5ab60dd69d67c8151e85954b5cf2c34748f2e2641ac8229ed66a238e994d93b17f7ac4c92bce3eb919a5b7f1795 SHA512 d7b40bae4fee36c71befb490ee3341b023c0bff38ed2c97cf57a65e47be44b71685b130879640b1c8560359dbc31b0da523f5c363f3544ff666b804c7af122f0
-DIST coverage-6.4.2.tar.gz 721847 BLAKE2B d4a36a4a8e6f70654be0b9f6c0a660419d31087ed6e05208e60f2919b6d46c1cff39c0d9db7aabb214d212b3b7ed325a862e2471735bf411b7b81f6d50debe79 SHA512 10254089ee51d09928831b01b5b6f30a9077ed0ee08594312dab5a3804be1539533d9cec7381dc2a4332471681d75a5b0cd6e3dec6d67e47906b7ae820b8aed3
 DIST coverage-6.4.3.tar.gz 722764 BLAKE2B f4d45aa9f0494bfe43e244907bda14e4a99bce7d4cdc4f6610abed3a2600a6f836dccd6c4c795f6bf0f8eeab2ab3df4f0ddc3f9e2d1285d57415f9bc06b47635 SHA512 7ff93dfb58f9d00a9016c86cc4425932c6dfc700954e5174b6a39c23900915f3dc1c5951a60d4ccb2155d82e2c552c07894670440dc17574e0ef5e0ba7bb4a81
-EBUILD coverage-6.4.1.ebuild 1678 BLAKE2B c7e457ab2b0d46e6550793f295ee6294b70f099aa0c6be6a3a3a8505cfd8dc8dce1270b550dd6a73c838d4aaea0c99d20c12c6fdab32bc05e62e45c902df6275 SHA512 a9a31b2d0883fb30bf389104f9d884313bb6906bc71f8093931021f7c9c5e441304ae536a33c2948c5df69a45532dad6ff9c531533ff23511853901d7d8ec224
-EBUILD coverage-6.4.2.ebuild 1686 BLAKE2B 433e48ff442b0b5523eb1bcc841e54baaa77704328ec322fbf2431b3e249022cce2007cca81b5e074024c83b5382eeb934543a38d1be54b1aa4b840a13be64dd SHA512 a339c3326b111097b5812beaf12da90ba021ea9bb2dff68f97754af3ca4e21d28de607445441709180a3d14c847bc8021bfab657f79b310f2d5b7745b564ce2b
-EBUILD coverage-6.4.3.ebuild 1681 BLAKE2B ebc00dda848cbb3ebd55b3c131a4f8ce69b155d8557d8ea9ad068165b28b1a0f1a990273ff64d1bf57518e0601e4bd754cca9969b308d1b620d4a506d73ff1a3 SHA512 26f656555db1e71deef81747f903e9fa6c7b59c1830916bd6c7e352b111109d0c6510b06a77de561a1e17081f6eb4eb7b6b4f433951148a6f8f7940d3de4a6c2
+EBUILD coverage-6.4.3.ebuild 1678 BLAKE2B c7e457ab2b0d46e6550793f295ee6294b70f099aa0c6be6a3a3a8505cfd8dc8dce1270b550dd6a73c838d4aaea0c99d20c12c6fdab32bc05e62e45c902df6275 SHA512 a9a31b2d0883fb30bf389104f9d884313bb6906bc71f8093931021f7c9c5e441304ae536a33c2948c5df69a45532dad6ff9c531533ff23511853901d7d8ec224
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.4.1.ebuild b/dev-python/coverage/coverage-6.4.1.ebuild
deleted file mode 100644
index 46cfdde3d0d1..000000000000
--- a/dev-python/coverage/coverage-6.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_TEST_TRACER=${1}
-	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
-	epytest tests
-}
-
-python_test() {
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" \
-			coverage/ || die
-		test_tracer c
-		rm coverage/*.so || die
-	else
-		test_tracer py
-	fi
-}
diff --git a/dev-python/coverage/coverage-6.4.2.ebuild b/dev-python/coverage/coverage-6.4.2.ebuild
deleted file mode 100644
index 8a27c2c95f30..000000000000
--- a/dev-python/coverage/coverage-6.4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_TEST_TRACER=${1}
-	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
-	epytest tests
-}
-
-python_test() {
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" \
-			coverage/ || die
-		test_tracer c
-		rm coverage/*.so || die
-	else
-		test_tracer py
-	fi
-}
diff --git a/dev-python/coverage/coverage-6.4.3.ebuild b/dev-python/coverage/coverage-6.4.3.ebuild
index c235e0551671..46cfdde3d0d1 100644
--- a/dev-python/coverage/coverage-6.4.3.ebuild
+++ b/dev-python/coverage/coverage-6.4.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index fa0b777485f0..14e12a7bec08 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,5 @@
 DIST google-auth-2.10.0.tar.gz 205591 BLAKE2B e5b6ea1a65afc42318dc26ed5fa18de19232ca85e6da5be47c45b41861595f763b42bfdd92aaa63d20bbbf76fc1447dbeb7d88424ae5f82ce23ea9f875d04700 SHA512 91cf5391606b896691a9ae1489391bb0545c461172439c3011fc56c575f4a67341eb25a41faec437cb82fc0a2835adc95006327e3460591137238721a6eddd50
-DIST google-auth-2.9.0.tar.gz 205241 BLAKE2B 3e33b3c404d0fbd8b4c0b02c6187103c5715dad0f8850b895c91cecca81c2b2adce1b6426eccb8fa5c94948b53978b8530c54c59749e54af5b9513ce23497f6a SHA512 2bcdf7c80d588f8229808e35426cf07ff1e14e778deb315ed375cb2c17a7efcec848c3cd2aa1ab8cd9c8550cd1e79eba9345c84d44f513844dfe1928e42a189d
 DIST google-auth-2.9.1.tar.gz 205219 BLAKE2B dd4d3c690a4ced2d4757167497689283b7fd8e9891948f0f14565fffe0d0c9eb62c4356a5715d10d02fefd1183bda5dfe3b1e7a7caa42c8d85c39c5875fd9730 SHA512 37830c708613f3a41c90658f220c2cd7ca45824c7e4741fa3b1754e635f6e0773daff05f770ad0836caefe082d6b517b5bd5b2a789cdbe03de9fdbca9a972f7f
 EBUILD google-auth-2.10.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
-EBUILD google-auth-2.9.0.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
-EBUILD google-auth-2.9.1.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
+EBUILD google-auth-2.9.1.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.9.0.ebuild b/dev-python/google-auth/google-auth-2.9.0.ebuild
deleted file mode 100644
index 37c2ffef06a9..000000000000
--- a/dev-python/google-auth/google-auth-2.9.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.9.1.ebuild b/dev-python/google-auth/google-auth-2.9.1.ebuild
index de5188c8fdb8..37c2ffef06a9 100644
--- a/dev-python/google-auth/google-auth-2.9.1.ebuild
+++ b/dev-python/google-auth/google-auth-2.9.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/icalendar/Manifest b/dev-python/icalendar/Manifest
index f187b239ec7b..d8f19ddb34c3 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,5 +1,3 @@
-DIST icalendar-4.0.9.tar.gz 84254 BLAKE2B c1ca7a7730404f7079e8fac8270f98a60ecd4e657f2b2b3d376d620f12c11a0db6dcd5713f7d2d4935c859d544497fa544b22ffb1a83be9c11ec2ea3923da93b SHA512 2eeb69da89207fe91661dfa6e9c2a623eb3be2fb5a48e999e87a881d7fecc1f339764124601b0610a14ce809f238c6731f30f2071bb4706206de10181365d1dd
 DIST icalendar-4.1.0.tar.gz 78706 BLAKE2B a676b938101e901c45cfeceba031c35f26dc361832ca24877acefcbe9158e111d883b757a133d72901579f73b32e34adbcb47db6d8ccbaa49f013106c282401e SHA512 15bdf4fd22394836d120d7d7ee029e218247d731c51bd99d4e6df7dd6046b91ea0874b8a81bd6090d366fff035329eac98cabdf0ba5aead43efc82c1e6566b23
-EBUILD icalendar-4.0.9.ebuild 785 BLAKE2B 105b1a77659d6dbb2cdd4de563d2e32e81bf11e02fa984736756045a05622601a8d73413909bbba6b9e7f7bf5ce33d3510e3590f131c0b2e76e32a7db4e67ac6 SHA512 05e1614b92d6d360d2c9079bf20301d70784c702451de4eac57ef5a0559f1bf5b52bceb5b43869e59a7147a5810e2f9d68f2edb306fd42233e05ed8fb4cfc9a0
-EBUILD icalendar-4.1.0.ebuild 827 BLAKE2B b58b5e9c3bcd60d562355f52084b0b9af9b9ec5052b3353b4769e9a8ebf7000c5bc8bfb58ff9bb2a6f3bea7c3b4e0db3fb0b50b71b7d40b3d592ddbc43360e40 SHA512 7fdb359ac12038f2135e1ebf59535deae1d9f67f7abf6f5ce405ad383f4980873c91a6dac0e48ad8cecb9d0bb8b6b3a5c4901bc609fcb0f598629958b5bc7e41
+EBUILD icalendar-4.1.0.ebuild 825 BLAKE2B ddf5963f44d220af76b120999ee24bf424040a733f7e1b789b96bd2b4c288a68e7273785f263f6957c88d048ca4fc3209d2d8c2c4b0da70734d0513c884fda18 SHA512 af0526244f3ec2e344504b3cc4d9a78dd3ba44841afb893bdd4aaa7204883c93280cd312c8a241508edeea7b877f67578673e61e0b2d67c24cc8a61e0c4d0c03
 MISC metadata.xml 503 BLAKE2B 284f63e95eb2d3015979a14774f8ff9df0df701b81f8aa2c7583f52d05973cfede1db8eb7904203b854165e10640cc50a0e3cf14d9aff090d9ff657c53098cee SHA512 d206db3c1255c8e475c4289c548f0224c7fc507aae513d3c15706998892ef8450400a97bd07dc7d52142a03cad4abae3595d5315d8912586440df74096edea67
diff --git a/dev-python/icalendar/icalendar-4.0.9.ebuild b/dev-python/icalendar/icalendar-4.0.9.ebuild
deleted file mode 100644
index 502789370766..000000000000
--- a/dev-python/icalendar/icalendar-4.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="https://github.com/collective/icalendar"
-SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-4.1.0.ebuild b/dev-python/icalendar/icalendar-4.1.0.ebuild
index cadfd9e2c317..1c649eb27c0d 100644
--- a/dev-python/icalendar/icalendar-4.1.0.ebuild
+++ b/dev-python/icalendar/icalendar-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 7fe2926dbc50..67d3f545cd58 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,7 +1,5 @@
-DIST pyspnego-0.5.2.tar.gz 328222 BLAKE2B 7c811948d1d3890e2d03f4a532b9c0158195684b0cdee915811b1ee3bfa791b84632edb6d098562aa7b9f4c36eb00f244e249340b4de557999ec2a0f176ebd1e SHA512 805da232d138edaf4094614df0ebc4840f0c1b9deb9586026bffe0ec17d54553e4d3876ffc53d87b13687b741951a68334369f0f2475cf2f12359f072dc6a0c8
 DIST pyspnego-0.5.3.tar.gz 389939 BLAKE2B 236151d9d9f37137d46b06a99f037922563b4d43931288129492aa7173f166d24c3086297e30a0f05158773101df9868f88efffe00864b1bd5deb0a99a496b61 SHA512 41ca9f785a7dcc99818da351e0a020ffaed72d65cd67b0f19ad4a462a6a1fe739d040acec85052133a19aed06066dae9a9e8f0b469713b331f6ddc52cd3b4c0a
 DIST pyspnego-0.5.4.tar.gz 390427 BLAKE2B dcd9a58b2ecdab8d0ef89c6d321cdc75b8711d613afc7fdc2d3986768397b8c097cd2dd86383da7072f8e85686ea02afbe4c738d603d20590c67f8560df5e790 SHA512 5f49ba1a2f86880ded9f09f81969eecdfefc468c72c770846e3af6520bb186c585bf8d74e8fc16bcba24d9220f88d6f5d9b59af203efe499866d6335d13b96b5
-EBUILD pyspnego-0.5.2.ebuild 922 BLAKE2B 72374a98bd8ad5eaaadb201d5fbaf996eee2050f84bf232e67eb135020f2510aa2332a7e24051ec5846cc1f6047d552dd4373d0c0a87562e4f9cbc3aa333915e SHA512 1320ae5b3d893d70604c4c32152974f59dc31399b8aff9c2e93aa4aa8d90c437c29c1f9a7b368fffde1ef804163df16e7d355241c64c53b3816e6d909dd621d0
-EBUILD pyspnego-0.5.3.ebuild 982 BLAKE2B 97ca7c2451d24c9308bccd207cde44b5e4dd37f2f352edc3bd2750637267028c9a14e83fb1eaae5cffac5bb663b750c6c33c28c83276242822fe3c5da5f44d40 SHA512 1a0f86ead69999eded2f5ab08c25da5f082a9adb7d15597bd87b2836a2b4c275e528603da62a10e4b60edf25ed058693ea72597676ed1d4ed785a36a3f87891b
+EBUILD pyspnego-0.5.3.ebuild 980 BLAKE2B a5e83e530e5bd701eb4f7947eb42ca8c3bfae39b8f65817576e8e5c453f5d6ad14bf619c473af8a055bda15d5b20baee6a9363a2ab9b619aca3a105512e7829a SHA512 efdeaeb18444e8c645bfbb7dc895db25cde2944681c40870a3f9b81858812c9de04c30af25c059edf97e0189035aedd4a91405ab806b3593cfb199a07e1405d5
 EBUILD pyspnego-0.5.4.ebuild 925 BLAKE2B 4c3d306b7b88e0bfbdded05c1e8ba82f44a9f1db3a32264b9261f5f8edd9fad45d83c8482f1d5bb32ca00de355e2a9f007ac67a4e93a95c010e9a8fca3858931 SHA512 f55c7a99baff0bdc65aeae861402156ca34b06f076d1ffc5211ff43d3410ad26bab015fe3c1ec51f45f6c1d0e01233142ea394ed6fe9c523f84217b09a46e98f
 MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/pyspnego-0.5.2.ebuild b/dev-python/pyspnego/pyspnego-0.5.2.ebuild
deleted file mode 100644
index b565e261d017..000000000000
--- a/dev-python/pyspnego/pyspnego-0.5.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="
-	https://github.com/jborean93/pyspnego/
-	https://pypi.org/project/pyspnego/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/gssapi[${PYTHON_USEDEP}]
-		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
-	optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/pyspnego/pyspnego-0.5.3.ebuild b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
index 1a908b0d6732..2dc2dd35d787 100644
--- a/dev-python/pyspnego/pyspnego-0.5.3.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index 3eefc7bbe29e..86834f1debfd 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,4 +1,3 @@
 DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
-EBUILD python-editor-1.0.4-r1.ebuild 413 BLAKE2B b396cfb29e900b833d3e9de1f245f723f57417ba3833556cff2213c560e911ac0e09d7a48e023eef3b8f570f1ae086ff85d7088a219ad335308f7c42b6669a35 SHA512 57604bbb882e8e487f0808d19449294dc21ac0bc503ba272b974a8af1799164345bc206c19bd758ed43e586c7b3c30759aaab8ecbc8c1b4d8b49bc9888c26645
-EBUILD python-editor-1.0.4-r2.ebuild 493 BLAKE2B eae45c16ec69ca447c6ee5a53e12d39f7a9938ab8c755b7ebe8a132bac21c869d31a2fdac3f7b1df33a9867e9eb47674c6a4d1f80ceaee279f43cffaaf00bad8 SHA512 53d41607c163519093d143b5682395d3d163bfe461aaef0479c923cacce45f40a23dc70344a8fef5cacfdf090fc3deffc9f4906390847fde8206261ac59628fb
+EBUILD python-editor-1.0.4-r2.ebuild 491 BLAKE2B 563671cf11dd5f2c6e84f13fb0dc62b54300ee03f621bc34ff776b283e1ec8b98071f31e96aee97d659c1026490f506538ab2d55b979bd7328c6dee060e83590 SHA512 1544a1ed16d989dd9968baeb095b10389fa333dc197987eb1cba7181607ff23c426ac8b3d0b5f57452605e3805fd59711ab8a98cd2aee41975bbae88276bb4ef
 MISC metadata.xml 479 BLAKE2B f34e8a8eddc2cf672c14027217798582df17f1a396d9b29bdcbc31dc523e718364ae0cf8254c2145e80ead1a8c1433eed0da7999fdb7bc0a952d6bfa8ec231c9 SHA512 d9a8cfa2722de34a33cf6db2f512e3407dc9aff72b7525cd798ac33efe26550f21e1db5ccda9610799d64e3fc5e9d4e02f0151200369f3c661e44e2a7aa3e71e
diff --git a/dev-python/python-editor/python-editor-1.0.4-r1.ebuild b/dev-python/python-editor/python-editor-1.0.4-r1.ebuild
deleted file mode 100644
index 7269812c4253..000000000000
--- a/dev-python/python-editor/python-editor-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Programmatically open an editor, capture the result"
-HOMEPAGE="https://github.com/fmoo/python-editor"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
diff --git a/dev-python/python-editor/python-editor-1.0.4-r2.ebuild b/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
index dc43d461812a..61ddedd7419d 100644
--- a/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.4-r2.ebuild
@@ -17,4 +17,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 26b4d65bc94d..5da125d4f1c5 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -8,7 +8,7 @@ DIST reportlab-3.6.7.tar.gz 4504447 BLAKE2B 3e691294d20f94850840ddc70565d2235bdc
 DIST reportlab-3.6.8.tar.gz 4503191 BLAKE2B 3d61ac2554309a8dfff2107ba6157152b558355fc6ebd7d2337b0f3152ceb9644ae2dc20b6e0f2ed312a579fc5f172e05eeda69e3b6acbbf921b62f27ce50f77 SHA512 7eb2381a8020f751f03008bb8dc1eb07f954a97c0c3d38646602a22ed7f69dd73e11bbd1251a471da141c98492be7f3867cf120e489c58911ae6e9f29c926507
 DIST reportlab-3.6.9.tar.gz 4507750 BLAKE2B 881eeaa36fb3934a75e420822d5b0d0f1718da190741190e58756c952bc3efac304e2c7747d8748713ef3f9449ead40c44d6774d6ca90218db51c16790d9e8cd SHA512 401127eaa3e4c9f303f5c13f96151a563a16efb15d1e9aaf6dab04cb23f275b552cdd8fb9a3a49bca420a8ddf83423c481dacdd11e39220592cf0ad911b70c42
 EBUILD reportlab-3.6.10.ebuild 1245 BLAKE2B 0b7cfb248e32193c06df4a017b018ebb47baf5786b91b12e641f43e7a3461d8a6933e4a7753860d1ef14b564aa6fe1ddec11ed1472bf20c61cf33ada6d3b781c SHA512 cea1cfff67c11de929dbcdf8126c1a078333ea96048bbe191fc84b62d047d08b74a831bac49b636c0ef2d787dae611d86478e113d09981d0b23d562cd3c9c5de
-EBUILD reportlab-3.6.11.ebuild 1244 BLAKE2B 737a305558c08e45c3d3021c46f3ee97f6961dd2dc3d3d8d1d08ae260c9204c6fd0fc84c590753e64c38df55e546332c339c0d40bd56dd9de0d4cda3967b0fe0 SHA512 ba45964fb6aec16d0aeae6d072dc8bfa70435c30fea6e87f2389e5a1eba38a1750cb2683c88fd431e8ed2a736726485bde9d1332228afe7acef21d5679e9ff13
+EBUILD reportlab-3.6.11.ebuild 1242 BLAKE2B 403f5438a6807ee2787d84142c826d6df09a97849ccb1785f2fdf341470b2b2cfd6582b3ceb3e0d61ea6f944049f0e42c2edaa8bc4e8c0f18c97774831e1bb3c SHA512 6128e1e8eaa0a43e4618a55f0f0ab4e4bb6ecebfd19f48098f4b6143a825c01b6e2a7f7feb60b958c79b4e3687210e7d5fc77b670caf635ef3f6f91f5e634cb3
 EBUILD reportlab-3.6.6.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.7.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.8.ebuild 1294 BLAKE2B 4f05f621cebd0f1bf5c81731b305f6c95223ace2e0f41f5202780b12137f9bfcef709b40d16fd3f3893da4a2bed0daa6826b3968d48f64852cee6deedaf29eef SHA512 38aef3cc5db138fb2356a5752e8b8c50a85964c368c211efc12c6e9b989d43d06bd8d59d05e4a7ed43c0f5711c985973010275d65e35659ead775dfadc0b8d29
diff --git a/dev-python/reportlab/reportlab-3.6.11.ebuild b/dev-python/reportlab/reportlab-3.6.11.ebuild
index d6c91033314b..94359524d4e6 100644
--- a/dev-python/reportlab/reportlab-3.6.11.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.11.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 79768d5fe3b1..9a9085528feb 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,12 +1,8 @@
-DIST trimesh-3.12.7.gh.tar.gz 10756892 BLAKE2B af1f40b5de1eb60ec3241d342b3ed99fc7dc5e906c71a7669578e539d7c45ab4b037038423efb324cc462dc34a8ac1d1a8134f6b775f1965f2512acd76a8af14 SHA512 35f8039e46f55a3b2e713249d66a658ef48eb8c4a0a6e196f34933fc28052ad0a73953cc4736377bb7b79606ea08b78b132bb9d709fc50da11b2e96aa0e231e6
-DIST trimesh-3.12.8.gh.tar.gz 10758444 BLAKE2B d26fa059d4015bd8b1185665d00da619471908d60dd612a6e761a2334b4f78d21bda5bc25f469be23185964f8b068977208a4e7b41591b20f7669c8f193e926d SHA512 ea6ff5577a72dc56ce89076cdee942b41866ce7bdef1971f86ec680e0ae34fad8c7038741a4a19cb83d355891d415b5e88561ae83ae13d0fc2448c08e06b2ba8
 DIST trimesh-3.12.9.gh.tar.gz 10757706 BLAKE2B a81e01a665a2a80a6a8f5b8bfcd8eb92f4dacb0a62b63209afccde48bea4dc31e05eeef8abcd40f01844cab1c9b7fe644b322c9761257be3f6abdb1858356c88 SHA512 55f9830b7f9016dc9827f5b852e035fa36ce0dafb69618fee627395c12fe40db58ea400d8c66981a313dd9a3293d538d5a0dec1c107e9bbbe691295b1a1f5fc7
 DIST trimesh-3.13.0.gh.tar.gz 10803906 BLAKE2B aa99ecec3d108ca7a7c96183ff354f930d349e1d35f00b689cba1dfed1990d0f8f9dcf93d83bb55173280d31235766052d99ce06c64bb80ecc0bf17b5ea49da4 SHA512 db816f163faed97281dcf8d251d2d57a1b7cb7d4b90ec39d74426e87ef3b22508968cd8701accc49803c3dc73bc39f1f81554feb339a46a9a67bbff5f916f803
 DIST trimesh-3.13.1.gh.tar.gz 10803494 BLAKE2B 73d1f9c7a7610310155e9dd714cdb7dd27b7319b7fa54f092dad7e380484b5c650c4b9aa74235621599ef182043493e56b8ce90f02483a2ba75238fe84bd0c42 SHA512 eca0c6bb2866b2e52c9c92b238f303a0ecbe9e40b7e2109b9a5e714a3d2791bd4fdfb26f06c8e18b8815661d198018e37877f19b2b009efd022080ef87f9b679
 DIST trimesh-3.13.4.gh.tar.gz 10804452 BLAKE2B 26b2f82d64114b610e97e0e937a821bf1ef6809f702ee1de908a756b7a18e7dceee75b1bdb49b831952b1753f63cc5735201deb5ba709709ab58e43ffd8ed175 SHA512 4f56dd63cfafb59941fcd3d9955de7b5ef2dab1f0d961d91aed37295f4aaa37ad3a427a39fa2366a85ea407bc12bc8b8980b1da563f46480b653422632bab911
-EBUILD trimesh-3.12.7.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
-EBUILD trimesh-3.12.8.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
-EBUILD trimesh-3.12.9.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.12.9.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.13.0.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.13.1.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.13.4.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
diff --git a/dev-python/trimesh/trimesh-3.12.7.ebuild b/dev-python/trimesh/trimesh-3.12.7.ebuild
deleted file mode 100644
index 40922f106994..000000000000
--- a/dev-python/trimesh/trimesh-3.12.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.12.8.ebuild b/dev-python/trimesh/trimesh-3.12.8.ebuild
deleted file mode 100644
index 11e1a73dfac5..000000000000
--- a/dev-python/trimesh/trimesh-3.12.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.12.9.ebuild b/dev-python/trimesh/trimesh-3.12.9.ebuild
index 11e1a73dfac5..40922f106994 100644
--- a/dev-python/trimesh/trimesh-3.12.9.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2fbed8b76c5d..815ef7615dfd 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 4bc41d0de416..5d05eb836310 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,8 +1,6 @@
 AUX qtconcurrent-5.15.5-fix-race-conditions.patch 1469 BLAKE2B 2504338fe36c1b2c4c8b82da124b2335db816342c63a42ce3d1c8933cbe0f945de18aeb7e014718f52974de6fb890424e6ec620e4664f4902d86740067e3f786 SHA512 ad1a6084d26b67e7135f78d09ca56da737ede6e587821d01527513e1a1f4759c5091e6357899b00a6c757502079af314899d082306a321726318d15303875887
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtconcurrent-5.15.5-r1.ebuild 555 BLAKE2B 6b549e297c587ec56026feb942f7b707e44ed8079cb225918cf1c7d4b060c70794b92bd66732dc75a41aa665350ce661d30c487d369496861186de2c9926a826 SHA512 55f62afd673270c798f810b66d17de6b1c74a08459f88b92c5f8691ea80d667e38edccee1903c40d0a04134f63c2b76c7c100cc646b4c1325fd3a00771c3f170
-EBUILD qtconcurrent-5.15.5.ebuild 482 BLAKE2B f6f93d1439f8b280891d63be609ca31d81dd58e655d109f137b24cea79517771e7b10fc501f24537a4f3617448148658a0074e9b97090bb6dc9a3a38e0eeb126 SHA512 71a36bb5d57392da512b20c8e65a53c99c53e81da6d6b3f582aeffd517614ce4eb6cb74811588c78e74fedb96892c1d6994d363e4075aff63b0ded1ec51cbc64
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.5.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.5.ebuild
deleted file mode 100644
index 8307e75b3263..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index d6ab5c1a8860..a5a812eca75f 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,10 +1,7 @@
-AUX qtcore-5.15.5-fortify-source-3.patch 2353 BLAKE2B c2eaf28a3daca0ccac7ace1f8a915f44e705ae848a9e5e46756a77178a442345c8d6b1c3d3dfec1fa092ac0e7ee2d83b2cdd825d8471cef3b2b81444e99587f2 SHA512 df7e570417564d14993eb91fbaf691a15bea896b3ee6a8b7f5ac654b74fccda9f7dac52f022626df8aa3955aac073250d7b50840fd3aae3aa443f180084d29de
 AUX qtcore-5.15.5-hack_never_use_execinfo.patch 880 BLAKE2B e63e908d592da13f5c762fdd2d38dc223a04dab772381c837a93446d41a16071b51b2b4685084b8de956c5a95b0c71e97a63eb21b99dae764cc202bba899840e SHA512 c9b73d0eb1e957b2ab7b47b4cb7ace72004bf937927572bc86d27536f0b92a4594df8897862090454b1110753af03b6bab3eabdaa728b5cf42b8e2d21ef039cb
 AUX qtcore-5.15.5-slibtool.patch 867 BLAKE2B 0e368bac0d3a066e64a45162ba874a857fa37550ae8b2a9d9378d1c864553bf793c53d5e3079f3e80a4c7f5e03201a0a45d084d0dc83fc35ec509f6ceae50188 SHA512 fdc58a17685ed2c66ab68741778a708dd3869ae1fc49b94bef676b96cab3895e68f835dd9e9653ffe707f179a9be5cbe72491b5d1923ad0c4136fc0f92b4033a
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtcore-5.15.5-r1.ebuild 2213 BLAKE2B 071bb5ba9e3351cf11b7efc40b30a7df80c49d9d36520abe53aa88e412c380fba5b0525c330d41fe4bf0ae3ad79ef8f38b5bb29596b9c26013f9a59a1eace9b7 SHA512 53a00e769a6cbb916a184404597c0abe5627cd3fe67f0e6fee9b468163480c4ba1c61e723ad459da58f75cc656b965f3db058704b3e54e9c2c43e69dc160de9d
 EBUILD qtcore-5.15.5-r2.ebuild 2317 BLAKE2B e5e64c0f64e4e0b2463f67c4bcb19e00f126f88d4527e1bd9703ffe26ace46a8181f3b8b3d052c1d5ad930077160a61a3046a0829279c6c6644fc5ff59ac5fb9 SHA512 8c852de875ced33d03aaf0d896818dd11525fd1853313267c539f561623e42676bc904e38f4a421c862f44a4d7f33a92d8348c78bad833a3cbb69bc4a6fd7a6e
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch b/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
deleted file mode 100644
index 1be46b496cf9..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.5-fortify-source-3.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://invent.kde.org/qt/qt/qtbase/-/commit/6d3d164bec17876f5b24ae9102767ef1236aa37b
-
-From 6d3d164bec17876f5b24ae9102767ef1236aa37b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 20 Jun 2022 20:35:12 +0100
-Subject: [PATCH] QArrayData: fix UB via reinterpret_cast (crash with
- FORTIFY_SOURCE=3)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-FORTIFY_SOURCE=3 is a new level of FORTIFY_SOURCE available with GCC 12+.
-
-With Qt 5.15, it ends up triggering UB in the pointer arithmetic
-in QArrayData which breaks various FOSS applications using qtcore.
-
-Qt upstream fixed this independently for 6.x (in at least
-eab6eb64d2fab21c4791738323ca7d670a907de1) but did so at the same time as
-various internal changes and hence is not appropriate for cherry-picking to 5.15.x.
-
-I reported the issue to Qt (QTBUG-103782) and they've created a fix for 5.15 which
-is not yet public but based on the description in the bug, should be functionally
-the same as this. They have not backported the intrusive internal changes
-from 6.x.
-
-Originally grabbed from https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtbase/mitigate-FORTIFY_SOURCE-3.patch.
-
-Bug: https://bugs.gentoo.org/847145
-Bug: https://bugs.gentoo.org/852974
-Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964
-Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-Task-number: QTBUG-103782
-Thanks-to: Martin LiÅ¡ka <mliska@suse.cz>
---- a/src/corelib/tools/qarraydata.h
-+++ b/src/corelib/tools/qarraydata.h
-@@ -42,6 +42,7 @@
- 
- #include <QtCore/qrefcount.h>
- #include <string.h>
-+#include <cstdint>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -58,14 +59,14 @@ struct Q_CORE_EXPORT QArrayData
-     {
-         Q_ASSERT(size == 0
-                 || offset < 0 || size_t(offset) >= sizeof(QArrayData));
--        return reinterpret_cast<char *>(this) + offset;
-+        return reinterpret_cast<void *> (reinterpret_cast<uintptr_t>(this) + offset);
-     }
- 
-     const void *data() const
-     {
-         Q_ASSERT(size == 0
-                 || offset < 0 || size_t(offset) >= sizeof(QArrayData));
--        return reinterpret_cast<const char *>(this) + offset;
-+        return reinterpret_cast<void *> (reinterpret_cast<uintptr_t>(this) + offset);
-     }
- 
-     // This refers to array data mutability, not "header data" represented by
-GitLab
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
deleted file mode 100644
index 80b1d1cbcbf4..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fortify-source-3.patch
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qmake 5
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 9c8874ae7530..372a6f8d4e6f 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtdbus-5.15.5-r1.ebuild 717 BLAKE2B 85dcf206f5d132bdd86e5e9a101c96704ae85a51d7feed4e7205bba006c9920b1dbc19720d5776970a6197619bc79c3da90699b2c007848890047f0fb2b6c7d5 SHA512 8fb29e730e39fb21fe2169ad7f713a1f180487fa71984276a22bafe5b8b102e802d3dc00f629f0cdb2f37a24461e1f7c3eb494ddf025b3304a71e9fc1a02719b
-EBUILD qtdbus-5.15.5.ebuild 717 BLAKE2B 180641b51d75ddeaf646e6b690859dbf7078cda7b0530a06bedeca8169fa604df86933f2fcc2a65ed5a7cc7ee37ca84ed7fec14cddf0501bf018cb4c26438c8d SHA512 8b8b6afe4744513483d865259b86a8c2d634da25c043a3c47e68a5d1485bab43f74356ef1edefb21eeb97db31c4caf01a6b48a69d0907a5dfee184406dbe0863
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.5.ebuild b/dev-qt/qtdbus/qtdbus-5.15.5.ebuild
deleted file mode 100644
index c9058e18b5af..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-apps/dbus
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index a6dd9080733c..0aee7915d518 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtgui-5.15.5-r1.ebuild 3895 BLAKE2B da9ffc7eab01eec75f006e0a6c9a052da4ff5c1abf722fe0b5d733159d3d33ea8dd47d3a49b9098f257197a4237981ddbd44ceb4ea0c0d362452a0baaa216037 SHA512 ba03b4e57c23a00903f8c3cd5dc51aaa77cb255c78db057dd1fe4a6db78149f474184e0497e2bdae7cfe8a01f09e140ec8de7b256a334da92fe7ee1402766867
-EBUILD qtgui-5.15.5.ebuild 3895 BLAKE2B 44c8de506dfd6172926579f0ddeb182c7b496b8c26880cdb5875622cad8f3079b647c43a32cbf5de8af8843f6ed9655125083e499ee486fd38414cd5ff563b85 SHA512 a461ec66e91256c2bf491e596b31d1a81a899c2ae186309537b5e74a59efd8e6a1a6a3650c403122abbc4b2b997a9ecc8b605a54b0c004ccd40404521f7ca9e7
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.5.ebuild b/dev-qt/qtgui/qtgui-5.15.5.ebuild
deleted file mode 100644
index 60247e762be8..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.5.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs linuxfb vnc X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	sys-libs/zlib:=
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	eglfs? (
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	udev? ( virtual/libudev:= )
-	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb:=[xkb]
-		x11-libs/libxkbcommon[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	linuxfb? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usev dbus -dbus-linked)
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usev eglfs '-gbm -kms')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usev !gif -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use linuxfb)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 9b7b10756ffa..80dfcc47a5a8 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,6 +1,4 @@
-DIST qtimageformats-5.15.5-gentoo-kde-2.tar.xz 2596 BLAKE2B c09bea5234b433d33f6307fbdf93f1ccd6b2b848dc34891afa17599028c2ec2d9b5dd3a1c3dcd0dd6ffff01bbbaaf350a6c17440e9083c05ea91ec3b31a02f7a SHA512 df30c604f167cda8e819af7461b11386701e3ea7357244d5525e1fa3c7a6391c21736acb1576b913b8965ff4e90ebf0b85f2e9bae419da0ac2bc8d9f5d423b18
 DIST qtimageformats-5.15.5-gentoo-kde-3.tar.xz 3268 BLAKE2B 21ada34678a2b999190ac9e642065d654e8bbc30ebe7789d20b97a49f3cae2d5e6893325b0019af695460fec8cb1f25e15b9573752396034a7db8ff6d7e49431 SHA512 fb2324d73db23da1ca13d1e050b9f045f1fd0b09cf722b94dc39eaea457629a643adacac16471841d4204cea7becfae11354674b70a4edf272dddc8863a10b22
 DIST qtimageformats-everywhere-opensource-src-5.15.5.tar.xz 1829872 BLAKE2B 7b240291e6076537daa9bc3b87f13f3285f19a4638de5b5db44a2b55275fbe843dc974226e999cd90e6bf902b43fbcd25f052619f291fa36807830a26c10cd52 SHA512 50a68bbe83fac710f21f05f3c0637beff17de00f9309aab2ceb27cfe7a178a1a56b0906f357584eef3188d7b89504591c924a9d4988a7321fb18a72271bb2dfd
-EBUILD qtimageformats-5.15.5-r1.ebuild 710 BLAKE2B bca14a1badda00a13e852dbe4e70168179a73ebcdf1e7a3799fb0da55fb0b4960460975090bcc46fd4e0e96c64595755cb38eccb0196d9f0c1c61bb70b96c4c0 SHA512 1ed641faed82574aeffec083593138b591d98fef813792695ea22a3fd9fad54488a3cf1efcc6fc52d022b66d153c683a4c4d19c32e5512b83faffd1a2fc73370
 EBUILD qtimageformats-5.15.5-r2.ebuild 710 BLAKE2B 8803bd43faa76d2cd2fd1c43667bef5187a88436deaad8bba80f006e7033db38ed7e79f296cdc51705e09e712f0e285cdbc2a20ad1a78c8fae5c5db1f0f72f32 SHA512 877cd68f208a170506e324a0ce9482d9c78f94e01cd4d079a67acd4fea303ff45cfad6ce0df08f34723147133f1bd6591f10217d78993b4ce1445f52a6dbae60
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild
deleted file mode 100644
index d3291db75635..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=2
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 905e6ba75b30..c199e604ea43 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,8 +1,6 @@
 AUX qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch 1760 BLAKE2B a6b4ed143edd639376f362c41c636d8fc9924aa9a2c93584039ef5b994ae53e2eff7eb0703bf8e0bce19300e7b873098fee7235ddf2f691764f33830712b4f03 SHA512 32216a87f120af2f689c2257ce1c77db2e26017ece16df04b06454c82888b9ceb800e7d4e91eb5b4ab7de127436906f3ce8c76eaee6407f779670380026745d0
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtprintsupport-5.15.5-r1.ebuild 911 BLAKE2B c9936afd6291f08097a122ea72040c7d30ba2d02ad27b753632630972de262ed072f1fd6fd55bb9f20202b57a874b324c1f567bdacd3edca9f5dc86cbb3a8827 SHA512 ae34a2eddb3e4ca13d5d148a61b2efc60ad76e612186c98220f604295e86baf1507eac66f34cfed4afea33b07f0f2fea2d7a73c386e60f4b8622f4f224952cc2
-EBUILD qtprintsupport-5.15.5.ebuild 833 BLAKE2B f83d54fd48a8828d6bd34815915042ef61b5070fd754582efe8fe71a3c86f6753624743c6c526e1bb61ebce8d75cac812e3691f42d33c9b99ad748d6658fce3a SHA512 ce6bec40b14228bf13ef9e6c2793cbe7f8022287d1f911dc60f5609e46093df1b0ae711a8202b6fb541ec3cc6d2172288d1ad56a7b966ffbbc61ed3c1b4b3cb7
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.5.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.5.ebuild
deleted file mode 100644
index f66d5accf842..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-	cups? ( net-print/cups )
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index cba3eea0dcf1..b9d66272cb2f 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,8 +1,6 @@
-DIST qtsvg-5.15.5-gentoo-kde-1.tar.xz 6796 BLAKE2B 03e80a083fef2b595d11e53cdf638082dd0a3da60a0c275d188bdf3967c0c7ceaf715e01917cd178d08714aa83827f1820c1c030253359b2018894ee805c2ff1 SHA512 31b7c804aa907aacad00debf318dd04700f16b437428ad9f5a1743dc1de3dc998b134a756395db6b439bee345d38569623a9baf1bb9f429ef068ffd7e1da593a
 DIST qtsvg-5.15.5-gentoo-kde-2.tar.xz 7428 BLAKE2B 8a061086a08f6f8a493685989c62d6360f55bc62e759b00ab2b501e7128b7ddf3c510df25cc8121a3abd47b4040bf9024ac44c9a8288ab8590ce2b80e8e20e59 SHA512 5b537d58886444e58089284473a9fac504edc6e2ac6b34102e6ac23965d0488b05294b185783ff1d3ae65dd3e519ff39213f8215fb34cf7a13b982850879de67
 DIST qtsvg-everywhere-opensource-src-5.15.5.tar.xz 1888600 BLAKE2B 3bf675d3ac14f64c9afd096342ef4fb574c6b9d93f52b6cba3a5184b8f0f54204c90a133193685a4838236eecb72e5329eb2254c80948fa55a6a103d52256b0f SHA512 7938a84abca282f263f7840425863379ed9e0f9854ecfe38e5d1edacdaf39b2516e9e9b8b5dbcf52113785d8c4123ebea550f441abc000d01c07a20a6a742ac4
 DIST qtsvg-everywhere-src-6.3.1.tar.xz 1727104 BLAKE2B be22d9083366faa0e5fe1a3e7bd37e5f439ae1bc3c2aea18ac9987d208d85a47384b71b989dd4a9e0118b740b0723815d959c1f46abbf60dbcc8814a8aea20d1 SHA512 c040e96d2dc7ef615859dec589e0b0c4e5972c3761dcf9208086b0662bfa1c3d147a10534d62d86fd8c9786a1567f8e9ca196f942a372422fc81cd02f1312c4c
 EBUILD qtsvg-5.15.5-r1.ebuild 508 BLAKE2B bc828266addc115a41fcbbf919d500f719e3c96ad68834441ef032f6f010627077af71057890f3ce30608ce4b968b6c32cfb562e9d44686918c4406a3ced402b SHA512 56068fb240741a5eb7783de6a5c57dd3a7760b9ea3c390bc688adaa9372a3fa0a7bbc02da19787bba37a8e723263d97db38d31d93e5fd8b4e99606984b2e2fb8
-EBUILD qtsvg-5.15.5.ebuild 508 BLAKE2B b8ff9b538c8348a5b25c09fe4063962c40cf6262274cbcbeaf5a27227556083e49ff6b134afabf968648ad85dffa0b31fbe1b109dd23e314b0c89354f31a514e SHA512 f6fb04786de78cc499fe09ce6fc28b088fafcae699736d8ba7ae47156ea2c4aafebbedafd027844961b4e721ab87cb59c4ef3ee3e1e2426de09615da601bbf73
 EBUILD qtsvg-6.3.1.ebuild 342 BLAKE2B 09c0c3a8014981af4f44da56fc0b5f0d79924f21ae7188f32c59905e0561e071bc403945aaa88d37317ead2d788bfb9a2b58c46dae88f56fe0c2f3f0802b5207 SHA512 432c136765f20e6f2f418e5cb851d2d77fac85d20dda139f59dc088b552f7b89e7d518d506b17ea2094e084445ebf7b27b2a4eed4243d0ce308e3787f90333f9
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.5.ebuild b/dev-qt/qtsvg/qtsvg-5.15.5.ebuild
deleted file mode 100644
index 9e5f77ee3f3a..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtxml-${QT5_PV}* )
-"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 89e706a7f5b8..92edf79bd881 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,8 @@
 AUX qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch 4691 BLAKE2B d817e7715759dfd6a6efc13b3b8e7742406b3af7cdf8602e134121b8d6e97e857dc82bb71e32c0ad04a04fc8f20443475bd5a251ab6eb0c83412a75201865561 SHA512 82ac704e0a57a0e6272676c329e29116a7ab4186c94a1e81fe4f503bf332b20b699930d86ff22e9a83e72be856a5711230f264a6d10991fd070601ab4e4fd67c
 AUX qtwayland-5.15.3-clang.patch 405 BLAKE2B 914a7448f590cfd6e83ca32352070644bbb6c07bd794d6f86ff6346d4697f6734d4c61469f20fa27517cf14f4742df946dba1f20ac242ea50d8e712733e3c099 SHA512 41da7708a596eabbbf58baa2d081c6a870fd49ac5b284c094e7e3230df201ae29627de1470bc3a80aff3dd30166b51bf9fce53e3d6fda0f18b97452fda3cd467
-DIST qtwayland-5.15.5-gentoo-kde-1.tar.xz 32076 BLAKE2B e42d847deaef08271eb2f3211db7496bb1d3e1da976cf242f2129775c0401eb834fd7c94b35ac58d601eb28e770c3b6bedaf4135e5ad97f43e0adee5054214aa SHA512 277c3612de892f21058bac3ef9c2b3584aa43850e1f6dab0c43989a952e30656c6069d1f7d07b0f1df7d1ec2ab1893a0ba1c4c6fecc6f56c101333832bdd483c
 DIST qtwayland-5.15.5-gentoo-kde-2.tar.xz 35492 BLAKE2B 91334609155e4bd227d76e5972422b400ab4b6196389a1b6b4c271994287851bc3b624ae761ece1418037735784edf7740ed5337ef6972bf708c598c202b7e86 SHA512 2663b59c7647e8a7d5f64905be114fc1b248cd8e10c2eba6bddc25b74fbbc5216e8264f41f50b6368819664921e27dfe96d4c1556c0e56f8c3c2c0ed75a72080
 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327
 DIST qtwayland-everywhere-src-6.3.1.tar.xz 835896 BLAKE2B 97dce7d120769d1d68c6b15f8154e7aefc95d44d011a3ab86565868e2b81ee38780ce0931ba02973b878eed24781c6098ae688294c4bd30fb265d6815a215a36 SHA512 571654a6abcd865717d4624c65d78e1b911829bba84f609521f349bf896b9475a8ce7759ba6b69e4bc4eef10c31e404c71610816dbee20d1202401efefa2323d
 EBUILD qtwayland-5.15.5-r1.ebuild 1147 BLAKE2B 40a68a2ed720af062d9054c26c705bad4c3fb703105e0236812572a83685b725b947e1da5ca4800c9ae537a78a2576ace427444c9e0c2cbd769ed2087f15420f SHA512 594b97d65fb32ce928f759017dfa1ffc528928bc2633767c90e45879e24d41f653bd40a4de9716bf58a823ee6b49e44433b8c264aa28e1c31ace8639f7849e0e
-EBUILD qtwayland-5.15.5.ebuild 1147 BLAKE2B cb388d4b724850c2ac83f161f5546d12f9bebf2193c73f3252abe1afb9de5ee8d277b84dd539a159191c50e011c42bf643a76a0ccd2950b815edef36f1f45245 SHA512 55e53e006bb1d8f138e7c9ffe40eda9b670a0d82f22b64d6867db3285ea84846c205df1a3c3516c1636cfa20a825338ce16aa1c1cce753e93730ade702f32f80
 EBUILD qtwayland-6.3.1.ebuild 438 BLAKE2B ecb43b4035f97bde672b22faf6a1aa7a5fd0860db6bf871b4055c97b1c199840e2ba84b6720a69a3a2ff5bc8222abaead3a6ba53c282e83b1c3c114cd075115a SHA512 c9512430e1085f3e60a4fcab21036ac8aa393eb442ec2ebcc7f4161958316a9131bddbdb422fb2018f190ec99d5d51d2ba02a28503c220cc5e2c16e904445190
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.5.ebuild b/dev-qt/qtwayland/qtwayland-5.15.5.ebuild
deleted file mode 100644
index a3da0ab2459e..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-SLOT=5/${QT5_PV} # bug 815646
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdeclarative-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
-	media-libs/libglvnd
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending
-	"${FILESDIR}/${PN}-5.15.3-clang.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
-}
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 741bfda64f58..527c8d4854b5 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtwidgets-5.15.5-r1.ebuild 1202 BLAKE2B be5255b50d5381c5b8aaaf99714f2e9323a0a4ac544b50cd3cfbcc9c7e91a91899070d1015172e638278484e591b201aeb749707f4151b889c416713a0b4fac4 SHA512 5eca43a918613a7afb15bf8906328e3b0b5a1677414bc806ded798e6f3066d91295cdfa2cf5089e3bab60e64cd7b009e56692275664ad0bacb144edc3f714a27
-EBUILD qtwidgets-5.15.5.ebuild 1202 BLAKE2B 4b07340a89e1d70785fac371c793e17af1276e173d6f0b548bf36ff75effe09e92ebf419f56ae9672d7acf60e41fd126ac452e6273ed52e38cefd7b82267209d SHA512 e9a199986ca80b3ff20d8f9ae54d71c77725ea055f4b69bb17fd266b4aacb68a592d721987423c758b8d2f6784f7cfd0b33a72607341a5a7fb54a0433f6d1f56
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.5.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.5.ebuild
deleted file mode 100644
index ab4ec9a942fc..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="dbus gles2-only gtk +png +X"
-
-REQUIRED_USE="gtk? ( dbus )"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gtk? (
-		dev-libs/glib:2
-		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	dbus:xdgdesktopportal:
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use dbus)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib -xkbcommon')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f1b5476fa4ba..970e6bd803f8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index ab8e77f19093..6b5ffc1324d8 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -2,5 +2,5 @@ AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33d
 AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278
 AUX apitrace-9.0-libc-dlopen-glibc-2.34.patch 785 BLAKE2B 0339c808f83ecb18e42fe643a0de01b3f8566251e805bc5eace16f7d77571cde85d9cd2eef24e408202591a7b7ad0f1ec2c090b4ce8525b54057dd55cf08009c SHA512 54a7cf81370de87b28e18840b7644aa764d67096268d49324cc25b2f0cf256eb44e4da10cd63fc5fae8b8fcfac4d9eccb840b24778accb3e76c992eda06e2af7
 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
-EBUILD apitrace-9.0-r3.ebuild 2350 BLAKE2B a088ac691d216414b0e7eaa352eb5ed54db1ddbac4fded595f7e8a9f691e1f1b0b82f64eae85d61e7599726760cd96931d858cd14a084f106ca1658af616442d SHA512 17fc2b8fc90102324e913cbde54f194cca247dfaf977a42c9d2f082ea02d87bc1fd9a876a9205508b89e877a32665024c03c9adfddb5b2b3e61828a1bee8bfe3
+EBUILD apitrace-9.0-r3.ebuild 2332 BLAKE2B 6222250677465a339f1a68744eb80ccd277b514df2d4fb3cae5ded3c5bb16b807cf20233d88ab892de3af0a724e30a8c3f74b30526231d1526795966ee9fe01b SHA512 141e522087d5bb662b744f1c981ddab107a9dcb7b75ef8cb5f0150cbf83586c1c2aaa8c822533168d68a2901c488da7ac7c79168ece5cdf4053f61c85272b391
 MISC metadata.xml 250 BLAKE2B a9437881337420620edfaa0a3f4e7660a47100479c9d360dfb3b8304eaa085d5f2bb97ea8d823fc6be282fd4f2964cf12d189ec0e6d18a09ea513809e5bd5cde SHA512 284c9edd2a7f91f48402414ec05379f5a9a40ca67f02ddc4dbf3bbc45f83cfe01aa54442af0016dcf8495bb6291423def988f0bba616c5a5024011c4e97fde57
diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild b/dev-util/apitrace/apitrace-9.0-r3.ebuild
index f558e102537c..1faadb28629d 100644
--- a/dev-util/apitrace/apitrace-9.0-r3.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake-multilib multilib python-single-r1
 
@@ -62,7 +61,7 @@ src_configure() {
 			-DENABLE_GUI=$(multilib_native_usex qt5)
 			-DENABLE_STATIC_SNAPPY=OFF
 			-DENABLE_WAFFLE=ON
-			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPython3_EXECUTABLE="${PYTHON}"
 		)
 		cmake_src_configure
 	}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index dfad1a863225..89ef96b9acec 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
deleted file mode 100644
index 44d2e78f6bc1..000000000000
--- a/kde-apps/kalarmcal/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kalarmcal-21.12.3.tar.xz 629772 BLAKE2B cb065b4389c86bdcc83de42bea8f5d60c82bfb7f4cc5f4f2f6d2ef94a7c8d5730b10b72b8d79984390a84b44a208dbb26ad98752b0d12bffe82080bc20dcacbc SHA512 d990542d653b796e9ee071190a4b37ee18175dd14e4e4e27b5cc7b76fffab40e9d16e2236bbfcf3bf2c6c51e45be26ac41d36a9caf1ceb4178e6916b6430554f
-EBUILD kalarmcal-21.12.3.ebuild 862 BLAKE2B 417fc7bab1d2eb598db4b7fe4e870fe2a108ec62d05f9fa374375047c510fe7f8a54bcbde2b55c671ece1d296883a05a1bc01facb5885268fd3e7f17efb6060e SHA512 c0525cb29ce59ace41b2bec3b99502cdc74b03c59841d8046e5feb29fa9503f030194137cc066d31dce35628e906b781271cf571b04c4012a46869e27438f20b
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kalarmcal/kalarmcal-21.12.3.ebuild b/kde-apps/kalarmcal/kalarmcal-21.12.3.ebuild
deleted file mode 100644
index 6f580e25ac24..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-21.12.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.88.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-
-src_test() {
-	# LC_TIME bug 665626
-	# TZ bug https://bugs.kde.org/show_bug.cgi?id=445734
-	LC_TIME="C" TZ=UTC ecm_src_test
-}
diff --git a/kde-apps/kalarmcal/metadata.xml b/kde-apps/kalarmcal/metadata.xml
deleted file mode 100644
index d925f2439758..000000000000
--- a/kde-apps/kalarmcal/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index b0c0ce762b7c..7b3e6b729961 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 18925e2b5581..030560782b2d 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,7 +1,6 @@
 AUX khtml-5.96.0-with_x11.patch 3371 BLAKE2B 4e4d8bcbdeb6d99b185400831a15fe77c81c54da98c82d5c922b194a8fd50b4a8eac2d814db9b61928bee553764a9e56a64550e0b3974a07e345c5b5f85ae3a0 SHA512 5ca257ec36652ba273afbb7baff2412357ef0bec047b3894152f18b4712ded3981f602cac4ed09229ba568fe9a24d6d5579a155bb636984015b5c465bf8a4953
 DIST khtml-5.96.0.tar.xz 1965056 BLAKE2B 857a338c9831a03989348ecd6d9c355d6538458311eb22ccc2ae1c631137a7dd411866c70632f941d2ae64bd54584283b90e9bb0cf6573f6504d6ceab0cb01f5 SHA512 7ccd0c8dbca62486b316f381c437568650696cc4fca0b2e382bf8d337435f9c7fc7fa4664e01bbe8db509bd293c23ebb4abaabc34719be38e91480ae0b1d4141
 DIST khtml-5.97.0.tar.xz 1965188 BLAKE2B 0a508b7d0de5969e020dc40ba89f2e4b1bd67c336ef97ba6e880c3a15dfbd45337e9120f173140027f3e37964eca7e0d96670d4f0704b399b5853fb78d49550e SHA512 746ee8f2ae8ae15ef1b2a67435fd6e57c6a6f8cb345eca3b0ab997ec8a9831e461d4eb9197436f7097a94945ab66116cce47c5baf58b4bbddcfc0fb00bd36ba1
-EBUILD khtml-5.96.0-r1.ebuild 1831 BLAKE2B f1bbb619ce02563d35dcd14db51a7ed99f2cf6cec064f819e95087ddd36bd5b345082fd9363fa16888ab6e4330ded8072715d0b0ada0de37f1fcea7fdc5ded6a SHA512 053e97f59d2848bd36b8b3ee975d32a8c0c19d5815c2a4f1d55cdbff1e7107fa6e71c30dbdd69a49e7f7257f96fcd7127658709e041dd2e5177e2cec4cd6af95
-EBUILD khtml-5.96.0.ebuild 1790 BLAKE2B 765c616050c5c7217c075108e4c7dc2fb5afa2ca31fd9a5e49363d035841f249d4eccebd3644f50c23f2571af6f9a8e9516da7d03c6259da486fb2d089282077 SHA512 3a77aa609b50c48560cd610da34189ced45385d72e6d5377410758e5997ff6d3c29acbe69eb6223b4b82769eba2390b8d752d113a8a69f8a74c731fb336464d4
+EBUILD khtml-5.96.0-r1.ebuild 1830 BLAKE2B de4f7699dea6c0d479ae17cfe63941635893d144c26f8d8779e2568f9e0ced4202e2c2df13eda3d2cf175aa9cc50f6d547cdc1c7b6c535deaafdc39d3fe3ee7d SHA512 e8539d33466e4c124dd755ed6ae6a140eb73f8c7714191050c6f18be068977d290f148cec22209e71b2deed5bf79979aff72b4ea22cd15460181dd19d250a41d
 EBUILD khtml-5.97.0.ebuild 1841 BLAKE2B 63e0fb2b401eb9dc8d91711da8c1959a2df1f750438dbbd874be0c775e09a3de2a589400f9c5114544bf0fcdad7bc30cf13dab6dc517335a94e3e1f1c0b07604 SHA512 1e46b83399eb2af505ed80f2dd89cc4061dcd323638af64ae9e599cd905f650743de7d66d4bc988294a1b7b5780e3a501b2271ff765816aa6969c49a51b941f0
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
index 8d674aec5f24..fe5e4869c9eb 100644
--- a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
+++ b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/khtml/khtml-5.96.0.ebuild b/kde-frameworks/khtml/khtml-5.96.0.ebuild
deleted file mode 100644
index d2b74891701b..000000000000
--- a/kde-frameworks/khtml/khtml-5.96.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="X"
-
-RDEPEND="
-	dev-libs/openssl:0
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/kjs-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kparts-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwallet-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	media-libs/giflib:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	sys-libs/zlib
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/gperf
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 20a01f215775..a375f051c387 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,7 +1,6 @@
 AUX kinit-5.96.0-with_x11.patch 2306 BLAKE2B ec443e5351d1fd727ccb4ba212a19dac96db7934bf59850590566f00a4713fee37cdfa30e676df01c7f7c72ee87d717b121e7613472f965baf1b29a3a298ea57 SHA512 dfc82d59a925503a586c2229581b754b26baf7ffec0614da32c60dbb0ed14a9107a323ba57d2a545ffbcc38d06d38a3f22bf4a6ef7538f05caa343c844946880
 DIST kinit-5.96.0.tar.xz 119408 BLAKE2B 7372a85d89e1344e1205035fd1bd643b88619ccb487667cb7f41b64b59046253e8afcb053e51e5093c31a86a8ee7bb71c8c1b9b9fdca342612d0a9ba024c4fb6 SHA512 e3f2a8fc3a4487baa1ecc60ac86e6322b9b15a1cc0fdda288eba9cf9fce387fb299435a689abeaef8570e22c9f5fdd646021409a72aa37653e28e37c8a230e7d
 DIST kinit-5.97.0.tar.xz 119428 BLAKE2B 2849e42ebff5293a2c928d9191c7eaa3199083508a950c2dbc1f4301d483c553c6c7051dc452e825cbe42933ec5f21548e36ba853ece328a22cb947e557622a5 SHA512 0dc829d156bd85245a6fa30d515c3a670378af0b4da3106713c1e631c3f65ce1966b3d12e89274c4e4c364de26c53324ab4c1420d2a065bb47b12e086bae62b5
-EBUILD kinit-5.96.0-r1.ebuild 1243 BLAKE2B d3850665bff0c59df03448d969a86fd1735652f203b252e51f9f1822d30612e1b976a99cbd45215938bbbaa7ec732e4e2095a4667278789e56f6534d8d3fc41a SHA512 43934d4a3620760ff7cd8efb8a39de8e1959c12f079dbea276ea9fa6744fd0f605f5153439f9b18a5b88df9569ef6a182375fbc938456000401801d3fc7e8754
-EBUILD kinit-5.96.0.ebuild 1159 BLAKE2B 6561c5868b8cf8d539ea07bf0fff51535560c1066aa03507b5dde5962afeac486ac844b56a96253c61a4120ef8d15638655635105e9b52dac22b54bc3db7076c SHA512 d1cf2d85ecaa690437f1df43205dc051fb888bf3e674f0b7b91d0d09d44cd45500b453d699642b854018185f54477582ed40d03cb7f00c06f95142597d18358e
+EBUILD kinit-5.96.0-r1.ebuild 1242 BLAKE2B e6b72d7a933a8316dfa0d81795f99e616b55831ec0304fe21c2b0950eeaaa20cb45a26cd34dc6fac2c9062135cd538da558cd4db9b1ff7a1e78f86adc4ef12d1 SHA512 d753652450826cb437c551b817a8ee747e7558a60e6026bfdf975977f71ecf22f3aec8eeed243a3e4f48711c42d5bb144db2ac5b1186dc2aa6c4f533d8c12360
 EBUILD kinit-5.97.0.ebuild 1173 BLAKE2B e861cdb145dc34321a4b0b50b96c0d2f8c1ac75a591d7ee1745705f964c5779d6a59c83865ffba8a43de2c84dc32733cb305f7f2a4ffbce217710a76a60e9dd8 SHA512 55c151f6ec2963b533059bb317ce7d14288c894088aca479dc8544938d45fff83ac64dc3efb966e78e2dbdf896c4dffc08e04a73283494f72440dd28c1d8c6f3
 MISC metadata.xml 565 BLAKE2B 8e740127ae95b251e2e5cdf63fc19fb605cf5ef42e631b54e0ef300e8f21f04e288527c4628500c076e884da4b3017d041b1b45ff9a6680e72585a43caa452a4 SHA512 0efe6998f185b5a5aca504a041b3e5fc1ef8da0a4f9eaf2398ef9533054d9de27ae50c9e940001b24e69958d2ead67ab829304d8e322404cb19fda0c904e952d
diff --git a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
index 69210092f31c..60cf6e3ee5cd 100644
--- a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
+++ b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Helper library to speed up start of applications on KDE workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+caps +man X"
 
 RDEPEND="
diff --git a/kde-frameworks/kinit/kinit-5.96.0.ebuild b/kde-frameworks/kinit/kinit-5.96.0.ebuild
deleted file mode 100644
index fb3088f5dac8..000000000000
--- a/kde-frameworks/kinit/kinit-5.96.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="false"
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.4
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+caps +man X"
-
-BDEPEND="
-	man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	caps? ( sys-libs/libcap )
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 73720e9de12d..0cafb752c32a 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -3,7 +3,6 @@ AUX kio-5.96.0-fix-crash-in-dropjob.patch 1568 BLAKE2B 91837508cbcdb278a1b38747b
 AUX kio-5.96.0-with_x11.patch 2626 BLAKE2B 22fe308b5238b54627c52e6ef927ffe8a3300a9086e04e91c4bd44c6dba9d7b09ee402877f0d45f08f685504f40fa426ddbb9f542274ee698aae191ac72a7b13 SHA512 4c54455ce672f7841a536d87ebf339187bda6db5e4c7ae876f3ff86a7d0e337c9de04be3ee09c81cbbe8d01eab4111819e8ab29b4cafa11f3cbcedd9e64ccce7
 DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3
 DIST kio-5.97.0.tar.xz 3369020 BLAKE2B dc5fa23f88e89d836ca41a43ebbf17e3021fe8aabc67ec260db68be69561cfe48cf0afc17328e85ee3f1d2ff075deb0b0ebc9c02be1f51e188ce1063c902c201 SHA512 bb6e8e45cf9f5e0a076c6bdfee765103409eff22cad41419a49abf59ed1c1fe73db7f186ec8ea2d6dd6fa26787596732870e8db63d69ed6a241ac721cde08ab7
-EBUILD kio-5.96.0-r2.ebuild 2573 BLAKE2B 6eb6fa383b03f464fd5f6c9770a3bcdc7ef5b40c73d1e843efa3ab1549a0873219456e9b96438f310dca2329932149de6bcec85ccd19e5a1419defb6b7d1a700 SHA512 5f4107e0cd22bde707c2793964c926a7b7ac1051f3e22c3d6052231e546004b8ac0be3b2f236225014b305d3396a0faf059b6abb98d1aa8d100699df494bf304
-EBUILD kio-5.96.0-r3.ebuild 2612 BLAKE2B be29833a804e56a2600a81170a980fdcb607502ac26fd20024723990003ee54a732990ecb34b389c38ef045ed275d9d6cbd5b551ed086e34a1ad1c3a3d64ff00 SHA512 a3e259ac49e61be53224837faed6796cbc5c6f89ed99aa19093e0baf78bc0d5a4064561d96a1c31a5e0035dda97ab8605a1e78fa36ec5e5966acbd37ac2c86ef
+EBUILD kio-5.96.0-r3.ebuild 2611 BLAKE2B 6c0c1953caf3e9d12fe6f4d5e8eb8e6a30d81692eab6d56f4d365022e425725f62c74a3b2fff6fc3c0e05b3edbe9c58764ea83fb9968a1db560e4ce672fae8f1 SHA512 5185cd0db555cf7a9fcb89d056ffc044352a41a7913f4d7e1e164e91608868c32b7bde825dd8da0a90ad016106e2a504d2e151d6dcff96f2fa350b9f2f6bb884
 EBUILD kio-5.97.0.ebuild 2406 BLAKE2B 5c72b89b37a5ce4934fd98fab97bbcdccb1e0173001c79fdd44ff27163334cd8139bd62b5678a9f768f4db83bf4dded1f86609665fb7b3d687b76d98fc10eba2 SHA512 b728f93e096ed28920dc001fa7d14696fb61dec5fdffaa64b15a3f2ac2623622d5fa3423f2de644e29694cd728c729e7ad8f03eb8add27d08904e255d9caf727
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/kio-5.96.0-r2.ebuild b/kde-frameworks/kio/kio-5.96.0-r2.ebuild
deleted file mode 100644
index a053bea7e420..000000000000
--- a/kde-frameworks/kio/kio-5.96.0-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-	)
-"
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-in-dropjob.patch" # KDE-bug 454747
-	"${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}
diff --git a/kde-frameworks/kio/kio-5.96.0-r3.ebuild b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
index 76295e56b83e..ba5dd490e22e 100644
--- a/kde-frameworks/kio/kio-5.96.0-r3.ebuild
+++ b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
@@ -13,7 +13,7 @@ inherit ecm frameworks.kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 057477b97b7b..19b3a3fe088d 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 288de4d4305f..2eb81705479f 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -5,7 +5,6 @@ AUX kwin-5.24.6-fix-color-picker.patch 1952 BLAKE2B 36409ce88f6a0ec2a9b561ed3313
 AUX kwin-5.25.4-drm-fix-blob-updating.patch 1096 BLAKE2B e0d4980bb08e5b1469df84a5682eab739f99f86fdcbffb6577f9cfdffd815c32f58cb7b891c2305c7ddce20fa5456524061f51f3084a77e6d64d0ff81ddc79fb SHA512 54cfcc6f72151787c7b22efb629dfbbd8e5af1b05567071b3aa2f11caf3c65295127e5fa1529763157971f6d707c4078c28d9cddd5bb0f244b774f20a734e08c
 DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb
 DIST kwin-5.25.4.tar.xz 6639040 BLAKE2B d2160b7e9bedb77ed50033eee9e901edf962c3b6c2b6d0c4e5b19651a1a466c4e5868a2b66dc6b2b00f73381661a59fc9da317fc9cda48488b57ee86f7543f7f SHA512 14ffb4ea0eb069811803253b8abb7737eecb5c121c99c477c1b085a80812eae10d9e2012e3343b326f1a3258a2854d1f8b138dad2f31e548835b9bf09769c0fd
-EBUILD kwin-5.24.6-r1.ebuild 4126 BLAKE2B 4f12925511011887954c13882f644182eb24dbbe9c39d58974be95565afdfa48b8d770f382b614a7a45439cdce8c1c2229ed2b486aa4c7724a8c352bfd87a7f6 SHA512 79bba7223739f8b61744feaead7eca554d526e0d1c8e84e61c2f1f73d05c645767221ecd77a6e292f0c9bb97da9734faaeafb01c92aa51e2d5cafb25d6c724c1
-EBUILD kwin-5.24.6-r2.ebuild 4195 BLAKE2B c95c12883354b609eb02576436b78e8c9c2e2d2695914d31df7b70e58fe0e33eebf248d42420383c448d0475b317c3e5435c7d8f05990ff199836fbb1f15265d SHA512 4132d9925e77412eaca7946a6ddb08552411a4d52215f0e8c6ef41fb636fb47d7beb53b8859b853c8c423813caf5f3fe3049354528328e346e221b0e537126a7
+EBUILD kwin-5.24.6-r2.ebuild 4194 BLAKE2B fdb0bd8025961424f53a05ce566d6dc91c19d54d2aa81dff98ed5bb4002c5a976917126ba49bf72241d497a37bbd3de04190a3a1f223776f0b8973f72b854ee7 SHA512 35f7bdd1b8679d3bb945a749ffd3a5f88d158ecf592e59ef29b708b6b201f230ca2d9a72a03f5316eebc14136565d9cbfab06f66acc2c2ed9df6437fe094196b
 EBUILD kwin-5.25.4-r1.ebuild 4261 BLAKE2B 54cac57cf5022ed700f94cae73463a29b3bf12ae08f0e652fff1189b94b6560f332805f764eebab661b62a504f9c455df1b217e1e4aa21f2f9c98b4495cdf051 SHA512 4188247aba43f8b37dff1aa7dad6becad7ae5e94e457d29ed1070c2520157ef321891d9fa9b3117d37f85c621b0f2e132ff7df84df06f68bea190d54ff86c5dc
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/kwin-5.24.6-r1.ebuild b/kde-plasma/kwin/kwin-5.24.6-r1.ebuild
deleted file mode 100644
index 1bb97a6779dc..000000000000
--- a/kde-plasma/kwin/kwin-5.24.6-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.19
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libepoxy
-	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	sys-apps/hwdata
-	x11-base/xwayland
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	test? (
-		dev-libs/plasma-wayland-protocols
-		>=dev-libs/wayland-protocols-1.19
-	)
-"
-BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-emit-rowsChanged.patch"
-	"${FILESDIR}/${P}-fix-color-picker.patch" # KDE-bug 454974
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
index 4a3b51d97304..d5b779a4cc40 100644
--- a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index faff775b1094..a0411b6ee78b 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -3,7 +3,6 @@ AUX plasma-desktop-5.24.6-fix-mouse-settings-loading.patch 1637 BLAKE2B 7dbd5ef2
 DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
 DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
-EBUILD plasma-desktop-5.24.6-r1.ebuild 5212 BLAKE2B 9e3292213d22aa001054312f084233ddb6219eaa97f5f52c01e274dcb51acf35d04512fcf3dfd58130a479bdd3d5cd19aadb810b384998aff36129de2b0fb663 SHA512 ca15c914bd7285044dca71c22bed509c2fb834f75d945d8b34b7d8c30004e493bf7557519d7304a2bfdcc72b90aa785af9c45a3bcad3d25dd4f1c07e2b08e8ca
-EBUILD plasma-desktop-5.24.6-r2.ebuild 5346 BLAKE2B 0cc1d66998b446c5b3f89f076ff9dff7a8b087208f931414b551603755d66da16ab53c9c171f9209246e7c07e5b96343d040e9a380cc5da3831eb3ebc0169c64 SHA512 626c8e4f174bc49e8f15a4d36fda315f61372f328c91123a5d3a0b070935914c9c3baa991df0878c9cd64dfba8da38d88dfeaae07f11b1edb26a37a2499d5006
+EBUILD plasma-desktop-5.24.6-r2.ebuild 5345 BLAKE2B f901b5c04f76da56895ef1393a656194c31f2d929713259db250b7583c2040a9c6c6631b24264723357a22c393f6ec1103c0b83c4456bea0533bc05a3952c1f7 SHA512 53286a2b785e35ab8167f4b44f567867b356dc3942feae31b63be879f9be9862592faa2256588a4383530d65d633ceb104d26c645468b83c492f3894aeaef994
 EBUILD plasma-desktop-5.25.4.ebuild 5215 BLAKE2B 01e1822a2eaf6eea3122ef571338fb01f77d9cc1a5f1f130dc673f2f291cf2ea2d9d896af18496dc5ea151a8f81563dada9734493d6c29ff1a111bd97b513a4d SHA512 e8545e7a8a0aa8ed74bee801758be0888b7cad77a18af7bc911a6a2da65b9d419c6f1b65401a3028ae8719a4f9860e6b1d4d00078e424fa7c002a00eb29d0a2a
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild
deleted file mode 100644
index 8547a063ba7b..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-2"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	emoji? (
-		app-i18n/ibus[emoji]
-		dev-libs/glib:2
-		media-fonts/noto-emoji
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-		cmake_comment_add_subdirectory emojier
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
index 3a563be24716..5b816b2adcf6 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7549c26238d9..d4dfc0e12d98 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libdmtx/Manifest b/media-libs/libdmtx/Manifest
index bcfa699362b1..ea5e16ed9821 100644
--- a/media-libs/libdmtx/Manifest
+++ b/media-libs/libdmtx/Manifest
@@ -1,5 +1,3 @@
-DIST libdmtx-0.7.5.tar.gz 790944 BLAKE2B af94a998e6ab0b06c17d64d6c720e874540830282fd1219260aa1e5fb44159b59f63fcfd1fbd750333ae50b080c341ec02b81216c2e975a8ef85628b23d4fb55 SHA512 c4bccc9eff4a93b6bb417ed23ed46e82cc98b650a94be40479d192af8537ee02a16700fbbd8f2271035ff8b804c40ab6461825d94bd80a3081d3a4b3988ea22a
 DIST libdmtx-0.7.7.tar.gz 791517 BLAKE2B 5ff0ba22dd753b644cc7d84a2ee9c98f48047d05b322993458d4a35e704ac9d330d3112db8f3461fd9945c1d09422059d47417b46b8000d3e65f31430efc8e45 SHA512 802a697669afeb74da0cc3736fe7301fcc1653c1e3bebc343a8baf76e52226cc5509231519343267a92e22ebdfcc5b2825380339991340f054f0a6685d2ffcdc
-EBUILD libdmtx-0.7.5.ebuild 636 BLAKE2B 5c016cee6ae44354c10138d2555eac4be1f1283515c2ec21fa753ecb6a7fc802b9dcac133c5a10b785af1055a22786902ad7fe8b40673a0201d085dae41a4cfc SHA512 6347f88703bf4bd669bfef3ff14d30f60d371f9498eb5df0e3d8040dae07cb9f0c18b08834146e84c0e74ab4fd7f8581a49b41b7d6b009594eaa5195c804e7ad
 EBUILD libdmtx-0.7.7.ebuild 587 BLAKE2B b774eef6f5d38a69785758904a3c9b88a02435dbd6d24ecda27fcaef72055335423c592ba9c38ee74d1dd7d3e2f8347452f1f884ad4a2bb5a58fec2b1e369125 SHA512 00ee20c3a6b4f195138c89378185f037d1bd6cc5ac42c176c187de73c5920cb6f4df17bdeed74c85ed113840b269cce118a6551cf948ee17d2b406f4670cd5c2
 MISC metadata.xml 379 BLAKE2B 7a0385fd25a2a4063b4daeee8e67299eaef34bc20c23e639bec3db9f2db760bd4fbec23778c1673e9355a2c053f7a4ddf5170735147efd3038ed6da21fc05ff5 SHA512 384fd330b22976134122440b2fd617f34a8d9508abe72c261e2821fee2db8d2ef65d967875b70dc9fac1bbd72e832166ac808348894c6b4fa60c41ac3badd1e1
diff --git a/media-libs/libdmtx/libdmtx-0.7.5.ebuild b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
deleted file mode 100644
index 9177623cb462..000000000000
--- a/media-libs/libdmtx/libdmtx-0.7.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Barcode data matrix reading and writing library"
-HOMEPAGE="http://libdmtx.sourceforge.net/"
-SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE=""
-
-src_prepare() {
-	#bug 663346
-	sed -i -e "s/-ansi//" test/*/Makefile.am || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 3a22e4bbe550..60d81165757e 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,5 +1,5 @@
 DIST libffado-2.4.5.tgz 1229890 BLAKE2B 18c260b782c9a97e3f2c8689a218f7a4925158c3e3cb14987182bf04043438d1325a9ababfe29860f6769a5eeabb49a843a8d15072b24b914334c447b5c7238d SHA512 a2c1d0515e14015b7803c4d52d67605afec27ae2569888dec085375ed4a488f4885b5033369e52305e668a35289d3bd749a9babb5778df339fa93553c23af30f
 DIST libffado-2.4.6.tgz 1230455 BLAKE2B 1e86e7f9179e94c00a74514dbd7c0c299de6d1870f22c4d9ba14cb6b105b41c9dda62d19d0d660e84eee7e0f02c0bf7c44fbe58e24634ccf9cc9e41f1d38b5c2 SHA512 dac651233ea94c19834e810c64230bcbd5516de9e694ced1b6497ad927d734c527b3a556281676393674d33da768cb2431e7da1a0fdfc6ceb268e897029aa584
 EBUILD libffado-2.4.5.ebuild 2814 BLAKE2B ff17cb0a6f5b3e38f8c8d218166f50135af2d3f99ff91371273f1e82a1ea039548009f366b95a96a2fda26d575a86d07b7c884ff0d2792b04f830e67a458e1a7 SHA512 fe1530f2fc2f93e771107c08d1844e17cc9fff59f68678459ac72778f48f610318d7092c232012761084f24ef622dda729d4dde823f79c0a2c8b94f9fbaa085d
-EBUILD libffado-2.4.6.ebuild 2815 BLAKE2B 4146598513af32d3980207471779b869787a7b151e0258458bbeabf43c7584a20d1c66aa66d281d07e5823d58ab9df7bd826be28fef563dca3688e164dca1bb5 SHA512 29cb410e81d062ae41ea14a39b8bae590c93b64e2de9769142ec9b218a328c3bed4f5076ec30be980c12f9d091a7931ccd4f263c78022a85d75db584b2ff051f
+EBUILD libffado-2.4.6.ebuild 2814 BLAKE2B ff17cb0a6f5b3e38f8c8d218166f50135af2d3f99ff91371273f1e82a1ea039548009f366b95a96a2fda26d575a86d07b7c884ff0d2792b04f830e67a458e1a7 SHA512 fe1530f2fc2f93e771107c08d1844e17cc9fff59f68678459ac72778f48f610318d7092c232012761084f24ef622dda729d4dde823f79c0a2c8b94f9fbaa085d
 MISC metadata.xml 344 BLAKE2B a7d2c27caa7e9fa72716534c406145b94bd8a13eadf57d06ea8e3148339857311bd7e8f0434edbf8a70a5e7bfec1726425e1d16734841b056caeee7754471666 SHA512 30d31f76c73ff218fa34e5f9d442e2366082bf4697038c804c093cac0e22720341691b732bf653466f8e5fc7e734c11b08a02cef7dd2a4bd93635968e2c29447
diff --git a/media-libs/libffado/libffado-2.4.6.ebuild b/media-libs/libffado/libffado-2.4.6.ebuild
index af0f8019ef35..4bb810c42e42 100644
--- a/media-libs/libffado/libffado-2.4.6.ebuild
+++ b/media-libs/libffado/libffado-2.4.6.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 290386f00ebf..a77688d9e098 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -2,6 +2,6 @@ AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff
 DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044
 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
 EBUILD libmtp-1.1.19-r2.ebuild 1705 BLAKE2B b8a2231e68ecc3afd4bd66894b9940f099ad151bdcf9c5bd777d62c239badaf18089607fa7db935ad12fe97f797c44f72ffac41a8b8536e7afdef2aa69ac5d75 SHA512 692dbba0b3a8b629dee534f1dd3ac36b2f813a5b4d5c6e8c1b8116844078e794b6a57d15492d634d2bc89d5b16fa424b72caae933f4ba48a7bba193c81155507
-EBUILD libmtp-1.1.20.ebuild 1913 BLAKE2B fab5539414f397189e734bfc3ac0dc3a9fa6d75fe45e38bfd9faee6efabd9ae779ccccecb7f32988ed6bf84c9188ff440629e6ff341fc6ed0d87fdecda1b166e SHA512 89220501a91939dc382ae7c117ff8e2cd632c8330853ef22591c93fa7500a31cded861c1dd9ad615bbcb358bca353540629d31b441e39d5e244a5300c18f0dd6
+EBUILD libmtp-1.1.20.ebuild 1912 BLAKE2B 1dce036ece405a07e6fd65c29ec3fdf9765ef1cd2dc5f3092bac783f93442843b18e5d82f1afab2e558674ae98aa3a1e57e3b4a05b717d954b320bcf08ea7e49 SHA512 efe58c0954c1f6e6b73f453c63d4dfd49485e35ecdc2a93fd36cd014342cda1f90c541f79adf0c13080f06d96c5a9cbb5a75114cae46cf951b949fc9d9927ce3
 EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
 MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild
index 70a29a38204b..ff5ee025a7d6 100644
--- a/media-libs/libmtp/libmtp-1.1.20.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.20.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	inherit libtool
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
index 5e1af4b640f4..6e2c15d3156e 100644
--- a/media-libs/libsoundio/Manifest
+++ b/media-libs/libsoundio/Manifest
@@ -1,3 +1,3 @@
 DIST libsoundio-2.0.0.tar.gz 120387 BLAKE2B d4005667767633cf90fbf524cdf102c69e04e4e37cad55b4f9b1af7fb3f89f7b1a6ff47569c86bf5d86649fd34d9d080b8ed74d6da07c4155abadb3cad0797f0 SHA512 347a9be1789a41e778ea8d0efa1d00e03e725a4ab65e3aaf6c71e49138643f08a50a81bd60087d86a3b4d63beaeec617e47ba6b81f829ece8a3ac17418eb5309
-EBUILD libsoundio-2.0.0.ebuild 988 BLAKE2B 7551d26be84375a57b51888b8fc72f575f5d04b44abd9e8d3280446ee1f1e9c1fd363a3ab8a7d304d096ff8a05525e61376785614559e202e5a4acccc2a20efa SHA512 619a8078913d0b4af32f9381e54aaadf5f35d74ef478f04e970763b503d9b932be9557a73b86a20ab4a943ce6a013e0be930657d99faadf6b159b86877c1e1bd
+EBUILD libsoundio-2.0.0.ebuild 972 BLAKE2B a8a426330d25541e3e7035475256da41c72ced61dedbd679bb1adc64b7ccfc4670af053e642fa9ec78e0826cd064c7322e9ae0ca96501a6b5109910ed081e3e1 SHA512 325d8d3f4a21ea9df32c478f2f07d597b874461e341bf59c487fa3368d33c07fe96a9a41d8466f44edb9a91b19024087c78c9b8db1a2f312a641d61ea0ae521f
 MISC metadata.xml 711 BLAKE2B b52734db8cd5c5a7b93653a086aba4da08bab41fb0aa6feeb84ed905814214a4bb6d5af4c37967319d3a1cad7208607b93544f312b698bbaea21714182b835e6 SHA512 04e8a088a732a324014bfa99d48b6a54ac12f16ed71843cef86f79a73a7af1cde945b9e3c445305d69396d8272f8159e0af5682230b23ccb544675166cc4bf5b
diff --git a/media-libs/libsoundio/libsoundio-2.0.0.ebuild b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
index a2ff792b5b8c..d076ca85afda 100644
--- a/media-libs/libsoundio/libsoundio-2.0.0.ebuild
+++ b/media-libs/libsoundio/libsoundio-2.0.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="C library for cross-platform real-time audio input and output"
@@ -15,9 +14,11 @@ SLOT="0/2"
 KEYWORDS="amd64 x86"
 IUSE="alsa coreaudio examples jack pulseaudio static-libs"
 
-DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+DEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+"
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 14847093bd76..adf34970acef 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 8f3a521463cc..f03f12a57ea4 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -2,6 +2,6 @@ DIST mpg123-1.30.0.tar.bz2 1091578 BLAKE2B 6acdbfcc1119507c63d9da95afc747c43698e
 DIST mpg123-1.30.1.tar.bz2 1092735 BLAKE2B 8ce6b964acf307ce4358b33468b7560e53024df2551a17602032260ac799d6c1ff0512cfb5fa6a59e3983c054fa82b1520f8329502fa4c351b94f66f9ccdee13 SHA512 098fcecc6a570e32ccd164b62428417186265905d148d009ea592c948a02027d67fc43e015ece21cf900008f31bbe35b3ec770faba5ae0b914db0022cb6b37fd
 DIST mpg123-1.30.2.tar.bz2 1093138 BLAKE2B 03247431bf58886c7a942fb00f11d7e82cc12f95cb30c95fc01bb986e32d8245349dba6fd2a0ada33918542ce8944037f9899512cc6ffa013b884a009dbe8cef SHA512 e2e9279799f3917c9ecbcb2ccdc2c246bda50317dbfdd7ba3d56281b7b4f5b1928442fc8e712fbf90543159afc703d1ab8ceb7e3c1c038e1547b82d1616bdc82
 EBUILD mpg123-1.30.0.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
-EBUILD mpg123-1.30.1.ebuild 3000 BLAKE2B e936de4177312bcc5c3d8a6b723ed3237b8ca1c5a79e90a95c881a940c16a7d68658304db57bcea797a87903937d5f7ee423883be76a0c90aef8b7936f9376c2 SHA512 2e806242b13f484135fa3c498114ef43c743e791a52c77f6cfc283784133be61e031b93d902af5e65807ef2da43f8eae3a6d52513352c0753cd954c31f7cad20
+EBUILD mpg123-1.30.1.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
 EBUILD mpg123-1.30.2.ebuild 3001 BLAKE2B ecd6bcd7b8a6b49a2bf100c3b2985e85a27341f1de33039bf68161f4b4bdf3207dc57281488b41391e2f1ba1da072c0bd4ab2eedd635717f60e5cd092d3ecb4e SHA512 70f37a15e1c35b5a5f28b2b370f8e1d4c50f9412b5be8bbe84a209432defc78a66467112a016766066c8e2f6d07b09210e541d95bcee7de94f887c17a7f0adff
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.30.1.ebuild b/media-sound/mpg123/mpg123-1.30.1.ebuild
index 1c6f82a04ca8..e82d3a628fb4 100644
--- a/media-sound/mpg123/mpg123-1.30.1.ebuild
+++ b/media-sound/mpg123/mpg123-1.30.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fa90da42eeae..f8053d3a79f3 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 39f7370cd6ab..2556bb10406c 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,6 +1,6 @@
 AUX simplescreenrecorder-0.4.4-ffmpeg5.patch 2540 BLAKE2B 5551255312733fca5641ffbed46e332181d02147dafaa9f6831df967b38cb0d6f05fa2d0d910f78fce1cecb40e1db24e1913b8ec71a7e05a3a7ef0ee761e0427 SHA512 823bfdb35b49bd63a7a2f294695f3adb986d1d018d892db68ada0f08cb9d917ddac86cc258ed7520c44ca53b1194164f58e7e4d4ffdd58a5cfeda4590dff5ec0
 DIST simplescreenrecorder-0.4.4.tar.gz 1961269 BLAKE2B 05c7635840f8461ab324f740f0cc554eb544ed91b00cdf39c80f861e6a8631f59afbdcc9fe958830b0f1e31eedb90f11d29c114ce4bbb612f1756264502f069f SHA512 a90549a2709490482d70559073e505e669417a93abf16124b98c021e6d2bf08b91b53eb68e006df4f80fcee9fe4da2624bf8de979618953adb3f37eb1d471525
-EBUILD simplescreenrecorder-0.4.4-r1.ebuild 2969 BLAKE2B c2c0e135d7e7f8f43d633218620396adf71afe0e41bc1224270dff87c7a86e512336a46d0ff94004a445ad0eae844275b8906120a6285aa3dbee1a5c574bbd16 SHA512 ad6cb749a3c93d236bb294134003bc429a9ed6dec953e226e893ce95211632e930a4803df72f4ef1ed765713cb281a5dc1d0c1cf98556ececc1d22fb2b7a1d8a
-EBUILD simplescreenrecorder-0.4.4.ebuild 2920 BLAKE2B 8e2abfb3f1203cd32bacc17845a0c76d6a3d57d7eafdd21ea8d3129d515a47fdb9d3478db8e902e654884ef72341e35007db3395fb33e0096d224e4f7b93322d SHA512 b4b30ea9d81838cea8530074abdcb2701aac3bb5f5526e7c282cdfca346a61fb26c6ea093ff7e4977946c2bc276363d5a723de71ef9fc1658572a4c7ba427d6e
-EBUILD simplescreenrecorder-9999.ebuild 2922 BLAKE2B f579d6fc82b09d1697abca25e69fd8d049aaebb489ab7ad3a1e18ba27a7dd6d8ae5181ddae3a85cc5fed8f30444c16805496e1cc046713caea4d568a28e3c6e6 SHA512 c99e945d9b09fc7ea220089bfcd1db9034901b6152ae3d3879ece709679ec1b99bc10f422b8f374ac40a758128367757399794b090519f655b17df7196b024d0
+EBUILD simplescreenrecorder-0.4.4-r1.ebuild 2845 BLAKE2B 76fb6d8025cd647e2c8ad6ccc073851b12a9096fc52130c103b666a544ed229e1cdb35af21480dab83798ed7bf0d0d99590c5ca5d30db6e16a39edca60dd972b SHA512 024888ef82dd6c964e208b13257769018e9d48622b6ba1303485e6b7ee79facac7492f5587fc424fecb6b8d66eef204ce516ab5e2eabfc394d8b92c4445962e5
+EBUILD simplescreenrecorder-0.4.4.ebuild 2797 BLAKE2B 669884e3208388e1216a910f6e156ba22d3043c0bd53ebc8684b7a94c6ea5a804b6fa5fd8ccf9ed33504a0ffcfa1d57a46498999882f735ea3f90f2e572ce28a SHA512 597b388fe32f132c5c4f98a48ac782a4eb936e71074a65fc7b5cb7bef1a1864ee00e35a5fd99be3e6f8fe8141f8f79936723a40fac38d460f236adacad173936
+EBUILD simplescreenrecorder-9999.ebuild 2799 BLAKE2B fd72c17c39d73ee6e4ccc48533eb193bc264e0044ce4044f2360a4f34b2eaf06f9c1e4532d13dd384085afa76c4beb2537ecc920764c1081f0564968784aea07 SHA512 74f4d0ea5f6bcf1f26c150751b30327aac64eb96e8c89a0c12fcbfaad306b48ebc6c71768c15cf1aeca1ce1b79e1a0168fb054df49fd3befb722dfb9a8b57cc4
 MISC metadata.xml 420 BLAKE2B 2a645626005a1656fb4365970626c8b936ad6c8bfe501bd16fb2fc0a3450b56691ea69cf67ddeb3a5bc4aef2f544ddd300a5a8ae7801c2e71724f1e4d361d70b SHA512 68b6a0da9153a989618fbb7249d04e9d92cda87be16f8ecbdf3dbfc1af65d48ff7b15472087904e2dce47087eb6dc73cc1ebee6b49fcc63d492a5583c273830f
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild
index 667f701f5639..ec483db9038f 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r1.ebuild
@@ -3,13 +3,11 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
+PKGNAME="ssr"
 inherit cmake-multilib flag-o-matic xdg
 
 DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
 if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
@@ -20,9 +18,12 @@ else
 	S="${WORKDIR}/${PKGNAME}-${PV}"
 fi
 
+LICENSE="GPL-3"
 SLOT="0"
 IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
 
+REQUIRED_USE="abi_x86_32? ( opengl )"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -36,19 +37,15 @@ RDEPEND="
 	x11-libs/libXi
 	x11-libs/libXinerama
 	virtual/glu[${MULTILIB_USEDEP}]
-	v4l? ( media-libs/libv4l )
 	jack? ( virtual/jack )
 	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
 	pulseaudio? ( media-sound/pulseaudio )
+	v4l? ( media-libs/libv4l )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-REQUIRED_USE="abi_x86_32? ( opengl )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ffmpeg5.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-ffmpeg5.patch )
 
 pkg_pretend() {
 	if [[ "${ABI}" == amd64 ]] ; then
@@ -69,17 +66,12 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	# QT requires -fPIC. Compile fails otherwise.
+	# Qt requires -fPIC. Compile fails otherwise.
 	# Recently removed from the default compile options upstream
 	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
 	append-flags -fPIC
 }
 
-src_prepare() {
-	# required because xdg.eclass overrides default cmake_src_prepare
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild
index 3140f84c1dce..e732de6afde8 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild
@@ -3,13 +3,11 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
+PKGNAME="ssr"
 inherit cmake-multilib flag-o-matic xdg
 
 DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
 if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
@@ -20,9 +18,12 @@ else
 	S="${WORKDIR}/${PKGNAME}-${PV}"
 fi
 
+LICENSE="GPL-3"
 SLOT="0"
 IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
 
+REQUIRED_USE="abi_x86_32? ( opengl )"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -36,16 +37,14 @@ RDEPEND="
 	x11-libs/libXi
 	x11-libs/libXinerama
 	virtual/glu[${MULTILIB_USEDEP}]
-	v4l? ( media-libs/libv4l )
 	jack? ( virtual/jack )
 	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
 	pulseaudio? ( media-sound/pulseaudio )
+	v4l? ( media-libs/libv4l )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-REQUIRED_USE="abi_x86_32? ( opengl )"
-
 pkg_pretend() {
 	if [[ "${ABI}" == amd64 ]] ; then
 		einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
@@ -65,17 +64,12 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	# QT requires -fPIC. Compile fails otherwise.
+	# Qt requires -fPIC. Compile fails otherwise.
 	# Recently removed from the default compile options upstream
 	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
 	append-flags -fPIC
 }
 
-src_prepare() {
-	# required because xdg.eclass overrides default cmake_src_prepare
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 5c2e985195d7..a365a63c3e5d 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -3,13 +3,11 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
+PKGNAME="ssr"
 inherit cmake-multilib flag-o-matic xdg
 
 DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
 if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
@@ -20,9 +18,12 @@ else
 	S="${WORKDIR}/${PKGNAME}-${PV}"
 fi
 
+LICENSE="GPL-3"
 SLOT="0"
 IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
 
+REQUIRED_USE="abi_x86_32? ( opengl )"
+
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -36,16 +37,14 @@ RDEPEND="
 	x11-libs/libXi
 	x11-libs/libXinerama
 	virtual/glu[${MULTILIB_USEDEP}]
-	v4l? ( media-libs/libv4l )
 	jack? ( virtual/jack )
 	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
 	pulseaudio? ( media-sound/pulseaudio )
+	v4l? ( media-libs/libv4l )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-REQUIRED_USE="abi_x86_32? ( opengl )"
-
 pkg_pretend() {
 	if [[ "${ABI}" == amd64 ]] ; then
 		einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
@@ -65,17 +64,12 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	# QT requires -fPIC. Compile fails otherwise.
+	# Qt requires -fPIC. Compile fails otherwise.
 	# Recently removed from the default compile options upstream
 	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
 	append-flags -fPIC
 }
 
-src_prepare() {
-	# required because xdg.eclass overrides default cmake_src_prepare
-	cmake_src_prepare
-}
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 16dd680ea6ef..38e2b3636d8a 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2d5ee401375b..7ac210a3c389 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Aug 2022 06:39:34 +0000
+Mon, 15 Aug 2022 12:39:33 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d25d46050095..8cc461cccb44 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 523682 BLAKE2B a866720fe3384cb354d689c52dc2eed547ab55e37608dcb637780fcc52106c8f5b1ad8a84b41fe53778860d6ace908fc8c4af0faa17e457054d95d23aee6e6b7 SHA512 8cd7653583d003af73b72c5887e3bbb7c5321dc87e14d08d6283a4c633685378b7922f0cd4552eeb523a7d2aca7c675e2fd4704a62d96cc574355d98d5158f89
-TIMESTAMP 2022-08-15T06:39:38Z
+TIMESTAMP 2022-08-15T12:39:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL56ipfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL6PohfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB1/Q/9GHOa970pnvpvPaon+y2ZXbMIf8yghdl6Caay5h0ke9/d2gCITQmjvVaP
-vXdjEN3crlA2COm531EniU2u/wLMIhLgr3YqctybwOkJcdmTfS2TKsWE05tfF7KM
-6LI7LboamLpa/GIwDxAQiC275IK8ytma1xBIqeMlm9GupmxtPE+rupWpzgc3Yvoq
-35tE48Hk+/OM432uv84eTQ521seNvbT6oT8urWLv2Eg7yu/boeiL56pvII+wAGu9
-OS435p5dVU/NHiDABZu+22aptBHTBaG5lIOFJWwuvsEFADejNcMl51ir/ELd1zzt
-NKBkU4BoT4iyMb/PkJRvqhqED1LayRKXkphv7p1N6tkV1Z4jgMINHhD+OZDZzCL3
-INs4trP4Q1qn9wxRLgMCY4ELGg7+Sb8BlwcTkOIEOZvXtpkmys+YTB6dIicN7EOQ
-qQgL+w4UIBvNGcfbwYnPn8DXLB3BQbej9zGsTKNAOfMb5+kTWCx4tgPHJ4uqhSOm
-wV951AQ3aMmB2YhNOrlWBoL1EFxmM/yEwZ2Tln83R0RdU/yPJeoNRAnq7QVHgW4A
-fW4+rHkU+ndlXyEVkt7h/apdL82ZBBL1V2qK8bFRiluBisCGIl1KUiifN8KOUPqZ
-8W9/lJRKknNsKb7TSNouFjbXU8/93FuEIL38QO3dN8vI8rQ8QVI=
-=IfiZ
+klBbjA/9GZXZH0yI2Sft7b/mDrfV9HF1h7725QsTnCIR2UXJZiBOXPkPEv98314b
+JiixA/6tHFhG+D28Xy0SU079jyK63hmHrpOb0QXavuMnJ/eAAHSgY5nm+RTxRqjL
+WaWWgc9lN4i6xhbqW9J19YsSJ/ngDSURkumum3OI7Yez9uur3yrma3UgsnFF7ZyG
+/DCeohhYOjfjQ3ny6t4yz4jWaNB2WHgDJ4ECpYqVypjYzXuLQKbsWt/Cy9UjOouT
+SdPi+GHzEMXc+6s7q78rUdN7R4d33KGzJHyjniMoUinx55Pd5sh7m/NGX7QaqmX0
+YvtqjqImjPCRYuuzUNREFgXLxNf3tFFywxD/MFRlIL5kdHdkLZCsbsjMlQmvvYX0
+bvLRJtizQyEUAn9ILeQm+4FS2Rbb35paa+sz2CASgTV2d3Bi7B1/WPc/ZMoGgZYI
+ceu1i5tC+u936If2k5B694FoejkT//F5Dr7PdRPg6WePU+/GsSD6NJJgtNBWUVbO
+klPo9DkjbdaQOsb2sW2C+LVqa0muHWa2JjXtIw3JNsvm1OLfbAulQkoYi/FCqWhK
+/We0Wt4KRLjxhplyV1u2IS8HUIOniMQyixaDHaojSOKP8pvaA8nf4z6dkZHTwBgB
+z7pglk87FaAs0rj2KaQQ4S5g5/Ya5jKJVLF2eGxjKQoYbZPpIE0=
+=5X5S
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d811bfb247b0..7ac210a3c389 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Aug 2022 06:39:35 +0000
+Mon, 15 Aug 2022 12:39:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b8d7c077e792..80562d5fffc1 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 cb6aad60e9da..726152dd49cd 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/hcloud-1.29.5 b/metadata/md5-cache/app-admin/hcloud-1.29.5
deleted file mode 100644
index 729791b94d5c..000000000000
--- a/metadata/md5-cache/app-admin/hcloud-1.29.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=A command-line interface for Hetzner Cloud
-EAPI=7
-HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.29.5.tar.xz
-_md5_=5306160267c67ea8dbe4502c83cc2315
diff --git a/metadata/md5-cache/app-admin/hcloud-1.30.1 b/metadata/md5-cache/app-admin/hcloud-1.30.1
index 5771445d5b99..9141a5b09d48 100644
--- a/metadata/md5-cache/app-admin/hcloud-1.30.1
+++ b/metadata/md5-cache/app-admin/hcloud-1.30.1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/go:=
 DESCRIPTION=A command-line interface for Hetzner Cloud
 EAPI=7
 HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.30.1.tar.xz
-_md5_=ce2c107bbfa1fdd484f3cf1d93721e70
+_md5_=5306160267c67ea8dbe4502c83cc2315
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 97b785ef2580..4f8bbc6df821 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/xar-1.8.0.0.487.100.1 b/metadata/md5-cache/app-arch/xar-1.8.0.0.487.100.1
index e7f37ea8b7d6..4000ae8b842f 100644
--- a/metadata/md5-cache/app-arch/xar-1.8.0.0.487.100.1
+++ b/metadata/md5-cache/app-arch/xar-1.8.0.0.487.100.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/apple-oss-distributions/xar
 INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=elibc_musl? ( sys-libs/fts-standalone ) kernel_linux? ( virtual/acl ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/apple-oss-distributions/xar/archive/xar-487.100.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=074f98a1bfa7e5f585824ca68114d35a
+_md5_=d61d91a703d63059801c3ce2c7d3b8b3
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index bb2cd44f4ec6..eb2ed034b282 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.6.5 b/metadata/md5-cache/app-backup/borgmatic-1.6.5
deleted file mode 100644
index d8ddb254ef4a..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.6.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/flexmock-0.10.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/flexmock-0.10.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/flexmock-0.10.10[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/flexmock-0.10.10[python_targets_python3_11(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.2[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/gpep517-8[python_targets_python3_8(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-8[python_targets_python3_9(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-8[python_targets_python3_10(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-8[python_targets_python3_11(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Automatically create, prune and verify backups with borgbackup
-EAPI=8
-HOMEPAGE=https://torsion.org/borgmatic/
-INHERIT=distutils-r1 systemd
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv
-LICENSE=GPL-3
-RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.6.5.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f3efc8221cb1342a4e6219eb628decc0
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 37ab3b7a0e7d..581292fb9f57 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/containerd-1.6.8 b/metadata/md5-cache/app-containers/containerd-1.6.8
index c6b633859da8..5f2e0f0980c9 100644
--- a/metadata/md5-cache/app-containers/containerd-1.6.8
+++ b/metadata/md5-cache/app-containers/containerd-1.6.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://containerd.io/
 INHERIT=go-module systemd
 IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-containers/runc-1.1.3
 RESTRICT=strip test strip
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.6.8.tar.gz -> containerd-1.6.8.tar.gz https://dev.gentoo.org/~williamh/dist/containerd-1.6.8-deps.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bd4557a1b274c34d5548b985ce1a6854
+_md5_=813da970e2aec091dea70ce2a5f5c92d
diff --git a/metadata/md5-cache/app-containers/docker-20.10.17 b/metadata/md5-cache/app-containers/docker-20.10.17
index 8d5177bf56fb..54faf1a77adf 100644
--- a/metadata/md5-cache/app-containers/docker-20.10.17
+++ b/metadata/md5-cache/app-containers/docker-20.10.17
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.docker.com/
 INHERIT=linux-info systemd udev golang-vcs-snapshot
 IUSE=apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-containers/containerd-1.6.6[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-containers/docker-proxy-0.8.0_p20220601 cli? ( ~app-containers/docker-cli-20.10.17 ) container-init? ( >=sys-process/tini-0.19.0[static] ) selinux? ( sec-policy/selinux-docker )
 RESTRICT=installsources strip test
 SLOT=0
 SRC_URI=https://github.com/moby/moby/archive/v20.10.17.tar.gz -> docker-20.10.17.tar.gz
 _eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=0d4c9fa7c0e206e4be575b691dcec734
+_md5_=c957d488016ba9fe6b9901a33f7aba88
diff --git a/metadata/md5-cache/app-containers/docker-cli-20.10.17 b/metadata/md5-cache/app-containers/docker-cli-20.10.17
index 8e29380c8e1d..fa303ce7d764 100644
--- a/metadata/md5-cache/app-containers/docker-cli-20.10.17
+++ b/metadata/md5-cache/app-containers/docker-cli-20.10.17
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.docker.com/
 INHERIT=bash-completion-r1 golang-vcs-snapshot
 IUSE=hardened selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=!<app-containers/docker-20.10.1 selinux? ( sec-policy/selinux-docker )
 RESTRICT=installsources strip test
 SLOT=0
 SRC_URI=https://github.com/docker/cli/archive/v20.10.17.tar.gz -> docker-cli-20.10.17.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=46103515df299cf973d17d348d10c963
+_md5_=fb7e09230479b7051d0842e6bb6c160e
diff --git a/metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20220601 b/metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20220601
index 2d13c4bbeb5c..793205ebbc02 100644
--- a/metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20220601
+++ b/metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20220601
@@ -4,10 +4,10 @@ DESCRIPTION=Docker container networking
 EAPI=7
 HOMEPAGE=https://github.com/docker/libnetwork
 INHERIT=golang-vcs-snapshot
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/moby/libnetwork/archive/f6ccccb1c082a432c2a5814aaedaca56af33d9ea.tar.gz -> docker-proxy-0.8.0_p20220601.tar.gz
 _eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c
-_md5_=162d0d1dc04b3a0c18c05d2c7fda4dd1
+_md5_=f8630133037a858df9e3e4e0936798f3
diff --git a/metadata/md5-cache/app-containers/runc-1.1.3 b/metadata/md5-cache/app-containers/runc-1.1.3
index 490613a48790..ced24b3d4821 100644
--- a/metadata/md5-cache/app-containers/runc-1.1.3
+++ b/metadata/md5-cache/app-containers/runc-1.1.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://github.com/opencontainers/runc/
 INHERIT=go-module linux-info
 IUSE=apparmor hardened +kmem +seccomp selinux test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0 BSD-2 BSD MIT
 RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) selinux? ( sec-policy/selinux-container )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/v1.1.3.tar.gz -> runc-1.1.3.tar.gz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6e82e0385588ab15c8045368677de0c0
+_md5_=835e973099857d1a92deac7096ebff95
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b604b20999fd..d16cd5a36061 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.0099 b/metadata/md5-cache/app-editors/gvim-9.0.0099
index 2b1879d3e6c2..6a369abebea6 100644
--- a/metadata/md5-cache/app-editors/gvim-9.0.0099
+++ b/metadata/md5-cache/app-editors/gvim-9.0.0099
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 INHERIT=vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
 IUSE=acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=~app-editors/vim-core-9.0.0099 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.0099.tar.gz -> vim-9.0.0099.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=37ceaff96d4ced7a762e5ae907e13a49
+_md5_=8c78ece50b20738268e71b35d8fc6ed8
diff --git a/metadata/md5-cache/app-editors/vim-9.0.0099 b/metadata/md5-cache/app-editors/vim-9.0.0099
index 7d9667f693c9..468fdff44d0c 100644
--- a/metadata/md5-cache/app-editors/vim-9.0.0099
+++ b/metadata/md5-cache/app-editors/vim-9.0.0099
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 INHERIT=vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
 IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.0099 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.0099.tar.gz -> vim-9.0.0099.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=55221a15ae23763c64eb95eabab7c49f
+_md5_=7c8b93314984d09c963dadd4c713fd8a
diff --git a/metadata/md5-cache/app-editors/vim-core-9.0.0099 b/metadata/md5-cache/app-editors/vim-core-9.0.0099
index 85cdf4152991..bac86c272172 100644
--- a/metadata/md5-cache/app-editors/vim-core-9.0.0099
+++ b/metadata/md5-cache/app-editors/vim-core-9.0.0099
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 INHERIT=vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
 IUSE=nls acl minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!<app-editors/vim-8.2.4328-r1
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v9.0.0099.tar.gz -> vim-core-9.0.0099.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=12848f638006f14b3dffd92631debea3
+_md5_=c48fbcc54dbf45349039098b3d161d26
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b6773ad45378..135c9b5ef1f2 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.9.0 b/metadata/md5-cache/app-emulation/protontricks-1.9.0
index 887ed4fe187c..501dd2262bf6 100644
--- a/metadata/md5-cache/app-emulation/protontricks-1.9.0
+++ b/metadata/md5-cache/app-emulation/protontricks-1.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Matoking/protontricks
 INHERIT=distutils-r1 xdg-utils
 IUSE=+gui test python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=app-emulation/winetricks python_single_target_pypy3? ( dev-python/setuptools[python_targets_pypy3(-)] dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] dev-python/vdf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] dev-python/vdf[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] dev-python/vdf[python_targets_python3_11(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/protontricks/protontricks-1.9.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c19b260ac756f9281a500ffd1dc9f439
+_md5_=f94d418ab71def70000b1f08679645eb
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index fe85e4cedafa..9d967102429d 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3 b/metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
deleted file mode 100644
index cf84ae3d2283..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.3.3.2-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-IUSE=gnome java kde java +python_single_target_python3_10
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-7.3.3.2*
-RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-cpp/abseil-cpp:0/20211102 dev-libs/boost:0/1.79.0 dev-libs/icu:0/71.1 dev-libs/liborcus:0/0.17 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/4.0.0[icu] media-libs/libjpeg-turbo:0/0.2 media-libs/libpng:0/16 media-libs/openjpeg:2/7 >=sys-devel/gcc-11.2.1 >=sys-libs/glibc-2.34 python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_10 )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.3.3.2-r3.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.3.3.2-r3.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.3.3.2-r3.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.3.3.2-r3.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.3.3.2-r3.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.3.3.2-r3.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.3.3.2-r3.xd3 ) )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=46c99772abea48f77f921fcf7f2013af
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3 b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
deleted file mode 100644
index 7e6c68d22d81..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.3.3.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-7.3.3.2-r3[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-7.3.3.2-r3.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-7.3.3.2-r3.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-7.3.3.2-r3.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-7.3.3.2-r3.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-7.3.3.2-r3.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-7.3.3.2-r3.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-7.3.3.2-r3.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-7.3.3.2-r3.xd3 ) )
-_md5_=5b95c159a2db25943cb97acd8c4b5977
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index e5dacdd50776..e3a17275019d 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/poppler-22.05.0 b/metadata/md5-cache/app-text/poppler-22.05.0
deleted file mode 100644
index 351a7e8d5185..000000000000
--- a/metadata/md5-cache/app-text/poppler-22.05.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) boost? ( dev-libs/boost )
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=8
-HOMEPAGE=https://poppler.freedesktop.org/
-INHERIT=cmake toolchain-funcs xdg-utils
-IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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=GPL-2
-RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/121
-SRC_URI=https://poppler.freedesktop.org/poppler-22.05.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8e55604a05375fb4ebf9871ca27afc59
diff --git a/metadata/md5-cache/app-text/poppler-22.06.0 b/metadata/md5-cache/app-text/poppler-22.06.0
deleted file mode 100644
index 7a24fa85fc22..000000000000
--- a/metadata/md5-cache/app-text/poppler-22.06.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-aacid ) >=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 prepare test unpack
-DEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) boost? ( dev-libs/boost )
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=8
-HOMEPAGE=https://poppler.freedesktop.org/
-INHERIT=cmake toolchain-funcs xdg-utils verify-sig
-IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
-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=GPL-2
-RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
-RESTRICT=test
-SLOT=0/122
-SRC_URI=https://poppler.freedesktop.org/poppler-22.06.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-22.06.0.tar.xz.sig )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=76e0c74571b2d70b9e1bc3b16af4a301
diff --git a/metadata/md5-cache/app-text/scdoc-1.11.2-r1 b/metadata/md5-cache/app-text/scdoc-1.11.2-r1
index bebe7f7bdbd5..d89912fddb4d 100644
--- a/metadata/md5-cache/app-text/scdoc-1.11.2-r1
+++ b/metadata/md5-cache/app-text/scdoc-1.11.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Standalone tool for generating man pages with a simple syntax
 EAPI=8
 HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.2.tar.gz -> scdoc-1.11.2.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a1de79435f3c47e47b1e29bd0e4b2211
+_md5_=f760755ae284c4aef0f1464b9e80ec81
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 1e2c7527b4ac..3cf900f3c1ce 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.12 b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.12
deleted file mode 100644
index 71b21c59b012..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND==dev-db/mariadb-connector-c-3.1*[ssl?] dev-db/unixODBC
-DESCRIPTION=MariaDB Connector/ODBC
-EAPI=7
-HOMEPAGE=https://downloads.mariadb.org/connector-odbc/
-INHERIT=cmake-multilib flag-o-matic
-IUSE=ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND==dev-db/mariadb-connector-c-3.1*[ssl?] dev-db/unixODBC
-SLOT=0/3.1
-SRC_URI=mirror://mariadb/connector-odbc-3.1.12/mariadb-connector-odbc-3.1.12-src.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0b609791d6c5c5a2d8c3027d1049be46
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 7a7502c6e976..42223b18864c 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/jdbc-postgresql-42.4.1 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
index 68c51276d35d..bbe767f19205 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jdbc.postgresql.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.4.1.src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=d35ed726e62478b04082239636550f9c
+_md5_=8a30af64948fa8ccaf39345da6424d85
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3100f93137d5..7e60b500238c 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/erlang-25.0.2 b/metadata/md5-cache/dev-lang/erlang-25.0.2
index 78400a1f7ab3..3989f20cd628 100644
--- a/metadata/md5-cache/dev-lang/erlang-25.0.2
+++ b/metadata/md5-cache/dev-lang/erlang-25.0.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.erlang.org/
 INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
 IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/25.0.2
 SRC_URI=https://github.com/erlang/otp/archive/OTP-25.0.2.tar.gz -> erlang-25.0.2.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_man_25.0.tar.gz -> erlang_doc_man_25.0.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_html_25.0.tar.gz -> erlang_doc_html_25.0.tar.gz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=1d0a12c79dfdb47169774b42f90c2606
+_md5_=122d11e58c4b2a756d0729d5a1534da6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 2b8be4d6813b..6790ae46b95f 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/nanomsg-1.1.5 b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
index d024424017db..19da5acc5995 100644
--- a/metadata/md5-cache/dev-libs/nanomsg-1.1.5
+++ b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
@@ -2,7 +2,7 @@ BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( dev-ruby/asciidoctor )
 DESCRIPTION=High-performance messaging interface for distributed applications
-EAPI=7
+EAPI=8
 HOMEPAGE=https://nanomsg.org/
 INHERIT=cmake-multilib
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
@@ -10,5 +10,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~riscv x86
 LICENSE=MIT
 SLOT=0/5.0.0
 SRC_URI=https://github.com/nanomsg/nanomsg/archive/1.1.5.tar.gz -> nanomsg-1.1.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b9c9f84b0d8fbc535e9982b6b542d2cc
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=95167673c53beee28549091805f0005a
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 198caba5fecc..6a1fc3226223 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/PyPDF2-2.4.2 b/metadata/md5-cache/dev-python/PyPDF2-2.4.2
deleted file mode 100644
index 80305d057d24..000000000000
--- a/metadata/md5-cache/dev-python/PyPDF2-2.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.4.2.tar.gz -> PyPDF2-2.4.2.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.tar.gz -> PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7951db5054505879d570fab46ac7d608
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.5.0 b/metadata/md5-cache/dev-python/PyPDF2-2.5.0
deleted file mode 100644
index 2d857edff1fd..000000000000
--- a/metadata/md5-cache/dev-python/PyPDF2-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.5.0.tar.gz -> PyPDF2-2.5.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.tar.gz -> PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d3af46dc51fcc77e8c4bf3f7fae9c70c
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.6.0 b/metadata/md5-cache/dev-python/PyPDF2-2.6.0
deleted file mode 100644
index 08ded0b9ae0d..000000000000
--- a/metadata/md5-cache/dev-python/PyPDF2-2.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.6.0.tar.gz -> PyPDF2-2.6.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/200644f7219811c3930ad1732ef70c570ece2d16.tar.gz -> PyPDF2-sample-files-200644f7219811c3930ad1732ef70c570ece2d16.gh.tar.gz )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6a4462f8bd1d60cfb11e738d0097359e
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.7.0 b/metadata/md5-cache/dev-python/PyPDF2-2.7.0
deleted file mode 100644
index 2e5de42258c6..000000000000
--- a/metadata/md5-cache/dev-python/PyPDF2-2.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.7.0.tar.gz -> PyPDF2-2.7.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/200644f7219811c3930ad1732ef70c570ece2d16.tar.gz -> PyPDF2-sample-files-200644f7219811c3930ad1732ef70c570ece2d16.gh.tar.gz )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6a4462f8bd1d60cfb11e738d0097359e
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.8.0 b/metadata/md5-cache/dev-python/PyPDF2-2.8.0
deleted file mode 100644
index b44b86fb4c3f..000000000000
--- a/metadata/md5-cache/dev-python/PyPDF2-2.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.8.0.tar.gz -> PyPDF2-2.8.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/200644f7219811c3930ad1732ef70c570ece2d16.tar.gz -> PyPDF2-sample-files-200644f7219811c3930ad1732ef70c570ece2d16.gh.tar.gz )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=520feb58c10cef5a6d3e000db0f402da
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.8.1 b/metadata/md5-cache/dev-python/PyPDF2-2.8.1
index 7bbdf12d1318..5dc6c1ad6b7a 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-2.8.1
+++ b/metadata/md5-cache/dev-python/PyPDF2-2.8.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/py-pdf/PyPDF2/archive/2.8.1.tar.gz -> PyPDF2-2.8.1.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/200644f7219811c3930ad1732ef70c570ece2d16.tar.gz -> PyPDF2-sample-files-200644f7219811c3930ad1732ef70c570ece2d16.gh.tar.gz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ff40000fc57dc90644fca10f6c687640
+_md5_=ba947afbbb55e8ec82406622951d3138
diff --git a/metadata/md5-cache/dev-python/alembic-1.8.0 b/metadata/md5-cache/dev-python/alembic-1.8.0
deleted file mode 100644
index 53e6e896c239..000000000000
--- a/metadata/md5-cache/dev-python/alembic-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-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
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/alembic/alembic-1.8.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3dfb5ed4e8fb8f2f6535c8a31070f0ea
diff --git a/metadata/md5-cache/dev-python/alembic-1.8.1 b/metadata/md5-cache/dev-python/alembic-1.8.1
index 6ab8f08d6a54..4b22e3a3a0ac 100644
--- a/metadata/md5-cache/dev-python/alembic-1.8.1
+++ b/metadata/md5-cache/dev-python/alembic-1.8.1
@@ -5,7 +5,7 @@ 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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_8(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?,python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-1.8.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6d416e8e60d66be10cf6852b1db206ba
+_md5_=82611cfeb234aa87779780920a63f20d
diff --git a/metadata/md5-cache/dev-python/coverage-6.4.1 b/metadata/md5-cache/dev-python/coverage-6.4.1
deleted file mode 100644
index 0787fdbfc7f0..000000000000
--- a/metadata/md5-cache/dev-python/coverage-6.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite(+)] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code coverage measurement for Python
-EAPI=8
-HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/coverage/coverage-6.4.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fa43d42815b166c7d3151720f2bbf5d1
diff --git a/metadata/md5-cache/dev-python/coverage-6.4.2 b/metadata/md5-cache/dev-python/coverage-6.4.2
deleted file mode 100644
index 9de19fcf6087..000000000000
--- a/metadata/md5-cache/dev-python/coverage-6.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/unittest-mixins-1.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite(+)] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code coverage measurement for Python
-EAPI=8
-HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/coverage/coverage-6.4.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fd591bf32bf5768ae028e7aa9d524f2c
diff --git a/metadata/md5-cache/dev-python/coverage-6.4.3 b/metadata/md5-cache/dev-python/coverage-6.4.3
index 050033749cab..ab747beb6890 100644
--- a/metadata/md5-cache/dev-python/coverage-6.4.3
+++ b/metadata/md5-cache/dev-python/coverage-6.4.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-6.4.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=05ccae3a856db4f1cabbfe246f1d2e11
+_md5_=fa43d42815b166c7d3151720f2bbf5d1
diff --git a/metadata/md5-cache/dev-python/google-auth-2.9.0 b/metadata/md5-cache/dev-python/google-auth-2.9.0
deleted file mode 100644
index 1b70c1eb9ff1..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-2.9.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=09627420ed88246bc20150ebc9459863
diff --git a/metadata/md5-cache/dev-python/google-auth-2.9.1 b/metadata/md5-cache/dev-python/google-auth-2.9.1
index 1baea4524b8c..f57fe2cf4d57 100644
--- a/metadata/md5-cache/dev-python/google-auth-2.9.1
+++ b/metadata/md5-cache/dev-python/google-auth-2.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-2.9.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1872107c91c5a0201cf7ccbf7c7198a8
+_md5_=09627420ed88246bc20150ebc9459863
diff --git a/metadata/md5-cache/dev-python/icalendar-4.0.9 b/metadata/md5-cache/dev-python/icalendar-4.0.9
deleted file mode 100644
index 682b091b4997..000000000000
--- a/metadata/md5-cache/dev-python/icalendar-4.0.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) test? ( dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Package used for parsing and generating iCalendar files (RFC 2445)
-EAPI=8
-HOMEPAGE=https://github.com/collective/icalendar
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/icalendar/icalendar-4.0.9.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c2c6d4ebcc14cee43e1fcad22d6186bd
diff --git a/metadata/md5-cache/dev-python/icalendar-4.1.0 b/metadata/md5-cache/dev-python/icalendar-4.1.0
index fd808f4972f0..1ff5b286fc8f 100644
--- a/metadata/md5-cache/dev-python/icalendar-4.1.0
+++ b/metadata/md5-cache/dev-python/icalendar-4.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/collective/icalendar
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-4.1.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ce5e57f77ab2cbfc3c90f51fea03fc7
+_md5_=5a2be9fef9a899b950cd0f4c9ea289ed
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.5.2 b/metadata/md5-cache/dev-python/pyspnego-0.5.2
deleted file mode 100644
index 8737ada6a838..000000000000
--- a/metadata/md5-cache/dev-python/pyspnego-0.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/krb5-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Library to handle SPNEGO and CredSSP authentication
-EAPI=8
-HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyspnego/pyspnego-0.5.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=56d428085a562ad9cffcd67872a6b46d
diff --git a/metadata/md5-cache/dev-python/pyspnego-0.5.3 b/metadata/md5-cache/dev-python/pyspnego-0.5.3
index ad0b1de6a8a4..233fbc1458a6 100644
--- a/metadata/md5-cache/dev-python/pyspnego-0.5.3
+++ b/metadata/md5-cache/dev-python/pyspnego-0.5.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jborean93/pyspnego/ https://pypi.org/project/pyspnego/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspnego/pyspnego-0.5.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=44c3df316da82ecf49d1885857158be9
+_md5_=cca996c88ce42eb58e718cd147a947e2
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4-r1 b/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
deleted file mode 100644
index 37c231b6a2be..000000000000
--- a/metadata/md5-cache/dev-python/python-editor-1.0.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Programmatically open an editor, capture the result
-EAPI=7
-HOMEPAGE=https://github.com/fmoo/python-editor
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ebb413d5d2f10014de6dc81c3ac9b95
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4-r2 b/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
index ffda86b168be..eb9228e1ff3b 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.4-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/fmoo/python-editor/ https://pypi.org/project/python-editor/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d47d271a6ab94272bfca1901cdf76824
+_md5_=9801a8a1d29d5666cdb913b3688f98fb
diff --git a/metadata/md5-cache/dev-python/reportlab-3.6.11 b/metadata/md5-cache/dev-python/reportlab-3.6.11
index 3d13ef762733..d2b973656606 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.6.11
+++ b/metadata/md5-cache/dev-python/reportlab-3.6.11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
 INHERIT=distutils-r1
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.6.11.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=57da569b4d403cbbf52a26c3b7e55d23
+_md5_=fc3066b1065aead9caa4e7c32bef3959
diff --git a/metadata/md5-cache/dev-python/trimesh-3.12.7 b/metadata/md5-cache/dev-python/trimesh-3.12.7
deleted file mode 100644
index 956f9b355e12..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.12.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.12.7.tar.gz -> trimesh-3.12.7.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=781d371ba1aed30ce7b7ecca6c0d9296
diff --git a/metadata/md5-cache/dev-python/trimesh-3.12.8 b/metadata/md5-cache/dev-python/trimesh-3.12.8
deleted file mode 100644
index b7907c4774e4..000000000000
--- a/metadata/md5-cache/dev-python/trimesh-3.12.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for loading and using triangular meshes
-EAPI=8
-HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mikedh/trimesh/archive/3.12.8.tar.gz -> trimesh-3.12.8.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=838f01dcebb4615d2db7ea9115b9431e
diff --git a/metadata/md5-cache/dev-python/trimesh-3.12.9 b/metadata/md5-cache/dev-python/trimesh-3.12.9
index b3f3c9d044b5..89e0129b356a 100644
--- a/metadata/md5-cache/dev-python/trimesh-3.12.9
+++ b/metadata/md5-cache/dev-python/trimesh-3.12.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
 INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikedh/trimesh/archive/3.12.9.tar.gz -> trimesh-3.12.9.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=838f01dcebb4615d2db7ea9115b9431e
+_md5_=781d371ba1aed30ce7b7ecca6c0d9296
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index b643297fc934..81edefc2a1de 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5
deleted file mode 100644
index 04258bfa4a4f..000000000000
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.5*:5= test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.5*:5=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=1895ff887a22240acf7f4ab46fbddf6d
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtcore-5.15.5-r1
deleted file mode 100644
index 39b8d49262eb..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=Cross-platform application development framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=linux-info qt5-build
-IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=5/5.15.5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=fc0ab2bfa6edac26bad866d2a9f2a26b
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.5 b/metadata/md5-cache/dev-qt/qtdbus-5.15.5
deleted file mode 100644
index 83a169f33e86..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.5*:5= sys-apps/dbus test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.5*:5= sys-apps/dbus
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=90e22481a54d1bd479b63aee1d47a924
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.5 b/metadata/md5-cache/dev-qt/qtgui-5.15.5
deleted file mode 100644
index 16ffff948867..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.5*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.5* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.5* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.5* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) linuxfb? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.5* )
-RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.5*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.5* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.5* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.5* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
-REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
-RESTRICT=test
-SLOT=5/5.15.5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0737696d812e467165dd10f6e7ff4809
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r1
deleted file mode 100644
index eda1f2595215..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=mng debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
-RESTRICT=test
-SLOT=5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtimageformats-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.5-gentoo-kde-2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=03e2d71b77890c4462b96e7a2fec9cfb
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5
deleted file mode 100644
index 6edc5607ea64..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*[gles2-only=] =dev-qt/qtwidgets-5.15.5*[gles2-only=] cups? ( net-print/cups ) test? ( =dev-qt/qtnetwork-5.15.5* ) test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*[gles2-only=] =dev-qt/qtwidgets-5.15.5*[gles2-only=] cups? ( net-print/cups )
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=2d1f08f61b7e39438b1c0f548a883c48
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.5 b/metadata/md5-cache/dev-qt/qtsvg-5.15.5
deleted file mode 100644
index ff4e928e4470..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* =dev-qt/qtwidgets-5.15.5* sys-libs/zlib:= test? ( =dev-qt/qtxml-5.15.5* ) test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtsvg https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* =dev-qt/qtwidgets-5.15.5* sys-libs/zlib:=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtsvg-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=f2b16c4fa4592da0eb30d2a090a47f96
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.5 b/metadata/md5-cache/dev-qt/qtwayland-5.15.5
deleted file mode 100644
index c2a569e3a2c0..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.5*:5= =dev-qt/qtdeclarative-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.5*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=vulkan X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.5*:5= =dev-qt/qtdeclarative-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.5*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
-RESTRICT=test
-SLOT=5/5.15.5
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtwayland-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=11a4dd4934bc9ca8bd22f8045a29adf4
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.5 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.5
deleted file mode 100644
index 1c40b514aae2..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.5* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.5*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( =dev-qt/qttest-5.15.5* )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=qt5-build
-IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.5* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.5*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
-REQUIRED_USE=gtk? ( dbus )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=6329790acffb5672392a85b4214e1224
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index b0adf73e01ec..b3e44094370d 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/apitrace-9.0-r3 b/metadata/md5-cache/dev-util/apitrace-9.0-r3
index 8589fb86179d..b0331397d0ec 100644
--- a/metadata/md5-cache/dev-util/apitrace-9.0-r3
+++ b/metadata/md5-cache/dev-util/apitrace-9.0-r3
@@ -2,7 +2,7 @@ BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0= media-libs/mesa[egl(+),gles1,gles2,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/waffle-1.6.0-r1[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-process/procps:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-libs/libX11 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5[-gles2-only] )
 DESCRIPTION=Tool for tracing, analyzing, and debugging graphics APIs
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/apitrace/apitrace
 INHERIT=cmake-multilib multilib python-single-r1
 IUSE=qt5 X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/archive/9.0.tar.gz -> apitrace-9.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=93f6b637e5b09fc9012d7632c9a221f9
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1ef863a9db004112ad0df953635ea857
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index dfbcc288a8ae..3e70e4a6ca8a 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-21.12.3 b/metadata/md5-cache/kde-apps/kalarmcal-21.12.3
deleted file mode 100644
index bb742254f9aa..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-21.12.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.88.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-apps/akonadi-21.12.3:5 >=kde-apps/kcalutils-21.12.3:5 >=kde-apps/kidentitymanagement-21.12.3:5 >=kde-frameworks/kcalendarcore-5.88.0:5 >=kde-frameworks/kconfig-5.88.0:5 >=kde-frameworks/kholidays-5.88.0:5 >=kde-frameworks/ki18n-5.88.0:5 test? ( >=dev-qt/qtdbus-5.15.2:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=8
-HOMEPAGE=https://kde.org/
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-apps/akonadi-21.12.3:5 >=kde-apps/kcalutils-21.12.3:5 >=kde-apps/kidentitymanagement-21.12.3:5 >=kde-frameworks/kcalendarcore-5.88.0:5 >=kde-frameworks/kconfig-5.88.0:5 >=kde-frameworks/kholidays-5.88.0:5 >=kde-frameworks/ki18n-5.88.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/21.12.3/src/kalarmcal-21.12.3.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a025f595a29a121d59630122bbd9eb81
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index cd26b8d5cd08..1944dffe85c3 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.96.0 b/metadata/md5-cache/kde-frameworks/khtml-5.96.0
deleted file mode 100644
index c9a4a88ec859..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.96.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.96:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kjs-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwallet-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.15.4:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=X test debug test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2
-RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kjs-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwallet-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.96
-SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fae9fe553aa808c64b265c5275c23730
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1 b/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1
index f176323b2d0f..835d9fb5a97c 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://develop.kde.org/products/frameworks/
 INHERIT=ecm frameworks.kde.org
 IUSE=X test debug test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-2
 RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kjs-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwallet-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X?] =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=239f47e59990f076967897f02a4dc1c3
+_md5_=6ea0d742d36d7aa0959ed834c1c25469
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.96.0 b/metadata/md5-cache/kde-frameworks/kinit-5.96.0
deleted file mode 100644
index b27a831acd68..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.96.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.96:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.96:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org
-IUSE=+caps +man X debug
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.96
-SRC_URI=mirror://kde/stable/frameworks/5.96/kinit-5.96.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ec12bb2d527a2790f94287c05ca3d826
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1 b/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1
index 1444caed50a8..0efa8f9e93ba 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://develop.kde.org/products/frameworks/
 INHERIT=ecm frameworks.kde.org
 IUSE=+caps +man X debug
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X?] caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/kinit-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b34548aea299904b9e48b09fce190644
+_md5_=5c53385cca34a103c549248eabe89637
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.96.0-r2 b/metadata/md5-cache/kde-frameworks/kio-5.96.0-r2
deleted file mode 100644
index 265ab2a49d65..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.96.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.96:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kbookmarks-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.96*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.96*:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=dev-qt/qtconcurrent-5.15.4:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=8
-HOMEPAGE=https://develop.kde.org/products/frameworks/
-INHERIT=ecm frameworks.kde.org xdg-utils
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.96:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kbookmarks-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5 =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.96*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.96*:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/5.96
-SRC_URI=mirror://kde/stable/frameworks/5.96/kio-5.96.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=18d9f256290a69e18fd0e448ca334ca6
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3 b/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3
index 2de64fedd0b4..9708096541c9 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3
+++ b/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://develop.kde.org/products/frameworks/
 INHERIT=ecm frameworks.kde.org xdg-utils
 IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.96:5
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kbookmarks-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X?] =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.96*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.96*:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/kio-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0070fddec8b2b702e2932bcf0a2656d6
+_md5_=42d8b7042354d81b9656441a28ac8ea6
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index bdad2363d2c3..f28db6350f02 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.24.6-r1 b/metadata/md5-cache/kde-plasma/kwin-5.24.6-r1
deleted file mode 100644
index 3151399f6051..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.24.6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-qt/qtwaylandscanner-5.15.4:5 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.92.0:5 ) >=kde-frameworks/extra-cmake-modules-5.92.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5= >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kidletime-5.92.0:5= >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/kpackage-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/ktextwidgets-5.92.0:5 >=kde-frameworks/kwayland-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5=[X] >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-plasma/breeze-5.24.6:5 >=kde-plasma/kdecoration-5.24.6:5 >=kde-plasma/kscreenlocker-5.24.6:5 >=kde-plasma/kwayland-server-5.24.6:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.92.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.4:5 >=dev-qt/qtconcurrent-5.15.4:5 x11-base/xorg-proto test? ( dev-libs/plasma-wayland-protocols >=dev-libs/wayland-protocols-1.19 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.24.6:5
-RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5= >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kidletime-5.92.0:5= >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/kpackage-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/ktextwidgets-5.92.0:5 >=kde-frameworks/kwayland-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5=[X] >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-plasma/breeze-5.24.6:5 >=kde-plasma/kdecoration-5.24.6:5 >=kde-plasma/kscreenlocker-5.24.6:5 >=kde-plasma/kwayland-server-5.24.6:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.92.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=dev-qt/qtvirtualkeyboard-5.15.4:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.4:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.6/kwin-5.24.6.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d9afc9958b5b64e8e2af62021bae4589
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2 b/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2
index b2b5b2789075..6a1a80fb3567 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2
+++ b/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm plasma.kde.org optfeature
 IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.24.6:5
 RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5=[X] >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kidletime-5.92.0:5= >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/kpackage-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/ktextwidgets-5.92.0:5 >=kde-frameworks/kwayland-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5=[X] >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-plasma/breeze-5.24.6:5 >=kde-plasma/kdecoration-5.24.6:5 >=kde-plasma/kscreenlocker-5.24.6:5 >=kde-plasma/kwayland-server-5.24.6:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.92.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=dev-qt/qtvirtualkeyboard-5.15.4:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.4:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.6/kwin-5.24.6.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=09baa9ee83474b7bd491b691a0355d22
+_md5_=c625e4b7143ec0c4ac20d77baf8db1a4
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r1
deleted file mode 100644
index c72cae690dc2..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.92.0:5 ) >=kde-frameworks/extra-cmake-modules-5.92.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/attica-5.92.0:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kactivities-stats-5.92.0:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kbookmarks-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcodecs-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kded-5.92.0:5 >=kde-frameworks/kdelibs4support-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5 >=kde-frameworks/kguiaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kio-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5 >=kde-frameworks/kitemviews-5.92.0:5 >=kde-frameworks/kjobwidgets-5.92.0:5 >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/knotifyconfig-5.92.0:5 >=kde-frameworks/kparts-5.92.0:5 >=kde-frameworks/krunner-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-frameworks/solid-5.92.0:5 >=kde-frameworks/sonnet-5.92.0:5 >=kde-plasma/kwin-5.24.6:5 >=kde-plasma/libksysguard-5.24.6:5 >=kde-plasma/libkworkspace-5.24.6:5 >=kde-plasma/plasma-workspace-5.24.6:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.92.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm plasma.kde.org optfeature
-IUSE=emoji ibus +kaccounts scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/attica-5.92.0:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kactivities-stats-5.92.0:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kbookmarks-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcodecs-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kded-5.92.0:5 >=kde-frameworks/kdelibs4support-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5 >=kde-frameworks/kguiaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kio-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5 >=kde-frameworks/kitemviews-5.92.0:5 >=kde-frameworks/kjobwidgets-5.92.0:5 >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/knotifyconfig-5.92.0:5 >=kde-frameworks/kparts-5.92.0:5 >=kde-frameworks/krunner-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-frameworks/solid-5.92.0:5 >=kde-frameworks/sonnet-5.92.0:5 >=kde-plasma/kwin-5.24.6:5 >=kde-plasma/libksysguard-5.24.6:5 >=kde-plasma/libkworkspace-5.24.6:5 >=kde-plasma/plasma-workspace-5.24.6:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.92.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/qqc2-desktop-style-5.92.0:5 >=kde-plasma/kde-cli-tools-5.24.6:5 >=kde-plasma/oxygen-5.24.6:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.6/plasma-desktop-5.24.6.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=344ac0aa94591c9bd10b0ee72f5b724b
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2
index 0e6b4f775f30..3d35136c1a1e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm plasma.kde.org optfeature
 IUSE=emoji ibus +kaccounts scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/attica-5.92.0:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kactivities-stats-5.92.0:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kbookmarks-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcodecs-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kded-5.92.0:5 >=kde-frameworks/kdelibs4support-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5 >=kde-frameworks/kguiaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kio-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5 >=kde-frameworks/kitemviews-5.92.0:5 >=kde-frameworks/kjobwidgets-5.92.0:5 >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/knotifyconfig-5.92.0:5 >=kde-frameworks/kparts-5.92.0:5 >=kde-frameworks/krunner-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-frameworks/solid-5.92.0:5 >=kde-frameworks/sonnet-5.92.0:5 >=kde-plasma/kwin-5.24.6:5 >=kde-plasma/libksysguard-5.24.6:5 >=kde-plasma/libkworkspace-5.24.6:5 >=kde-plasma/plasma-workspace-5.24.6:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.92.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/qqc2-desktop-style-5.92.0:5 >=kde-plasma/kde-cli-tools-5.24.6:5 >=kde-plasma/oxygen-5.24.6:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.6/plasma-desktop-5.24.6.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8848486a6d0cfff5142f50d53bf71968
+_md5_=e893f6c86a361ad23e4a7afdc8e451b6
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c6c94c0bf3e7..598ada413d8a 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/libdmtx-0.7.5 b/metadata/md5-cache/media-libs/libdmtx-0.7.5
deleted file mode 100644
index 087bbb5e8f23..000000000000
--- a/metadata/md5-cache/media-libs/libdmtx-0.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Barcode data matrix reading and writing library
-EAPI=7
-HOMEPAGE=http://libdmtx.sourceforge.net/
-INHERIT=autotools
-KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/dmtx/libdmtx/archive/v0.7.5.tar.gz -> libdmtx-0.7.5.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1e3f88f78d77dcc1abb68fdc9609a8db
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.6 b/metadata/md5-cache/media-libs/libffado-2.4.6
index 1b69ade47fb7..7a3ace5ac88a 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.6
+++ b/metadata/md5-cache/media-libs/libffado-2.4.6
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.ffado.org
 INHERIT=desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 IUSE=debug qt5 test-programs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig:=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/PyQt5[dbus,python_targets_python3_10(-)] ) x11-misc/xdg-utils )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.6.tgz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=2b3a8dea534aa69c81935ad1db370317
+_md5_=b3e7632b7785dfee664b1cde5f9a3b2b
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.20 b/metadata/md5-cache/media-libs/libmtp-1.1.20
index 4017eb5a6bda..ad45303e18b4 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.20
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.20
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://libmtp.sourceforge.net/
 INHERIT=udev libtool
 IUSE=+crypt doc examples static-libs
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=acct-group/plugdev virtual/libiconv virtual/libusb:1 crypt? ( dev-libs/libgcrypt:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.20.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
-_md5_=d214aca25b07c6cfdd33d629fb3986d5
+_md5_=48689a0608c266b5e939fd86db97d4d0
diff --git a/metadata/md5-cache/media-libs/libsoundio-2.0.0 b/metadata/md5-cache/media-libs/libsoundio-2.0.0
index 3ecb59878852..c7e383231da2 100644
--- a/metadata/md5-cache/media-libs/libsoundio-2.0.0
+++ b/metadata/md5-cache/media-libs/libsoundio-2.0.0
@@ -2,7 +2,7 @@ BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=C library for cross-platform real-time audio input and output
-EAPI=7
+EAPI=8
 HOMEPAGE=http://libsound.io/
 INHERIT=cmake-multilib
 IUSE=alsa coreaudio examples jack pulseaudio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2
 SRC_URI=https://github.com/andrewrk/libsoundio/archive/2.0.0.tar.gz -> libsoundio-2.0.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d4b7356bc47186b61ff66241989c834e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fd62e2f243b4bb22f5ff1c1ec6ae4532
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ba792a5f6a8d..9115f0b179b5 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/mpg123-1.30.1 b/metadata/md5-cache/media-sound/mpg123-1.30.1
index ac0548286435..c50cd09dfd0a 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.30.1
+++ b/metadata/md5-cache/media-sound/mpg123-1.30.1
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.mpg123.org/
 IDEPEND=app-eselect/eselect-mpg123
 INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
 IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse 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 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
 SLOT=0
 SRC_URI=https://www.mpg123.org/download/mpg123-1.30.1.tar.bz2
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=53af64d4c9eef81d4f6f3f6455fac057
+_md5_=ce2569fc441806f352daa1acc707c784
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 27c0337a2598..bb7459283487 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4 b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4
index 5be5824d4317..b613fa583247 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio ) v4l? ( media-libs/libv4l )
 DESCRIPTION=A Simple Screen Recorder
 EAPI=8
-HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder
+HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder/
 INHERIT=cmake-multilib flag-o-matic xdg
 IUSE=+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=abi_x86_32? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.4.4.tar.gz -> simplescreenrecorder-0.4.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=553d78edb2db0d999b89524d7bea618c
+_md5_=eaa1c5f4a546b07093fcba0ced67f97f
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r1 b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r1
index 12cfb63c176f..8d12f8d4eb99 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r1
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio ) v4l? ( media-libs/libv4l )
 DESCRIPTION=A Simple Screen Recorder
 EAPI=8
-HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder
+HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder/
 INHERIT=cmake-multilib flag-o-matic xdg
 IUSE=+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=abi_x86_32? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.4.4.tar.gz -> simplescreenrecorder-0.4.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5e308e5764c78a4d76e8087778bfb17f
+_md5_=68cf380f1f2ddb7f59bfeb76215ce66f
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-9999 b/metadata/md5-cache/media-video/simplescreenrecorder-9999
index b5fce4cc1868..ecaf730ac0cf 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-9999
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio ) v4l? ( media-libs/libv4l )
 DESCRIPTION=A Simple Screen Recorder
 EAPI=8
-HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder
+HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder/
 INHERIT=cmake-multilib flag-o-matic xdg git-r3
 IUSE=+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( media-libs/libv4l ) jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] ) pulseaudio? ( media-sound/pulseaudio ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=abi_x86_32? ( opengl )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3241361a4f5fa8251949311e355daa07
+_md5_=d8e1e9c475196e7a37eff7f32852a051
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index a9be7e50b76d..7e81797af434 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r5 b/metadata/md5-cache/net-irc/ngircd-26.1-r5
index 95ce732c6acb..2847c033ca9d 100644
--- a/metadata/md5-cache/net-irc/ngircd-26.1-r5
+++ b/metadata/md5-cache/net-irc/ngircd-26.1-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://ngircd.barton.de/
 INHERIT=tmpfiles systemd verify-sig
 IUSE=debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=acct-user/ngircd irc-plus? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs/pam ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) tcpd? ( sys-apps/tcp-wrappers ) zlib? ( sys-libs/zlib ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz verify-sig? ( https://arthur.barton.de/pub/ngircd/ngircd-26.1.tar.xz.sig )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=590f337dec681fe6a87c8f8c54ecad7e
+_md5_=b0d848bcaa96aea560d2a9a788aabcc0
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 1fdae5f22ade..caf33383b41f 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/linuxptp-3.1.1 b/metadata/md5-cache/net-misc/linuxptp-3.1.1
new file mode 100644
index 000000000000..440601238af4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/linuxptp-3.1.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DEPEND=elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=The Linux Precision Time Protocol (PTP) implementation
+EAPI=8
+HOMEPAGE=http://linuxptp.sourceforge.net/
+INHERIT=linux-info systemd toolchain-funcs
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/project/linuxptp/v3.1/linuxptp-3.1.1.tgz
+_eclasses_=linux-info	56708ddc53d8b607ed88fd97a56e59dc	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=566f55d4fbf1ed8ea4c41cba99904c96
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 1b63dd6a36d2..e6e6abd5af1a 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/headscale-0.15.0-r1 b/metadata/md5-cache/net-vpn/headscale-0.16.2
index 040303ecf6ef..bbeeae9f5fdd 100644
--- a/metadata/md5-cache/net-vpn/headscale-0.15.0-r1
+++ b/metadata/md5-cache/net-vpn/headscale-0.16.2
@@ -10,6 +10,6 @@ LICENSE=BSD Apache-2.0 MIT
 RDEPEND=acct-group/headscale acct-user/headscale net-firewall/iptables
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/juanfont/headscale/archive/v0.15.0.tar.gz -> headscale-0.15.0.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/net-vpn/headscale/headscale-0.15.0-deps.tar.xz
+SRC_URI=https://github.com/juanfont/headscale/archive/v0.16.2.tar.gz -> headscale-0.16.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/net-vpn/headscale/headscale-0.16.2-deps.tar.xz https://dev.gentoo.org/~jsmolic/distfiles/net-vpn/headscale/headscale-0.16.2-deps.tar.xz
 _eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=85dfdff060392dabf81158c2557dee3d
+_md5_=2ff4a74f161451186a14c8207a16fd98
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 960583242b40..0f4ab291ee87 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/eclib-20220621 b/metadata/md5-cache/sci-mathematics/eclib-20220621
index 0885451fca46..87cf11c5d2f3 100644
--- a/metadata/md5-cache/sci-mathematics/eclib-20220621
+++ b/metadata/md5-cache/sci-mathematics/eclib-20220621
@@ -4,10 +4,10 @@ DESCRIPTION=Programs for elliptic curves defined over the rational numbers
 EAPI=8
 HOMEPAGE=https://github.com/JohnCremona/eclib
 IUSE=boost flint minimal static-libs test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari:= dev-libs/ntl:= boost? ( dev-libs/boost:= ) flint? ( sci-mathematics/flint:= )
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/JohnCremona/eclib/releases/download/20220621/eclib-20220621.tar.bz2
-_md5_=11409a78e4e1af44b1e6c7e37185fbb1
+_md5_=84af37cbbe0299cb5fe589e297b252ed
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 27edea42266a..8a424f7b40bc 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.0 b/metadata/md5-cache/sys-devel/gcc-10.4.0
index bcc5898619b1..3db3a6d91762 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	40412ed53991bf43431475ab4672f162	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=405a1d7ff9f2ee7da0a1fee2ba769a72
+_md5_=43c41e67316bf58e79a60c2672964204
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 7dba3f5db76f..992ccc08b5f4 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/git-sources-5.19_rc2 b/metadata/md5-cache/sys-kernel/git-sources-5.19_rc2
deleted file mode 100644
index 0b4b74d75899..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_rc2
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc2/v5.18 -> patch-5.19-rc2.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc3 b/metadata/md5-cache/sys-kernel/git-sources-5.19_rc3
deleted file mode 100644
index 8d5e90142cf2..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_rc3
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc3/v5.18 -> patch-5.19-rc3.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc4 b/metadata/md5-cache/sys-kernel/git-sources-5.19_rc4
deleted file mode 100644
index bd35a6eacb0b..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_rc4
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc4/v5.18 -> patch-5.19-rc4.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc5 b/metadata/md5-cache/sys-kernel/git-sources-5.19_rc5
deleted file mode 100644
index 7d472f24981a..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_rc5
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc5/v5.18 -> patch-5.19-rc5.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc6 b/metadata/md5-cache/sys-kernel/git-sources-5.19_rc6
deleted file mode 100644
index 542300f43d67..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_rc6
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc6/v5.18 -> patch-5.19-rc6.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc7 b/metadata/md5-cache/sys-kernel/git-sources-5.19_rc7
deleted file mode 100644
index 9f4725533478..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_rc7
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc7/v5.18 -> patch-5.19-rc7.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc8 b/metadata/md5-cache/sys-kernel/git-sources-5.19_rc8
deleted file mode 100644
index c69727bd2a72..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/patch-2.7.6-r4
-DESCRIPTION=The very latest -git version of the Linux kernel
-EAPI=8
-HOMEPAGE=https://www.kernel.org
-INHERIT=kernel-2
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.19_rc8
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc8/v5.18 -> patch-5.19-rc8.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc1 b/metadata/md5-cache/sys-kernel/git-sources-6.0_rc1
index 6c118b8a270d..abd9b153e213 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-5.19_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-6.0_rc1
@@ -10,7 +10,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.19_rc1
-SRC_URI=https://git.kernel.org/torvalds/p/v5.19-rc1/v5.18 -> patch-5.19-rc1.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+SLOT=6.0_rc1
+SRC_URI=https://git.kernel.org/torvalds/p/v6.0-rc1/v5.19 -> patch-6.0-rc1.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-5.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=973abc80e92fd1c7467b37547cf66513
+_md5_=5f2bf9520f0bc049811fcb3f3f463db0
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d33570d91825..8dc388fe0913 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-15T06:39:38Z
+TIMESTAMP 2022-08-15T12:39:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL56ipfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL6PolfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBIqA//cEXECgbb7OwJsMArKCQMc7gw1XaqG8cKeHLavl6NL+Wfy6l9Nki3qp0+
-GYAJSSzg0ZEvxB5S7/0/u4SmuAPzVb7IHc8Gm5bIye7dJf3b2APlskkVT8burqhR
-yULAiU4eA8A5KE5LgtpYLCssKDK8ceP02N+XzosIgGRW/U+/b+2ea4Mf36EuIM3m
-5CArD1coXdYStJlRqfZT/fimtEJGBY/ewADJ/B16+DkLKRzs3eCLDJOLUs40H1k3
-ayPfr+PJuWTwVFnqSazkomJjBl4Hn8hai9nxb4miUdkEVWmnV0vUPYZjzJ5anBR6
-XpaMF4mha8M/vDaH6rh6HA9oaJa1686YssA5qfWG80x+doz+IhowyyvQV0WlOLKI
-P4cXsS/ZWwW7JVygKhMzD6vMf+ZtQJVoqahULWYOeD7V7kZ53VMpz3MHMgUk/w+3
-f8J8voiUPuzFHc8nNzK0R0JtRz4W5O9MYZEBimglFTiawSbYtnwBdeWCS6m5hzF0
-wkvA77VJOsLpU8sNKN3//iQCJ8Zz19HgACkmheyJU0wwLujqiS0wtBKbna6ChCZ5
-BAw93aPLY0TM+ve8kYBjqf6hcYmQH9ckj5HDkfEWUsFBq0uZndUOrVEqNn/VEqMW
-PmQDYOspxDNlYM7Y6g1epfnKNjlM1ReJcN/pO38XPeVEIGI2uSo=
-=VByI
+klD3+xAAtB645itZXyXKih7L21XXH0fREmQcTUmoCZ/F4MYRiNdcSOGx3Rx9+zrS
+gMGatxzvwrEXB/k0Vjz2iN50vu6N+6wMoP5PFA2CYYS0AgmJ/OEIGgV7em6kNqAN
+cMe7Ftjd2kgKcjd3bCkf9X5W+5U4mOQOeMOd5gCnCWngk46bZiL1T4jSk4YBQwyM
+TsVx6VUsRgKZ0A8wMuNm7wZ0qZYqHE9ryValMU7/t0GE3o1L16jF8unoeOBrXxPf
+THm6mA+lGhbBhouBqJWKjiX/KWCqU2iqwEvSPm7LFP3jjwS2/dzDqRhLdt6NPh6U
+gjLm7YVn4zYvn0uY4bnx6q0MhS4ifup/g+zARS4UenKuZQ4QfrAohlwahc6MY4pv
+Ge7liRtm02Q9d9VrUClR4GHUZbBKwV6x0GPzsBABzIlI6g6QNbl9FRg2h1vqiFkT
+9BiSwAoxDwULX8CvOqGFeKDuqo+Hw+56kaALdZxM2+EaZjJtaRBQWgOXTuGYzqAp
+/bOWGzwf6PNhjGO8NFELZrBmWhFPyp1oxA4Sik06P3yoFoPfwao/e9Xpi2TME1on
+vggNsQ+DXj+h/z2gf5/8n5KaQKAx63yxmPSXugdLc0hnnMzP2jCSpd3iXss3nY9R
+TuQ0I8P0EE/c+p2qN6Xwk8vllohellmwdv/eMVDAA0dRhdhSHNo=
+=8Q1B
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d811bfb247b0..7ac210a3c389 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Aug 2022 06:39:35 +0000
+Mon, 15 Aug 2022 12:39:33 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a84c66798946..e68f0cb09348 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Aug 15 06:39:34 AM UTC 2022
+Mon Aug 15 12:39:33 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 87ad7457c502..de653efa3828 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Aug 2022 06:45:01 +0000
+Mon, 15 Aug 2022 12:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f3cf4fac153c..3bab02e37e5f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-065daff1d670a2e61eaeaebe75fc052c586bd236 1660544582 2022-08-15T06:23:02+00:00
+506bf6405699d895f58bfac23e09e0266556744d 1660564660 2022-08-15T11:57:40+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 650ddaa2109e..3e59c3fc2a6c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660545601 Mon 15 Aug 2022 06:40:01 AM UTC
+1660567201 Mon 15 Aug 2022 12:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2d5ee401375b..7ac210a3c389 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Aug 2022 06:39:34 +0000
+Mon, 15 Aug 2022 12:39:33 +0000
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 6976170d8548..de0a61aed68e 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index d3249dfcc0dc..5507996a01e4 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -5,5 +5,5 @@ AUX ngircd.init-r2.d 1271 BLAKE2B f385805c7ae63f4046cee12449b60bc4309007fe69b52a
 DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee
 DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848
 EBUILD ngircd-26.1-r4.ebuild 2533 BLAKE2B bb5d0f9d2653184ab0964afb08eb7fd803041af9005b9675e7446a13c3a63ed305e88c53d7e7fa4e116c8519a4f8edb63fa075be4845b4c94728ce49e1045120 SHA512 744ff2b19724127235a91c8b88e2f937ba7903a0ac0073e4d298276d3410171f231b907d5c114a7fd9da6157bf41186baf4a51243867a2af5b89672cf29062c5
-EBUILD ngircd-26.1-r5.ebuild 2672 BLAKE2B f9976614ed4baca6453e3713d7cf220b34eb7b76962ccc7938585c25838888a2775de74c1ca8ae868d4ac566abd2d4416137d544cb48501c6ed7fd19fba44783 SHA512 bdb0c5e4d37cee8d0a8afde1623215e647bc321f9cf1f1cab4040ee6921e5d6905588017a4d75bc5be9af6e2297de5460a95a539a13d08d1898f92bac48b8963
+EBUILD ngircd-26.1-r5.ebuild 2669 BLAKE2B b39bb435932aa340a1e01da73cd7d6b6ca0ba4d70467e4d67c890da11d9fc7a90bae8cd1f417115b8643e9df2bb0848cfa0e736d39fbbc92a2375063d4d57128 SHA512 8e18357c100ebd7f2589f5a70900929222fd7aeadfdf5f811a271c77f9e6902e2b2c8d246c05c1940aa83026ae05327db92729f2dfcce77ce5e35e5eeb7f5a33
 MISC metadata.xml 651 BLAKE2B ba57a0fffdef6acaf3510f62bc146c9dbfec0805b9e6a5e889360fee39c3a3e539aaead44fa42c72523957c492c066a9729c2f362c84f56c0ab27627b8e92f36 SHA512 82529647ece0d29898c2ad7f5794d6376f919d0e1d30cdc7dea0bea97418c9fba26e9e9748232a7e9963d329d5a8b5f4f8d2c6acc03682a231ec3984c63980f7
diff --git a/net-irc/ngircd/ngircd-26.1-r5.ebuild b/net-irc/ngircd/ngircd-26.1-r5.ebuild
index 4c6293a77170..817c46179f9b 100644
--- a/net-irc/ngircd/ngircd-26.1-r5.ebuild
+++ b/net-irc/ngircd/ngircd-26.1-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~x86 ~x64-macos"
 IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
 
 # Flaky test needs investigation (bug #719256)
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 37915dbe6eb0..dab6b94a1cd0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 0798da5f46e8..b0167f5a7f56 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,5 +1,9 @@
 AUX linuxptp-2.0_nettstamp-systypes.patch 1374 BLAKE2B 2b90a983e99cea7c686cbb28eb7c53fece2ad22dda0a898fa3ba0a867686d500f288e24c18c473729d48deda99565069b4983ee02f56214bab6367e6a19ff9cd SHA512 e9e0ae1be45c1d3d71cbf9c7df30584e52d8169755f516e920eb49e52c0dea5e388c36e92d9d000112d7630631cdc97d2eaa55fab1413d13d145a4970b1b7120
+AUX phc2sysAT.service 248 BLAKE2B b0e1926a7755314bd0def600e81dbf7b60707216ff3844194512511ce99407cc88da7a2c83e019b20571098eba3f2297c1a1fe54da47f8fb5e07a58c20a007a2 SHA512 55f048ae44eb43894aad957b35842b0b21aa27e922be85bd286847281f8716bdde9b8187ca90d90d31c9d4587de4c35eebaf0e47498f9b950279037e03069086
+AUX ptp4lAT.service 242 BLAKE2B 2b0ca6ca5b7e4adde39ca360713af02450c0d36b1f4a2393350a59d80dcb0cc26000862546b732aac9f6b89ed6fdec0175485685cc3343d2d33fc48d671cca03 SHA512 f182fc52ebfc8fa878d94604fd398d071fcf8347cc8c251a2f8f78fbce518181c543f2eae971ecfb768bc9337c816d894ab150b37ce1642e854a65792324a50b
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
+DIST linuxptp-3.1.1.tgz 218784 BLAKE2B 5b46580a0e1b6e003f5f03e512c4f9b348c086f356fd47d3480da5e8223ba291fdb213798c696c37759896a99bccf21cd7e7daddce5aa5ed5701afb0e622a755 SHA512 c3c40987fe68480a8473097ebc3c506fb4f8f3b6456bbe637b2b3cb0b3e0182f1513b511fdc04b3607d5f7d8bd1bd22502bb86eb13f9fa4fa63a3331846b33ec
 EBUILD linuxptp-2.0-r1.ebuild 1042 BLAKE2B c1ca710e95c14a358dfa16ee99fbe0fe5594e7e7c403a987a79b03eb9a74464a3f72a7f585c0ec779d5aceceb8f5a25afc4d3f55ac4a0038fde8fd5b4a992f42 SHA512 3cd615b214e0f519f6ec63fbadc36169aee412742debeffbf3364b05d301cae2361a7d0ad9ac79567e25713f38744160f359abb72fad840eeafd5c0d53364017
-MISC metadata.xml 328 BLAKE2B edf94c00bdfbc632e1fc2fde5a402e16e5035c86bd49b1817c4a9e4cd21a23c00c453b59bd4405c0240024fdfc9c5e0ac3661c24b38a6f8b08dcc764bc8c1bf2 SHA512 a8e8616a30f7d4b12523f423896a2fff6f3ad97144ad5c43aa367f21475070a67acc717781049e0e3ace3fdfed88a82299962f67dcc2f5f2c4c602353ea9c327
+EBUILD linuxptp-3.1.1.ebuild 1123 BLAKE2B ee9ce4164baa4e80be57f33fcd37deba319c4a83badffa167eb88f924b31c6aaf8384160e319deb8025a53bbc51dbcb9df733931f0a257c4b28e34e63c959897 SHA512 915a2cf5143ef773f0cc0e9b8656e6f9504f94caf1ccf5ef878f8e3da6f7c4b1f8cd72d108b2482728510e912402264748a40b4ca20f45174810d4a9e3c8921a
+MISC metadata.xml 434 BLAKE2B 6294b76d69b7459ff51a8b3f679ca7bfd940a70088eb53be6e15092465a3cb01f4a7b8b5430244b871321c320ec389ac1b05b239f3eef54e9284e881910e13cf SHA512 7f2fb3921793510144e823c70d1ac263297d3591055c680fc8192dd8402e8a763bc8de8882f9c441e060e23cebaa5e6c684873d82738a6ae8f54b6e027b5c837
diff --git a/net-misc/linuxptp/files/phc2sysAT.service b/net-misc/linuxptp/files/phc2sysAT.service
new file mode 100644
index 000000000000..576c7691ba89
--- /dev/null
+++ b/net-misc/linuxptp/files/phc2sysAT.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Synchronise two or more system clocks
+Documentation=man:phc2sys
+Requires=ptp4l.service
+After=ptp4l.service
+Before=time-sync.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/phc2sys -w -s %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/linuxptp/files/ptp4lAT.service b/net-misc/linuxptp/files/ptp4lAT.service
new file mode 100644
index 000000000000..c3844605d2e3
--- /dev/null
+++ b/net-misc/linuxptp/files/ptp4lAT.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Precision Time Protocol (PTP) service for %I
+Documentation=man:ptp4l
+After=sys-subsystem-net-devices-%i.device
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/ptp4l -f /etc/ptp4l.conf -i %I
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/linuxptp/linuxptp-3.1.1.ebuild b/net-misc/linuxptp/linuxptp-3.1.1.ebuild
new file mode 100644
index 000000000000..faae13c19360
--- /dev/null
+++ b/net-misc/linuxptp/linuxptp-3.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
+HOMEPAGE="http://linuxptp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
+
+CONFIG_CHECK="~NETWORK_PHY_TIMESTAMPING ~PPS ~PTP_1588_CLOCK"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	# parse needed additional CFLAGS
+	export MY_FLAGS=$(./incdefs.sh)
+	export EXTRA_CFLAGS="${CFLAGS} ${MY_FLAGS}"
+	emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		install
+
+	systemd_newunit "${FILESDIR}"/phc2sysAT.service phc2sys@.service
+	systemd_newunit "${FILESDIR}"/ptp4lAT.service ptp4l@.service
+	systemd_dounit "${FILESDIR}"/timemaster.service
+
+	dodoc README.org
+	dodoc -r configs
+}
diff --git a/net-misc/linuxptp/metadata.xml b/net-misc/linuxptp/metadata.xml
index bae898a622e5..4b4b63f6299a 100644
--- a/net-misc/linuxptp/metadata.xml
+++ b/net-misc/linuxptp/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>tomjbe@gentoo.org</email>
 		<name>Thomas Beierlein</name>
 	</maintainer>
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 799877739df9..00a829b5915d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/headscale/Manifest b/net-vpn/headscale/Manifest
index 5a2c81d4424d..32c4cd376b1d 100644
--- a/net-vpn/headscale/Manifest
+++ b/net-vpn/headscale/Manifest
@@ -1,8 +1,8 @@
-AUX config-socket.patch 503 BLAKE2B 508c1837f4d026d7afb4729aa57a988db2fcbc70eaa8be00e2c2614f803e1e448d90baee21513391494d59f2fb670faa71eaa9cd797b35be4a87c5b56601f2bc SHA512 9654582bc6175aa743951d25e7b426ab0a3a4676ad001daf052105db2fe11a5562a40d26ded998b4d650b4a10ddca8c0729550165e88184eadb61893bbaec37a
+AUX config-socket.patch 513 BLAKE2B 05a5ab5e0165a8bfaa517cbe595cb0c2d9c16b832b9c0d4bab5244281a1765d71256c22941d5f98e0b1b82b5206d764fa544a62efddcd64f85518e5d226ef0c2 SHA512 a7b476932ca06d0da7f42962b29dbd7ebe80e3982262d09ad3851a94acc0eb49c524b1651f5a5847c7c9ae89d266ae59897ec80382d9351b4c915998845b6503
 AUX headscale.confd 165 BLAKE2B 0bf5013e2820c4a9dcae234b61a9e1c5bc6b45903eb6b5687ccb561f4857c2b68332a610e7a813fd967fce10f0a1028e3a989e2575fff8dd9abc35121d642e09 SHA512 ff1e354e60ffd912be4c36712228550e70d9bc66928aeaf470504875fe68a04ed1de3b0d5a96ec7980c8957bc42912da643737d32631c379f3e72cd53b0adffd
-AUX headscale.initd 846 BLAKE2B 91b558868dfcb4046a1d9c09d87154a979a4e7c7b1c4caa1d5a38ca2d97af3fdf81171f4e6ba206f95f560937ccabcd1981cc6d741d87037bdda5c9412aec8e6 SHA512 7e152c141b352c22ada47b93895dd3796737e525836b038bf36e48347e24425b2b4b7bd2f599abfd428ccf271aa100c31a5d8c01438ea15597d08a36761639c4
+AUX headscale.initd 957 BLAKE2B 9f67a4b8b53f0385929e7ccb6b1c0eddeae629fe43f68f9774016effd509c97e9db038b9a46a58255242f79d800b4058f14930b4cdb00179347f0291dfa51f29 SHA512 df7fb5e616c25d090a8d13619edf48464e189990ec8558eb6c06100c5d59a49aaecf8016dd22039e5629b0b3848dd7dd80e5fd3972863bd5c3b8c7da15df6c10
 AUX headscale.service 459 BLAKE2B 0c8d9b82cf3a9065fc9a57a0b0670a4cdb57cf62b27d1aac5c6823581b398c073922a142e07ef11d9867184e96981c314a6ce964d5f126dae51cabcba360ad50 SHA512 318b7394fe8232c461415438eed878962a429d4a47b7ffcb55f9aaec711c851aa59135bb5b9115b898d5ec2ae078fbaf1926052cfe44e6aafa44617e0ebffb37
-DIST headscale-0.15.0-deps.tar.xz 199844288 BLAKE2B 17c9e4a8877ee05f75f08c20794f6c084019f4554769ebabfc8d37e1ec309ac0cc2d18d341db241927df4ba3e43da39e8acb6a33a4a68435f9b3d3f7aebc098b SHA512 aa942787a4bc8644bb5e041fef293fd53a8d4ebc84faa8964c56fe9022b0359cd08ddd568898bc8fa4b2bc358f4c911b8a204438d676c5c4030bd89612d01c01
-DIST headscale-0.15.0.tar.gz 311959 BLAKE2B e4bcbf431c3b903024df95782b4070591e30439263796258f9a3cc07c7a2f4ea3f9895fb2869b642d6c37dc92fe492cc9d3b78261d8faa0a8e2c9eba3906aa20 SHA512 29b867f109e48bf04ab4f8a81bfab94155050f59f6c2aa2b4971567a7fb24ed343b869636e66e9cbb7b1b8df7d7415e769a85a7c3864d0fae169c15b6c7b6eb2
-EBUILD headscale-0.15.0-r1.ebuild 1242 BLAKE2B f9a9eb66887732fe3fd5e1b4b51eabd1dfdac95eba869877d0e343cb53dcb9a4982efa17f40e09a0d5ff48fa450de872354207418e836d37fce93b8704a4c1df SHA512 efc09de2df1c53477cef5ebb6360cc5fc57ec477f9eb08430c1a8fd6dec601be3e0b982273654d08ef6b172ac6431fa2bdc3e405946e3d4d98a165efd9b88566
+DIST headscale-0.16.2-deps.tar.xz 246778024 BLAKE2B 7c2beff2b18ca87aa4d496332d6b521f31d7b496227950204d9efe35f8259fdf1f3519fce951827f3698b5c166148db3ef69225acf16ce2e659b70017ac9e0f2 SHA512 5bc9b1b6bf1c3c70a7e033c2820c9fc05df45d19855e8050687072f0394920d77416640eb9af100027a96646df285b5a3d09bab4c959d4475e8b2b304f01a4ef
+DIST headscale-0.16.2.tar.gz 391683 BLAKE2B c75835e7f15847236b357988cdb66c65c3e2cb6ac2328e4fb5cb07da9c132b664afe69fcaf3fa9f6a70951e76a91ddf8fda2ea74c1af9055daca30f3efb593ab SHA512 bad885866855211d43b45dcc7b958595967241af4c2a1b370532fef7c751b85002138cd3742e4046603af383c123b66afd7de9aba59e8eee600d7ffdd70ff12c
+EBUILD headscale-0.16.2.ebuild 1278 BLAKE2B 0845074854a35dc983e1c5edf345f34275c9100d544a2480adb6e1afdbb5c0f07dffbf9a88e815c9555821d80cd38b489852785a5d5523b904863725edebb10f SHA512 bf4e51ab1932fe0128f1b648d9f419e4c805df65104a05a524b41e009b137985158c4d8db9f5dd5d82e4c5a92b8a75e6a6f07785b135bfe66d45e02cf9e6ee6d
 MISC metadata.xml 500 BLAKE2B 7dc95b76985ac9cb40ac5f12de2739f6e8f9f4f4a68a0bb397968c7419900c52c6233df1ce7eefa369de0a66cfa07ce8ec71624a6111d72e8c91553012169228 SHA512 d5b77a9da9eba9bdf9ba2ce675f92ca058f145f5bebc3546ad7acbff8140c16915afdf153bba8aacd2ce5130d7427cdaedef64efcb368546da91cbac8b5495e1
diff --git a/net-vpn/headscale/files/config-socket.patch b/net-vpn/headscale/files/config-socket.patch
index 4d6c90e3f0f5..73de6b6578d1 100644
--- a/net-vpn/headscale/files/config-socket.patch
+++ b/net-vpn/headscale/files/config-socket.patch
@@ -1,13 +1,13 @@
 diff --git a/config-example.yaml b/config-example.yaml
-index dee25cb..007d8ec 100644
+index d3d155e..a070c22 100644
 --- a/config-example.yaml
 +++ b/config-example.yaml
-@@ -202,7 +202,7 @@ dns_config:
+@@ -208,7 +208,7 @@ dns_config:
  # Unix socket used for the CLI to connect without authentication
  # Note: for local development, you probably want to change this to:
  # unix_socket: ./headscale.sock
 -unix_socket: /var/run/headscale.sock
-+unix_socket: /run/headscale.sock
++unix_socket: /run/headscale/headscale.sock
  unix_socket_permission: "0770"
  #
  # headscale supports experimental OpenID connect support,
diff --git a/net-vpn/headscale/files/headscale.initd b/net-vpn/headscale/files/headscale.initd
index 5a98c0e6cb34..f43b3a55af38 100644
--- a/net-vpn/headscale/files/headscale.initd
+++ b/net-vpn/headscale/files/headscale.initd
@@ -8,6 +8,7 @@ user="${HEADSCALE_USER}:${HEADSCALE_GROUP}"
 directory="/var/lib/headscale"
 output_log="/var/log/headscale.log"
 error_log="/var/log/headscale.log"
+private_key="/var/lib/headscale/private.key"
 
 start_stop_daemon_args="--user \"${user}\" ${HEADSCALE_OPTIONS} --background"
 
@@ -23,7 +24,12 @@ start_pre() {
 	fi
 
 	checkpath -d -m 700 -o "${user}" /run/headscale /var/lib/headscale
-	checkpath -f -m 600 -o "${user}" /var/lib/headscale/db.sqlite /var/log/headscale.log
-	checkpath -f -m 600 -o "${user}" /etc/headscale/config.yaml
-}
+	checkpath -f -m 600 -o "${user}" \
+		/var/lib/headscale/db.sqlite \
+		/var/log/headscale.log \
+		/etc/headscale/config.yaml
 
+	if [[ -f ${private_key} ]]; then
+		checkpath -f -m 600 -o "${user}" ${private_key}
+	fi
+}
diff --git a/net-vpn/headscale/headscale-0.15.0-r1.ebuild b/net-vpn/headscale/headscale-0.16.2.ebuild
index 856fe17a4444..690595a38384 100644
--- a/net-vpn/headscale/headscale-0.15.0-r1.ebuild
+++ b/net-vpn/headscale/headscale-0.16.2.ebuild
@@ -7,9 +7,9 @@ inherit go-module systemd
 
 DESCRIPTION="An open source, self-hosted implementation of the Tailscale control server"
 HOMEPAGE="https://github.com/juanfont/headscale"
+DEPS_URIS=( https://dev.gentoo.org/~{dlan,jsmolic}/distfiles/net-vpn/headscale/${P}-deps.tar.xz )
 SRC_URI="https://github.com/juanfont/headscale/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~jsmolic/distfiles/net-vpn/headscale/${P}-deps.tar.xz
-"
+	${DEPS_URIS[@]}"
 
 LICENSE="BSD Apache-2.0 MIT"
 SLOT="0"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index dd929150b90b..292c37ca0d92 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 1d0fb618f28c..65369af0c1db 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -157,11 +157,6 @@ app-crypt/kbfs
 # and no commits upstream since 2017. Bug #834383. Removal on 2022-08-26.
 media-libs/libgroove
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2022-07-25)
-# Merged into kde-apps/kalarm since 22.04.3, no other revdeps, obsolete.
-# Masked for removal on 2022-08-08.
-kde-apps/kalarmcal
-
 # Michał Górny <mgorny@gentoo.org> (2022-07-25)
 # aioredis has been integrated in >=dev-python/redis-py-4.2.0.
 # No revdeps.
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 57bd32ec88df..65e24def4c60 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index 381bb7e8ffc4..228b360d4c1c 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,5 +1,5 @@
 DIST eclib-20210625.tar.bz2 921173 BLAKE2B 8ecfde35fd6e557601c0a4e5f877ec49e355dbd5bb4248256c89b1160406992f59568db1060a835bad482d6ba4f1f0cc7719af5f03ecdc79abbe2ca0c9ed713e SHA512 a1319e91790decbc5219e02edbad5b86a6d3e5400bec3a9a9f2c60b89d340a0b915458f93c86f63d21c4b72995aa5fe65e0b5346241f297fe54ba2d3fc183ae3
 DIST eclib-20220621.tar.bz2 921610 BLAKE2B f53f0648f09e427ae9b208a17c93f9808c2ab859cc41db6b5acb3b1382e9aaee93b17cd9d94c14e7f4941f140749d91b2ad94ad684f8a2c0f6033ac042cc89e7 SHA512 45cc47256f6ccbf2a00711d14533cffe8a3fc0dfea3d94d9823ac43af8a56cfe95485f0559c9141203910e85b1d3fa3284ee12ca5e53d083b74cbb2907afca42
 EBUILD eclib-20210625.ebuild 868 BLAKE2B 29b76a0f676f8ec04df6ff8e145799411466740c388645333966c38d26f703878561cbe3a9eb10200799e4897f037bf6a9f8a6f9b72fde1a86e11132fa5b14d1 SHA512 387a22c5d13c847725e350e25fc0679ab1108ed1f564311c5a6b78849241bc45fce0fb30c966e53d827c951bcb23749e1626e72fda58024a9f7cdac55802f3bd
-EBUILD eclib-20220621.ebuild 870 BLAKE2B b836682a3768b7f9a6308cc134d88f1647403b8c6b4cb1d62a9345adf3a8804123ca57c30e29777e7499dee50be7f2267041a9ded5037c6edbb0774b5eb353dd SHA512 23aced798879540cdb33a9dc00a9c6414e0b297178b51e5d0726a3ce45ce73db91895a2f875ca6b1bd622202238238d5993201df144fd705fdb98aaeaccc2cf2
+EBUILD eclib-20220621.ebuild 869 BLAKE2B 46ca028cc712a8eaaf1a47fed105473d27abc2afeab903e4d91ef42cf79cce5783dab01387a0ad0ed291a5f65bb3fa28d01877fd4fe3a564d24d71acd62eb65c SHA512 67437c82d90b0f75a4e4f4a6f3fba489b7b1a7fa363b615d0ae71307b8fead2c92db005dfd37e708a983177ac6e5360442dd30990e864ae4c92a6d61e828e135
 MISC metadata.xml 1089 BLAKE2B d10f9af5634478f0f13595abd10d9eefc437c27955cd3f504165beb4219e55c3997f16271148c1c2fbb5c9ae71e08665000836658bb954b83db06aeffa2b4098 SHA512 7111f3231464624d356611372934d0604fdd7a05c3531342a372979292a068dfa2edf49c4de5840cbf07b6f4819c22b8d87d54d7cacefb28ce0f53576d4620fd
diff --git a/sci-mathematics/eclib/eclib-20220621.ebuild b/sci-mathematics/eclib/eclib-20220621.ebuild
index 1cd685e56faf..1a1ab3fc06b7 100644
--- a/sci-mathematics/eclib/eclib-20220621.ebuild
+++ b/sci-mathematics/eclib/eclib-20220621.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 # Major version of /usr/lib64/libec.so
 SLOT="0/10"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="boost flint minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 5a178ad608cf..3c587796e6e9 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4106be50b428..8f885eb95afa 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -42,7 +42,7 @@ DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.3.0-r2.ebuild 502 BLAKE2B 2fefeb929c4dd64837a4d27549624bc5c11a10f89ea29e73873f60506a332c220aa70dde76ce29a17ef023fea82ea6a7b3548f14b1a38f22adc028a09bd98d31 SHA512 7cfd3be4e22142ff7abb2a63c0eedfa42994a25753f45e47ad74a6bc266a467b25f072600a3578c12fbaae17110d957161e164623d31f5a3496447187e6e46ff
 EBUILD gcc-10.3.1_p20211126.ebuild 542 BLAKE2B 43170f8b81699ab102c389f42313ab6d448ee8097cbaa940cfd10eec884c3223b1569635169e6285b5810f07bde4d9d40d78003ebf6dbe07e32e60a80469cc97 SHA512 dfc4cd1ab39af930d37ff7d14bee89a92a575624e159223be56d2c695ee384afdc6ea84797d468c3b736992db8befe379c5cee04833772fe259d16d6965d58a1
-EBUILD gcc-10.4.0.ebuild 1451 BLAKE2B 47a4b14ff3e33a809689738704b3e0dc1e512471b7d6ada12d46060abfe748bfd96b3e2bc004865d3ef04b1bcdb34df87d75305454d53a72ff93dea3154b3d5f SHA512 f6a152b279250f3a5a5cd6dff115099ceb084ba7d259b1f21e9df94f5319024b51bbd1b6e82fa16a3e3b2c4edfeb13a813cbd76aef49f5fc6221e71250731973
+EBUILD gcc-10.4.0.ebuild 1446 BLAKE2B 8b28b55283e30c6524f5aed8e73ef7d80cac8a7f7aab3bd93a85b36d0c7f36ff112fdb821855425c08c57b07822024cd7e497d7937abc8cc10cc3c06a11f5ab2 SHA512 f4e100e43056317ea0bfcc50ded0c7a1a0d54b98e9eaee8ea1691de8ca920d3e414d5ae76715609eeccb8c13c25d072244090537868d4b91ea0da072b6b2887b
 EBUILD gcc-10.4.1_p20220804.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.4.1_p20220811.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B af5f165e046455efaaaca747c1deb018b0f43dad720129f72821879fe61790b9d2c233ae9ac0e8d11911b92d390c7a8b082b5dba5a771716f7d9b0aeeb1c6a3b SHA512 905b1f6108ac0608c077e940570829bf9c1e5bde5d852cdbae2b5fddaa304df76dd5bd4499dfb5d26667ced09b3a772567dd850169cec8799731d1cc0abb125c
diff --git a/sys-devel/gcc/gcc-10.4.0.ebuild b/sys-devel/gcc/gcc-10.4.0.ebuild
index b1253f4e5f32..31a46b613160 100644
--- a/sys-devel/gcc/gcc-10.4.0.ebuild
+++ b/sys-devel/gcc/gcc-10.4.0.ebuild
@@ -36,7 +36,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 RDEPEND=""
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b075c65d7f4c..fbc8a5ef3bf1 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 2a01f037da63..5ded86747cf8 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,18 +1,4 @@
-DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
-DIST patch-5.19-rc1.patch 90995640 BLAKE2B 0042e0a588fb4fa43259373e7c251e0f17f7640994d88bd1b27f73388a9a7a3229e03edc194f0cb719b9505fff651c7c9a4119c4f616040b35af7e500afd8d36 SHA512 bb2614786eecee03e38742a32dfbffce2b08881d35f51222dec88f9cec584eb1b60f3751e35f1a354124a162d443f0a4e345f6ee0193cebc29bc7ae5abb89003
-DIST patch-5.19-rc2.patch 91368249 BLAKE2B bef883f4eb087216758ed81dd83652f24486dbf918a7bdb3da2104eaaeda5cfbfa66b820c6085971b68b20daca9f0da2bca475420273ba765264dbed19b8e505 SHA512 8f59b859f7f464bc44dfb65f0d7dae435e01c5a6f2692243ba61249bd96e8b8fa5fa196461d0ad78ae90879d1aa9d89452ab93d1c86fe823a7a2f479b280340d
-DIST patch-5.19-rc3.patch 91707998 BLAKE2B 838fb540ad60b1e6f90e90d873d470ae6defe5762239ab0113b7c552f425ecbf2701846ca8788414b198dd9df541f4387c62fed8e111fa3d73f063b98b26a536 SHA512 18a9a9c3254417425a6a9a4f438322ea926f2667621102fd715f0557dbbdf282a73af0c786ecce7fdc0fcd58f33443f470594f6b6cfd52c983bbf9c35d1d55b2
-DIST patch-5.19-rc4.patch 92086340 BLAKE2B fec8a8ca4dc1f25f6f06c1b7b2031b9e5f40b4b6ef56effb9a6150ba88beda69ebe3a88cb5bd00ba8548490d3b98b573482a6cf5dc5ec2b8b006d61b67317279 SHA512 9a4f7b207d31e2a2299c47de8f3fbb01558512ebe899af132eb6b711a3dc92d57568b9479b559b4e1d1a7eb59c5731afe38673eb13d09b250ee8a3df2d7e4d4c
-DIST patch-5.19-rc5.patch 92286884 BLAKE2B 869cd7384fe6d7cb2752f7144b1fc8a030d1721e2502c0e4c20888b117d22c6411ea568852aa9e58459477f3bcea0b40762ec2bc37e1cf6e4467ef192223f4ed SHA512 237f3be30596050bf0654356511a77453e661e2724b67de9f3ba91db5260e30b5685cedc796f6ab39d5c28faf40c25ebf168f8153c95c9ee71e17af4a20378cf
-DIST patch-5.19-rc6.patch 92531798 BLAKE2B 6298e7c38d27c7711176d24ab82ef8751aaf15769ed77081805ad515e495b9461e08df5a1aff29f9305895fceb03b592b8596eb269405634a057e5bd3a66b657 SHA512 5f893e2395dfb8049993a577d764856e005fb8561a6a7a162145be963a9d83ad987f1ac45b05235249d35510f37b090664a2480a08da78083c45380ae5c3501f
-DIST patch-5.19-rc7.patch 92848147 BLAKE2B 732f15e4a6d81ec23a001064410cab9591e71f67d6a11cbee12d6274a9e72ffcc53330bc92b66f9b6dbbcd21bfdf72edb8d9b736743434b7d14f74b3b1ef7da3 SHA512 3786cf805de3e83aeb690d5cbfe9cfe3cad4993649bc4e2eebade6952a6d7d15aa4c0039a1b3aa77d93d131d2b20d7f22f227c41149871616912d0c42d6526a1
-DIST patch-5.19-rc8.patch 93071973 BLAKE2B 8a8b37c7f53bc54793a6ca695d138471645e43adf1d2a08e110e78ba2a34a38369d5a3f55636162c47f74071f80a65813ca9f28b1ae2382585519708b18d1ccb SHA512 48288e87f975a0cb6c84c62a8701240fc72c8b401f99dc453d90ac3b103ed8dd3f82bb7d4d288b6507c9cdb8b18a7f99e6d9013ed41c89c1e7479d00c251cf7e
-EBUILD git-sources-5.19_rc1.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
-EBUILD git-sources-5.19_rc2.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
-EBUILD git-sources-5.19_rc3.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
-EBUILD git-sources-5.19_rc4.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
-EBUILD git-sources-5.19_rc5.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
-EBUILD git-sources-5.19_rc6.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
-EBUILD git-sources-5.19_rc7.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
-EBUILD git-sources-5.19_rc8.ebuild 1192 BLAKE2B 17d7e9777b9b6ce5699d5a84adabe89e3d41d942911aedf4550f16e11abd992458de2114796e55e897173df1c89a1f93ab926b2799e04dc217153a3fdcb379cc SHA512 f744fd11e160faf85c23bac4aae3a0c35761ab796dae4ef301c1691821b9946dcb8d21f908963900e5da0c695362c78a9dc6ab14d72e61cb6745934dffafd603
+DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
+DIST patch-6.0-rc1.patch 107038239 BLAKE2B bea392cf4596fe326b58c08c20918bfe34d9bfb4ee8fca35b5930c35b44b721771ddd8d82fcb1c39f87b9fd3f072ca4e50417009346f0dcd97b930bcaa09c3fd SHA512 12113138533109c9939c8d1eae8982a4abaccc4c591c8d8f6a76e61a26bb04df94bd9074c2ce70126f712f7db031c6c2c7fdee3ff038e6926cb4aa5b7353e038
+EBUILD git-sources-6.0_rc1.ebuild 1192 BLAKE2B a6c16c1322a1b4a56b4bbd9cfed65ea98ce0dbdabca2226c5f7b3bdd3433ad8efbf1351bce2bab2703fcabd11b52451530755973b2e25a5215997317792321ce SHA512 0b9465106bfe1370fd6a91b2579c12e9a08e7db597240e4bbbb1bee017210b5adf8e11e71a1252dc0be1d4934f9aca049e98684beb983d02d4a6170169ade2f9
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc1.ebuild b/sys-kernel/git-sources/git-sources-5.19_rc1.ebuild
deleted file mode 100644
index 64a9dd30df4c..000000000000
--- a/sys-kernel/git-sources/git-sources-5.19_rc1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc3.ebuild b/sys-kernel/git-sources/git-sources-5.19_rc3.ebuild
deleted file mode 100644
index 64a9dd30df4c..000000000000
--- a/sys-kernel/git-sources/git-sources-5.19_rc3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc4.ebuild b/sys-kernel/git-sources/git-sources-5.19_rc4.ebuild
deleted file mode 100644
index 64a9dd30df4c..000000000000
--- a/sys-kernel/git-sources/git-sources-5.19_rc4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc5.ebuild b/sys-kernel/git-sources/git-sources-5.19_rc5.ebuild
deleted file mode 100644
index 64a9dd30df4c..000000000000
--- a/sys-kernel/git-sources/git-sources-5.19_rc5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc6.ebuild b/sys-kernel/git-sources/git-sources-5.19_rc6.ebuild
deleted file mode 100644
index 64a9dd30df4c..000000000000
--- a/sys-kernel/git-sources/git-sources-5.19_rc6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc7.ebuild b/sys-kernel/git-sources/git-sources-5.19_rc7.ebuild
deleted file mode 100644
index 64a9dd30df4c..000000000000
--- a/sys-kernel/git-sources/git-sources-5.19_rc7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc8.ebuild b/sys-kernel/git-sources/git-sources-5.19_rc8.ebuild
deleted file mode 100644
index 64a9dd30df4c..000000000000
--- a/sys-kernel/git-sources/git-sources-5.19_rc8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
-K_EXP_GENPATCHES_NOUSE="1"
-K_FROM_GIT="yes"
-K_NODRYRUN="yes"
-ETYPE="sources"
-CKV="${PVR/-r/-git}"
-
-# only use this if it's not an _rc/_pre release
-[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="The very latest -git version of the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
-experimental nature. If you have any issues, try a matching vanilla-sources
-ebuild -- if the problem is not there, please contact the upstream kernel
-developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
-report the problem so it can be fixed in time for the next kernel release."
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.6-r4"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/git-sources/git-sources-5.19_rc2.ebuild b/sys-kernel/git-sources/git-sources-6.0_rc1.ebuild
index 64a9dd30df4c..6789923d7615 100644
--- a/sys-kernel/git-sources/git-sources-5.19_rc2.ebuild
+++ b/sys-kernel/git-sources/git-sources-6.0_rc1.ebuild
@@ -7,7 +7,7 @@ K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_NOUSEPR="yes"
 K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="5.18"
+K_BASE_VER="5.19"
 K_EXP_GENPATCHES_NOUSE="1"
 K_FROM_GIT="yes"
 K_NODRYRUN="yes"
author	V3n3RiX <venerix@koprulu.sector>	2022-08-15 14:28:19 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-15 14:28:19 +0100
commit	1c3adf43f1b866276828623dd63f9e10d29421d3 (patch)
tree	08af6cfc34a399a31fab99fe6691383651b7891c
parent	49d7633bbfe37c8e50c9cd1815c4210ca0a38d49 (diff)