gentoo auto-resync : 01:05:2023 - 11:19:44

author: V3n3RiX <venerix@koprulu.sector> 2023-05-01 11:19:44 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-05-01 11:19:44 +0100
commit: c3d14fe9accdf0b091e42f26a66ed7626ba8c24b (patch)
tree: 354e4022d98ceadbdf02f98879cc8b1feb4d61b1
parent: 149480f9f5548b5a0fdb457abd473f8d10f60f51 (diff)
525 files changed, 2790 insertions, 3358 deletions
diff --git a/Manifest b/Manifest
index b526f4bf3e38..af3f2a8977f3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29481 BLAKE2B 8b23be77c215290f6fda60c5fecaf2f99c3d5c346e92fa706fc181f99c6dfcc0ea40f3ba93d6fe4a70a1cdd39fff570b29a45e918f573ee450295d562db9ecd7 SHA512 76b8e0d38fc9e806031457cf34202395b8226cd73a41365367e40f733ce20091e326d2d65c42159fa37d95ef1c04a81410741c8766c5fceda601266b484f07d6
-TIMESTAMP 2023-05-01T03:40:05Z
+MANIFEST Manifest.files.gz 29457 BLAKE2B 83dfb692a9a4533b4ada5c574cfd5c09078ff2e7b527eb4f6643115bb5b0ecbd29080ed3ff13c178cfa52a5c7c614ac4858a2ce1d6720b4dc8bf5df563c0b772 SHA512 af4e2377427be0a7628f497a7d20efdaa4c0cac1722d98c57ccd89fcb9f183f0c8f9470ea3c07bfb5a927104408a2c3493e7fef5624ed6964dabcdb4319deefd
+TIMESTAMP 2023-05-01T09:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRPNJVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRPiO1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klABXw//ant9cUkoq2iZzI158p+cvT4AACP8v9PL7x7QBd2Q0VI5ye+49saSAP7Q
-GEugnj/+wlJSRkujXERAYOBmHqobcn7pL0B/mvQ4n+HGQevgBkes+nOAleHLgaM9
-GrEXolrZVHdtbMrVga3uU0bMYVp0AS5BxnrP0KJqWyV+FgJvZnDxYx1Olj8KNAWP
-IjYqMVbI8X4bZuprSTILY2av/UN5U99K6r1+jCA2WTbxRQMhsKl8pQu/3KVC7dqh
-WYOxpUmag4HvYoXUit4P7VLvyf/zC4HOiMXc9MwP6ay5xVXQqIq/+8q0ynUfTd3K
-7Zm5I/NYo+g6JzYi+/9a+ZSuonGuR4CHhEHEHht41odkFFdD9BInmTOfhVkNAeU+
-kwSUhx2ayhX86hdKgkx3KWADuGw+OTu2+ttEjYbZfZs5ca0JUCtLRmE6dRKl3vpl
-CSEOM7vs8S37vp1j0Kw46ttpthyALrtyB3TPRN+tg2ScDHTD6EO3j/Oa9ss1kXrU
-OHt68jYfkoWAKWdgjU7XlPRB66C43Cu2EPrDXJcmsE0bIKlf8hd8nWAAsdP1rT4Y
-Iavh/v/pQ5P2807fe6wLYUsyQncEThQYb7y0bklWSOYsErM1im2BkyOWUK7LIkN4
-0Zcpgfk+TC7DjrgscT7ZvOIsobvyQrezc/Gr2blIQAVErFXS990=
-=sk7g
+klC4Lw//Q0ou5ERqrMmqV+u4C03vDAUmPglk9gLBTXOeXBhqLcXTMW2GPortCevm
+mA8fHB7ccarUs0OStZkkYEeZxkKsV/dy48oz+wUiV24jwyvVw4Z1nnkeoQl7sO0s
+m5NjGjSDm4yZcznQU1Nj+SZdtYjP0WGSrvAMUC796eikpncVwEJ+Oj/i28s1z0ep
+kyYXCQPf0oVSVLWR8c+CW/45+9al02dJV0+e4kjKNugH59t08MgPHAwEH9E0uzba
+z+XeDOvA4Ra82e5WpGCPf76RT2hflbsr2iwE2ZMH20AupRKYYuy/GibLzlzl0DIT
+tXVfZewXSzLUH/Ky7ohVlWOlEmQD+FN+821Nlb2rYBJjk/MjfQv529pIYtjlggdI
+daDsOY5zgMsIP/oA0ieoDOy0x29ldYbNY3EH1Oav4zWHAULMvGA5pwsLlW67vDRy
+NxSdDSxGJ+7qRTPdm0x99s9c+JFS2Tf6DmzpOLT0e71YcUS1fy1tz+BwO29eTxej
+7+lkxw51gXhXA0JBpQhZNOVzIoexCIX0gkMsNKwfO3ZvPVJBSQkJ6BxO+3N9BM6Q
+z/3jwttfLRhOwbtXJijwpM4UMBQaeOE09SID8cQQH1ENz73pJpZNvaMujf7+h61U
+WndIg2wgR7Rcg3gAejdLijXeSjvLAgpJ8JhiGMpfIdG8xoSgk4o=
+=q0XR
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 238a428a35d9..649ddb28aae1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 8986e9632fec..46f9d0508b7f 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index f411e2f55a06..901fdc595b05 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,3 +1,3 @@
 DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
-EBUILD patool-1.12.ebuild 309 BLAKE2B b64fc668ce7212a90a187d11c01d6c112e3847c7932ba46703ae67bf003b641d5f4ed46f032ef5a33556830907de6e57d0b7546875132072b92288473938ee85 SHA512 a9755303a92f52491009e07708dbcc4904cf980d922cbbb21bfa6a5807deda30d156fef7cbbd7539d6a142d36a7d9ad08c7044ea2080b0bba1af3dddc0c3adf2
+EBUILD patool-1.12.ebuild 309 BLAKE2B 52083e7c430def04d0dceb298693060e25db3a521055909417d11f1ea29c078370402542dc402764cb722dddf3e6700700d5ed408f365ca7d02edf6b66c8688e SHA512 75b3d106edc6f7004ab104a60760259fc51b752c40d8d5631a6ad2212068fb6d156473827de16a62df9dcf2e44a7c4e3767a62fa8e1603aea9052348399f37da
 MISC metadata.xml 297 BLAKE2B 138dbdc9e037c29e668c846a1f2bdf26e6a868e2b3212f2a698ed50d58f65dc0254d6ad7ea90cad41e0ef17079926855f729c9e971c9c77ffd9218f6a5fabe7d SHA512 d16456723d4eb13816bc7797f7e24e22c7b15bcb555dbf1f3ccea77eb67ddf05b164ff9ffa051d3649cc66c4ffb38c82d35a84ea40fc6965a5f7a6f806ea8efa
diff --git a/app-arch/patool/patool-1.12.ebuild b/app-arch/patool/patool-1.12.ebuild
index 2390c5ebb8ee..2adf0587e37f 100644
--- a/app-arch/patool/patool-1.12.ebuild
+++ b/app-arch/patool/patool-1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 pypi
 
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index a25d5800a1bf..6e39594f1845 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -4,6 +4,6 @@ AUX snappy-1.1.9_gcc_inline.patch 3166 BLAKE2B b4d05035647a97709ba43ee9673fbdaf1
 AUX snappy-1.1.9_remove-no-rtti.patch 1420 BLAKE2B de5194681f365e8d34ac9f56fb3951caad18f1f8af9c3fd65e0ce21de0dd45e8b5fa28c831d04bedc88c8a9fd3b3745c6bacd696b407bb23be766e259ec05aea SHA512 96e16b453ee5e7718930227c8203a5e814e5c0183cf3e13a310d232551dff32bae08dd88552acd714cf373cf7f052630d9c4091776c72d3f451dd395f8bba1b2
 DIST snappy-1.1.10.tar.gz 1105312 BLAKE2B 5195335fb1883974d290e7dca2b6d928bde2b183f3f61bca9da28855b39fd9a4ee1c24014322d238d2ec94f3a3a55fd43110c88283e85865272226e11cbb4834 SHA512 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070
 DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
-EBUILD snappy-1.1.10-r1.ebuild 1498 BLAKE2B 2370b2308ced4e7895b2bd08fd333800cb45d9aecf6e950d4226cef6c58394292d7ec5ca6e94fa21d5faa61b6a6df9311caaa1827506558dd72055e27846045e SHA512 cda24631141edf6f73fa03c69c42121ffabb1c4c848895a15e22acfb8e8b3791adc8d3389be8e892dbd25a89fd3af6b584ea1c8c246fdc3ee5e6fc2ae219136c
+EBUILD snappy-1.1.10-r1.ebuild 1496 BLAKE2B 43e6e9d29cb153100086ec377a1b494beb70303d872dd3c21fceba7a22cdf03717652e1f14deb0ef4b853442706fdc690367995866161325d8604c04ea3b0488 SHA512 ac2d9c78ec6e08bc1060137ba4a2568bf69e28bf724c68ce0648e024195098aedc84dbe961b7615a07817f5c87da7204a6a996649855e3e39ee82acbb91af805
 EBUILD snappy-1.1.9-r1.ebuild 1259 BLAKE2B 9678bcc5829074ffeb2bdf2e05f028c10d2d5a58611242ca6dafcd83b11087ea754b72a2eb4e77e9dddd6b6d36f0606ca5ad4137881b51642f8a4dbd97b72b73 SHA512 f7ae64ae9963d2605c1be080b55b973d59666d8a50821c8e5e5d33acf7718baa0a815037adc41ac8735561e2b4e5fb613aa915ca6e1c4bcb029c61e4012935f4
 MISC metadata.xml 801 BLAKE2B dd35b7d1e7c5113cdf16e4ca002c07bd433f47265486a5f1710c3908d7d494b5c6dde77ef1ede60cab913b74b8ff645dcd89cf2c59b21f313e6cd4f4b4740dfa SHA512 13d13dc4efa03efdded3c8e9313753315a132a05d4b53471f7268715c80a95faea18df466eb9b3a756a018fc21e5f5b31cf10b024652b94cd7cfd40f44d56cc7
diff --git a/app-arch/snappy/snappy-1.1.10-r1.ebuild b/app-arch/snappy/snappy-1.1.10-r1.ebuild
index 14b36d9b7c69..83cd13e6ac21 100644
--- a/app-arch/snappy/snappy-1.1.10-r1.ebuild
+++ b/app-arch/snappy/snappy-1.1.10-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 # ${PV%%.*}.FUDGE where FUDGE is incremented if ABI is broken without a new SONAME
 # Please use abidiff on bumps.
 SLOT="0/${PV%%.*}.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 02aa9ee26706..e4280448d608 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -3,5 +3,5 @@ AUX tar-1.34-fix-cve-2022-48303.patch 1123 BLAKE2B fd1fd30443372eb29ba6168ec421b
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
 EBUILD tar-1.34-r2.ebuild 2835 BLAKE2B 055771c521466673b972532b36c8150ea6dfed14db5e9a70cb7b1dc7a6a23fcca0e141837a45fc5dc5807242d4ee473eabc95f1cf3ae55a9f756c92b64dca16d SHA512 168e92f580e1d21e92b424482dd540b79f9e9dfa0c07e2204f34f043a601c24e291c9158833f84e48a5ef13de28c5e7ef07ecda7bc22d7a4c6085ea54dd553b9
-EBUILD tar-1.34-r3.ebuild 2895 BLAKE2B ebd808a132c19cf07e9965be0e069c43dbd2a355643fb8ea952114c315b17b184f119942da4d07e2ba131d212504a6bd1a26db1bec4c3ba65be6487ca3f08517 SHA512 53b62966aaa6289685d47244186fd0a704675956d92aea54db1b4c179e49e7c40e16ee0a225e9f2be270dd275c44a288ed5fd10cbc7b4c2d5c91492a8c66d620
+EBUILD tar-1.34-r3.ebuild 2894 BLAKE2B fb91462b6e85b2340e9811059b3a7298060496bde76486660e8dbbb0fec7662302f294839bb46bc7c262599926ab6f21f2b199d38fb8075a089767a1b6bbebb7 SHA512 7bb5910b9ee67f139b0395e04a31ae9ff751afb725aed7dedd1f7c559cad6fcbbf029b0f7a3b03f243ca50083fb38f043736e741c5b6cf86f7af38cdcdda56a0
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34-r3.ebuild b/app-arch/tar/tar-1.34-r3.ebuild
index 7fcfe9f2a31d..8e3fc53e5d28 100644
--- a/app-arch/tar/tar-1.34-r3.ebuild
+++ b/app-arch/tar/tar-1.34-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="acl minimal nls selinux xattr"
 
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 2e60e46a845d..4c46be9e9c16 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index fed329f782a4..dbf413f816cd 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,9 +1,5 @@
 AUX devmanual-eclasses.patch 486 BLAKE2B 7e772ed7386c199c697808137ecf6f999e60ff32f05a89eb0ceeb41b34576d667996fe9b7f7279b87a40bd8c1efbef5415d69be1b0b9f9f0954e813ab890ffa5 SHA512 1f34bf4e0ed105122eb45ad498ddc737774103720cef9a3a30346a16e85173bc8fb38dc9cc1e9bb2d9b902feb167e5df0ff4cb39f62640f4314fe750533f7cf3
-DIST devmanual-0_pre20220326.tar.xz 183228 BLAKE2B 67ab1a24e8f1043f2d7938a76f4d819ecfaffaf3516cf5ce9eff20ac0e481c60be06c83c4adc3835e6ee66c44def290aa682567662dbf7a7a7057b0d168e1677 SHA512 364fe3504ba424201b450e08fe2043e55d1067c3603c4d3248112117461a4ab667d50f82deac9daaf50e28ea5d996c1ae08668d55b7379915cc175f66edddf9b
-DIST devmanual-0_pre20220625.tar.xz 185236 BLAKE2B 3fb6bc0ec184c611fb10aa3062ffc7cd12e1d77a5a093fd13f7958fbf3494c42dc9674e10164c67080d1b5af1dcdc2fa09c017aeaec77e09fdd87cf63556b4c8 SHA512 46f44a9d77b0f433b9f8bbe48f1a2c9871c00a78f9726b7bed8aebb1e389898e0ddcbcee313ff277fc3946b3b2d46b5a23227c4f6d41cee467605086c182ba56
 DIST devmanual-0_pre20230121.tar.xz 185536 BLAKE2B e099b3644ee84148f6ab7630934beb80420501aae76774949ec16529d64716c09bfc26a0e7a3641c5cc2809adbf00e5560b04182840799e229b30182e4920dd6 SHA512 370cb49d5b257f8efc872bc5c85a53aabb3a01fc0fc8d1f65144e27a5ff578286a25987e62fc9874dfdda7bf4864e7921d31e97f43db12e75bd59b429314d369
-EBUILD devmanual-0_pre20220326.ebuild 1577 BLAKE2B 4057e847caaae24711dcf5255f7a67a431858b566f19a1bf28d17135b8310eafa5272e095dee9d6be11d613e0c1fbe5b1f75fb99b2fb11cbeb4a025dc635bd02 SHA512 93e0fb13941ab548ec82c103e2f2feaefdf40beb4d65c5a61e357a7ea5b9679dca98358ee9322fd87234e95d6e4cbe5b45a31bc0bfb98925568d171dc3e01414
-EBUILD devmanual-0_pre20220625.ebuild 1583 BLAKE2B e0af380f580cd58b9919ef301d0b2082697ef4cc0aad32950a6a5936aa81b327a514c23e034cce997a5e7440d4fb78fdbdc1da884ab902f93691ed187273c56a SHA512 1fb60fd0f28aca7b522a4b82632e92a2eb1ee1f7716c4c9cdf64691c2d990ead2bf562b99948153ae080478aa6b2252aa4b40fd830a9ce0cd0cdc932275e697e
 EBUILD devmanual-0_pre20230121.ebuild 1579 BLAKE2B a470d7713c0381c104127ec9bd5bd16fb897e0df2f3f1b39f534f67aa386ae9b49804c52a338c4ee72249e86bd8241377fd3359fb21aa275c5135ec13524af30 SHA512 1ad09987c2a2761130d9d1cf8c4d233b9f2189605a3cb66d610a2f7b5307941055f9345d8a6dbc852f1051a2842be08a9ab347f6c8c6242a7a7e4066ae497a22
 EBUILD devmanual-9999.ebuild 1585 BLAKE2B 097d404860082cbb28595d891e6b9c3cd2e4d6d2f220898abc228222a5b5618f89856441fe7af8d82f14ed541dc69d7a29c92b8e88da8f540b68c700634c0906 SHA512 8b66cef245df07f8289cbbfcd6d9b9fce16a84942f4b85e995d1c4f60d415abb3cb243a8c177051287db736afc62cc172671ed1936c007ad0d85442130c5a3b5
 MISC metadata.xml 605 BLAKE2B a51f587e2c9a370f59d201e8be98d11ec9fe5beda3de6c4ba4275ef5e1618f86ce49f6babfd968af102eda33beea40e1206ad9c019ed1f6ba0deac5128701066 SHA512 a67dd2e7ab753d3456407d44895c8081c5ee23c751f1ce4463f021c84fc4293379200b5d5d1322faded7f904c14824a01fbf60edea79a35afaf2e403d252f42c
diff --git a/app-doc/devmanual/devmanual-0_pre20220326.ebuild b/app-doc/devmanual/devmanual-0_pre20220326.ebuild
deleted file mode 100644
index b5a07de32b53..000000000000
--- a/app-doc/devmanual/devmanual-0_pre20220326.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="The Gentoo Development Guide"
-HOMEPAGE="https://devmanual.gentoo.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
-else
-	# "make dist" in devmanual repo
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE="+offline test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-libs/libxml2-2.9.12
-	dev-libs/libxslt
-	gnome-base/librsvg
-	media-fonts/open-sans
-	${PYTHON_DEPS}
-	test? ( >=app-text/htmltidy-5.8.0 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
-
-src_compile() {
-	emake OFFLINE=$(usex offline 1 0)
-}
-
-src_install() {
-	emake OFFLINE=$(usex offline 1 0) \
-		DESTDIR="${D}" \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
-		offline mode, point your browser to the following url:
-		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
-	if ! has_version app-doc/eclass-manpages; then
-		DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
-			include the documentation for the eclasses. If you need it,
-			then emerge app-doc/eclass-manpages."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-doc/devmanual/devmanual-0_pre20220625.ebuild b/app-doc/devmanual/devmanual-0_pre20220625.ebuild
deleted file mode 100644
index 78dd10aef4b8..000000000000
--- a/app-doc/devmanual/devmanual-0_pre20220625.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="The Gentoo Development Guide"
-HOMEPAGE="https://devmanual.gentoo.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
-else
-	# "make dist" in devmanual repo
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE="+offline test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=">=dev-libs/libxml2-2.9.12
-	dev-libs/libxslt
-	gnome-base/librsvg
-	media-fonts/open-sans
-	${PYTHON_DEPS}
-	test? ( >=app-text/htmltidy-5.8.0 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
-
-src_compile() {
-	emake OFFLINE=$(usex offline 1 0)
-}
-
-src_install() {
-	emake OFFLINE=$(usex offline 1 0) \
-		DESTDIR="${D}" \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
-		offline mode, point your browser to the following url:
-		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
-	if ! has_version app-doc/eclass-manpages; then
-		DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
-			include the documentation for the eclasses. If you need it,
-			then emerge app-doc/eclass-manpages."
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 252144454476..5ff332a102dd 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 7749dd4dbe36..c7e7a81dfd32 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -20,7 +20,6 @@ AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553
 DIST VirtualBox-6.1.42.tar.bz2 165554573 BLAKE2B 8419793d9e4c4d0804baba926443a27259b012ab90d1bb27c8f9d90b018ddbef83d1cc47e9f5b88e6e247f22c186603584a5ddee4b0c04fe842eba56f3fd103a SHA512 a4861b44ee85d6d1d72ba1d19b5598873503feeb6d562cf7d8c770cc9b466741bdfa5abe74dc4e7952ff189d14c6caf60f584731492c38f688a360baba019ab2
 DIST VirtualBox-6.1.44.tar.bz2 165775421 BLAKE2B e87d7175bc616784c79d02b595d81119cedc7f4df1822b71ca10b85d44d5cd1dacd999e7867a0bef8579ea715ef732b990cef63f3325fff0c139abe394d88ad7 SHA512 49c3baa1a40dcafcc6b31d0abcfecfcb24305de44e5efd3f68ba4443574e21b8cc34d7288e0fbc56730bc3be2bee07089b7dfed14848a88dc38a1433b6dda8af
 DIST VirtualBox-7.0.6.tar.bz2 199512172 BLAKE2B cfe4d7abd57dfdb0294177759e80aa9fda797b9b5433f214771a57764cb23404450169e8c7c30cda13de85b8e02a37024584c7b1f0b5a44b10b100aa66b8d5c5 SHA512 f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
-DIST VirtualBox-7.0.8.tar.bz2 199298777 BLAKE2B 6e36532516fb1ebee4cf7f356659a8cde6bd5074a509c824499ed34d8d0ffc9aff45211d4dcb35e3977fcd72a9b18796ed57f8760dd45e578d8225814c4c8710 SHA512 4c25f8275269d085cf347596a242b8921f140e0e40d8c44fd6b171742b8cbd0c9a45f4702dbc0c1272e10091be68c3668711c9e4d1a8b3ce57d25f871e0eb9fe
 DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d
 DIST virtualbox-help-7.0.6.tar.xz 3939412 BLAKE2B ea1326bccb3c2edc33ab37e122a7bedf79475d335e632ee62f99e0dce4b80de7634cbfe121c8c7ccd6588ff3b81effe7b20efe123cc44bc7b1ff4f6a851302a6 SHA512 ffb59f0c99c91b165a0b83d29317e04eee9097b0d0ac92a0d3e71558e70ec8b2807491a4633562a5e820e5f5a8e1339883031fd03de93d09a188f19b8b4d3a93
 DIST virtualbox-help-7.0.8.tar.xz 3941816 BLAKE2B f1c82ccc8a0d4e99f2302a7024a551e7e4a70348b193cf0c3a3b2917a717451c74d652555cadb278f6e27c47dac88a8121acfe9425bc0f5b82b5101475f384b3 SHA512 7483c4321492effb5b4329d48b363d8d2b3aaa248c0259cd06569497090aa438c39e94d6a5da4f511202f424e596f66e7580e37ffa5da66661fd0fadcd99c5ef
@@ -29,6 +28,5 @@ DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0
 EBUILD virtualbox-6.1.42-r1.ebuild 18627 BLAKE2B e25ef4b3fc346ecd36c4a40ecf5aa629b5002d437dd8a81dd045d729ae987d481fc72e2dc38641b1e9a963a329703d2e316139e96decc964adb3a507cb8b3723 SHA512 580ba716c626f0fcff79b1f5fb3d159be44faf4fb763fa5838237d15f3076942306cbc4285fb6b2148f04988a972d8053cebf2305147db1d084b2780682b7e9f
 EBUILD virtualbox-6.1.44.ebuild 18625 BLAKE2B d7a2d17cf904ff24741bdc184bc4c5c2b01b5e4bd0dbb1b6ee5a37983051a45f72229bc7321488926284823f68c0b48bda7342d2548f950abca4929387cef9d9 SHA512 0ae8b87965114abb4668aaae56d38a9336fa5f0acd0d3a01479eb31fb1011927c18a64eee76e178fb67266b894e88d530ca84a83c3997d8557082ef53313e20b
 EBUILD virtualbox-7.0.6-r2.ebuild 20395 BLAKE2B a51572013b0ffc561325368b5d3e3d6b755d58ae5d74a06aaf346650e31c8cc21d7b33a64fc7a01079a78cc3e7da4e82653ec4f60099e16bcc892033765ff4d0 SHA512 5f1b93f532236c3c1ddff26a45ac400870fccc9ddee2a98d06d9d94a1d204f191214b3a1153ded2d4a64d93f279a683b14bc2385de7f9807bc6eb735b6268bfe
-EBUILD virtualbox-7.0.8.ebuild 20557 BLAKE2B a5b2793a0618c5edbb6ed847faffe678c7fe87cbf9e517bef38ae2e9b35386bae88730538c514ec215cabd230b314b78b3b1851c59c6155fb26341f10e1fc4b3 SHA512 4ad836ee2ce2dc8ae3fd423341ae47add423fabdec9e2866b49e64b8034d4fcc465f96e28cd908b2e63f6fe6026e26084483796ec452018eb53d09cba22a19f6
 EBUILD virtualbox-7.0.8a.ebuild 20603 BLAKE2B 011b51838224e0959d3b162dcc944f11ca12826374da6ecb84c4267eda9afe6bb3ce39bbcae56d60ff872ef7edb430abcd44021ba3b3f9a80ec78413950bdd0a SHA512 11ca2792e0cad618f7ce99a67c199293ed7dba7950c8bda06563fc1c07ef8777a842bbca3811d924d92928dead9c0a8bcf7993db0d7eb2e7089f94bc9413a019
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/virtualbox-7.0.8.ebuild b/app-emulation/virtualbox/virtualbox-7.0.8.ebuild
deleted file mode 100644
index dbf3c33aa1b0..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.0.8.ebuild
+++ /dev/null
@@ -1,733 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
-	python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="
-	https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2
-	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libtpms
-	dev-libs/libxml2
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	net-misc/curl
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		x11-libs/libX11
-		x11-libs/libXt
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	lvm? ( sys-fs/lvm2 )
-	opengl? (
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	pam? ( sys-libs/pam )
-	sdl? (
-		media-libs/libsdl2[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXt
-	)
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
-	vde? ( net-misc/vde )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/libxslt-1.1.19
-	virtual/libcrypt:=
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	gui? (
-		x11-base/xorg-proto
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-	)
-	java? ( virtual/jdk:1.8 )
-	opengl? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		virtual/glu
-	)
-	sdl? ( x11-libs/libXinerama )
-	pulseaudio? ( media-libs/libpulse )
-	udev? ( >=virtual/udev-171 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	gui? ( x11-libs/libxcb:= )
-	java? ( virtual/jre:1.8 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/tar-1.34-r2
-	>=dev-lang/yasm-0.6.2
-	dev-libs/libIDL
-	dev-util/glslang
-	>=dev-util/kbuild-0.1.9998.3592
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		app-text/docbook-xsl-ns-stylesheets
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-		dev-qt/qthelp:5
-	)
-	gui? ( dev-qt/linguist-tools:5 )
-	nls? ( dev-qt/linguist-tools:5 )
-	java? ( virtual/jdk:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
-	"${FILESDIR}"/${PN}-7.0.8-python3_11.patch
-	"${FILESDIR}"/${PN}-7.0.6-gcc-13.patch
-	"${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.0.8/patches
-)
-
-pkg_pretend() {
-	if ! use gui; then
-		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
-	fi
-
-	if ! use opengl; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	if ! use nls && use gui; then
-		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
-		einfo "will have NLS support."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
-	rm -r kBuild/bin || die
-	# Remove everything in tools except kBuildUnits
-	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	#856811 #864274
-	# cannot filter out only one flag, some combinations of these flags produce buggy executables
-	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
-		append-cflags $(test-flags-CC -mno-$i)
-		append-cxxflags $(test-flags-CXX -mno-$i)
-	done
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	if use sdl; then
-		sed -i 's/sdl-config/sdl2-config/' configure || die
-		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
-	fi
-
-	#443830
-	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
-
-	if tc-is-clang; then
-		# clang assembler chokes on comments starting with /
-		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
-
-		# clang does not support this extension
-		eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
-	fi
-
-	# fix doc generation
-	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
-	# replace xhtml names with numeric equivalents
-	find doc/manual -name \*.xml -exec sed -i \
-		-e 's/&nbsp;/\&#160;/g' \
-		-e 's/&ndash;/\&#8211;/g' \
-		-e 's/&larr;/\&#8592;/g' \
-		-e 's/&rarr;/\&#8594;/g' \
-		-e 's/&harr;/\&#8596;/g' {} \+ || die
-
-	# fix help path #891879
-	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
-
-	# 489208
-	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
-		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
-		src/VBox/Frontends/VirtualBox/src/main.cpp \
-		src/VBox/VMM/VMMR3/VM.cpp || die
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-
-	if ! use nls && ! use gui; then
-		cat >> LocalConfig.kmk <<-EOF || die
-			VBOX_WITH_NLS :=
-			VBOX_WITH_MAIN_NLS :=
-			VBOX_WITH_PUEL_NLS :=
-			VBOX_WITH_VBOXMANAGE_NLS :=
-		EOF
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-
-		$(usev !alsa --disable-alsa)
-		$(usev !dbus --disable-dbus)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev vboxwebsrv --enable-webservice)
-		$(usev vde --enable-vde)
-		$(usev vnc --enable-vnc)
-	)
-
-	if use gui || use sdl || use opengl; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !gui --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
-		vboximg-mount vbox-img *so *r0; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
-
-	if use pam; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use sdl; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-	fi
-
-	if use gui; then
-		vbox_inst VirtualBox
-		vbox_inst VirtualBoxVM 4750
-		for each in VirtualBox{,VM} ; do
-			pax-mark -m "${ED}"${vbox_inst_path}/${each}
-		done
-
-		if use opengl; then
-			vbox_inst VBoxTestOGL
-			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-		fi
-
-		for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		insinto /usr/share/${PN}
-		doins -r nls
-		doins -r UnattendedTemplates
-
-		domenu ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc; then
-		dodoc UserManual.pdf UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	elif use gui; then
-		dodoc "${WORKDIR}"/${PN}-help-${PV}/UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	if use python; then
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
-		if [[ ! -x "${python_path_ext}" ]]; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if use gui; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 430bfd9415db..f785cb5c5699 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index 72988241f5d9..5dd687a24587 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -2,5 +2,5 @@ DIST eselect-wxwidgets-20180529.tar.xz 2380 BLAKE2B 2f5d5e79b9cd85442b0aa0d1453d
 DIST eselect-wxwidgets-20230114.tar.xz 11328 BLAKE2B f417bd1549d12b9a0ec629d92a38863caafc000a6212560f1405930dab6149c106836d0d1e61d8dbfad14059c628775e85fbf0ecdcd909403e06f666aff5e684 SHA512 0da2713e61920792a89e82334b1561464a0afbc61aed7857b7029980370b7f023edcae0da8d7225f091e65dc207e6c346cd4bfddcbe06a71264f597ecffeea95
 DIST eselect-wxwidgets-files.tar.bz2 9126 BLAKE2B 47ec94aec721d325fc483ece28e84b48c35b103078415447b6e79e68ab44af9356955c960b9464713396f4cbbf663522e5a4493516414641aa5b99e7cdca0ac8 SHA512 c5aba3bf4bbb891534e0c7a444da6cb90a947dab407e436a1eccd13ddb33251816ce95b5fb6826aa9a64ec2b3d9be09c9852859597b0b8ce91cbaf0f6ed6da5e
 EBUILD eselect-wxwidgets-20180529.ebuild 1475 BLAKE2B 175bb052deea18c0b3af895e9059df7d43cda8f1ecfd3af1f999a9b2e0790684fc197552a20850c2f2930d102a0c3756d9d51d554739a6868bcfaa13ded3ee16 SHA512 21c257c106e5066e4ccf649efd08485392442882ca9174ad43bac0ccceb28c3996314ce99476f7f4deb6c426d4a5469457916331ce6435bcdadad44f9aa3217d
-EBUILD eselect-wxwidgets-20230114-r1.ebuild 1368 BLAKE2B 41a57b7d0c25144cb27d9906682548f681904e2bc9c77f0fa50270df6f56adc2b5440a5d01a2b87c15bb6cff5845e7116ad33a913c51fdf9be60a4c2370aa417 SHA512 aa198dcd6b6e49ba85679d2d66efda5ad10013a3c8b17405b8e6b88ce136629c59988a7e334cd5a1f8a8f53b370b97ed97c2cdde3ecfe38efce34282c680e886
+EBUILD eselect-wxwidgets-20230114-r1.ebuild 1367 BLAKE2B ecd3d54b1329c30a02f1a5a3e1e8d0a02bbffe5e99a817ee9bcbc12c9cc758565f7e65f39f855c15edd868fe4ffc9d9f368cb040535d8f66143faebf832d8829 SHA512 03c458c34ce4c386d0d5d4d22d04c4d3ec1dc7b70b6ddd38f786e15d2a1c427b2afef9a5b2d28bb38f6e158f325cc0835e7661aa4729faf8abb62d5ca7f90fbd
 MISC metadata.xml 286 BLAKE2B 91c8e29e8be49c7c6771d57afcc8e56318257f45486adcc9c783b8e658b144306cf9afb5e40ec85a9efd83d1b94e7d849234aaf9c19fe161d18d7a4dce548d5e SHA512 8c4c678d180c83ab8b5235d415a740593795675c74118aa927965a2edb18fa411b17797b0d4049cc67428420f6dcd40636267a7784b61bc5dacd27fb59bcc5fb
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
index cbdc30a9a6a2..d1bb0261662b 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.4.13"
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ff6bd89ef24d..fe60752c3a1e 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/volatility3/Manifest b/app-forensics/volatility3/Manifest
index aff0fac0d62d..f26a45e57f11 100644
--- a/app-forensics/volatility3/Manifest
+++ b/app-forensics/volatility3/Manifest
@@ -6,6 +6,6 @@ DIST volatility3-2.4.1.gh.tar.gz 486648 BLAKE2B 7f00ec6b57eb9ef6420f4c1aa735203f
 DIST volatility3-linux-sample-1.bin.gz 143967523 BLAKE2B 3321e991a50b6e4ccf19e0ee48d779664f43f4cdbdb950ca31a5d08c8ee9de0018e2d4f69f42206f7e8f1c6ea735c47f8aa42806ed0f85e9a837b611f07b3289 SHA512 82a34aa1d4e7d7deb9ea12e892f14ba0a28908b2da2e31ca76efd1e9e59d87769064a1ffffe8979a58b992cea7005fa20954df50984dbe1dd186513ad95168d7
 DIST volatility3-win-xp-laptop-2005-06-25.img.gz 180343409 BLAKE2B 9fc10ddb9208d7023854e9619f6cf5ce140f2a2aa5772ccd8bcd852dd50c6f77e36298dbf7df1512334e7976b6ab35dd77f4c49505e531c3a289dd0f26cfc01e SHA512 a1f758cc1b4febcf11f64bc01b872c7528d19c686d81f8e03d742424fa0600254914e656cdf35c3752b406354f769a8aa256622b2f2afe2d691c4bb6d3be3f52
 EBUILD volatility3-2.0.1.ebuild 1075 BLAKE2B ac2c0c43b7d1a34402f02a6e6081c66af2a4ab77085a5664edde6a32113f5ee8c01376979ee8e3ed6d18da58866d07ce151f78060ff05a2386b4d712348badf3 SHA512 f20c054f84810af6b340dc429bfd64259a9e2fc7212edc367eafc0a308c236245ce98978982a00022d28dee9cec3048867ba450d628ba1e2a7ebff96d3b036dd
-EBUILD volatility3-2.4.0-r1.ebuild 1916 BLAKE2B c4c9bdf15b29c60df0515ce022bf5f82679acbfafc81c2fdedd875ae4b09a7132c10532a6c651f1f0f1f860708615b22b1393af4ea0019c2978dd11fe9eb99a9 SHA512 9b879ea3e2f56bdab05cce8d1a3d922a57b9377e5cd5bdda03f37340fe54d247ebede6c757082506c3fb880dbaca243954315995b9bd6f4698e560213235671d
+EBUILD volatility3-2.4.0-r1.ebuild 1914 BLAKE2B 40ec32e377ac2b4fa49a9a4a7d77375e80556ee2d15a56ebb5981e8df9cf24db7da99c8840fd9d9b65bcd6af80400ac95ea8c615d9996fa5e8e47d6518daed76 SHA512 9f095fc3467c61c951bddfe6a658d545c3965fdce5afa2bbf21cccabaeec3b7117d3973363f73fafdec3ed9905bdfa85d861f34d0cb438838be2304025a3f55f
 EBUILD volatility3-2.4.1-r1.ebuild 2090 BLAKE2B 82d84b0526f147194d19457c532b217bf8bf460e5a939fc25f3756f19c74a280384b6009d993ab9843d8f5a3e50e93c600f72735fb7d84b8eef03f45b572f1e9 SHA512 9931541534e634d816df2c89913bcb319206bddf8a9ca3257ae2e0b85bc1ebed37d0fe1b8921c7054d80d20661d7a41200cc5801b08c085569f139a15b17a532
 MISC metadata.xml 1353 BLAKE2B 6646bfc20fcabe361b50e05b55aa5f16d2b551706bb16d34477409611d10bd3ca398f487435bcc95e2f6c7eb2b2cf6b4104bae6bb6e5e603bc17c366631895d0 SHA512 b52a0032a4b6d5b9ba46dccf4cc7c4dc0f25afb9cb9051815366eda62de29fc67b78aea16b2835994ee5885f206868bf7311b7a1cf1646108441cee90c01bf3e
diff --git a/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
index 77dd21bb52d0..730afe82d72f 100644
--- a/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
+++ b/app-forensics/volatility3/volatility3-2.4.0-r1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="crypt disasm jsonschema leechcore snappy test yara"
 
 RDEPEND="
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2c7d8414472e..2af0762cf786 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index b6866eacac62..46d2cb92bae0 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,5 +1,5 @@
 DIST manpages-l10n-4.17.0.tar.bz2 108073280 BLAKE2B 4604b0c406cf16bb87ef5b7d1f43868b0ecfa085cfdfd6717e2156bd953ead0fa33d6960b78cd9e98a8e8c448c7c01bc669b91b04b3a11cc58c52c2963812f86 SHA512 e53fb8198bdf9ca2380c5cc487b2864b361011d3293202245fed4af1644563e478428547cd7c307be2556d0aeb88f7fad8ecaa34e837326319d4adb554473372
 DIST manpages-l10n-4.18.1.tar.bz2 110701567 BLAKE2B 107529345eabf24a2c63ef859504ff5b0d0a44fbb521f82053e03ab7c6e8ca7d1c147d36554a488f5b99d25b1aa326c50b2d61d2c1d2b7f0de959447647a372a SHA512 7975aa7118eaefee3dceba5f60be5a413abb9a48d1ec51c536bda9a742ece897196df17633349b55aac37b76319d0360f7dadbe9191514551cb7d0496710a690
-EBUILD man-pages-l10n-4.17.0.ebuild 1798 BLAKE2B efadbc3cb1c447ebc105a56c99da59cfe294680cfda4275dd18f074a867ffa1137e12ea5dcdc2c7b932e217edbb966d1a913c80ead8de6d569d24d24d2a7ac0f SHA512 8f626cbf44691c32745707744a5b88dfb161bd5871f5f2004838fc739a66f168d4d0095e524ecc7a3948097dec7b173718a538c0858c57fca8f56f35c523b1ce
-EBUILD man-pages-l10n-4.18.1.ebuild 1727 BLAKE2B 6294c3d829c8ca6f52445b5767cedbce796705f57efdf50876f3e6175e8ffa4b0218f2de388e78682edb6c2d8ad36aadc0e2366286de77ed491a9b2bbd280b5d SHA512 bb209b157149a69bcd0b8a77d748d5bd3f3a096b7f7ae709766b5f2e8eaef5559abd8fba073e8492a3e945af2d0b836537800fe36539609b37d28d6406b7ba3e
+EBUILD man-pages-l10n-4.17.0-r1.ebuild 1811 BLAKE2B 08b59570c1c84a1abfc66acd8129b8cb4c718f3b51beb55d6b5ca452199aee06e94fa7f3260a43a1d2561efdc27042adf6ea32e3a227cabab4c2de3bb8c5bcf5 SHA512 95d86c666090293cf2f5454588c07247b2dfd3eaf4a99ae9d16620a83543306fc5fa8bb3ef9ad7e8628478b8653ccdfe1c2776649d3768876fb5e8a56ef4425f
+EBUILD man-pages-l10n-4.18.1-r1.ebuild 1740 BLAKE2B 7108b3bdad23f891cc2f2c0676a0acf283c4823ab2aa38e91046cef4704d88873e336071d43a499fa1c3eb997c2fc65128d6802fa1b667d55104b682bac21edc SHA512 11ae810ec6f16171f72546881dd29fa1b350d07e615c344b30fe9fb2e61a3a9710d2322c902c273fee6a1e85489f278a7bdbd103ee1b3cda8b039a1fb8ec8633
 MISC metadata.xml 236 BLAKE2B 4573b45e3f887eefa853dc47285138b1804285f5fca6cbc79cc9a475d19d9fe653ae5be35dfa9e8b04e5cf8e0de0ad4c58c8ec1b0c013213a01c13e7cbec2394 SHA512 3c9ef4b64af9b84abb15d7e0d315767d85a0ddb001471e4e8f0108ba4381fcf4bf3d7474929813e0da27d068e75b1bae56fdaadbb701d4f5f8a768e25c1b882b
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0-r1.ebuild
index 1ec442286093..3e9c89a0d4f5 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.17.0-r1.ebuild
@@ -53,6 +53,7 @@ src_prepare() {
 		halt.8
 		killall5.8
 		runlevel.8
+		shutdown.8
 		sulogin.8
 		# sys-process/procps
 		free.1
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.18.1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.18.1-r1.ebuild
index 7ec9425f175a..9794ee3924c3 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.18.1.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.18.1-r1.ebuild
@@ -50,6 +50,7 @@ src_prepare() {
 		halt.8
 		killall5.8
 		runlevel.8
+		shutdown.8
 		sulogin.8
 		# sys-process/procps
 		free.1
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c0dfa09560d1..d3a6c0df4a37 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index c85ea326e150..68cec317ceeb 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -4,5 +4,5 @@ DIST golly-4.1-src.tar.gz 14877727 BLAKE2B d9cac1250901a39d6a360b527c6f4872fc78d
 DIST golly-4.2-src.tar.gz 15348982 BLAKE2B 21ebed4c282a77a3f61aafa98936c0bb39b39a7c97505e96fc43ac720bd2eea4cf20996ca28c801f79a46577a0cf99ff60614ce134081605d14ca5972c841d50 SHA512 b9f5cfdfe9b96590411695805dd8b875329c81027fef98dff3f16b832018be2ad3a06583bb64e12fb305268feba2347ef63c4586ff0e645721a8085f04ab382a
 EBUILD golly-4.0.ebuild 1390 BLAKE2B 496a39f47a65d993dca3fa57cd7f222ceb6809b350098fa013671e45fe81732c10b449bce2c1bd74791cab87681c1ec8e2c30bd7d1d7181849e6144afd6e904a SHA512 90ea77d4e1e502aaaa7daac1eabd1bc389716036e84bbbfcb57531318e08c461c89583e94eea8767cb491122223606bc6f9ed78a22c3d38335ae1da6c9f453b9
 EBUILD golly-4.1-r1.ebuild 1411 BLAKE2B f5100628ebec553b0bb7c87f90d002216be68a758101c7336e378910f357494be97a73a67b0a027fc83efe2bfc0f3065dc1a26dfba935746a32f0b77f61b9057 SHA512 b90e1f02ed3d59e107ee412adc88ad3603c9083943314cf6cd60d01625cb85ad207acfc4153f2cfffc74a1e6621d4f124df4c6d2d62801a8822211a1c422756b
-EBUILD golly-4.2.ebuild 1482 BLAKE2B 7b6acd44085ac822ba6407fffd27944ea05aad710d6673d492873c3cac382c8b0a484733587ea6a757e15a2e5c231d31401e7d7ae668c887f478f3494b80e187 SHA512 d86e7eff5121a95dae48954a0ed95b0bd93d614756f370820cd78b840f5741806c00a2ec7731b61e53b3842e39517932188eaac1ee4f8ada0b48fb40e558db23
+EBUILD golly-4.2.ebuild 1481 BLAKE2B da8efee8856ec2f00f3c1e6ea2ba33cc28f7cf09da424f749049dabfeb97db36e5d52cc9a9d3fdd01c5e5f16fb2049084b5d9885f8759feac8bd1a4a9a4bdfa9 SHA512 293359d4150f9ed8458f597bcf590dae54d0eb98229493d7a98c7143b0be012fcbb1e4fb24bbcdfc247b95adde5eb1a2787d4e49965a5932c48580af78817489
 MISC metadata.xml 571 BLAKE2B 64399eaf28ab52d39c1338758ca1abc2f67f195e4320b01d411d00fc3e434065d25cbab6c886dddfcd18611cef4d057c0b74c22c73e432ce1c3efb22e523164a SHA512 7ddf9bbb0cb55f5beb5377b2f0a7823e125195d0019f45dfd26c0868fe57c69913d11946de5060416856ac68bca863fd06a1a1128704a8fa53fd494df4b106e5
diff --git a/app-misc/golly/golly-4.2.ebuild b/app-misc/golly/golly-4.2.ebuild
index dcdfaa3151b8..a35f1c8f3a23 100644
--- a/app-misc/golly/golly-4.2.ebuild
+++ b/app-misc/golly/golly-4.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8e397288993e..c8783b7482fc 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index 34455b90d590..a84e5c1dce24 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -1,3 +1,4 @@
 DIST thefuck-3.32.tar.gz 1234795 BLAKE2B f62aca1601b2cec4cc14dc63f6d7e7fffc8ab0e1cf88e44c3170ec6744998e97e97813e9dc6aaccc0a850b0a15f958483da24bcf1d176e43bad1b2272272e7a0 SHA512 961b9b6dc374cc0b854698455f688cf110adb21cfebd4cb645eb5f1ce11c14de6699bb4d40de86a5f9461273cbfc2eea318a9d437f803dc578dd431966cf26c1
+EBUILD thefuck-3.32-r1.ebuild 1154 BLAKE2B e4994187ccafa9292db7859e3d944bbba7b1546da96ebdccc179055e048e9ebf92fbf6f058b9c72b1f4a85f2ec389e8a07c00d6b2c5b792fbb5951895f318cf7 SHA512 79c74b5caabcb1c9c37ed45ff9ccb0bdbf480b5d41ad831126238295691f7bae4ae51c5efb6c0d83be4eed9b819fe9686c0ac6009ccae8ecc83a268e379dc16c
 EBUILD thefuck-3.32.ebuild 880 BLAKE2B 33d3844291aff718733891764bebe53b61a4fcf8b88676a4d8e2728aac6976746765668e94bb1243a89d8f0cf37eb8b11a04baa337bc555d783e725d9da88416 SHA512 a5ec9fe2764887c580e5d53a93ca2ca0e1f02102ac60e2bccdf0917db0111e9735332bc5ddcd88832138b84462c522d5db4e4dda68e0df2e41d28590480d9e99
 MISC metadata.xml 269 BLAKE2B 19b3e31874e41daeee0fcc465075c0519eb2e56df2eb93a93b48e1041459802d3e0312fc7298ed25742f7058dd0e24982c1da267a1cf65fdd9fbaced7d206e9c SHA512 a5cc8b5aa63bca75b9e84676d513003707cbbfc2ce2c51a989896032e7cc134b3759056fc9d4262545c442307267edd801dad16c392d48aa7bfed2a894f14733
diff --git a/app-shells/thefuck/thefuck-3.32-r1.ebuild b/app-shells/thefuck/thefuck-3.32-r1.ebuild
new file mode 100644
index 000000000000..bfee9daa1a8c
--- /dev/null
+++ b/app-shells/thefuck/thefuck-3.32-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Magnificent app which corrects your previous console command"
+HOMEPAGE="https://github.com/nvbn/thefuck"
+SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/pyte[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing tests because of trying to access portage's home dir
+	tests/test_conf.py
+	tests/entrypoints/test_not_configured.py
+	tests/test_utils.py::test_get_all_executables_exclude_paths
+	tests/test_utils.py::TestCache
+)
+
+python_prepare_all() {
+	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6acba718fac3..790c6f143a43 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index d22f6617213e..d0e462459dd1 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -6,5 +6,5 @@ AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f1
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
 DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
 EBUILD dblatex-0.3.11-r1.ebuild 1827 BLAKE2B 34b52a951121ede45a6068422fcd3348b98fe3f5b764fa2eaa463a837c260a0dc881ffdfa7b2d63464062b1214e12f34a0ccf4c2b78942b81944b74ad86d1b9c SHA512 7c760c2e1caeb089c1b038535ee849becee4ce06fc9634a3c382b2f518ef81d60a9ab5869ca22f44efbc42dcb6be73d2d5237ea6940732bf09ce5fd793a0ca50
-EBUILD dblatex-0.3.12.ebuild 1923 BLAKE2B 2df32a7dceff140826ae3d808572f6a333629c7cec352955ae165950e5cda77c08092062958bd7dd2378209130c4864dab1411e5a762e02c984e650f95cc2ccd SHA512 f0ade3e6802ce3f3bc607abd308818197fcbac34d6e9372cdff55450a4c0d30ff5feab23dfb108f34db2f00a608b92c875c83d650a845d4b97c3f6e57900fc5d
+EBUILD dblatex-0.3.12.ebuild 1922 BLAKE2B ae7e64bc9c8ebfee3463603058066dc6870c5cbdd54a61f0744463d13a087da0e15a968f76457ea2818d3e14af8093ad55e9a36640fbfec2602096f08e603f47 SHA512 b93b7bc7a51c4db1203e66c3ab0f0a3213b5afe1663a825b37987115bda2090c8f74d394c480cf524564986f3a213bab69289c1af27db11496be8d819e6f39b1
 MISC metadata.xml 908 BLAKE2B e13f176739b3fb7a63a5eaeb704afa1c0b4e9740ea25dec54656c283cf9f8f614096aae407df8822414e054eaad0082c738c0a5a2acc91a51ce3f6b729fc37d6 SHA512 a39c4073b4cec1753724d16bcca023c9306eeac79bc7f008c6e090f85c4661733810c9864b91b9552fbbec242c01a312780ee780d11724ce26399bad3c9a0899
diff --git a/app-text/dblatex/dblatex-0.3.12.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index 80bfee3f7e03..bb888c8e01ee 100644
--- a/app-text/dblatex/dblatex-0.3.12.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-$
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="inkscape test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 0a5538d6a2e9..f438bef0a1d2 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,3 @@
 DIST gspell-1.12.0.tar.xz 433068 BLAKE2B 5726f40b07ee1d23a5a2e22ed012b52d6090a645b3141ecaf6a92cc850442be605ff2481a28ec87ee0d5b727b792fe2812a3e32ffd05978ed984d92b593910ec SHA512 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549
-EBUILD gspell-1.12.0.ebuild 1531 BLAKE2B 436884fb6e5ca361948e277666f99a227ae17a7ada92ac87cb3e5d6be7731ca5c92065024f40f244caaf8dcb48d0faf6d4370a0c1279c75c4538d23dabbaf78a SHA512 53af0ed05f2fde48d650e8a45310a79fa1e9484804c8e9b70291838f570ab95d388854188f4519659d9fb75913e6bbd756262d7425a75ddddbf6e44cc4c855b6
+EBUILD gspell-1.12.0.ebuild 1530 BLAKE2B 27a15a4f25d6812b198fe421b0d22f257bb6bf1f758c5bd19ffab8bfe32f015a69481a818579e831837e7adced19f961577523b8eaa27175f9a3c7320f872ccc SHA512 8fe0257fe254faa774e11d89faa9cae1afc4dfb134409efaade1724b12cbbef31ebf280f9edd1cc76342245d835cf2dcd701f5b7e216baa175b969bcc89b92cc
 MISC metadata.xml 347 BLAKE2B 3b91db6ff2ea521010e0437fc23b5f69567011240291483423ec748b70cf2baba234824c41cc493f8d30106dad208b9e4b376e69ca3d8e495072b97dd2f271de SHA512 4691f9bc67d5e5372945a4aa319185c4478b58e463c9c1b853a2503c80ab7dacebc433c8ffc247d0fce9e7b2f0f03fd4e0216d27e135598efa26e2988ac7bc73
diff --git a/app-text/gspell/gspell-1.12.0.ebuild b/app-text/gspell/gspell-1.12.0.ebuild
index 02282d452748..bfde539fde92 100644
--- a/app-text/gspell/gspell-1.12.0.ebuild
+++ b/app-text/gspell/gspell-1.12.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 913d43ef78b3..e3eb1bdc04d3 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,6 +1,6 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
 DIST unix-tree-2.0.4.tar.gz 59497 BLAKE2B c55f8f64f2dfc6364ce3ab5ec26e59860f958eacbf681d1d53848172d474605f71864c1eb7db27be15f3df2fc2979787685e80de76ff817c5cdfafb9c52af203 SHA512 59f391de5792ce9990153c2de06bc545813f9e7aea635c574ef21f1603203146cdad4dbed821266715d716241d7153276aa220626ce8354446dd85df47e75fa6
 DIST unix-tree-2.1.0.tar.bz2 51401 BLAKE2B 89b15df0268c03ba66827c7e6d234d1f5c4f6a5d9788e30bf6859d477b340393acbeec9ad7afc1909fdc7beb81ef7934917206066e0875d9f1662fca170f4127 SHA512 0f3a6ecb450bb3d683804667d4f15aecf9c9765578d47a62e39a8ff69cbe1c2a0a4a922fef3728359060338f4f9cd2de7ab8eb0f992a4c32949278bb47d17edc
-EBUILD tree-2.0.4.ebuild 894 BLAKE2B 27b4b712dbb5b8816f4f652de3428e4048bb5269ef319c56cb3f8dc61d29cd59a43e9a8772741a1823fef2eaa65f04ddbca1c55b31f1f0a9cd745481314e10a4 SHA512 f9a3bc8dc092da4155a53c28b03b44a3f4117b0484d74f3dd986e9fea12472771eb8a5ce4e1c7127850d1818530b7c72175ab48c9cb7a5cfda1234d32e2b2928
-EBUILD tree-2.1.0.ebuild 917 BLAKE2B dd5655e7d19d497b0b125c0ae1339f32835c6906c26d4bf150a071783a69dbc493c3a524c464b325fc3f0e2074204c9f686769b624c4e83708de9950f3504026 SHA512 a60dee61d5eb799042cd2420acfbfa66a0e6f493f91c6b2407b7c523a38585ca644b36a544c324fa3bdb1d92d7ee8fcc828d8527b9e80062472bfdfa29be825b
+EBUILD tree-2.0.4.ebuild 917 BLAKE2B fc02cb6fbcaaca6481e2d761423df38318dda65bf11ac6576f246c64d0ebc9ea53e51166add1c89be9aaedaf99a7489d6758aec3f7606cda4cdeecb1c5d4b7e9 SHA512 500075a1d58a9ce4634893d7610fb92a8192c7967aa4a022778773cdbfa157eec0806e4a68b3b6c44c7bd99d0c9b78604bd4dfc1688bebbc60383cb137413ac8
+EBUILD tree-2.1.0.ebuild 887 BLAKE2B 5c862c36ce1a1c455186f430bc2bbf9296aef252bcbe28488a5e574d4c31dd790321fc2d857073652ca0b3dc4dfb6d76a3ffe91a24e427e69d98a512051dcdda SHA512 1791bd223f24afac368afa5a9aaf73ab7bbe8b23d0f2969e73afbe07b7214246d25f1200cfb9f9d37579d4ffa55340154eb6a94307552d4e2df43ab5f4baab7e
 MISC metadata.xml 726 BLAKE2B d4e2e3176f82eb4577dbac312756eaee7e50da883c80b0e22a2cf86e75493eb4791ffdef9387a48d5a486cf968526aa483e05b213dc172839f04c528701be69f SHA512 ff609ba8c9839744088c1d77159d039ff46aae920f570842d4dbda9b4b4b4a6956f49815571d5e2d837deac2128bf71fb42316d5520c5a0dfe74f9bec798b56c
diff --git a/app-text/tree/tree-2.0.4.ebuild b/app-text/tree/tree-2.0.4.ebuild
index 75fc979ed4ec..3bfcf36cde72 100644
--- a/app-text/tree/tree-2.0.4.ebuild
+++ b/app-text/tree/tree-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,8 +15,7 @@ IUSE=""
 
 S=${WORKDIR}/unix-${P}
 
-RDEPEND=""
-DEPEND=""
+RDEPEND="!app-i18n/man-pages-l10n[l10n_fr]"
 
 src_compile() {
 	append-lfs-flags
diff --git a/app-text/tree/tree-2.1.0.ebuild b/app-text/tree/tree-2.1.0.ebuild
index e3c1fec412dd..a8aa448762ab 100644
--- a/app-text/tree/tree-2.1.0.ebuild
+++ b/app-text/tree/tree-2.1.0.ebuild
@@ -12,13 +12,9 @@ SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE=""
 
 S=${WORKDIR}/unix-${P}
 
-RDEPEND=""
-DEPEND=""
-
 src_compile() {
 	append-lfs-flags
 	emake \
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 0f540f59a42e..5cbb46e461d4 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -3,5 +3,5 @@ DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c
 DIST xapian-omega-1.4.22.tar.xz 570476 BLAKE2B 05bd5c8135870b3a2058bcd032da9609cac7d0b1a07b31cb84f8fdf175bb87d22acd9beb392f93ebf1f23e4ebf4d23fbe12b70063628d318012b71246d14f26b SHA512 460120fa2c76ad99f818f4183c4ded92eaa7f01a9dd782af1e93faf11caf2479053f45a9e9f0a602bf31631dba8be2d2c18bba28340c578126e8658ad4937c19
 EBUILD xapian-omega-1.4.19.ebuild 1183 BLAKE2B 860088e7f9d5818b0de08d8aa5d5e1b7c83b98ea892dbf579934c069bd275f6580651afe3ed7f280deaa66e76d8a105be8b001b7d5d968ed6e15a366063c209c SHA512 8abda4b0e180124d2f6c514d800dfaf005f1873555609479d72588ce3100bd711be9b8224fb61951ca3224c81d9a26b4476d771a0fd6b443a996570db6d68c12
 EBUILD xapian-omega-1.4.21.ebuild 1183 BLAKE2B 6e849058fc6a2ce3510ee3c612f056563827a46136c0eff42e9c23981e480379c1ba2e234dab23a81919e7aeabc6a6436cfdad78b5b1fe28345d5207c6d1955f SHA512 78bff567e04d0119f4846f252583a94773410275858db84e13e5db52479a2ddc329b7d7d949eedca9ee0ab739759b6dd6ffdba1eb5c9999b2415ff817225d628
-EBUILD xapian-omega-1.4.22.ebuild 1168 BLAKE2B 140933e2a67a55cc7a502cb4d6ba9827b74e71b55de01cc80ce158197487f9f3521045f8774420fe58caf942ecbeb533b39290bef986c3fb594844747f13f645 SHA512 ab84bd1eb8daf4d561fd3258cfd0f400c4909579dabc2e204739fa8558877f745463859c33a598ad218b6cd59eda0e9c2f70caa9f134ba1a9ac46247d4be5833
+EBUILD xapian-omega-1.4.22.ebuild 1165 BLAKE2B 1a3929912bd4004254bbb7ac924a5f5c4a26f4e02515eb757c2abedf12518051053f2e5982e7eba3b04ef14a7c80ae0aefa449744eb422765b7055226b7467b7 SHA512 bb49573293fe0553b540f3e942502382d82b555484d2c9ea0b6ba53dbed6c79fce64d76f9b646ce78b079bbbacfc63a9b7da1d38cb961d0368375a4422f31918
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/xapian-omega/xapian-omega-1.4.22.ebuild b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
index 24f037a0ec42..f1de79c264f0 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 DEPEND="
 	dev-lang/perl
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 27ea293d861e..8050ba6f948d 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index f47a40450eff..eac940788da6 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,5 +1,5 @@
 DIST libxml++-2.42.2.tar.xz 848924 BLAKE2B 75c28447b41e50f1484a8670042af819f90619acd36eaea3bf68ed197745836c3ede38c208a851e59a345cb2657989f569fd0129724916f87d90105ec3c0fc2c SHA512 214da4c8120fedc96adf6ad965b65be9f4deb53d86f41667c236c52e1e3aace819fc61b096815879cc38aaf12ac77fbccb050088ce6bc3ff03030dcc81e4a8c9
 DIST libxml++-5.0.3.tar.xz 843720 BLAKE2B 0c85171962c9637f71846a6a4914229f2ad6c60a0315743543526d78a33baf2e86f21eeef2279c8d51233d40fd059aad266c80c365decd587c5c54a303ad93a8 SHA512 418723a96f018fb8e332847d0ab601eda38c99d6be48c83b6cda6f07789e5ecac76bb417540e29d0abace2828a74eb1e08695ff2fc92ebf3e7458364547ef675
 EBUILD libxmlpp-2.42.2.ebuild 1300 BLAKE2B b1fd2e809824c10bd206c9a7fe523fc8d95ef91325bf7a1bc2631e02818b2bfef957151a02476aa56c11a33cf41c75b80438eab54090bd556f9d756ba85cff35 SHA512 cd249cc916e3b581a810852f4acc4d017684b1364723aedaeaebdd95be4c99b7f75cff42d174718ab75eb5dfc444f40a0add50fb7bf5c28e9671c22e9294e3ab
-EBUILD libxmlpp-5.0.3.ebuild 1209 BLAKE2B 9713b9a77dd60a4fcdbebbc6cc5fb5fe3b8f6ea4ef20db7ea93ccd9518723c0b7042076bfddded76666dfcbf8d46854defc41bf07a616eb60b1355a5a2b97a3f SHA512 2cbba5e9998c04fc09c331ffdfd6a8ede6a455e44625862200d6c3f6d116fb68883b795c2511dd52b8785f9f389224568cdf02baffd36ee691a56cf1ba442041
+EBUILD libxmlpp-5.0.3.ebuild 1207 BLAKE2B 810691985a79c09fa7f1c1e9398ddffdf1fb60659371011aa968a7a22487bb159e7191c76ade1d1f9045c0f8eb8115b8b53c9b3d2f60abced05b323d68a0c2ec SHA512 ecf2e2bec655b51441a7fb32d54f5f20d3dcc4ed8e6af9b76998b586ea77941fe17d3c5c802485a23f2c9e8edff2346f28e07c486e46b7a9f9de5c35041591da
 MISC metadata.xml 358 BLAKE2B 8b582150db49d0c4ac43268c59fa182078c0c2d8e4b7db6f4a0008cc4bc0376038024de6adbbd438528025419d480c456d1eca6e4b27bf7cd610730ba2af5940 SHA512 fc5f35fa1bab9635e576db3cff7b5151ca60a74401cbe182dc2aa923717a10ca87002773339c2fbf234feddd8f16a7c7a2f6b47ea8fd14424cbf7f900effca57
diff --git a/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild b/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild
index 7507e888cc94..c1e153c08e9a 100644
--- a/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-5.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="5.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7ebc060448bf..ff092a05aa52 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index 946978325ecc..6c214d9d5e1b 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -2,5 +2,5 @@ AUX lmdb.pc 295 BLAKE2B 29c1cc5a70eb3d7f5c9dc4b1646644045514929428f164894ece93a4
 DIST openldap-LMDB_0.9.29.tar.gz 144545 BLAKE2B b7e55e4fa03e878a95b8f7c583684727a81d51a3acf2ec064d8fe26475bf9ffe4dddf16c2bccbda901b94b7c8d57f41fa63f7c09bcab46401bd000958a5b87b3 SHA512 b41ba5b139375d23617a79f4d322399df55745c5a4a63159ddbe0f1ded4707f0eb7f71acf3d1a4928f8fcab30a7b5db17e3e165441a61ec1dbd29f8d9efa65d1
 DIST openldap-LMDB_0.9.30.tar.gz 145023 BLAKE2B bf93d23a3d2a2a4fe1e82e310125187e52f22cfcf7809f729edc6085521d2f66c07c042c552b745d8241d515d58c4c8da9921d503cfcca25ecacd1d06a662ad4 SHA512 4d531f1e2bb01566ad60970201cf10418a894d64167dd2e01503ab7b42c148c6ced8e857ae7f5d09e46feaa709b88f7006e5cb702b69ddaa343f005d0fef16ed
 EBUILD lmdb-0.9.29.ebuild 2378 BLAKE2B 5f7d0adc974b6c4569312698604cddc62151716db262754c69c5ec463008dc8676bf59c8b9920495aebf11de77c308cf0c56b819a63908c05d567124d9d79db5 SHA512 f97c769f8c00a595b306c5e65080d423fa2a3fba9b1e61047dadfb05e2887b6cb33b0e86c8d74714987634123879c14cb1684d42141ae920b0ab36aeb32d138a
-EBUILD lmdb-0.9.30.ebuild 2394 BLAKE2B 2e657353071736255052245800ee62efef56a3377b8017e2bdad5b7771928f6fabad1b0474c67d94558568effd06fab86ce7c0aedd0612bf118bab2b606ab994 SHA512 b446ac24bfc645e41a509823ef27e658fdd4bc1af386865404092ecc6855434e6d6500c46a18d8998a5b9f83060247aba8435d5529c866caad41248b85e8d9df
+EBUILD lmdb-0.9.30.ebuild 2393 BLAKE2B 3d21fd7cd7d617b754f292c1a461e07eefb5ebe83f05eaa045fb13a246972b03bf860ff0164dbe5a9d6aa4bb6a1719c688d48010e5e2b4faf134fc88971a110f SHA512 2565d3e90b6e006ee14ab4da65a10d0998c74a57f0b3379551b272a8b53b39670e3753ee9521c1b96c1ef64be086e146848768b7047d85abcf57f46167af633b
 MISC metadata.xml 433 BLAKE2B cf3186fe7876aa15283c1d2154469b7f8451e99b3a36637e67820703a576fa1297ac7804ef7df660aaa63a44b1c18a3d2298dac12159a3b3268526e10d7bdaf9 SHA512 f526eb14df23a1b9e92bec0b643e8dc993ad489e8776641aa330d1db878dcf4fb1b7dbb8b62e0c88a4ea484a393e5b396902abb2d035b8a311555e1e69fe387a
diff --git a/dev-db/lmdb/lmdb-0.9.30.ebuild b/dev-db/lmdb/lmdb-0.9.30.ebuild
index 23fd008482b8..2c3df0b2854d 100644
--- a/dev-db/lmdb/lmdb-0.9.30.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7104219d19bf..e530c7cbfd63 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 9d16889573c5..223932c5b4ee 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,3 +1,4 @@
+AUX efl-1.26.3-libressl.patch 8420 BLAKE2B 637269f26888dd46f2f8faca3e63d3ccf69376f231c7f1b2423a7a1e2293eeeae569dfcb6d98dae77fe4005a74fea60c991ab622c79260f616b6e86442284cbd SHA512 10257eedd85b520b956f7e064bf596d6c31cbb7d6200c7396498b7a3d087a4b4f366a54bff06cfe5aacf8454163e2e5c803b82ed5cdaad01b3d5912773ee4e6c
 DIST efl-1.26.3.tar.xz 168540684 BLAKE2B aeb0215b9cdce9ca10550c698df4985ff9557c3c400c3a300887148d04a8900f04c7200473e5fce1d3021378be1e664e9364d171ec09c4fc488b4ec758722ea5 SHA512 9801ee8bc963786962d87af56d532d3f019bc18a91924d2ef84934dcd0ae30452d858db93c33964f2bff9af2f3c8feb9927f7281ead4a8993ed622cd0cf2c514
-EBUILD efl-1.26.3-r1.ebuild 8325 BLAKE2B 75798e925575880bdcae6a33ced67b2316d1741b6f1608694ac9acc9c5ef66ed703110ca53d7e590a1d60c583744d3c224d97eccdeca256a0d488f807886eef1 SHA512 177483ce55f23c4627ea9200466994fc1031d96917142084e8ca1c7bb48b09bc041064f4bd25824601bdf3b78e61b677617d83ae384f072e4e53eed3b1e7fec4
+EBUILD efl-1.26.3-r1.ebuild 8389 BLAKE2B 8af266631a1ba0b0fbdf1435e4e03f67cd8f0c55963984e20b07a46c568e14f461955ffd8653c9bc2bc69ba500aaf066b63e7af6954b7fdff05f287a6b4606fd SHA512 cedd8de585bbf423756b7d8a96df95a4629d152e3cf06e403aecfe30e35bd2bbe5c0e379bdfc79ec486c561c82a715cdc82868ba084e1aa7d2742b43fe31dcfc
 MISC metadata.xml 1889 BLAKE2B 00d61cd4f80a59696ca2a0b2547d5ac39f93312e35271b6f94ce7aed168d3aa042a05378b1bb2d3874dcab9c166ed5ae53a1c955fadc6b588dc40deec07ccdab SHA512 b852affad80c80834e80da06d33e3c3e42aba404cb5b628bee06f23977d3956225bf38e9897e24d31325cc10efebcd448d4c50ad9d4e8a154e23400a545e2e9f
diff --git a/dev-libs/efl/efl-1.26.3-r1.ebuild b/dev-libs/efl/efl-1.26.3-r1.ebuild
index 8b00eb21d056..fb26d694f9b3 100644
--- a/dev-libs/efl/efl-1.26.3-r1.ebuild
+++ b/dev-libs/efl/efl-1.26.3-r1.ebuild
@@ -131,6 +131,10 @@ BDEPEND="${PYTHON_DEPS}
 	nls? ( sys-devel/gettext )
 	wayland? ( dev-util/wayland-scanner )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.3-libressl.patch #903001
+)
+
 pkg_setup() {
 	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
 	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV}
diff --git a/dev-libs/efl/files/efl-1.26.3-libressl.patch b/dev-libs/efl/files/efl-1.26.3-libressl.patch
new file mode 100644
index 000000000000..6bb1b6bb83e3
--- /dev/null
+++ b/dev-libs/efl/files/efl-1.26.3-libressl.patch
@@ -0,0 +1,191 @@
+https://bugs.gentoo.org/903001
+https://git.enlightenment.org/enlightenment/efl/pulls/10
+https://git.enlightenment.org/enlightenment/efl/commit/bdd5b244e6a6161228f4a98210cefd9ef8a12e85
+https://git.enlightenment.org/enlightenment/efl/commit/0e22417f4579333a967fb5ce65ab339dfc066753
+
+From bdd5b244e6a6161228f4a98210cefd9ef8a12e85 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 4 Jul 2022 09:05:38 -0700
+Subject: [PATCH] Support LibreSSL 3.5.x
+
+LibreSSL 3.5.x now works with the standard OpenSSL code paths.
+---
+ src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
+ src/lib/eet/eet_cipher.c                     |  8 ++++----
+ src/lib/emile/emile_cipher_openssl.c         | 14 +++++++-------
+ 3 files changed, 17 insertions(+), 17 deletions(-)
+
+From 0e22417f4579333a967fb5ce65ab339dfc066753 Mon Sep 17 00:00:00 2001
+From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
+Date: Mon, 1 Aug 2022 17:35:52 +0100
+Subject: [PATCH] eet emile - cipher - add braces for if defines to be clear on
+ order of op
+
+---
+ src/lib/ecore_con/efl_net_ssl_conn-openssl.c | 12 ++++++------
+ src/lib/eet/eet_cipher.c                     |  8 ++++----
+ src/lib/emile/emile_cipher_openssl.c         | 10 +++++-----
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+index e59c6811c9..56c8a595eb 100644
+--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
++++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+@@ -27,7 +27,7 @@
+ static int
+ efl_net_socket_bio_create(BIO *b)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    BIO_set_init(b, 1);
+    BIO_set_data(b, NULL);
+    BIO_set_flags(b, 0);
+@@ -44,7 +44,7 @@ static int
+ efl_net_socket_bio_destroy(BIO *b)
+ {
+    if (!b) return 0;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    BIO_set_init(b, 0);
+    BIO_set_data(b, NULL);
+    BIO_set_flags(b, 0);
+@@ -63,7 +63,7 @@ efl_net_socket_bio_read(BIO *b, char *buf, int len)
+      .mem = buf,
+      .len = len
+    };
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    Eo *sock = BIO_get_data(b);
+ #else
+    Eo *sock = b->ptr;
+@@ -99,7 +99,7 @@ efl_net_socket_bio_write(BIO *b, const char *buf, int len)
+      .mem = buf,
+      .len = len
+    };
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    Eo *sock = BIO_get_data(b);
+ #else
+    Eo *sock = b->ptr;
+@@ -146,7 +146,7 @@ efl_net_socket_bio_puts(BIO *b, const char *str)
+ static BIO_METHOD *
+ __efl_net_socket_bio_get(void)
+ {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    static BIO_METHOD *efl_net_socket_bio = NULL;
+ 
+    if (efl_net_socket_bio) return efl_net_socket_bio;
+@@ -359,7 +359,7 @@ efl_net_ssl_conn_setup(Efl_Net_Ssl_Conn *conn, Eina_Bool is_dialer, Efl_Net_Sock
+    conn->bio = BIO_new(__efl_net_socket_bio_get());
+    EINA_SAFETY_ON_NULL_GOTO(conn->bio, error_bio);
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    BIO_set_data(conn->bio, sock);
+ #else
+    conn->bio->ptr = sock;
+diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
+index 025750cc98..30501b99e1 100644
+--- a/src/lib/eet/eet_cipher.c
++++ b/src/lib/eet/eet_cipher.c
+@@ -472,7 +472,7 @@ eet_identity_sign(FILE    *fp,
+    gnutls_datum_t signum = { NULL, 0 };
+    gnutls_privkey_t privkey;
+ # else /* ifdef HAVE_GNUTLS */
+-#  if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#  if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    EVP_MD_CTX *md_ctx;
+ #  else
+    EVP_MD_CTX md_ctx;
+@@ -562,7 +562,7 @@ eet_identity_sign(FILE    *fp,
+      }
+ 
+    /* Do the signature. */
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && (!defined(LIBRESSL_VERSION_NUMBER)))
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+      {
+@@ -756,7 +756,7 @@ eet_identity_check(const void   *data_base,
+    const unsigned char *tmp;
+    EVP_PKEY *pkey;
+    X509 *x509;
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    EVP_MD_CTX *md_ctx;
+ #else
+    EVP_MD_CTX md_ctx;
+@@ -779,7 +779,7 @@ eet_identity_check(const void   *data_base,
+      }
+ 
+    /* Verify the signature */
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    md_ctx = EVP_MD_CTX_new();
+    if (!md_ctx)
+      {
+diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
+index e5a1ed4135..7fed417d3f 100644
+--- a/src/lib/emile/emile_cipher_openssl.c
++++ b/src/lib/emile/emile_cipher_openssl.c
+@@ -45,12 +45,12 @@ struct _Emile_SSL
+ Eina_Bool
+ _emile_cipher_init(void)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+    ERR_load_crypto_strings();
+    SSL_library_init();
+    SSL_load_error_strings();
+    OpenSSL_add_all_algorithms();
+-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
++#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
+ 
+    return EINA_TRUE;
+ }
+@@ -73,7 +73,7 @@ emile_binbuf_sha1(const Eina_Binbuf * data, unsigned char digest[20])
+ {
+    const EVP_MD *md = EVP_sha1();
+    Eina_Slice slice = eina_binbuf_slice_get(data);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL) || ((OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER))
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+    if (!ctx) return EINA_FALSE;
+ 
+@@ -196,7 +196,7 @@ on_error:
+    memset(ik, 0, sizeof (ik));
+ 
+    /* Openssl error */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+    if (ctx)
+      EVP_CIPHER_CTX_cleanup(ctx);
+ #else
+@@ -204,7 +204,7 @@ on_error:
+      EVP_CIPHER_CTX_cleanup(ctx);
+      EVP_CIPHER_CTX_free(ctx);
+    }
+-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
++#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x3050000fL */
+ 
+ 
+    free(buffer);
+@@ -331,7 +331,7 @@ emile_cipher_server_listen(Emile_Cipher_Type t)
+          SSL_CTX_set_options(r->ssl_ctx,
+                              options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
+          break;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+       case EMILE_TLSv1:
+          r->ssl_ctx = SSL_CTX_new(TLSv1_server_method());
+          break;
+@@ -780,7 +780,7 @@ emile_cipher_server_connect(Emile_Cipher_Type t)
+                              options | SSL_OP_NO_SSLv2 | SSL_OP_SINGLE_DH_USE);
+          break;
+       case EMILE_TLSv1:
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
+          r->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
+          break;
+ #endif
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index a0bd0c248eab..06920c9cb7e9 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -2,6 +2,6 @@ DIST libcbor-0.10.1.tar.gz 284393 BLAKE2B 49b224493b4743fab0352e139ed9e85873238b
 DIST libcbor-0.10.2.tar.gz 289450 BLAKE2B 3ef2d7fd7942ff32acbe59db6a4b68ad72dde3af4675ef2ee3c93666360554d6e9a29392dbc4fb3029f9ff821f536b90bfd1c522c9c9c2298ab511322fb53d37 SHA512 23c6177443778d4b4833ec7ed0d0e639a0d4863372e3a38d772fdce2673eae6d5cb2a31a2a021d1a699082ea53494977c907fd0e94149b97cb23a4b6d039228a
 DIST libcbor-0.9.0.tar.gz 275405 BLAKE2B 7e78722650c702552dda4844615c454989281abe8c45ba3c9168af16e9d440a1b7e4e0c9afd89faa48e74ba85dcbe0c7733eec3e44fdafc0ca340e97574fe274 SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0
 EBUILD libcbor-0.10.1.ebuild 1429 BLAKE2B 6e47e9c385520af1351ba7d562bc2b1e1a00651a4e96395a6cee09815d654c607b0bd257b7be4a2b893acfd00f5505a1ec7949fd86feaced2565db6e98baa9b7 SHA512 ebf51462c4ef40d872f904acf952e4148842375d07e467889a6af84bc6e4b38aacdf9db38352f058ac35713401230a082d2aa8185abe0e69a110954dea3ff51f
-EBUILD libcbor-0.10.2.ebuild 1455 BLAKE2B 2a43d4397b98a5182a6772c644bffa82423e93fbdc0e5f6199dcbf7a72432663c172434714e138f5f57afc1c8dbeb4e50448f2ae0d94452ad0cb5a863e0d5e16 SHA512 8ef50d006f165a9fc9d2a481d5df2be0fdab80114b1a2b4f4c5c884d9ca263b19b7e08cc8c3e9d4d7dad855875a43427c1d91c3a179bdc65a610e4c188431ad9
+EBUILD libcbor-0.10.2.ebuild 1454 BLAKE2B 7a91188362e145202149e994455f0e9c781c4c92083d80022309164e45b68faef0b9059faa777245c964b4c27fc4326dde4be590d965335aad6dc9f107398ecb SHA512 b4001431f1c7aa81d6d92527601b1b895a45e9452ec369e49c98550b2f90e0c549b071ee99e80c1baf812936f86ebad9524c27abed269d61e710a37b4730f07c
 EBUILD libcbor-0.9.0.ebuild 1455 BLAKE2B f651cd08439fbd3fff20396b5292656845955ecb85c070873b0ca9535f2b0282c6b4521e9f0cc7928ad76fc6a55c2ea67073748096e90cfad78029e89efd2d4a SHA512 9a078bf458ba5cc775571314ada0b5d20d13164596fda951b9e001b9d4f05bbd8496d034d68575acae549d63b0a4865aed79815a80e598789966c3f44635ca59
 MISC metadata.xml 430 BLAKE2B f478d98c9495fbb0946ec5d193e489f8f8a3c0a4ecbbac58ed2e3a79124d65741a54dfdc1a73f41dad39c596511aa0873ea38d2ba22d45b75a9600a122886f1d SHA512 ae7788a8a66d6f5333ee22601ff1ac202d279a7dd2aa245231440bb8a48e83d64361d4c105e331c217b8be096d9cc6d76f3878d4132e8060bc1fdcb7e8a64b18
diff --git a/dev-libs/libcbor/libcbor-0.10.2.ebuild b/dev-libs/libcbor/libcbor-0.10.2.ebuild
index 878bf8dd79be..b7c6aff0849d 100644
--- a/dev-libs/libcbor/libcbor-0.10.2.ebuild
+++ b/dev-libs/libcbor/libcbor-0.10.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 458ff691dbb9..3652606f1a07 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -2,6 +2,6 @@ AUX libfmt-8.1.1-fix-static-assert.patch 2670 BLAKE2B 781ccf10647dede937f38f2743
 DIST libfmt-8.1.1.tar.gz 826254 BLAKE2B 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
 EBUILD libfmt-8.1.1-r1.ebuild 816 BLAKE2B f2012a5435e3d0f901b4a50ec64b20658120dec8193d9f9d1543df6574a0d1f066f0982d4cde2d47b1c3617563922336116bec97d25e91eaa5334b92b2ae0416 SHA512 0fd7f2f39dc951b623836eb8eb82609840d13112a210aad66f689ec9b1e8a79a281cbdb440662a53c4d30807a3faa0248b9f5f7a5d70579ce7a0486d4eac14fe
-EBUILD libfmt-9.1.0-r1.ebuild 726 BLAKE2B b0eda4c38676b2367d8a7c2490076844f32d1d78275046f1347fd2d243aaf4f77c8614ed9c857563fa08ff8d83366e37d42c0a3b5efb8e3a5aab10382c5720ac SHA512 b62ab9473d45607b8c82584a50fb4bcc0d8960367857f3f9615f31e23783a114bea61fa547d029257354331fbba8387e56f33e9c2a92a21a5320fd3bf689edd5
+EBUILD libfmt-9.1.0-r1.ebuild 732 BLAKE2B f8889001e89c870af690ae05b02654668cdd7cd56af5a3547f8310672ea7a32c36d155e5cab0c8ab196df83d20932040c562c6277ee110fb0522d77b043d7a64 SHA512 c7b6ae6d22d09da7df0656b7d6621af04bc5748c671583b5ebc2dccb8c52f9f77adc9c9834c0d8073f22868914797e2a1280d04e8f62495ad1f76826aa254781
 EBUILD libfmt-9999.ebuild 732 BLAKE2B 221727734038f14c302a9be166a4ae8133302357f223c7cb81fb2ff66b79fe27b69bd72d20e989c2609b0f28cb5375126ef57f18cddacc6317559e8381fa73d3 SHA512 6adc37f69eeadebc02c67642a2743999fadde4787e3affc047aedf32a7032dc77723d9cf26c50ae2571d381fe5e805cfd9e2b47873fd9de2839f95abdb949eb9
 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742
diff --git a/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild b/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
index 942c623654db..332185c45236 100644
--- a/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
+++ b/dev-libs/libfmt/libfmt-9.1.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index c0f5ea900dc5..0e5bcb8504eb 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,5 +3,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
 DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8
 DIST libical-3.0.16.tar.gz 921245 BLAKE2B d6afe96abf32ece87393d85b4e5b0c1c10330ac64bca52bbaef96af45fbc06242cbbb4274fa350cc9a56655de238a85dea6111f381674b7cff44ab67a470e89e SHA512 72659c98f6c98b3e0fa15849df7f80993403100fb5c237e452df714a7be2d1d27f4547c81b399fe7bc6b1fb10c8c7cf9a23f5b969d588d7b05d7fe2e29c86bd4
 EBUILD libical-3.0.14-r1.ebuild 2440 BLAKE2B da31d0afef20d9b9d6c9b5ff12cd550953f23f9d00f7fa898c64c1a84917ce3be2a65d80e44ea3e9495d31f14ac9174f434a1fbcb9305bb9d9d34e9bfe2aed13 SHA512 ea6494ceb319e5e9de079f1b97b3bc395e6466d73f9c1d7dba040a0ed181263d897e7dd9b2258e06c49c01bef3e9e62baccb6998f6787e1c13b0b0c2f7b3aefc
-EBUILD libical-3.0.16.ebuild 2449 BLAKE2B 7ff68a0edcead3b460ea6fed6ac9e903c011ed5d7af1a7d146f4f27a503c193cfa129d683d0ce48ec25689518e547a15c316a540b14891f739f4b5e232cdaaec SHA512 98250e2fff38893fddee80355cacfeec48801850e048ccccde5f48faf8d0889517d70dfcaf8c6146bc458232c909004bec20d35f7fe7cb41524f4b6bad4bfd69
+EBUILD libical-3.0.16.ebuild 2447 BLAKE2B dac5bccc6a00edc60160baf9bf4c0f9678f5945e82e9da8ab4e572af347fcf16f8df6a7d051e864900eb1510b4fe6d7796ad56858c17ba2c80ca1877ab0cfcd5 SHA512 d51b9ba1eb9c5edd4b95ca816959824b3263f81685d09312ca5aa5a9f0a710555008945ad95586396515926ed79370eafe3d2feb7e116ee9aa977fb5697390dc
 MISC metadata.xml 426 BLAKE2B bdc616f3bedfa391b56edde0bd0f350b171c1f9afa2a8a9e0166e71ecf1177946aae064bea9f48fb9933d24cb94fd784a299bd97b12ad7236b3483641a5dd763 SHA512 663bef7814dfd66077f1046094879c0ec1eb0165d616e85c08eb0ff9cecd3557afd31e7d8dda8f1e95aca6955d94818f3253c8b763ff135195d41b1b1e871d5c
diff --git a/dev-libs/libical/libical-3.0.16.ebuild b/dev-libs/libical/libical-3.0.16.ebuild
index 9cc39a86fe66..d7f06d70e229 100644
--- a/dev-libs/libical/libical-3.0.16.ebuild
+++ b/dev-libs/libical/libical-3.0.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc examples +glib +introspection static-libs test vala"
 
 REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 5f9d9e5fbfdf..70ffd24f4e9f 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -3,5 +3,5 @@ DIST libpqxx-7.7.4.tar.gz 745900 BLAKE2B 2306ca1481cb36d32a5911452944404d9076089
 DIST libpqxx-7.7.5.tar.gz 745921 BLAKE2B 0ca9b36aecc96a436023621a1fcfcac2732443fe9d85507a64b511914a606a05f1a1d7e569dbf893d47412fb4040d02c0af2c8de280335d1f7a43240464df59d SHA512 78f1f17f5083347cfce607349d4f62be2878c41150c4afd1f26844dc796d0fe190b387b295e1b6bf9d81a26a0ebe1d82597fa651227c3a1cfe3acbd02ea7246c
 EBUILD libpqxx-7.4.1.ebuild 2034 BLAKE2B e75b11b7430d4a5511ebf3d13d9aca155af89d453dd4ba4375d605611addcf736a1788d33b44b69058b6655d57da4587d9d12ed05a66b37399b59c14cbc509bd SHA512 10adb26f5f26afabd0aad13f2c17a31d4345bc608ad39b3ceded97d0895d680f5708b097660180ef716340e9ec7fb65f5526791a09db0e7bacae1c27f8e7182f
 EBUILD libpqxx-7.7.4.ebuild 2084 BLAKE2B be397ebfbfd0ecdefa5652bc633a61fc69f150536b8a488dbee2a39bb0b02d2764821d59bd73a7ff907864f37dd569e72378198dbe123da92a11a63b64e0fffb SHA512 6eb04deda962611922d1107732f2dcfa1533b3b5f629e9aa79ca0eafddd26d71457af550bd9d4ac701d68ad740df9d2667da5e18ab950793ec4589ef167251b3
-EBUILD libpqxx-7.7.5.ebuild 2088 BLAKE2B c8c272b570e20b1f0fc6e3fbc16439adfa093437cbe4808147a99e8c7f5ddadc9540a17a6d9a4b3536141578bc8ed893655755343271f51f1b6a5a55adc4192a SHA512 956e83c67ca2f585fe7fd525e1d2f87d32346bafe24b8aa650c90aab098768f03f790d6c946c897d4ba4dc7440e06af935e4bb2ccc8ab7a209b15c26769a7bb3
+EBUILD libpqxx-7.7.5.ebuild 2086 BLAKE2B b4f1be7e892f4695622a13be692162721d6506dd369b197044a8dbfccd8357a9bd97c3480f4da20f9df671ab7616aa222a3ea764ce8bb1833f8e8bd25722424a SHA512 a2a2365bf30cedf337fd4c3c2c93fda2812da83da59b4c1c8f2677b1ed3dff36b3da2ef037c4e52725dc6446c7863c9bb2aeba49a454498da8191b3086490bda
 MISC metadata.xml 692 BLAKE2B d1308456fb80ef7563f3e644e26cc4c65fcf6c52c7ace01133558e19471dfb85a51e91b1ea26c74cf9e4acc902b29c33e8391e3a3006da0cfc74038ddbe4430d SHA512 061b6fa59d3b6314ab85de5ba8bf7d5548f3e8dac25f1c6ad3a43526df3d60a32b5b5e9aa040f8b8eb4d1f8c008c479b45763c7f09427fb0f2a0dfbf4320bf43
diff --git a/dev-libs/libpqxx/libpqxx-7.7.5.ebuild b/dev-libs/libpqxx/libpqxx-7.7.5.ebuild
index ec06b7f56679..c8e11d38610b 100644
--- a/dev-libs/libpqxx/libpqxx-7.7.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-7.7.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 inherit python-any-r1
 
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index b403635eb5a4..3f9039249c6c 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,10 +1,12 @@
 AUX libxml2-2.10.3-python3-unicode-errors.patch 1208 BLAKE2B 8515db0c9d79c4397c3ef4147660ddf395b863de3658a8db27db20d2274949962172a42637bf9555d3d7bf63ead8f695d19f28ddb5e957b5302c8aed466058c7 SHA512 f2ab7934687ba14bf7541a381317d88c20d9912b424d1b206f8feb60224482f12e03c79ff4e8637025ee8d1bddd870183db932380990eafca833eea1c1373a06
 DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
 DIST libxml2-2.10.4.tar.xz 2643600 BLAKE2B 5bbb63c6e58accf434513aeb974fed7349e5458de642ef89db77768c8d1383532614254e0e3f1d9471e2274c6b81a04a0a3afcb602707ce79550c2bd8e9028d9 SHA512 792c1dceb098cd353a7eca4c46d31cce6310b2553d97fd3918cf0b94d93b2480759202036511bde36c24166236bd4616f57e79959eea9afe3f60614bdfe13094
+DIST libxml2-2.11.1.tar.xz 2627948 BLAKE2B 4ae2c8583ff2fb590b29ffc250baae8d4d3978c6cb9d1d7fadbd3d9aa1d38a69ed0aeb0c9036efb060f869154e6f6d6ea6464ecbb05c7e788b7d93b1c2fa932d SHA512 cdcc06b7f8f8c2bd05ce3272dfd317b49cb52842bbf4bd6b50cd93c6f0b1bb6f57698b20369f6afeb110338b950633babfb8e9858b29f8c7d8b710fcbbec679d
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.10.3-r1.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3
-EBUILD libxml2-2.10.4.ebuild 5702 BLAKE2B b77c495a92d9c57f7cb579cd39ed16ea315a9729478da660ca08ba9e9379dadbebe20115a837c8e2799e89902f61ff42ac8a4878035caf782cd477c105a3380f SHA512 dd8b918c3e5139f1b9e5295b4fc06358e7afda1cfb01a790383921ad9d96020bb7dcc9f0d6e7dd029f72e9b7f502394dc9eba92cde2910fcbaa17957002161b5
-EBUILD libxml2-9999.ebuild 5633 BLAKE2B 09b27b32f4d5ad12ad1e7175209822d1e5b87a7c4c4dde808ed5bb2c5c8b42b4d865ec2ddcce3ffc8878e14c75f196a1d9accc8642534ac04f0fa29868d3998f SHA512 46d6a65619696877e6bd46cf3f05a6e8fc0856a24ca0b66a34a41abb5a06ba98896ce0fbc39f9b3d2d30e3f239240d0878eaa55139aae658737efcaffde2025c
+EBUILD libxml2-2.10.4.ebuild 5696 BLAKE2B 1d5eef76d04f883193a1153a4db9c1cad4645d30f7d2b999d7ed60f08704123d83e877d5c09f2b9cee5545eef929977586af858234fa73cfeb32ca9804ac14dd SHA512 3309e4929895ff9e9509b1246810b0966e8c5403843f23292cbe061f4c185c994e659a683fe5cfefb46fac03c129c480dbe760618952f5ebd101d65d286ad5f5
+EBUILD libxml2-2.11.1.ebuild 5449 BLAKE2B 6ba3a0f2a4f9999048a6216679a599f7ee4dd314d4b4b70c4bbcbf8df143722e6aa0a18e7191b8ddfd49912a29f702a4247f7faea002f11f60b8868ec45e1c69 SHA512 e55897c65b3b251a60f6e7b006ac0879527470bf5f7e602b29758b9ae035ef31c318fd52c0abf63c6ff51a00106b0bf84c8150e9f06eb5a6456ca2b6048f2eb4
+EBUILD libxml2-9999.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.10.4.ebuild b/dev-libs/libxml2/libxml2-2.10.4.ebuild
index ee48fb701f31..f793a86d16d3 100644
--- a/dev-libs/libxml2/libxml2-2.10.4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.10.4.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/libxml2/libxml2-2.11.1.ebuild b/dev-libs/libxml2/libxml2-2.11.1.ebuild
new file mode 100644
index 000000000000..bce83228cbc6
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.11.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit flag-o-matic python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit autotools git-r3
+else
+	inherit gnome.org libtool
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+SRC_URI+="
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+IUSE="debug examples +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-util/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+# Needs testing to see if still relevant (bug #745162) and rebasing if so
+#PATCHES=( "${FILESDIR}"/${PN}-2.10.3-python3-unicode-errors.patch )
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		local tarname=${P/_rc/-rc}.tar.xz
+
+		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+		unpack ${tarname}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
+		fi
+	fi
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Please do not remove, as else we get references to PORTAGE_TMPDIR
+		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with ftp) \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index 007c90de1cfa..b31269fea30e 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs
+inherit flag-o-matic python-r1 multilib-minimal
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
@@ -31,7 +31,8 @@ SRC_URI+="
 		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
 		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)"
+	)
+"
 S="${WORKDIR}/${PN}-${PV%_rc*}"
 
 LICENSE="MIT"
@@ -40,11 +41,13 @@ IUSE="debug examples +ftp icu lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
 	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )"
+	readline? ( sys-libs/readline:= )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -56,8 +59,6 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/xml2-config
 )
 
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
 src_unpack() {
 	if [[ ${PV} == 9999 ]] ; then
 		git-r3_src_unpack
@@ -100,13 +101,6 @@ multilib_src_configure() {
 	# Filter seemingly problematic CFLAGS (bug #26320)
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
 	# Notes:
 	# The meaning of the 'debug' USE flag does not apply to the --with-debug
 	# switch (enabling the libxml2 debug module). See bug #100898.
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 46bc648c68db..ef2895dea868 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,5 +1,5 @@
 DIST apache-log4cxx-0.11.0.tar.gz 1145075 BLAKE2B 786f3374923a5d47172bdaba7edb1725bedc766cb310b7b1237cfcc2fdd84cf2e390b47d55284ad0ce65631798e545523723090f4c0f7ab262f6cbe41a03e327 SHA512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd
 DIST apache-log4cxx-1.0.0.tar.gz 554344 BLAKE2B 2664cdcb84c298cd9be49e98ee767f16665614435ad44e79fa4d10219f42373ba8bb3f6cfe698bd65c0565ba120b6f6e1ab7a8de8ce9a1f43e977dde80596c3a SHA512 a6b928d7b5b4fb60a67504be082f436a6d1a750b752a89df51d0660670b6c008e7376cf56c1749fd5fc17777ae8a2d957f72879c9a89487ecb0f179999dc1283
 EBUILD log4cxx-0.11.0.ebuild 1266 BLAKE2B fe4becd93c715d6b2c43ce49402e1b1b72d81e0768beb0b868a86dfef8b619ff499c5faeeee683d4c61eef293808064f199321333fa7ad67cb356f1a0d7b2634 SHA512 8ccff6eaa7058b7127a1f75b9e6d20b2f3853fc53cba4a482d2dfd57b21663d05b515ff7014de42f37f58efd6213eb42ff858b00b7437e9b24c11c008fa30321
-EBUILD log4cxx-1.0.0.ebuild 1278 BLAKE2B b541b9ae3815732cbb46cdbc1f474810ef293b218ce9fd3dba2954fb9ed302e8205183c43fb08f77dce65762ed08654a24236a041848b797c248993a16751365 SHA512 7ef5f6fc8bb318cea90a9a508f2e67fcbe6e5e722714ea0955f2b6de1ef80167709bcc0689a7e0cc56a9a07c8404c9c46b392116e1b2cc35a396949a9b6e3957
+EBUILD log4cxx-1.0.0.ebuild 1289 BLAKE2B 10476f6a7dcd93a249e2bf82f4cc8326574079e9d7c3e2311614446d2be9fb307d93d661592ef1e6779a822f0873b74f118570349058741ee5acc59a4eb64db9 SHA512 0922a7bfd563ee0318db21199722e0fbf9742572ed7aa1fb10313cee9f3a2408e6883bf4cd9334aac7c40e3dedc88bdb593b382c5fe88d39895103f415f3fac1
 MISC metadata.xml 349 BLAKE2B 16623880a591924cd9c0fb6371a9d99fe9b3e520e84e84517f1588d74dcc4e2e0d2d4d296c585a381e3000d991e790d2005d62cb262276a0a6175f216fe97552 SHA512 08113b1261b2a74088e8d1dcf2351707adab4b30868b57bf9c478e7f26a1015196191fcb9d938ca446a7f63e6fd79771a4a88706a7fceeac9c2dfc4f56099b50
diff --git a/dev-libs/log4cxx/log4cxx-1.0.0.ebuild b/dev-libs/log4cxx/log4cxx-1.0.0.ebuild
index 9c3e5526f562..a84ed0eb82f7 100644
--- a/dev-libs/log4cxx/log4cxx-1.0.0.ebuild
+++ b/dev-libs/log4cxx/log4cxx-1.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/15"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm ~hppa"
 IUSE="odbc smtp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 5b9016978546..87ca8d42a359 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,5 +5,5 @@ DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7
 DIST xapian-bindings-1.4.22.tar.xz 1074840 BLAKE2B 49c71ece1a159a21b95ff8b6d30c5786e6fd2d1744f0a2e27427b83a85ebced6106ab57655715f6e2089bc3e56da32d6f2ad3d71303a1b75316c7d1a61f84cd0 SHA512 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f
 EBUILD xapian-bindings-1.4.19.ebuild 7115 BLAKE2B 9c93d9f8b020813a6b997a957b10592c3d7564e9ad01410d72beb676d8d48237c7419bdbd44ccccac3581b5b885933ab1b5a2282aadd75bbe83a86892e6cdc79 SHA512 68370978c0ba23e83304613663d387a6cf2ef4b6c6677975702382c76539b069f4c52772e13fbde9aed442fca432ce94b108eb715ee769e46a4036d8e74a322b
 EBUILD xapian-bindings-1.4.21.ebuild 7119 BLAKE2B 28da79127ce839b22daea81505f3d7523209238be7747d4fac27cbedd676fb332f758dc1ccde95eb5fc72217e9d0e97556518f8b743905e7aa19e8c32a6a0cab SHA512 0ab987f1757ccae25087b9b44d62ae8c37cff59f350ee72bc03186ca58a4fea8f91313c3a531b90556e0d622f74fae06f4a36005bc7887d2e0a1ea609204c8ed
-EBUILD xapian-bindings-1.4.22.ebuild 6987 BLAKE2B bf0907f498759f06ac6a03d37ff884e4e280cb4d003f35c9d59ff97f5ca8c5a8fc2efe42aa631ca1bb4c007126ea9e85b5f85ec41cc2ca29dc6ad35af52800dd SHA512 45eb92f381017121f6a99e1ca58b59d23884e4a45b88d48a1ed2eeafbc23e266edf7bc843d444bb443988f80e463c09d24972c695b15b4aa1937a26e72e12e51
+EBUILD xapian-bindings-1.4.22.ebuild 6984 BLAKE2B a6280b0ae1db920890b65c87c7a71ff9e9282f797aa2b52e44265c1eea23b123574aadb5ef3ff7069feeec4086a16cf8e92d7800b056e88864ed452019d79efe SHA512 3dbc72a4ded0c18ea77875aefa1786adfd4c952adba923695f242054a77950402de6ae303962b0a40a68fb94d4aa905c0c55e8777f3a9b67f9be8e6bfc8453d7
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
index 1c2bf28fe943..b7368965d5e8 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${P}"	# need this here, some inherited eclasses change it
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="
 	|| ( java lua mono perl php python ruby tcl )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index fe3195f92146..40384261218b 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -4,5 +4,5 @@ DIST xapian-core-1.4.22.tar.xz 3019608 BLAKE2B f4aec86cd5f63f6f1825a4f8f427ea23b
 EBUILD xapian-1.4.19.ebuild 1881 BLAKE2B c35cd8b3aeccab24d62187fb405ed78a83d073ccfcda27caccc29461a2f1f16f7122ad462c796c9ca3527d26f2f7d72805be83dc1cc8a40c49ea5ef574e6cf33 SHA512 58770b49391f37da0322b208d6fdc21478138deb978aa7032625b82a34c43613aec973666466e7175ad0e8e739c573767600d0ca2aa4c0b882cad70386d2644d
 EBUILD xapian-1.4.21-r1.ebuild 1431 BLAKE2B 18eb02c6338b248bc4d6c3cf0a5cdafcbcf711a3c1167396506e3593f0b03c1094bf7811e3c89c2be57fff9b94d02659b621dff89822a891642366897808f396 SHA512 9efb6374e9e3ba334c768706dfebedecebfaba3c7f46327b40d336205d4894d2d2a9c5b9457359133279411e3745f55ca692755445310f6bacc26ccf7efc09a5
 EBUILD xapian-1.4.21.ebuild 1881 BLAKE2B c54cf9d37454b61dc8c8c3716439461d76884651cd68746404d6697c148895848cf01b86b864508687b7be9f689a3d4af0204f44704de073184d9168b0888b15 SHA512 a60e6628a3dfdd1a92a638f88716b8822b3b1bc66cdcb588ce86da516ced52f78640343af4333f55b90b8781a52a61393b64fc547e85e76633020f288ede7975
-EBUILD xapian-1.4.22.ebuild 1402 BLAKE2B 47d4d55f734075e31cd768086d811cc6199e9e52965bd8cab7f2668f1e4a6b5a87024c0c545b91480cbfcbe96e7aab26893727e1c91dc63bf0f35f983f9a1a19 SHA512 d9f02878bd719b8c64797d549362798d236a814d0261a4731e86569bf8f9888291a6357d3ad17df579f6d7904bf851f3e5f5e316d292ea42dbc8192c57632363
+EBUILD xapian-1.4.22.ebuild 1399 BLAKE2B 11ab41a45b05a6dcc510281de49e4aa47c710fbf884a43d2b70b9808f4f6423869693dd0913c19f9dc4290f0a05eb68a13c93c3bfbf0f5fd1b38e9d6688c7a49 SHA512 5f4f7e9d9a673718acc6e2889fcde814530115780c5efb07bde7248a4a5cb0dcc52104085a496482c0e60caf9f2570ee2d53adcae6a1f5418675e9617a40e3ae
 MISC metadata.xml 728 BLAKE2B 7873e39dfb724c6f3268a7de74226d86dea77e6dd53b21aa0df104db1d30efa5c24c18b8e6597acc45b4b6bb39f1f069b7944ef0ebc2906e75a2b5efeed02ebc SHA512 5f582793cee9b74f5b36f57d6997120cf61c4f4204c49694d07b9ace813a9821710a812df2db315e9effa4913fa3b62ab069be96399369f46cc7c811b6d728ba
diff --git a/dev-libs/xapian/xapian-1.4.22.ebuild b/dev-libs/xapian/xapian-1.4.22.ebuild
index c4fdfd3e38ad..d0ee7efb1aca 100644
--- a/dev-libs/xapian/xapian-1.4.22.ebuild
+++ b/dev-libs/xapian/xapian-1.4.22.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index e1a57e4d1228..3dd6d45227b2 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -3,6 +3,6 @@ AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aa
 DIST xerces-c-3.2.3.tar.xz 4184368 BLAKE2B e582ecfa13d521061d0a0ba2e53b595047b325b53d5b634eadc0ed1967410733142e11951d907edf96386b1417adc938bf2f2f4eab760dcb81c0e718a48cf300 SHA512 8b8ac9a8377788753a918af2bd4437af5bb94b275e50fe1ab7cc6af88a8531248518705bc794da702a3e06a82a064cbd25e4149c2526aff7f61cf49ded4fdfab
 DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf
 EBUILD xerces-c-3.2.3-r2.ebuild 2872 BLAKE2B bf39e3fb49aada949ee01b9faee806838e47a205fa18d03734bea89ebeb0031c20f58a1170b88fcb2210cd1ebfe3971d3732031aec20539a94f596c66f240224 SHA512 f99f2163b4da20192268cf4bc6cef91ee2c95bfff479a3278ed0c4b2b6f7d47a946eb3e65ce9fe46960e0d435758b3a7d34760b88b798ba499eb583c4864d81f
-EBUILD xerces-c-3.2.4.ebuild 2811 BLAKE2B 78a131e7b44b66e61f3b4474ac3362afed86b5f24362896de532d6bb8671b0ceebc8900adf8520572c7a275d7c5eb413f0b6add91a75cfff24060e7edf1c1de9 SHA512 9338d693f85f888d6b83fb0de4ead66bbf6787d85830582ebafd8977117c82e4e89f7def8b0c2b3974cde4c8a939147ec384d27b2f27882c6c0dacc54820add1
+EBUILD xerces-c-3.2.4.ebuild 2810 BLAKE2B ecfee6948c03007ba9e0257e54e781265a3e02a9d12b22bb85e1b57af8fa0a9d54ca3459a599b96253e9120ad791a300e45fe9e24b9f0be2218d0589a6372992 SHA512 937c2f8df46d8e7089af70dba8bd3f9b745d3f75aa5a0b4b39d617a0063be0f7f1ae39da4678b53bfb05a29641aa03ce49a838d153ea99cd10196df76fc4ea22
 EBUILD xerces-c-9999.ebuild 2817 BLAKE2B d55076252e84b3b273e4997f740ca0845043cd44c6a5c1cc47cf991f3c8fb115d65892a1d3ccfd8e30fc04f267b85894a7b2df16072ddab360a0d92da7c4df3c SHA512 1d163062122cab95d114561d68e40e3385a14c0a13fc17fa1675b39c501bfcd754aafc23bd7991f0e7e6503ec2f6b6e28692cae37b3df23c8db884e397bf7776
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
index 2ff533cc8d36..dd3b781f5317 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fb5dbba709ff..dc2130c7679e 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 3ab16a958905..0f4ef64fcdda 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,4 +1,4 @@
 DIST cachelib-0.10.2.gh.tar.gz 29249 BLAKE2B 2f15e59f1f3ff2dfabed4076e0e47888d16421b7e94cbe13903a39641d903e044c6879aec3a7ad1673e0bb19d7b668d69316bee9b8f8bb4176125de93bc547df SHA512 7168703bdca228982216c65cd1a765d727813e47a0522d5e84258251b8aebde4d6d561850f97232b4e6c054fe09487e35a251b3992682145ef49c5ff1212488b
-EBUILD cachelib-0.10.2-r1.ebuild 972 BLAKE2B cfaf4572ba515c795ff87537969a33bc85e768d44c0496387d1c913b5cbe21597f74cb94bd719222fe12517d9be3bbb9fc3fe9cec3e02d06fe300adaf16da23c SHA512 cadf573d1ca16be0264ccf1619fe81918220602169969f87713f6cc79ccfd4ed59e674ae75d643de85b09e85225fe27eb2adf552885c46ca394cebfabb234891
+EBUILD cachelib-0.10.2-r1.ebuild 970 BLAKE2B 7f0206f872b155fcbd2c789feb2224fd5f3cd575e1f0903f603b600fd54f2ab5f355bb924253de3cf74998c62f4074c14cc8447c4404129275fca6da423fdbdc SHA512 3ebeda2501e3fac91b38e726c296499e1365bcefe86e6fa5ad8a967065d96d843d5510ba9ecba79d0ee14145ca72585efaf7fb1b90c27f4ecd523193e2921f6a
 EBUILD cachelib-0.10.2.ebuild 970 BLAKE2B 01f013c8fa78e21de3ed0049515cd7e89b0f6677ffcf85ff10f59460e17ac4e6911c2b909ae9d55ca970811d8a6184202dc7ebd42d913ab2dd3985cdd4135202 SHA512 edd3c6655ffe0e4b3a18c40fa33f6c3513b67bc16dbc7c28b8f53035300dffd796681f2177aa21eb654bbdceb184c35ca08c806146847a1ee982c6da657c0300
 MISC metadata.xml 510 BLAKE2B 456e0e3b13e50fe5fa9fb866ca2a20a63c180a55691d3cc5e63cea2d16e9e98c61d4f0f5d043f8cf73c2fa80f68eb1b29f182b5bec04356fe1c5965799ea4d7f SHA512 caef760fc497745b37e82a3603d360eb3ca173d1c6d1ee47d8cc358c28db2683446e5ce67a60e267f509e6f7688c9ee3aa5c499539752c014f0830af9896d3c6
diff --git a/dev-python/cachelib/cachelib-0.10.2-r1.ebuild b/dev-python/cachelib/cachelib-0.10.2-r1.ebuild
index fa1018f6e406..57416b0a7340 100644
--- a/dev-python/cachelib/cachelib-0.10.2-r1.ebuild
+++ b/dev-python/cachelib/cachelib-0.10.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 0b4924b8f3cb..3c3689013e7f 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,3 +1,3 @@
 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
-EBUILD colorclass-2.2.2-r1.ebuild 826 BLAKE2B 527a4e960e89aa6aabb871d3912f45e1a3ea6825b3b354ec61080cbe32e8835c2da36b60f27aae1118d8217569d962d7eb72d6fba489de6c546ba7b698d02219 SHA512 523d3d83963da04dfb1af5d9ceeb63c06605e92f6340ebbf531f43639ff0ff75d3ffce9c8a69c7ad4a5ec989d57fe0a9575a852f5361c0a3f918f94d10fc9428
+EBUILD colorclass-2.2.2-r1.ebuild 824 BLAKE2B 3632248e82e4fd1324cf82ae4bbae7137aff31af1d6e25a7a55efffd1cb0c9125a60039d0eaf7da33d1793008ea9960f2c9b6c511d7fe39cb0bc668ea1971af9 SHA512 e20a5df0d6066ecc0a34c86e437a442a3a27147211b7082b63d09ef69a59a32728bca8b9ca1e4e5824a11b724ea184346e160491ec8fe87b2bc46001d9a99567
 MISC metadata.xml 375 BLAKE2B 80d8bedbdd9260ff3c0113c3ea75df61ddc166fbc36033289531d0a9e704c04582ca1defa3107ee5f0d5c1bf0510b8739b19b28d00cba655988486c45bbfbce9 SHA512 27ad28c11c7b5114d0eadffe08ba4378bdd0e756dd3193e331e66dc4974c9543640b5530c4e344c263b5028bcde7ff87339a1627b87b9c715649bb6755e12d7c
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index bc61191dc180..73b11d5d5a59 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 219cd0ede876..a7894fe3dc8f 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -118,6 +118,6 @@ DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec6950
 EBUILD cryptography-39.0.1.ebuild 3441 BLAKE2B dd2082951f8413a8310228199faa5e4aab3e6f965ba2219ed42fda8f4f1630999d345c0852d57b3287eaf984d7c73b83fecf6d6629fc5810e87cc1d57a799e96 SHA512 e105a7b450556e3a71ebc92a7ee06725c6496a29a2aa68563fc9a4319aa48afac096c1808470fb1e778fc7c32a6bb09c64a19ccafa7843a2a905a3fefe2ef717
 EBUILD cryptography-39.0.2.ebuild 3448 BLAKE2B f6d83f28487a9548517b9d91862a29c3fd809a74b62b5bf4c02c0af4ee49f1291f187ece392680379e8ccc31f24e79ef6b144e4819359bf39340aec79981a955 SHA512 89bfd59f86765b3eb7bd2c1f22471baa11335f8c6f7511284317ae0ec9c33f8c764abfe225a1d18b7094d4217a65b42ce2fb9642b5114fd6041a59ddd2eff81f
 EBUILD cryptography-40.0.0.ebuild 3827 BLAKE2B 249bf551925f5bbe1b48d135ab73259705ae582b75c5b46e0cd38732d40f1b5ee1b7b38463884d954f35c6449f36a0cde865efa67e84997e6b2e509ff50bb488 SHA512 69d065878d1547a960ccc28e6c23252cbe588573e2f92c739a75c0efc817d355782cbc624c4df38229dbafb5f6830d4ac6bef0744b5e25aa7f0b9eaefbef5b8d
-EBUILD cryptography-40.0.1.ebuild 3821 BLAKE2B e14ef9bffb1b63e16380f648473335707a1b7d525a250eabd45cd1038c72f66035545061d98810751a0b3a5796e5cc73fa2266a2c7b6448a1cac02a3afe63cd8 SHA512 95d359405726dec36f87e94ece039c4037da653c55bd81222b6a20251019b4ee1ade0ec4415e2abc05bdd0a55d2fba0409816ad0ad9b9f3bb549206bffdf23b0
+EBUILD cryptography-40.0.1.ebuild 3820 BLAKE2B 4f06a69f2b7a8c4e227c0fe9f049001e8be64a0fa37ac1711901c4459de8bce66d373db689f707349e409caf8586141a768782c282d5357da959b76ce30aa4b3 SHA512 3ea5433983b90cce2cecdd38115accbe6487b17b92169c3e63b8ea024fa31244db49ca96207e86ae67201ed902f912e822cdf78308c05d776ec3642183dff4af
 EBUILD cryptography-40.0.2.ebuild 3827 BLAKE2B 4eeb767282323ab3998686f8f5342affbf0ce712dd5618d6ed888cd7326bd0734bbf3cf52ecb867eaa326b84d65dd3bbaf1bcf34112762971c63a152c6c0c87f SHA512 3878b114f919f2386932f448a01041a3627f509686c89aadb161640b6bcd8a33f67fc5ed75b6d93d23fb0c38939bfa51793e26e00651ff88cebba143d3e12ae4
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-40.0.1.ebuild b/dev-python/cryptography/cryptography-40.0.1.ebuild
index 3937718c3246..1a040912ae3d 100644
--- a/dev-python/cryptography/cryptography-40.0.1.ebuild
+++ b/dev-python/cryptography/cryptography-40.0.1.ebuild
@@ -112,7 +112,7 @@ LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index 38b893f2d7e3..9cb027be01bc 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,3 +1,5 @@
 DIST diff-match-patch-20200713.tar.gz 60711 BLAKE2B 9108557050d0aced61e8073e0bfa1969e780e4350dba86e3cb159760d180b09ff2502e8b0a664370e0586bb0ca280f29cfebb983cddf051f10204e3cd1026d8f SHA512 f161efed3d87dd0693c98ee81aedb3868787f040f8f9f31015f9f1de04d50046be75b2351a65a4c26ae1d194b983dbc1420799cf70e7c25737ee4eb3cc78a183
+DIST diff-match-patch-20230430.tar.gz 43324 BLAKE2B c13beb380d68cf96af41c124eb23f890c71664624de20780ea586f71b4c52a55ee06ac3427c61c233ebead309fcca02cb75f3447f17b7306c2728ebc5b06f6f8 SHA512 a62d15327de659999e3381215249fb088a9e40368008b91201de3db3d02f22892bbf6d2ac40dc4ea4986d24470dd396eaf69583fabbe9078a5cb1f97bae94000
 EBUILD diff-match-patch-20200713.ebuild 400 BLAKE2B f820250f4daf9469f7455e1c3afb7205a7bc00825902eb05590845b45f3186e88f9e278b8607edb15cba53fdafd6e4778ef65c0abf9d8efef04b4fb8a77aa07f SHA512 b0b5596798ef46246f7609613b912a14d4537380e2c7f60892736453755fd3ee2f3155192acda6e3c3b29e19a3a158a12974721a378f16dc5c8a04c85d7271b4
-MISC metadata.xml 1185 BLAKE2B f7be2dd5be0415434a378ab66383e4ea09bad3e6c4f4d90dd5aa06d00a0ccbcaec735489a2eaa9accb25a95203a7328895c76b98a15097971b921b9842548ed9 SHA512 c11a0ee2ec7ffeb30eb47050baeec4ac87681d31b2469446b9eca9387c278c716fcbd66e3d8807ba4ab6f070f26f02d0d6af87fb3857fd7df7ceb9da329cc851
+EBUILD diff-match-patch-20230430.ebuild 494 BLAKE2B 9208f851b244291aac99dd5472550275ecd553d30e5fab887bea53d367fce4535837b1dd7621398314aa9563a84baacd0adebbe9ee026b4ee921efdc3a84ecbc SHA512 a89fce45b8df1a698087a71e63df6ef0f370a83414ffd73dbda8906ee8959c5b5885a0fecb35717ace444f4c9207300ca8818cbb253720e026f84667dd729c22
+MISC metadata.xml 1265 BLAKE2B b9cee200ca7d1e918e77f065231d8860293ce280f6b66451609632d777d09f9b241119952805151120a361cc6f09eadac8c3cefe45cd66ae38f807dcff0641cd SHA512 0ccfcac32e5a2f4a3604cf2b97fae2e6a98fdf0b8a426c6c05c1f9818652a9ca4583e4bc4e7c6ba72d7c72b2fc397fbd3863e9f0a65da9f60c4373e4c087ad05
diff --git a/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild b/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild
new file mode 100644
index 000000000000..0251b27bf244
--- /dev/null
+++ b/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff, match and patch algorithms for plain text"
+HOMEPAGE="
+	https://github.com/diff-match-patch-python/diff-match-patch/
+	https://pypi.org/project/diff-match-patch/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/diff-match-patch/metadata.xml b/dev-python/diff-match-patch/metadata.xml
index 8ff39d9ab20a..3a1754d7588c 100644
--- a/dev-python/diff-match-patch/metadata.xml
+++ b/dev-python/diff-match-patch/metadata.xml
@@ -20,6 +20,7 @@
 		library features the same API and the same functionality.  All versions
 		also have comprehensive test harnesses.</longdescription>
 	<upstream>
+		<remote-id type="github">diff-match-patch-python/diff-match-patch</remote-id>
 		<remote-id type="pypi">diff-match-patch</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index eed37e6c02ce..cefd6958a7c7 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,5 +1,7 @@
 DIST dkimpy-1.1.1.tar.gz 66368 BLAKE2B 6b9107129a0857a384d90b9c7d3970177aa32edaaeb41d62dd4edc6fdf7e8c16e3160162aaed074f865d476dc3f7f20ad299f7034858c0fc59ef88c651552ae4 SHA512 46db739f48f5b3aa1605f12822bef61286767b8770685d5056fcebf8475f9cbc78265c792a0371226ffaa97a55703acc6f6ae63c44944cf29a392c8bf51d49b9
 DIST dkimpy-1.1.2.tar.gz 66466 BLAKE2B a202acba76b83bc6c9e82d02e45ae77a09aa016c77285efd8c1c291ca9633f1cb02335b86b6da232a291e6f9a9ae3b344f217a1539bc9bfd7b0cefcbff81ab4f SHA512 92d8427ffd58269d91d0ebc20b082cf110431aa73a1b49fb4565d69e84b6f99404eb7cd91a3c81683461e6ff6361084f41a147b35b36ae4824cffe756b78a9cb
+DIST dkimpy-1.1.3.tar.gz 66793 BLAKE2B 179bd811725f17a89c6ef62b9295d5e0c97df9fc6257e62025262466eae79562ccb3e8088e2388ec481558c88647a646ebeb9b36afbf5d59919e14ac6f1ce0af SHA512 6c845e80183b9c0384163f9353b4cf065736684ec4b32f4d71ae9b92eff51105358d7c203f38d427921c00722656dbe1971247dd69e7a1442d6d0ed89874b2d5
 EBUILD dkimpy-1.1.1.ebuild 764 BLAKE2B 685f28d69261fddddc280e1cfd415006b4922c0a5d98693db4da248c875af4786aad094cbfad8268d732004b4eff003efadc654b871e5bcc572a54c33d0a09d2 SHA512 c612ba54b0e88755784ccfeaa77a1dddd07a4c97aaa7987133ff42ea482c53a9ee22fea0dbf6c62316df29b7dbcaf819cd15f36dffe252dda67089ac7e4daecf
 EBUILD dkimpy-1.1.2.ebuild 767 BLAKE2B 8960217a56f673459968760888226b9b4f6f98db17d268ce589e578661fa4ac2612fa1acb617d2c44f33bdaea5c2305392decb213fa1dab7281814c6020bf7c5 SHA512 ce8c5728bf2076458fbcc7270de55a43695899c5db046d3984e707c5da687a54a5fdfaeed394adbefa02ac26b51dc31015fc3c9071e8153faffcdf1125c681db
+EBUILD dkimpy-1.1.3.ebuild 767 BLAKE2B 8960217a56f673459968760888226b9b4f6f98db17d268ce589e578661fa4ac2612fa1acb617d2c44f33bdaea5c2305392decb213fa1dab7281814c6020bf7c5 SHA512 ce8c5728bf2076458fbcc7270de55a43695899c5db046d3984e707c5da687a54a5fdfaeed394adbefa02ac26b51dc31015fc3c9071e8153faffcdf1125c681db
 MISC metadata.xml 538 BLAKE2B c0b9cb73f84e5f3e6cb6653b0983a0ef5002ad9c1a201b36f6ccbfb150d15990820562b18eef385e571f024b4e44f8572b30eaea57e93df44bbb6105df7abd11 SHA512 1c650532a9c9152eef0803c1c29781095390aca93c036cc097dcf6b16ad0d5ff9938ed48cb12ab092d0df777fbb6f7ca6626be7dc10935ac2563332869e6d511
diff --git a/dev-python/dkimpy/dkimpy-1.1.3.ebuild b/dev-python/dkimpy/dkimpy-1.1.3.ebuild
new file mode 100644
index 000000000000..7a71236ad9dd
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="
+	https://launchpad.net/dkimpy/
+	https://pypi.org/project/dkimpy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index e18fcbe4f1dd..7e21aeda7f4b 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,4 +1,4 @@
 AUX docopt-0.6.2-pytest_node_from_parent.patch 958 BLAKE2B 0fc4437f92f9410a47823a28b1b26057bfbc1687923ee56b0c69b4d921128b7b868fd793098b8399349906a4353aed9e2801ced0d458cf121af31b209df118e3 SHA512 74a384b1e62128df781c5c24bfa6a0f01de63610fadb51349f8f094375b84ab090209d86cde1a65116c735bb90eca61cabcef60e608297bb6976da2f5b510529
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r5.ebuild 679 BLAKE2B 7a81c633f4a87fcb4d16fdbaa972fa8401d667f8e381c533899cdda9a681803a2beca168ec14a5710b446c580e29b012ae1d12a560f35b5182b3d3d0b27ad5f9 SHA512 ee260da3126d743a7cd00739697663e35b5b4ccd8bf972100a238a97435abc43eb0fe510fae7d9333f27c72890b2f2eacf5660be15bd5c226dcd0e249dd91d41
+EBUILD docopt-0.6.2-r5.ebuild 677 BLAKE2B 1a38b430794b55c333319dc96d6631ecde2c50b45b14204112e0c6ccc1fc05a02276e69378271d373a7afbe126ac3639436ea532f8ef3fe4a51f630e95dd65cb SHA512 3f6095e712f98cf8544e824d3e8ecedf503b868f9bfbcaffd6a1e664623d6443c16ecbe97a0586e0eba0699ef45e1d1bddb049fa4f5aea92faa049fac2c8f688
 MISC metadata.xml 387 BLAKE2B c190df1ef516cca0d259568bb7c371b007f0bdb34dfaeda4c9cf6fca58773ce5db43eeb526e4046797d8b7c367a8aab060c29ab042b51f0f3f7df4e0fc896345 SHA512 c65933341a2f83c779ec8c9557aa35676a04ee748aa007da93294154c8df2471194c2c03cd88a10edbfbc1255c9732ef1a3aad4208a917c095fd1a8ed8ef7843
diff --git a/dev-python/docopt/docopt-0.6.2-r5.ebuild b/dev-python/docopt/docopt-0.6.2-r5.ebuild
index 96675c6941c6..27e02de9c12d 100644
--- a/dev-python/docopt/docopt-0.6.2-r5.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index c8eccab687e9..23b24c2240e9 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,10 +4,12 @@ DIST hypothesis-6.72.2.gh.tar.gz 9358396 BLAKE2B 0f93935523f0f56ec570f1434d33ac7
 DIST hypothesis-6.72.4.gh.tar.gz 9358883 BLAKE2B c877e98140d767b7ac5c9c968f21f1ae26fc7405a740fcdeafb3191a7608da17791b49ef769f0373efeb39a1ef16a519335072dff2a6b88a71b300eea4266dad SHA512 e94b7c70f775337084f43cfd8088a43919383a66f4e8896e1a9bc27e282a718083b3a38c49c25e57eb22688a7fbd8f76fb8809a42cd0d7c4dbc69a415cbe952a
 DIST hypothesis-6.74.1.gh.tar.gz 9364092 BLAKE2B 917b98aa86319c902aff8dd7603b02e94722a4d4b22428bd981f130d2dfac3c85eb5a15c98486ea709ce9f4f6ef2f882a6c3263b650128349a2fb0737b134728 SHA512 ad6e53579434c15ae843d827590275955848575e8f10899178289f19ae7b5c23a60bb2ac329ed782e2018635ac5c62fc08336c3454ebe1987fdf64d4ec4cb5a6
 DIST hypothesis-6.75.0.gh.tar.gz 9368603 BLAKE2B 8f98fc5b2cf24feb8ea9e417d7d75930ba7cc1ea889222ead0b1a4992ac6e7968542263d2da595598f3dd22a8c60803d10d2657c46df5784a901f382f3f8c4c7 SHA512 d4214511da6e6a628c7fe81a756d2462448d01b0c45fc7816156859ed28cc405c9b64aa2c38aa55602d6d977a6366a3423bbe8dbd00f9e5970091ccfc63dfddb
+DIST hypothesis-6.75.1.gh.tar.gz 9368674 BLAKE2B 4a25c1537a5aecf0cd06850fdc8d034621a1f0a1593fb957bb671a4cd463d6ae0013b1e1b3906505f7eba7597ffda2bf698ecf594e1de6e37eaef57201a83094 SHA512 3f3b48ec93f26756c760859af489783ad2df3c93e76b9110d40fec74ffd23de07ba76f897262950f0d97b36daff7ac1f2e319f9f75b6132a9113932e3982ec5f
 EBUILD hypothesis-6.71.0.ebuild 2128 BLAKE2B 74e1a7c5fb6d1d7b9acdef8a94993b3d0b5cc446b0c7208daf25065c5238d67851a417d3d0b73f8a108bfa7468fe10db66d7682c467a5cacc6f7cf7beb692651 SHA512 2b76881fee9dc0ed2dab414ccbdb7bfd63102b72b8b8664668e37164e944f444c9c001d7144ee22d05f3d0b3de9175874b1fd993a108eda4c2c388dd978e1ca9
 EBUILD hypothesis-6.72.1.ebuild 2125 BLAKE2B 51d07695cdc9af22cb2b6cba55a932a31325861d109fa77216c3dfbd5bda0ddf4246014e90faa2559e7f50334ad5eb33efb377be5319525e664f5c334106ba87 SHA512 bcc6d5b8eafde5dcd3aef80abc3485974131f29975500ee6359fad0aec7d1759848fd131d9901a13a5bc48ca880149b9ef72e5baad1a1368a9300bac65cd7807
 EBUILD hypothesis-6.72.2.ebuild 2462 BLAKE2B cfdd254098008afca44214767f81fb584a68a071f444abea8316b203e5402bfecbfb833fe2654fc081395340a048ab4600afc769ee36cfe4a0bb152897aa57da SHA512 236e73e4bc0de2d653755d87e4440e0031f19d6181382fdb88a4dfec8e576f5a435c6929a133847edf8097bb7da837cb54c2443e29352f0d0948c143f011affe
 EBUILD hypothesis-6.72.4.ebuild 2462 BLAKE2B cfdd254098008afca44214767f81fb584a68a071f444abea8316b203e5402bfecbfb833fe2654fc081395340a048ab4600afc769ee36cfe4a0bb152897aa57da SHA512 236e73e4bc0de2d653755d87e4440e0031f19d6181382fdb88a4dfec8e576f5a435c6929a133847edf8097bb7da837cb54c2443e29352f0d0948c143f011affe
 EBUILD hypothesis-6.74.1.ebuild 2462 BLAKE2B cfdd254098008afca44214767f81fb584a68a071f444abea8316b203e5402bfecbfb833fe2654fc081395340a048ab4600afc769ee36cfe4a0bb152897aa57da SHA512 236e73e4bc0de2d653755d87e4440e0031f19d6181382fdb88a4dfec8e576f5a435c6929a133847edf8097bb7da837cb54c2443e29352f0d0948c143f011affe
 EBUILD hypothesis-6.75.0.ebuild 2462 BLAKE2B cfdd254098008afca44214767f81fb584a68a071f444abea8316b203e5402bfecbfb833fe2654fc081395340a048ab4600afc769ee36cfe4a0bb152897aa57da SHA512 236e73e4bc0de2d653755d87e4440e0031f19d6181382fdb88a4dfec8e576f5a435c6929a133847edf8097bb7da837cb54c2443e29352f0d0948c143f011affe
+EBUILD hypothesis-6.75.1.ebuild 2462 BLAKE2B cfdd254098008afca44214767f81fb584a68a071f444abea8316b203e5402bfecbfb833fe2654fc081395340a048ab4600afc769ee36cfe4a0bb152897aa57da SHA512 236e73e4bc0de2d653755d87e4440e0031f19d6181382fdb88a4dfec8e576f5a435c6929a133847edf8097bb7da837cb54c2443e29352f0d0948c143f011affe
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.75.1.ebuild b/dev-python/hypothesis/hypothesis-6.75.1.ebuild
new file mode 100644
index 000000000000..6173a4ae7bc6
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.75.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		EPYTEST_DESELECT+=(
+			# failing due to warnings from numpy/cython
+			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+		)
+	fi
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 72beb15122ac..fae0f4f8325b 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,3 +1,5 @@
 DIST jc-1.23.1.gh.tar.gz 12853550 BLAKE2B b10c3688025c35b4f71345756b6efd93af1e8abe2a343ca66e9f658d986f7ce60c04526d65a27286425f1f24c188de3e2ba923e4304a8e669139006db1d53766 SHA512 6f2936b6c42136909ff04233cbabbf0a5827552d83f29131c42cbc4de20a3b7fee2263a5cdec9c596d39fb3edc26dbc56863631e992d124c038c53490ba37ebf
+DIST jc-1.23.2.gh.tar.gz 12866729 BLAKE2B 8c37611e75952533fbbb1ac2a4dbf9fc95d6764452bc619da2fb4a0e5b870f3314061276eb5ce0f98f69fd26ae5b0f083443c7840a1254f5934d9b210d7fe4a2 SHA512 bf3b846e359fdece1445d9ca70e7752db05894f97d4c1ca162ef397ffea9e3e719dbb71d496cd0565649ebe47f977d7ef7689e360470b29639523f24b45fcdec
 EBUILD jc-1.23.1.ebuild 679 BLAKE2B ed9a4947dd9c653e2e686e13a86eca2bb51271baac935de60d45a511ede083fe314b673aedf49a2e6c8fd1f96c7f9a42af3c342c4990fd751fcc05bae1c7a353 SHA512 0118ff8cb50c0e571acb0a300409490232e4793f1d67d781b05665d9c9989e1ee6ef009a089786bf2943ee7f9181ebcee96f3328dfaf3f8ed5528f2d3e60f602
+EBUILD jc-1.23.2.ebuild 713 BLAKE2B 87c178b9285165e5b89109f3ee687d389c69a9eeca34594f27cb3bcaf44d2866ed323eb8d824cee2b7a890281b5e8b2e7d44ce679b6fe3cd785ec4c0d41335c4 SHA512 05e6d89e856278ad0fcec89902b2a1e5af51792e39e276318e336d9642f3a7cab67445d81c562f13a7f96f9a5d2d7797896a3d611705ef95d29e2f2e9cd5dbfb
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.23.2.ebuild b/dev-python/jc/jc-1.23.2.ebuild
new file mode 100644
index 000000000000..1a55e5e1e8dd
--- /dev/null
+++ b/dev-python/jc/jc-1.23.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+# no tests in sdist, as of 1.23.2
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index 539fc1048694..2c67f843a179 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
-EBUILD jupyter_server_mathjax-0.2.6.ebuild 1082 BLAKE2B 03b7b2c76b7d580aad025588a8f81d940a08c9f6bbe31b76ca55463f84b20018c994dfa611fdca301092747b1e9151873d8c3a3969203ce303bfdb8e25aa5fa5 SHA512 4d932464de0d7df1e2c35bad2bb7c982638c1f56d20b4fef0937f5bd29941bdc917427e71783d4a50ba66f45d31cd93e668ae30ce72aa8e59ffdf4fe9d5b1406
+EBUILD jupyter_server_mathjax-0.2.6.ebuild 1080 BLAKE2B 74b277bf552be0330a1f1a40004dc5a5f2da79a12775be4e690afe53cdb0c1d524e9f2f84f5db37bb7aa659bbc4b67db0669cc015db29e64834de0ffb51e583e SHA512 33d547625e571f72564929d121feaa7a205d272b664380a416f38d45fb9ec77656164011073a27a2eb105ef3c3a0ef0f4d84f66af13bb23467d31d69ea12dd73
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index be933f11ae3d..2bbc73ee500a 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index cb86ae503b4d..f91ced8736b2 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -2,6 +2,8 @@ DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f40
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
 DIST nbdime-3.2.0.tar.gz 7513703 BLAKE2B adfbb22e4591112b19079fed6fd7ac4db9e9169a5122cb1e9ad282ef9d07af9f3e69b84b32558af539abd5c7c010eb42182c29b4eba486159961b35cb709044e SHA512 875ecd64f55b26bdb239e489022ee33ed28dd3bd459c9f8ef0c40d86011d4b024e42442cc347ab193a1ae6bec0a0a385894a381f317f74676e7e43edd3fdbea1
-EBUILD nbdime-3.1.1-r2.ebuild 2943 BLAKE2B 088a9f984cc4dd332247ff86ba1490adfddee0de01282c22f22ead697120f3eb7441737734a9841425471d604eedada7b4126a7aff42ef3dbf183f5bb05ec456 SHA512 06874b5a179339be7dab73d777ea80b2441f7aa735cdcb71f9a5933f2b3289eeee98cce5134d0349488032241abe2d2f395661c75beaf4148fb72101b24e637e
+DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8 SHA512 6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60
+EBUILD nbdime-3.1.1-r2.ebuild 2941 BLAKE2B c0b2fcbc7bc0dfc96d21e1583db81d53a9207a1f65a975fef9ebea77602b3653396113486f98ae6bc0884c5402f6a6a6d02e8126205e40039844b4b6bd7ee2c7 SHA512 1c723a48a05a96c20aaf377d7476b0535570a643ff2298ca86ff6484a6c9d61a7d7a146970ea58e886bf1216c38ff4cc06d29df304f6226349984eeb194c0b0a
 EBUILD nbdime-3.2.0.ebuild 2370 BLAKE2B 5ea10a6c8c459225e5de6f28b1c2d16cca2b0ed0bdcadbfb0506abc71d4d2c54608f6e99fa41a6a65c3f3d66c8f0ca9dfcbcb7b4d46252e304b1aaeeef98e732 SHA512 04ddccf118bfc39dbeb5ab9b3b7d222c62f2179374c3f6e3321105ef1a4a0aa955ce7dfea3cddbece5edbb07b4824f297e920f53c078ecd1b75767da8bd077dc
+EBUILD nbdime-3.2.1.ebuild 2370 BLAKE2B 5ea10a6c8c459225e5de6f28b1c2d16cca2b0ed0bdcadbfb0506abc71d4d2c54608f6e99fa41a6a65c3f3d66c8f0ca9dfcbcb7b4d46252e304b1aaeeef98e732 SHA512 04ddccf118bfc39dbeb5ab9b3b7d222c62f2179374c3f6e3321105ef1a4a0aa955ce7dfea3cddbece5edbb07b4824f297e920f53c078ecd1b75767da8bd077dc
 MISC metadata.xml 414 BLAKE2B 9951da7227d2b6628d68aeef19d236a17e9011c62f6318ff274f7979b0db4e7e84be7dfcaecb32c82069a761a743efe6c8b27cfbac421274c39e417cdcaaebf7 SHA512 7fe4193e5844adc4d403c8673acf55bd9c7322c484374072239dbb266e0312bdd9e7b18e0f338e45e602003c89f1cbf50090ae9fca2e38833e17d41dfe4e131e
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index 93f4dbe89ebc..cc2ac26e4f8e 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild b/dev-python/nbdime/nbdime-3.2.1.ebuild
new file mode 100644
index 000000000000..b771305df768
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbdime/
+	https://pypi.org/project/nbdime/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter-server[${PYTHON_USEDEP}]
+	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/recommonmark \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
+	nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
+	nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
+	nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
+	nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
+	nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
+	nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
+	nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
+	nbdime/tests/test_web.py::test_api_diff
+	nbdime/tests/test_web.py::test_api_merge
+	nbdime/tests/test_web.py::test_fetch_diff
+	nbdime/tests/test_web.py::test_fetch_merge
+	nbdime/tests/test_web.py::test_offline_mathjax
+)
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --skip-npm )
+}
+
+src_test() {
+	# user.email and user.name are not configured in the sandbox
+	git config --global user.email "larry@gentoo.org" || die
+	git config --global user.name "Larry the Cow" || die
+
+	distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}"{/usr,}/etc || die
+}
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 4f4c87d46afa..ba58389aa892 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,6 +1,6 @@
 DIST nbval-0.10.0.tar.gz 62727 BLAKE2B 5b8d2815ec38481da1c0b3b5b62f809a231c4d136499b73ef13dba6a5214c87a5d4f77db1d81488e1bf13bd3ff365414e75760763a56a3cc28e752dd316ac009 SHA512 3e0e495db40aa4969e03ed1359f0c509b7470a54b3d8b6a85731601af5da0407bd44b3f069178f1a6b3aca7bf243747aaeaca4cb2332912e917e360f705eae61
 DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7
-EBUILD nbval-0.10.0-r1.ebuild 1042 BLAKE2B 906cfea79b5a4506e928069bccc132cc85b2e3adc48abbc4e96a5993847b64f810ff2690262601db173b41f1095281e1fb8edf08f087ac4b4b7722022f48fdfe SHA512 9554d0087bc343bfb9da83653c67fb04ca0de00077cf1d50811126f8e2806accb4ce6ab80d7c9cfe6be1719538e7d2c3b7875459e8a27bb09c428d26061f0064
+EBUILD nbval-0.10.0-r1.ebuild 1040 BLAKE2B 454487b4a4b6ddeb42c619d25ee9de4d31471f5a8c6e5292319e4b5756a4d61e367a9314fcee3df62f155af4783a1df9539bf5636e5a97cf3b81e8b055f4f48b SHA512 18745640d20dc4b9149ff9176048b87462d04414389f53e9d805b2e9b277c677b7be401d812130c912a25c224b151fceb74b6d9bb9ad9c9fd82f94c13aa1e5e2
 EBUILD nbval-0.10.0.ebuild 982 BLAKE2B 2cdf4e4513111076ec62decaf10b4931445239e29528c35ccd4a672087f4c59c9e04e5c8af21db81fa5fb46bdd50d2fc00188c56be830797cd9b872660890798 SHA512 0115387da679b9d11f378e9c8a59c4af78ca8d2ce3b35f57bd5a834e6678cc3b99a01eb77a663c70e21fbf84606e167f7b2dee2380dbc294fb9bef0db38e5108
 EBUILD nbval-0.9.6.ebuild 978 BLAKE2B 2ff41fe3f14119a897ba2a31959b17ba1537d3528c4ea18c9f5865dbb23ab671082d49665dd00439a79500ead951f5ad738998851ecbf87493fbe2703e88c832 SHA512 18b47f5a8a56d5df04b5243412a394c51feaa19c510675bd103bf4dde4167a805afde61081ef07e47f3eaf6c42d12cf65a87d26b33f8271f7ba3a92c98260e7d
 MISC metadata.xml 984 BLAKE2B 1f5a69806d70ed9aa5c0cf2a7f3466afc76e8b5078923142d10aa8ac5a68ab41dc54cd2345cef061236b7b68fc13fc76ff7a072b9fec8697eae259272a32aefc SHA512 13284c08e700976e1da78dbfe0038c2cca1d1e3f286726c4096ad53ded3b6ebbaabd51e105f70781be57293a46d8e2de3116e406cee4ac35d2dc80f1a165a7f8
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index cf949aaaf925..d1b987ba5d96 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/computationalmodelling/nbval"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index b98224d34e48..0843e8d7e7d8 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -2,7 +2,9 @@ AUX pygame-2.1.2-libsdl2-2.26-tests.patch 889 BLAKE2B b676d4f591041858492df2cbe0
 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
 DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
 DIST pygame-2.3.0.gh.tar.gz 6547956 BLAKE2B 3189dc5dda7e5fc12fe2091af304816d905a24a33f6f43070040b90bd1bac1191fe6fe1a738ccfda49b5d9b472a704962c3b6aa7d8b99bc67e15317a9df06a2b SHA512 ed93cf5f0fac67b8a03f25f514ac71bf9b9a97f4df30efca9e3225396769e7616d3ce1063e6cc6ee3f4e6f1327154a9e0ec4e81b179578118af3a140bb1543bd
+DIST pygame-2.4.0.gh.tar.gz 6602242 BLAKE2B 27335b2bff6ed20cedc07bd76d50b8cc36c3e8b5c295785b675963fd8730ada8711903db5ef167e24909d274888cfa9dda026df31a7ef5c71e90b76f446e4729 SHA512 4e8500753a1f4314c57c82b6fc43d5666d0602d7a1d7aba6ba8e7b208b0350fa0dcf3a6614cb75202b18931050a6bbd2d51ec08c04c8afb9b13bf27947bcd3ea
 EBUILD pygame-2.1.3.ebuild 1975 BLAKE2B 9d8d7ebb593c89452536e91989833bae2d208a151450f331033e08c9389ad41221f064371d9dd71732f46d059f797185bf94b473164d9525baf6c425e5465674 SHA512 1380ffd43c772136ebf8216ffcf16febdd3d12065792021052f35b2d282130c7fde6dcc09906ccb97eb2247c519c4517b1bf726c5d26cc9d54ae396039fc100c
 EBUILD pygame-2.2.0.ebuild 1912 BLAKE2B 31fdebb9c749217a33ba81ae930e5dfd27d5d1b7df75cb2874640ec7ce1c8610871ff72687b0f4e0fd1d5f4e494c5f7106a6307a1762329e4244030f15986390 SHA512 ddef31ada30a32e9ae3c57c0fe05ebba44b226bffe186728f5b5759fbe8340625a9494b3e3f77cdceeb60a39faffdd73041f5cadfc6a5eda0044164b93c5018f
 EBUILD pygame-2.3.0.ebuild 1913 BLAKE2B 041ea48f7861f6702cef524b9056d35e3a91bfe332e724e99bef1c46c38a4370e965e54ff0dabd720bbc216c366fc2365f2220f760511ba7af0c7206fd82109e SHA512 963265794158716730177eaae6f0caf9679171c753010ee586d11193cc1df0e514a1af08067596e573d3da31320990a323dd2d35322b727281a3fdcdf13e8415
+EBUILD pygame-2.4.0.ebuild 1916 BLAKE2B be3df976b5bff81721344d9e25613cc44ffc940ac4695329de90dcbf6aaf1e4ff0f89c2be3526dd96243cd0301f27b74df05f534e563ae68c4515349089cd490 SHA512 0519c416542e271dabc59be0491ab5995cfc4adec586ed143fd276abb032674821ec31c45848b741138fd3aced2a3c6e04f4447d55ac16515027e865563388dd
 MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/pygame-2.4.0.ebuild b/dev-python/pygame/pygame-2.4.0.ebuild
new file mode 100644
index 000000000000..98583ae7b73f
--- /dev/null
+++ b/dev-python/pygame/pygame-2.4.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="
+	https://www.pygame.org/
+	https://github.com/pygame/pygame/
+	https://pypi.org/project/pygame/
+"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/portmidi
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
+	!X? ( media-libs/libsdl2[threads] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)
+"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig
+"
+# util-linux provides script
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)
+"
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py || die
+}
+
+python_configure_all() {
+	find src_c/cython -name '*.pyx' -exec touch {} + || die
+	"${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index 669b02d7a005..f6fb8f8d3f4e 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,5 +1,3 @@
-DIST pymilter-1.0.4.gh.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
 DIST pymilter-1.0.5.gh.tar.gz 1030610 BLAKE2B 7af714ca771ad9c90a0b20b386f0d46d25fc5cd213c43f7c1c6edc1a9300f7bda987f46fa9a9b8add68f020c33783648f9187c3b05a34a4c13ad8a4ae7206f39 SHA512 d6cd291f3be5402d6e4ab824deba940c6500d970b30c8d73b2fb1952eede4ac784033a7ae0b9a7307f18a3bfd52fc3f40fb0a9cce6cb94e724fce5cc3e8eb25e
-EBUILD pymilter-1.0.4-r3.ebuild 604 BLAKE2B 32d0aff5934ea30dba647416adfd2a284b46926c33fb8893c4eaf1f6cf6c3b5452f5a30b084fb7e4e632db4aa25a53cd072c3eed759dda390725075eb992c632 SHA512 945a0e645a8de79529450b86b4edf48d6bf38f1c20c17682dfc3d71153bc73cd03458d1d934ab15f34d940089a501e109acd9fccfce33988ff1d6968692bee5f
 EBUILD pymilter-1.0.5.ebuild 695 BLAKE2B a1b3f6b1dd38c910da611f0852b916bb63b2b4651b85cf0ab498a76acfc34bc436d690c95fb4ab2fd45c152142bcac2a1b251825232c8e978ae6471698ec045b SHA512 30eb3867385aa903caac8f4dfe6f19d180fe650fef5e9e5a20a42be8ee88f245b8c3e5f427f12e87f18a80b55b812c79f3f5e3f9add9a6945405a52eba756bdb
 MISC metadata.xml 553 BLAKE2B 66a69c981dc6bb2ec26750786ad9c75f103fd67b1d08cafd9d987b06e23e03a8e977c75af33e40ea8e21daa941627f4a28e21f1a40feff141df35eff0cf10c82 SHA512 3e3cf81d9072195e491cf0e6cb219fbad2ef39bbc6b1a271ab0cc23b607f6ececd4b470a869f9cbe62cebd589259a87cfceac508c147824207a37764d52133a2
diff --git a/dev-python/pymilter/pymilter-1.0.4-r3.ebuild b/dev-python/pymilter/pymilter-1.0.4-r3.ebuild
deleted file mode 100644
index 4e824e349ad9..000000000000
--- a/dev-python/pymilter/pymilter-1.0.4-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to sendmail milter API"
-HOMEPAGE="https://github.com/sdgathman/pymilter"
-SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="mail-filter/libmilter:="
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 2091612ddd5b..325e2354399c 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,13 +1,17 @@
 DIST SQLAlchemy-1.4.47.tar.gz 8559530 BLAKE2B 051e6f0114162f5525e756d8762281464020a3c4e1751df8432f76ce3281ea1004fbf842e92bdd310e3a736fc87d25db12a1566720c76bde7960d51c22a483da SHA512 702cbae848bc662b686db43b2d2dbd18b503b3aacac6f5960bcd260cc5bd7058536ff2207f1780cb8425c228a82796490088c3ec32f24637edd2cf1cdac7a8bb
+DIST SQLAlchemy-1.4.48.tar.gz 8448993 BLAKE2B 02c5457e099a0f0bb0e5427a95d3ea35d504d0b5f1d10003b59c8dc76f92ea7b4720512d934fae64b12d95c5de5230139f3af9f5bd6e372fc07228b432995bd9 SHA512 f948e79c92889f2462b117ca49ccb8e82d5f8da0027c65488a3f6c64a802dc0bca96cc84c4e77bb3b8d434dfd66b621ef4d69c5d417ad781d1dc7136bcf6dea1
 DIST SQLAlchemy-2.0.10.tar.gz 9364115 BLAKE2B 0a058eb179e08fa04083eb75aeffff7a50b6e379ea9b5b31d568a88c8ceaa208c0df613d5b3054d477af25e65566b8d413a3be694744e96609f74ab5ac102365 SHA512 f672eec34851e85f1ba41778104a379a37f833804e549ed12cd5b2d5e3cdfb5578e05aa61a61264aee1985d03af19c81b950977ae2b458161dfc8320db371b69
 DIST SQLAlchemy-2.0.11.tar.gz 9260972 BLAKE2B a23f65e9014884d8edaa9285a9749bc02ba412e33fc648da2eff611829931a951107f941a77b00352226be5b3e62f4e6b99434a5657793ca462d1094b6a34788 SHA512 8ca9b3dd1a825b8adb788e0110fe65cf14808de8554fb9b733e27e83f77da148a36f4ebb845a81d9260d464827b5deece657d58cd34bc08262808d7964b2b11e
+DIST SQLAlchemy-2.0.12.tar.gz 9264506 BLAKE2B 83a3aa719e2809b5b48ef5332cf6cbc0e973089dad142dbbe952d14b2e4f3e5a1cf67c7a7240017fbddfafe1c57d6acb974d9c61e72970d8a8c49b7a57f52a91 SHA512 0e4bbc7d4729b2667ca1e8a0c88293e44698346415e3742ad3c686495c9855b5714dab161590605d5ee60523a2544f590f67ac7d01f7f2756ddc7156688db902
 DIST SQLAlchemy-2.0.4.tar.gz 9250723 BLAKE2B c3cec648a527e7beb349b2bbb6924a4e794a1fe4d1563ba7573afdc28ed24fce149c5b3c08fa419e85713b68080b2a805e1999e312f59ed7fae55f9aee6a966e SHA512 098004c594ff00a47a66850b0661f673e4d7a6f168fce72ca37a65ecfe04b3d291b9a6fb9393f7671c9a7c5c128ab6ba2035d18cef28736df1207e689cd8c412
 DIST SQLAlchemy-2.0.7.tar.gz 9298301 BLAKE2B abedb2805cad489e68fdec383eaf1bc65ef92777230317911a9351fce7c9159f746629197f7443a37495c23cd8d3cdd1015d8417f00227f28b8af1468a8327ef SHA512 94f5c4262741986456a9de435a81d9df8d5eed16417cc8c07321cb28030c99ea347c33a2054f2961e3b794bd5f75da19b0879675e2c1106fc5030382895caf75
 DIST SQLAlchemy-2.0.8.tar.gz 9314926 BLAKE2B bc54ba9be9f68cc2995bf5328cc5268e0890262efb162a94bd36713f3f3d2f1ddffa95b4d1d8ab140f865c2788d1a913f6c104f21809a695faa132686d77cf3c SHA512 66408768ff702b16ad1365931b254d72976313a3369a74e5a81326d83540ee274805b01d449010ea8e8750312e26dc91aad3b724c4cbdf037e7314b204f6908a
 DIST SQLAlchemy-2.0.9.tar.gz 9318327 BLAKE2B 6fd734aad4a7c281164a6a4188066d5e14996a80c849cc18b979d2acaa4bd24ed66c8ddc37de2c08759e8c0a9b36a0009bdb48123c6a50fc5c8c382a1e5df4ae SHA512 e81193ac254280feee542ad61a28540d62441d0471bdcf00cce20d3730ad956414de23ccce6d3bf8781c0970c3c825407b909d645d58c9657c38ba68716dfe54
 EBUILD sqlalchemy-1.4.47.ebuild 2835 BLAKE2B c2ed746fa742a1a59acec80bf6c7b0342c28226e3235fb3a7ae46a2d8b260cabc05840ce58d091bfaa16b7601b24c4da0f3ef32364d8817258af0551f560d787 SHA512 a326e8a93a6b6567314833c9b1b2f3da08cdab0176166e7faf7e19fb5ba65bbf0a54ab8ab1772fc7394157af02eddfcf40055292ab05431af6210adda30bdb3f
+EBUILD sqlalchemy-1.4.48.ebuild 3012 BLAKE2B 3c5761b887f620a1d98d9f967d23ada2ef1647cd2ba94d71ae686256a03764f06a26c46b852f5938e0fb2dec2a8b2db9bfaf3db6c2a6325bda510ae8c0f97754 SHA512 b56c88ed4d09afb12793317826f49c9ddc255cb67df5d5d56bac47423320518e585e1c02b37b0e9d355bb66728834d47dc3c5567ef164ced9eac0b95d258b697
 EBUILD sqlalchemy-2.0.10.ebuild 4032 BLAKE2B 267a19fdb4f18fc6e14fcf998e9cb4e6d175c5745984628ea5dc77a1e560ffb65a7c9966e9d7fddaf46e41c96a70ddfc689c429424348f310eac2781ccad5f2b SHA512 c6e2b953fb7cce4a4da29be84ff46e47d0420ee3ae31c8f6253edf4d546c4652338e7caceeb4743efece8c81ed6f8ff3c6d43cb059b19b0061305dea8be82317
 EBUILD sqlalchemy-2.0.11.ebuild 4218 BLAKE2B 484419ab7ab8b68c715b3105ec75364823c302c48f260a492d938a9355ee74b036a4db5948b3f7c718592c68e8765869ca48f754a589b184b0cb61b36de489d1 SHA512 f56ea79fe3a67df5a976219e9318431042ad1989d5642f193afaa4d23d86b5c238e40c751e7213ac216d3f524913509720f0c8eeaf9ec6b0b76fa49a4b500b52
+EBUILD sqlalchemy-2.0.12.ebuild 4280 BLAKE2B ee4f389ccec27726402b65e4d9c659a0e6c01689dbf60c566efe37865a05062fe7c7021e0a6e48e8e4c23a11573a07cb2b05674ac89ed610f3d787b6d0dc5cda SHA512 16bb11dbbf733bdb0f5817ed6aa653f7da50c58cfe5cdade5c5005169eaf8a36a8154c1ad8fde8f12fc6399a81902214a6aa92ebe2ea150a2dc759cad4bee0e4
 EBUILD sqlalchemy-2.0.4.ebuild 3765 BLAKE2B 0250e7fada00dfd9043367270cc40a7e4ffaafe587859fe7dd938dc4f7714f6a016779c928856ac35f64a430ae6f6c5629f2458dc85beb0388820fba69f81dce SHA512 565ff18cae76c9383848b569d78a4c61a5ccf1b760c363eaaa80ef489daee95f210a589a710fa273ae35ef99e768fbd17d72f2a221d31546cd43e298f41fe602
 EBUILD sqlalchemy-2.0.7.ebuild 4077 BLAKE2B 463a7310c961804ef0f7e8dcb66608c4eaa5ac0f249733c037f59098deea22fea7e6e8f53c86c98f5b703a330c09c4994bbcfabecce8342d2d36bf36acb2b390 SHA512 f20898aadcf1796b39bab2a5d66d43eb6827ab5eccc529301496803b86b444441a6ef3f21b980f79a9bee79a22b30b050aedbfa91eb870ed1afb5a94f8f996dc
 EBUILD sqlalchemy-2.0.8.ebuild 4080 BLAKE2B 1659a397b7511fbab71a9a11b1f9d900175e22c6653c7d7b81bcb59fc52041310369786f922266a45a2e1a3ad6bc699403f453eea30f2ae09b6068b93879a8c0 SHA512 22cf24bf6905986c2d0a17ca3b361498599700bb23b9da7f7e00131e92293dc93984e44558cbfc9ea5ab8d19477019fef99a4e91206f4cf5ac6a222d08b45578
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
new file mode 100644
index 000000000000..a2201b33d92f
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
+		test/orm/test_query.py::YieldTest_sqlite+pysqlite_${sqlite_version//./_}::test_yield_per_close_on_interrupted_iteration_legacy
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild
new file mode 100644
index 000000000000..ef611a252cb7
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		test/ext/mypy/test_mypy_plugin_py3k.py
+		# hardcode call counts specific to Python versions
+		test/aaa_profiling
+	)
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+		# TODO
+		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
+		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
+		test/engine/test_pool.py::QueuePoolTest::test_recycle_pool_no_race
+		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
+		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
+		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
+		test/base/test_utils.py::ImmutableDictTest::test_pep584
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index be6bf076df65..3eac66be1adf 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,3 +1,3 @@
 DIST python-tabulate-0.9.0.gh.tar.gz 59342 BLAKE2B dc101ab8d1411196619c3d77dd83c84e48f31e148ec3878c2b844a1e26ea1187cc948cfb1eb740d61a667d6b669806a5288c397ea7fcbd59685fedaa9bd0bd2e SHA512 26b0f079f1aca48578883147cb1a2e30e96e0bb85d5af3b72b26eba5f73cea41cf1a0686f666487c8374f95ca0412703168e480c947f1567e6408f941756498b
-EBUILD tabulate-0.9.0.ebuild 1379 BLAKE2B 36a7592620dfde5c3f57a7c6161bf819f864585a407d459f8da4496413059fe8e6352d230d0f14f7e1136663c1469ccdaae194d9ca8619ff492bcafaeddca955 SHA512 007835c311ce2a882a3d7fcdc97f11328859310bac8e9548df5b93b585aed0cf42a6d89a48cdde0192864145577f16d40912b0383e54b215dbcbacf71c1d359c
+EBUILD tabulate-0.9.0.ebuild 1377 BLAKE2B 6c5d97fdd29fee3cc2c2ec30233e86e785dc22b8e39bf80c7a24791c33fd4859392058e7600e122e61c0ef0bb2b6849f788a3027f7f7893467370fcc39458231 SHA512 969c6e0ad0d0f607fc919fba2eee464419158a56adab84a262fc1c75b1523bdcb58c6026b811bbcf8ebfead1ca83a560ac64599da2db8e09b2f66845a05e6c24
 MISC metadata.xml 399 BLAKE2B b92bc308afead78cb604ddc6bc288fb28ed5a2a523c890270ee87eb5bfee21133748c5861829bafcc8a7b3401b430dff84dd99264ebf3e7ea74342f99ee8cfc5 SHA512 2d8c4dca9558e5a5d6413a6bd5e2cd6e15d1d0d447e6c692af84c8575be899f3d78246782e6c908a626326662aaffde56b2c3f96f4e9cfa0473c976109e3dcac
diff --git a/dev-python/tabulate/tabulate-0.9.0.ebuild b/dev-python/tabulate/tabulate-0.9.0.ebuild
index dcc944100590..c246e85937f7 100644
--- a/dev-python/tabulate/tabulate-0.9.0.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 7e326ff18dff..d97057a6c60b 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -7,5 +7,5 @@ AUX wxpython-4.2.0-no-webkit.patch 1285 BLAKE2B 19fdee2293da214b8ae318b2670298b3
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
 EBUILD wxpython-4.0.7-r4.ebuild 2370 BLAKE2B e8b76a2c2a0b2153c4663a4e514d0ee6c54bd5946e92dc436f854775e410031393b8f8506ae50567490b5b709eb5ada1ab3cf24c980f0a14f2d57b91e21c780c SHA512 f8e47b0de868d90b9a9fcb33c9fa22a96c8ad7d195b35917239ec840a685fdd9fc42f5a0259c644dec17886395bc433a125539ab7b09107f4f135a1b08042b95
-EBUILD wxpython-4.2.0.ebuild 3844 BLAKE2B 109a338f4667b8f95b27cb6c350cd05fe8a28d351be87eaec15fb00692587cc040f98aca8d124ebf215ff7d41f510bbb7ca9e38fec3d5aa346fc1a8a9a916f00 SHA512 83e05ec66d6eefbcef55b329d2331f5c946ed832a4923b4869bfd0d209f5f12de22d32d4793f1e737c9ab5aa7685c2d9fae627afe648ccf24f390a11786e7615
+EBUILD wxpython-4.2.0.ebuild 3839 BLAKE2B aa8b7787379482def514e29543251a6908b1731c7100187cb4929df5b3bb210591dd50baacbecb6ffb14dc7f89a1f475532840f02e2c2f6b630fdf5c243d2430 SHA512 d2e5041979f897c8653511a2e41bc76a9e674cff0646e59523f214e876627d7dd33562c101e863451226a0dd5dc651debf443d27becd08180224838f3a02f356
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
index 378e4ef5a3e3..1a0913847851 100644
--- a/dev-python/wxpython/wxpython-4.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.wxpython.org/"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 # Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures)
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index b5a691bf7294..d3f48c8f29b6 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 54fc4f178ae2..fccb111dd382 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD assistant-5.15.8.ebuild 1304 BLAKE2B a8346fafdd8d94ad7da1f46ef1ba63bdff287c9a50b3fce4cb1eeeecb810b7e1117323bb503c83f54e7237f1d920d9d43f9e5ec4cde95e9403be0e1e3da69080 SHA512 b11a0b125b33f8760db75d31f65a46d7928502eda6bee6cd9a4b6518386fa753612a0a673d685a30ff87d1c8fc0b6ff37b99c33f47de48a7afdebfecdea5c5f3
-EBUILD assistant-5.15.9.ebuild 1305 BLAKE2B bd7174cb774f8d78f385e7e88dc3b35abee870ecdd296c77e086ca9b8d47e7c8cb912ded388fe4e0442c152b5a6e6015406c0ed8a2c5b45c29950a40eefc966c SHA512 6f8fa300022d2f8eff53162bedba2f8e42b51085518f32a5ccf38cf62e304cbc0e7d19c43799ffdec8528bf9df9ed143ce42ae4af04418de8543ff2af079234a
+EBUILD assistant-5.15.9.ebuild 1304 BLAKE2B a8346fafdd8d94ad7da1f46ef1ba63bdff287c9a50b3fce4cb1eeeecb810b7e1117323bb503c83f54e7237f1d920d9d43f9e5ec4cde95e9403be0e1e3da69080 SHA512 b11a0b125b33f8760db75d31f65a46d7928502eda6bee6cd9a4b6518386fa753612a0a673d685a30ff87d1c8fc0b6ff37b99c33f47de48a7afdebfecdea5c5f3
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.9.ebuild b/dev-qt/assistant/assistant-5.15.9.ebuild
index 5ed2565bdd5b..95a6f017be24 100644
--- a/dev-qt/assistant/assistant-5.15.9.ebuild
+++ b/dev-qt/assistant/assistant-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 2fadea645a72..a5883406399d 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD designer-5.15.8.ebuild 1322 BLAKE2B c91457e4c5f542c5d3e4599d4d0c51de785541ec4418adecb5611dde64a5eea71987e6f559c22291e134568f5b4b1d1c762e6e0c6773bb3863ba028ed86e9531 SHA512 f139c7cf3d6a97c41e96a4a0ec961627940d2a43b5a889672dfd1d6936a065b5f0f39ffd7e8e319b95a795ede6bb774e307feba9212763cfbf2aa087b43d8682
-EBUILD designer-5.15.9.ebuild 1324 BLAKE2B 8defbe5044f4b0db37cb778d90e276bccec31159501e40a37a8b9cc1d5cf301992366d702c2b567a9d87098bc2dab52c9d12ff02398c5dc1f1a852ee26ded3c5 SHA512 00098d4e252cf858977dd94978e3d854e07ac813c96545b05a9d9043645870c282dacb1133bf065985db9ece9935baee19f3d7aaee9a573fa23ae563848e8f91
+EBUILD designer-5.15.9.ebuild 1322 BLAKE2B c91457e4c5f542c5d3e4599d4d0c51de785541ec4418adecb5611dde64a5eea71987e6f559c22291e134568f5b4b1d1c762e6e0c6773bb3863ba028ed86e9531 SHA512 f139c7cf3d6a97c41e96a4a0ec961627940d2a43b5a889672dfd1d6936a065b5f0f39ffd7e8e319b95a795ede6bb774e307feba9212763cfbf2aa087b43d8682
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.9.ebuild b/dev-qt/designer/designer-5.15.9.ebuild
index a1d6e0dfc835..efcae7d942bf 100644
--- a/dev-qt/designer/designer-5.15.9.ebuild
+++ b/dev-qt/designer/designer-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index f6d9850ad258..4db9a3afa034 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD linguist-tools-5.15.8.ebuild 722 BLAKE2B cf53532a6adf8836728f9ae0ce4c592107042f4079cec0af41987e944f69c2a0c096531ab4c2e1002c56a73577db27442e76192fc538849164236909769a8f25 SHA512 1e6ca9494ed3b86c9001cd5611c60d1801f9fce7a42a1f621b8d8270f0d67a2927973678fba6ac12ce8a8311cd36bc425d679516582117d9eda9e6e84795048e
-EBUILD linguist-tools-5.15.9.ebuild 724 BLAKE2B 4c4b66a24172513fb436371e07c7a76fef97e26dce81ab5743db091f76965590f47b2377ba1fd91189158bbc059a999ca2f487086a111eff9838c2b70352f0cb SHA512 246d89f0323d88b79352bd272d3c75eaf5a2278eb84d44439b1fa3398deda028155b5096c2ae1b89cf1ac072955ba244cc180fa7d895d3aa0398f217e01a5d44
+EBUILD linguist-tools-5.15.9.ebuild 722 BLAKE2B cf53532a6adf8836728f9ae0ce4c592107042f4079cec0af41987e944f69c2a0c096531ab4c2e1002c56a73577db27442e76192fc538849164236909769a8f25 SHA512 1e6ca9494ed3b86c9001cd5611c60d1801f9fce7a42a1f621b8d8270f0d67a2927973678fba6ac12ce8a8311cd36bc425d679516582117d9eda9e6e84795048e
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.9.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.9.ebuild
index c471030e3aec..1f4cd8e248ef 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.9.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index e8404bd90b31..9a88f8fce6af 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD linguist-5.15.8.ebuild 1104 BLAKE2B 9bfca39b022b73027a2da3ab1d4dbab4794e73a98e0167ba4e0ac84c71df32e0b0e19c7376401dd753f5dbf8096e96120960c4299e1a2d5aed1176ec6e4b1468 SHA512 7b4556d5fbbb9fb8563aa1f28ba4a4d52aabe9b3662f16fcc3cd863e6839e77c187be96fa870cf0be059d4f475218c44d2c01b39245d27fb8a90732889d3b419
-EBUILD linguist-5.15.9.ebuild 1105 BLAKE2B b552a1f9dd9edc8c2439a472a335fcbc5fd7d6315bfcfbd481a435f1d5522b7e9803d39b67de906e465737b81f289cf02989468df64e3f50778586b7610a9386 SHA512 d71264ac109d0de9eaf288c04089aedbfcad848373b80cfc599ad562a536d5d7a7f9a9c8e36c966c7a92002c512599074937cdc44a5d3c7f7e7cfb8046d93543
+EBUILD linguist-5.15.9.ebuild 1104 BLAKE2B 9bfca39b022b73027a2da3ab1d4dbab4794e73a98e0167ba4e0ac84c71df32e0b0e19c7376401dd753f5dbf8096e96120960c4299e1a2d5aed1176ec6e4b1468 SHA512 7b4556d5fbbb9fb8563aa1f28ba4a4d52aabe9b3662f16fcc3cd863e6839e77c187be96fa870cf0be059d4f475218c44d2c01b39245d27fb8a90732889d3b419
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.9.ebuild b/dev-qt/linguist/linguist-5.15.9.ebuild
index 299d06c69c6e..5b6769e3789d 100644
--- a/dev-qt/linguist/linguist-5.15.9.ebuild
+++ b/dev-qt/linguist/linguist-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 51f13b7e967f..1d051b738e99 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD pixeltool-5.15.8.ebuild 595 BLAKE2B a174492684a223813005021ce331bd499e734dacb768227b04e927d8c93e8f6193cb07cf516332c5d785733ea716cdaa5b546214de01794a55e0e6fe90861004 SHA512 9908b6ca3522f57ef598c11c6cfd1870ed61c6c16115504f5aed4d950191a67d6cb941f160a527ec5e54683ace2fd3ba928a66be1029fd3359717b585c73869e
-EBUILD pixeltool-5.15.9.ebuild 596 BLAKE2B ff331c093dd72bab5ac5f31b2691cffa672d3805ed09e3bf7d82fd256a8985abe7cbce4c6a42d968fc4eeb385733e89dc54515cd758912cc8c50265358b1b4ee SHA512 9407e22bcee66f9c0967952518335da84cfb516fb4441da375f113e10b5613fa190872b93769b8d5f970b5015385a216525735a9df13485353006e701f719a67
+EBUILD pixeltool-5.15.9.ebuild 595 BLAKE2B a174492684a223813005021ce331bd499e734dacb768227b04e927d8c93e8f6193cb07cf516332c5d785733ea716cdaa5b546214de01794a55e0e6fe90861004 SHA512 9908b6ca3522f57ef598c11c6cfd1870ed61c6c16115504f5aed4d950191a67d6cb941f160a527ec5e54683ace2fd3ba928a66be1029fd3359717b585c73869e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.9.ebuild b/dev-qt/pixeltool/pixeltool-5.15.9.ebuild
index f83693c54bde..4bc1920a8dfa 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.9.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index ecca6932fecc..221dc8186974 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD qdbus-5.15.8.ebuild 631 BLAKE2B 649206d6647fd0162af4d9b540489918d0cfaf18832e581f473f70b692d4de1b63cc5e00962bec1fcd72543282c004206562cd72b5a3e717466e5d84baaf8d8f SHA512 390f0a5dbd4b2ae8831633cb490f3aa57e6d39467e57673e306d44c12a9fd951263007aaca856e97c729eee8ea698e61eed5497430564bc613a832c81801987f
-EBUILD qdbus-5.15.9.ebuild 633 BLAKE2B e5926323a0bc6b08b074896cd3f96158ce6367fe6d347a22dcb3d41c7aff798b5fdb8b41df6720dddf15aebde441dc839ae3f81d3484b8a5c1ca776eded3d7a3 SHA512 707aa3c959316e4fbc98c87b6a7766dffaa27adf4bb037acca2cfaa885c3e7c9fd9c9e0f3f5db58008d3551813b1dfd64e3e6a83420a643442197c917f5d5089
+EBUILD qdbus-5.15.9.ebuild 631 BLAKE2B 649206d6647fd0162af4d9b540489918d0cfaf18832e581f473f70b692d4de1b63cc5e00962bec1fcd72543282c004206562cd72b5a3e717466e5d84baaf8d8f SHA512 390f0a5dbd4b2ae8831633cb490f3aa57e6d39467e57673e306d44c12a9fd951263007aaca856e97c729eee8ea698e61eed5497430564bc613a832c81801987f
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbus/qdbus-5.15.9.ebuild b/dev-qt/qdbus/qdbus-5.15.9.ebuild
index abcfdc8a920f..9b86efa19694 100644
--- a/dev-qt/qdbus/qdbus-5.15.9.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 536b8c4fb530..85c58f932951 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD qdbusviewer-5.15.8.ebuild 1079 BLAKE2B 107f58b45cbafd223f56eb30c16f862c22be9ad8ea6a945461c164137e72cb1c1c440335d7a59fec2cdaba6a4d5e5302aae62a45945db155d4798e0c8734ded6 SHA512 fa547968df29ad8eb9682755b641111e2cdaf3117fa3855b26c6fe0e00f0b26db3d6680239b40cb89d20373cea082325261effa6801b623dbd5e26f341a162ac
-EBUILD qdbusviewer-5.15.9.ebuild 1080 BLAKE2B 4cd1adfc8b9a3a490c709c2bb6aa495853cf0af75d941cbd322aa40162e02a47c1d769e7da4891d55eff2b9fca60876e40c8e8ba33ea6714806d8c818bf95048 SHA512 9ede3aef305dac1cf6d10c90c862bc34a8f6298603b83b45a1f1b815ccbe6bc88a1b5226aa3740a0497c10354981fd61a65896b36ae0101e6da09851a394718b
+EBUILD qdbusviewer-5.15.9.ebuild 1079 BLAKE2B 107f58b45cbafd223f56eb30c16f862c22be9ad8ea6a945461c164137e72cb1c1c440335d7a59fec2cdaba6a4d5e5302aae62a45945db155d4798e0c8734ded6 SHA512 fa547968df29ad8eb9682755b641111e2cdaf3117fa3855b26c6fe0e00f0b26db3d6680239b40cb89d20373cea082325261effa6801b623dbd5e26f341a162ac
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.9.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.9.ebuild
index 851618aaa30b..ae8c8cd2f2ce 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.9.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 2522d42ca10b..222c3f727894 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -3,7 +3,7 @@ DIST qtcharts-everywhere-opensource-src-5.15.9.tar.xz 4253692 BLAKE2B 9fdb2dbe9a
 DIST qtcharts-everywhere-src-6.4.3.tar.xz 4386856 BLAKE2B 6085c66dedd26c5712c462dfe4a55246b5d694a46f31afa72eabe1f47fe3d9834b782343dbe1166c7100732f085601688decab7de087e5b34b5522df368f198e SHA512 369e5e69596a0fc4be1c3ab936d32e3690d2efe5bf28344ef71022af209813a5f1435f11ad7ed42f3dd825471d2e2d38c33564bfa514ddf8dc173b708afa3994
 DIST qtcharts-everywhere-src-6.5.0.tar.xz 4415456 BLAKE2B 405106453a2c40c57e7c5dc7981969e0a0b46865f946efc860c2775c845a857719308d8f6c7d6333e5d5dbcf0c7f45720a1386487a84929935ce276c2491293e SHA512 6b9b5081ae96af7fa122b6d9b59334d2bc69ebb44e91e544d39d62b570fa0cf763494162f7aa5c6960fbcd1197e856b19c2b278713e1d5e843e30fb25d9a2648
 EBUILD qtcharts-5.15.8.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
-EBUILD qtcharts-5.15.9.ebuild 574 BLAKE2B d820a56b99d45cbe9a63cbe78557dd5672aa2817a2bdb7d51c11b09161f8e7fb04e149c7a88baa0d31feac4b89a782d803bce3a4e8f2254ea0fd661f93ecd657 SHA512 7341bd8d293bf53854436ad1bf1e5164503f4560394e4de4b8dc79a75418679a47a41b672a7cd13c0664f6d536594efddaaa6dbd778c10e0a3c7e8b314afc432
+EBUILD qtcharts-5.15.9.ebuild 572 BLAKE2B 8b157c6f720fd9befa6b1cd25fbe018b72936c88b3b47b3744e9080bb48c78f46538df11f52498237b01967fc7c26ffaf172f24a7a1ca1e8107269aa61951bd3 SHA512 42a14766f3898d45ce51b03680f7751dad7c0cf250e7b7de7af3ab012f5168bf2aa1969d701243af5038049042e4d57d7eb66b79899048c917b4358ab9ceb4d2
 EBUILD qtcharts-6.4.3.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
 EBUILD qtcharts-6.5.0.ebuild 364 BLAKE2B b637c8d9924182c03b7998406c3ccbfd71be22400c4b4aad50cd5bd10b17c4d510a737dd1a2b0f582cdcc408c0e2852fc8402196bf2ecb3929d49a19d30a7efe SHA512 2daf6d829c87ecf1938d8a7447feef5d5e8bdd42075ad3571014c40c192293461235ae4cd1161cccf02ac94d1c7330b26b49f06b5294745e7d22f0f97750a716
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtcharts/qtcharts-5.15.9.ebuild b/dev-qt/qtcharts/qtcharts-5.15.9.ebuild
index 7c1c89f594ce..e9bd58a7e48c 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.9.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 17d80b6784b9..e69200b0d8e4 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtconcurrent-5.15.8.ebuild 467 BLAKE2B e2ad04164432baa96b3a1853d2ee3b1960349d8908367953899d1cd0a05d0d8a49b5ce04eb319c736ef7db3d4f99baae425532be7df67375cee6fae9ef367b6b SHA512 c7b6b8dd95bb8a61627502b96783a885ab6d936fcb603657dce4b011b625615b8ad590b85dcac980d1de38f010737e88ed447eb5ec2f0ce51686b265df845157
-EBUILD qtconcurrent-5.15.9.ebuild 469 BLAKE2B ea2b98475b4994205a635a5b412a8c55d818d21805d10cedf67f7b4aa6664381578bd9bdcdc6c089d4fafc71846bd7e0f29286a7899b85fe57a1965afe623b19 SHA512 7c491c80aaa02d2ed88ebe4c217a74de633b91b102fbb79ea21ec78c853653e695a4e1feb52bcbedabe51e9f6fb134720b3dd3acb15891d73c5893dec537cd83
+EBUILD qtconcurrent-5.15.9.ebuild 467 BLAKE2B e2ad04164432baa96b3a1853d2ee3b1960349d8908367953899d1cd0a05d0d8a49b5ce04eb319c736ef7db3d4f99baae425532be7df67375cee6fae9ef367b6b SHA512 c7b6b8dd95bb8a61627502b96783a885ab6d936fcb603657dce4b011b625615b8ad590b85dcac980d1de38f010737e88ed447eb5ec2f0ce51686b265df845157
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.9.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.9.ebuild
index ad79188e0e7f..11dd7f39f6ba 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.9.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 0f4136c30b1a..ff12d527dc9d 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtcore-5.15.8-r4.ebuild 3101 BLAKE2B 13af6082eaee95d509976e38037141e242ea0ef6a5fd644a6fee0b6bc34dcc2a54138b11b493302a332071494bfca91172be6e52c5f8b3657234c1896f4f109a SHA512 ccd88e7f60996f70e3e6a3a90732a8ede7ae6ca118af604eff79359c27a001b9622510356f20db1e9cd0ccadbd46626df35850a6cbb8f915988bf1c8d002424e
-EBUILD qtcore-5.15.9.ebuild 2985 BLAKE2B 46121e190a3b262e3aa2edb231542ec9d94a47d4fc84448a79d865c3b97fc7809205b4d6bd6335e1270a28eb1712ec9ff45cbdeea79e127364340d940e88795a SHA512 2950b9460cefd87146a0d0957d8323b85e30add75a5390a8779d16d0ac6e9f4cab973ec4629c89b2a87f8638a957297ddba6043fdd86e0dd05dfdd71da74703a
+EBUILD qtcore-5.15.9.ebuild 2983 BLAKE2B c3b319f027895875da585b8e2900ee76c140d819bb50b767579c1a0dbe3409cd7b7e6d518bf52fe04aa505d88ab52869d4fbf767ef46dfbba5e43c673a95142c SHA512 0d5f9dd4e9f71b9a27143efa74d1044ebe8495aba4461a098a1ee2bc287efe8b0ebc102f239be0705b9c557065511f71cd267a7d9e31f69e422709aae87db8c8
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.9.ebuild b/dev-qt/qtcore/qtcore-5.15.9.ebuild
index 47f0775995e7..32510d431664 100644
--- a/dev-qt/qtcore/qtcore-5.15.9.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index b0c930bca0c3..042c53a88ca5 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtdbus-5.15.8.ebuild 705 BLAKE2B 3bdddf199b6c94f2545ffca68fb92f599500ad9ea89e7653bf7f927260d37582465a5e65ef360692fb9dddf1e4b6ec8789bf46db73bf66bb18636e8fa95f5915 SHA512 3671eb35367921bf1ddc009c4821de77044b96fec2799f85fd26d7d1664fcdcd73ef29b97f9515d3f5d8dbafc8f241537bc497d466fb4110c1d72143f858a520
-EBUILD qtdbus-5.15.9.ebuild 707 BLAKE2B f5eb1251f9fb46ce794029df6f32f6505affe00808d40a90c171d80e3122bef2e602536f47d5959986383e7177699f4d19b0e320636bacac22e7d369e82d0a1a SHA512 832fa2ec82574edf6d416cc7749698a5104b639bef2613dacd81ca0460bb840515e8e6535fee1512da3555f4bba583500765305aa74b4df4c0bd77a91ca9a6f1
+EBUILD qtdbus-5.15.9.ebuild 705 BLAKE2B 3bdddf199b6c94f2545ffca68fb92f599500ad9ea89e7653bf7f927260d37582465a5e65ef360692fb9dddf1e4b6ec8789bf46db73bf66bb18636e8fa95f5915 SHA512 3671eb35367921bf1ddc009c4821de77044b96fec2799f85fd26d7d1664fcdcd73ef29b97f9515d3f5d8dbafc8f241537bc497d466fb4110c1d72143f858a520
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.9.ebuild b/dev-qt/qtdbus/qtdbus-5.15.9.ebuild
index 09fc36a64b97..810341b4845a 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.9.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 210b9932dd25..a48d5b6ae7fb 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -6,7 +6,7 @@ DIST qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz 21587820 BLAKE2B 530f
 DIST qtdeclarative-everywhere-src-6.4.3.tar.xz 30556972 BLAKE2B a8020e59f9195e83e211db2dbb6054e66e51349f278a4bc3a24719591764b78983fbf2ead40c80f58f1feddf1ff43033c6216bf9690910169bd54fa1d8473c96 SHA512 ba1a477d4e388e93cdbf76c594650b431fbea1212af110fda994fa1ebca0d6cf2dba699c995744deba71bad2a9c45d214b671ddef01a995d7c6c82c61ef82aa2
 DIST qtdeclarative-everywhere-src-6.5.0.tar.xz 32597512 BLAKE2B 294832bf6932a4cfa60d474a79acd23772a5f598add63adbdb639d6211430c72a75da7f8dd43e8cf43483ac43b611f0a87d28ec6a1e75b59f1165b153a1df19b SHA512 df31f08be3849b2775c1fbeb72f9922f7fa64b8b18b506e5ce309b718cfaeef9bb7225cb55610c8cf695f85e5fc0430461f1317b335358b4196b5e48242a7d00
 EBUILD qtdeclarative-5.15.8-r2.ebuild 1537 BLAKE2B 6a289e389c041d25520253d5bbaa0bf428abbed7bb0ecaf25df696276729b3879955b78eeeccf55303cf3ee2b49fa51a1e0426d9dd75901bcf67148c22b617db SHA512 9ce75f2f9dc0141bc351ac57492b2cb1c98eabc81a7245d6b3de5050e87d5335e08def97690a5e695dac95b4f0e337f3d41b259e0f8d2d21290bfb0e3ce9bdae
-EBUILD qtdeclarative-5.15.9.ebuild 1539 BLAKE2B 80ff1772b40c1dbd774dd3238025fa8d4442a8a9a63c5d952ef3b14d837978e22aa857445f3fe527f9ebcf57e19c027de30968fb1a27588b35db8fbf0b308202 SHA512 f7065c70b996986f8f94a7f6b91c36b26010c82d0d80e13bfda49fe931d239828484a9cffb20a9d2588a4ce9ac06775321a84e01c07bfaac8cd16f5531faa926
+EBUILD qtdeclarative-5.15.9.ebuild 1537 BLAKE2B 7a4c8c240e26b70bd7a7e60e4268cfbcb3f9f2b88091abda6be1ac39a3728072928ea53d93c044eae7c6981a2ac2936fa6e0af9ebd498e8bbe2e39bdf361b3b8 SHA512 24a254cb03164d73de0b377980ca36b85f21475f7abbdd67afe683a9b39be7d0558af0b18c9d7e809ec01ebe443c185c77939064b1b3d94a7733955e694e24a7
 EBUILD qtdeclarative-6.4.3.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 EBUILD qtdeclarative-6.5.0.ebuild 521 BLAKE2B f353152ff22805e1bf694df508c61f40bcf67b72e256bc4bc9cdc6f41dd7df855f6f28389ccfc6d4ad8254db4f7e27347b0413d7f946595452993111f1bd94fe SHA512 80299b3c62f099f5f71fdcfb17fba7f7a2b429747b29f24b67b4fd6be3ff53e74b4793e6b2fa3eb68524779c5a160a747c7ee1580bf3d2b738c0f17582728ea8
 MISC metadata.xml 799 BLAKE2B d83b1968260ec3b1de9c62454382de42f214c985171c04f98377cd7e1c3a167b5a7707b328d0ffd700e525e7bfa82780907d7358df350a0a9922f36cac940d17 SHA512 b798e3e434f485c82fb058939e864a98dd86b5c2d5df902de256e461d37371291bf0159f31ff474be36d129effb0556e27eb5a5e95ab850fd987fa30f8caecf1
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.9.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.9.ebuild
index 97e3b0b83006..6a1ac3bd9434 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.9.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..11} )
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index e8ccfec53161..e7cac4c00f2c 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,5 @@
 DIST qtgraphicaleffects-everywhere-opensource-src-5.15.8.tar.xz 14043772 BLAKE2B 412b37dde627cf7c57a4738e365b842d771c3e3898cced1ceac9dc29143295f61a63b6445a69658a005ddfe49c2e1b8508e5f9291a7eecd485217631afcce322 SHA512 bac9d18492b7ce0092ae9e3b27bcbc2fa421531eb76b3f4c69d20eeaa0520201eca850a2cc692c38f00b8efb24015cd28f53bd892b350e3c1d1337003b399c28
 DIST qtgraphicaleffects-everywhere-opensource-src-5.15.9.tar.xz 14043904 BLAKE2B 2bba25f17451db9722eb936fda7f3b2adebaecc5dec65d109514c0969c1b9e31421644dc1cdb8d5d4583a380c33ce8793f5ae1b4019850ba69fad4f88f7a1569 SHA512 ea9a9cf069ab5df82ac29842f093ef4b795ccd6a4bb7ca3c0ff538bfe2ed6473e24a7b8e7b9c28cf8ad7550b2314515567e5f53b7d913ae96593f0b2cdbad2b8
 EBUILD qtgraphicaleffects-5.15.8.ebuild 473 BLAKE2B b0926014983109be4aa0be482cb09248ff582c836588774397a0e6c94b4d98c768b20744f649094b1f8c2f2dff19d19c76aa9482242747064e038389ed22c05b SHA512 8cfc850bc53f4e12d908f9e509a7175892aed0eca0ccb75d109d895a82f4610c3cb579a88236abc9e3594ea1555a6ba2f2a411c7c1f32320e326f2cba28d1093
-EBUILD qtgraphicaleffects-5.15.9.ebuild 475 BLAKE2B 77c94b8ff27c0a209249af174b26380ae0d98261f77b9dc0482fc9a6886f75c05196ef178d2c2e7b891895b38f9615369488c14b0cbaabe9fd7f9c1f99c6c01a SHA512 c46e0323c99650ed9c0c0ad4d5a4ce8a9d0eb780ab6f93a862fb78c3c48b71ac4c77284f48660ee33476daa14364d69b71667428dcaff73bc4730aeb418591f9
+EBUILD qtgraphicaleffects-5.15.9.ebuild 473 BLAKE2B b0926014983109be4aa0be482cb09248ff582c836588774397a0e6c94b4d98c768b20744f649094b1f8c2f2dff19d19c76aa9482242747064e038389ed22c05b SHA512 8cfc850bc53f4e12d908f9e509a7175892aed0eca0ccb75d109d895a82f4610c3cb579a88236abc9e3594ea1555a6ba2f2a411c7c1f32320e326f2cba28d1093
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.9.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.9.ebuild
index ab632df95690..7fdb4142ea22 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.9.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.9.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 5f6c1af7723f..3a8b25a2ee7f 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtgui-5.15.8-r4.ebuild 3836 BLAKE2B a33363b1cada6643b8f225631c4a554ec159a9ca36bc272a6c94ddac85b5aaf383a0e7fe53424ae5168b8bc690eb8d3b59ee54f9f7cf1dfe41fd32afbec49dfd SHA512 ed269c233158aa16858f31ad5a2d58f40364830d73513b193802e37a77b93dbde794980c6d3d191cb008a409d8bb223080e6fb02f92a0fb4d51f443d4f49a2ad
-EBUILD qtgui-5.15.9.ebuild 3866 BLAKE2B 2d7f6902249b92310c3c2a3afee7ee22d41902d7b9a4e27ca952e78bb4a0491e84751bfd3b1b975312a6c2fccf80cba344aa5acc38048d2ce85bdd011a443f52 SHA512 5c7b1a7601ff1594604392a6192e4a07b92bad84071ed6dc27ed5b6983d61ab73b003e150baf0dffa6437722bab77e54dd0c8ed5a7f9711ab054f8644f22cd75
+EBUILD qtgui-5.15.9.ebuild 3864 BLAKE2B f8a7f4a2ea9e992bbb61305f52c21a9ea835d7aca14bc970cfd65df21f348cede9b029e9b9cfcc452177a2a4bcf3a0330b2f7c3b249adf1fe910f6469a93148c SHA512 5b0e0e0371e2bbe33657b83f7503ff5b19511c98218a47c77fc040a4c8cf18773e32ce85c0b2d143581d64cae187bdbd56c7100c1fe4543fafe81ca29794f6ab
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.9.ebuild b/dev-qt/qtgui/qtgui-5.15.9.ebuild
index 6771e9341963..ab60b1cc6d3d 100644
--- a/dev-qt/qtgui/qtgui-5.15.9.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 774242ab21c5..86c3c33ada58 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -4,5 +4,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD qthelp-5.15.8.ebuild 744 BLAKE2B 561bfdb33f642e247c8960643f2f609da5f527c187a53a11ce1ef742c5cfc62cf4ff84bb941f6bebf4ff0c62257379b1e534109a77890d2da08b80b19417a48e SHA512 e6995d54e4707aacd4c07980e624bc5b5a5c887ad2ec04fc2346aea5e24161b456d4c90e9420d85e0e05d79c9379eb9bb002fa5d42b22d8c2fcfa85cf7a4898e
-EBUILD qthelp-5.15.9.ebuild 746 BLAKE2B 2611e6687a0ddd11637eb7067037739874cc5cea7ca83328c634ffaec3a6206e373abd72877987340ca6ccfbffd665618f8b8ca72b0811aa30a6da54f9c0a296 SHA512 5afca4bd85d2690bcfb81c7c9503f2bee874bebfe83cc052818c53c62a9cf54443317fbfb8afc95d767bf91f3b4c2a603804d176af98838afad7a4cf4cef6f5c
+EBUILD qthelp-5.15.9.ebuild 744 BLAKE2B 561bfdb33f642e247c8960643f2f609da5f527c187a53a11ce1ef742c5cfc62cf4ff84bb941f6bebf4ff0c62257379b1e534109a77890d2da08b80b19417a48e SHA512 e6995d54e4707aacd4c07980e624bc5b5a5c887ad2ec04fc2346aea5e24161b456d4c90e9420d85e0e05d79c9379eb9bb002fa5d42b22d8c2fcfa85cf7a4898e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/qthelp-5.15.9.ebuild b/dev-qt/qthelp/qthelp-5.15.9.ebuild
index bdea155f72da..b69427627ef8 100644
--- a/dev-qt/qthelp/qthelp-5.15.9.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index c52af4ad056c..3bc1b062e935 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -5,7 +5,7 @@ DIST qtimageformats-everywhere-opensource-src-5.15.9.tar.xz 1844504 BLAKE2B 0135
 DIST qtimageformats-everywhere-src-6.4.3.tar.xz 1962440 BLAKE2B c03c82d8a2ec1608e61ba5ca09078fabe055e700ab8d9462f48c62b9e8e3ee6dc0b90edee2400a418bca96dd8037cce0e64a14701c4dc788f5400a56093f257d SHA512 8e165986394c184520412533fbe088577d3a5661fecee8ef7938467ad329da28aa2771721f7ed84c75f1878426d24a17812aee3c492da68618cf6bbcc5580a36
 DIST qtimageformats-everywhere-src-6.5.0.tar.xz 1958056 BLAKE2B 96c8c4ce429068544c79a33083786363419675c6a5aec7a7b659a7e7a7ae74fb15c5e9a515478addc99c1a1b48c36b39161b5bd0d19c12d2fc14d9b577cb658b SHA512 2456f6e85baccc933f275e2d1f0e1ee75ef6816b811d52544345b208e19755d9a9ced5fd314d47744d894bd0395c0b9f9792b739d021f90fa67e7c3c08b9f751
 EBUILD qtimageformats-5.15.8-r2.ebuild 698 BLAKE2B ef59b51820973e03dfb7869cb4a09d97dcbeac42d53ce9f675b1a70ff1958f836c2bdf579a206317cca726ccabc85c958dc480cef0405d336aebac227aa38bf9 SHA512 83faf26415c4083fdac0b9418f00aacdbff4e747a5b1af90ff0c02e42f3e1b33a992262f760c9afbc0a2dfd07b99f3d18858231d8f2257b23d49d01b78ded07c
-EBUILD qtimageformats-5.15.9.ebuild 699 BLAKE2B 4f0f4a7f309ff3dbfaa6e872a6a9bc541c97601dbfc5b2c77fb85fc651c0c744a26bcdf30ff00670ce855ae9195460f91c74352c9f8186c1a2900c3bc82f5418 SHA512 9d7e05fa8cc2804964ccd49ec27f2db9d03fde7bab5fdad6be02374b5394c49cf24478aa80f0cb8b97af6701ed1aee3e0e68aa0eb26f8c8f5cc44de49227461b
+EBUILD qtimageformats-5.15.9.ebuild 698 BLAKE2B ad1a859438729b83988a8ca0a97b2e75b295f0f077a8cc93b2157f828238623e16d60fd4de835ce1b93851d55c4cfb308868ea76cd61ba5db04f733f11c61f76 SHA512 a74183f207d9008a88b0fc9140349c56f555d613ae6c12b9c0615c440ce982ad7739ae61bc079352a14f66198d00dc7d04abe5e5bf6dd4b358cc45ea71f8af43
 EBUILD qtimageformats-6.4.3.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
 EBUILD qtimageformats-6.5.0.ebuild 633 BLAKE2B 11de4650840755a4b30608ebbcd7db6bcfa2cb18c9e5cbfa12768233fe307e8038e0647062fc4d3a3a30be75515268e300c1859e2a846280f177de5e9a8f7ef3 SHA512 e41c878b72d2fe1e1d38b37265c7aab66c7a183285053aec604541149e81d7300f20901cbfe9ab6537fec168adcc7a9e0bda809db0ed3ea96412bbfa835424f2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.9.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.9.ebuild
index 0dc8a6affd01..c546fdded876 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.9.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 9e4a70d4af0f..562414905b28 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -7,6 +7,6 @@ DIST qtlocation-everywhere-opensource-src-5.15.9.tar.xz 6552244 BLAKE2B 5091aef5
 DIST qtlocation-everywhere-src-6.5.0.tar.xz 3038252 BLAKE2B 5530b37669f29c8f616daf2028ce27b712352863299ccf77fcc5a89999e34ab8e3a00c60ba30ef01b1c4337a519261be8288f3c4be0da18a840d418381bcc1f2 SHA512 e0b0c8f4093436aa53661fbcea885ee86565ff8e61bae4b567be24e7251e56b77071b78e160903ddc487b36931ce6f1a525c74135cd360cdd1d189da4463a96d
 DIST qtlocation-mapboxgl-5.15.9-5a07e196.tar.gz 3726230 BLAKE2B 9dbe08088a55bc1da4952a628af987b3b056615e883983d3a5e2eb392ce4aff16bfd753f84bbad07f9a415fbd275ec9933a64b6bcfd27ea6d8adced6d2adcac7 SHA512 ec3de81f643388690eda45d073a9c6f908d8efeff30cd062d9afcd1f94c6b45b301327747928d45b4047ce04b7df5b0afaf9e8942e22660711a5ac49787829eb
 EBUILD qtlocation-5.15.8.ebuild 1277 BLAKE2B 67479feae9b42a04257895978b433a0b25a5e1ee3e83dea87c2e4b4200c2a19978a1ed2618ae9daa024ec8c4d4c10f78408f122b9aa2622245ce5267e720f073 SHA512 c3a329a700e3ded64c4bb7d67f4830c27ec076c8c992b81e1e08293bb79472bd68e350c8b06eaa0426c19e9bdaa1082382583e12ba061e4b310bae059cfdcd41
-EBUILD qtlocation-5.15.9.ebuild 1649 BLAKE2B 3ada77138c73ccaf0019b0d50fb8889d5eb1354f0105323533c8d72c8a6dd94077efd013da19aa4444156ab494aa1efb2d77224bae5a7173044d7a9ca8f94df5 SHA512 f89ae8ade0be85d1ba73a06da86910f98979ce9324f40cb7404edbe002b8f05da2b1835ca5b655bad6e0a8cadc0d02a97047a7b9cf88a03d58099414ae2efdef
+EBUILD qtlocation-5.15.9.ebuild 1648 BLAKE2B 3eef58b8008cca5aa3ef1d3e8149d8e55d498905f26bbc3d8d1f1b677fbced9b2b31b93ce9874a7f7acc9a4356146fe7d1b78b1d04ccb96f183f08ac879056d2 SHA512 e68ed2e2d6ccc2507334bb7749f484362cf654dd823cfcb6d85f1c3eda02572bcfddb3524f4c0806b9647b37e69252d783c5bd0d71016ef9428dfff7d4da8546
 EBUILD qtlocation-6.5.0.ebuild 364 BLAKE2B 587a510063f71296820a8eda326353e37e2a69e3b90e85912ee22f65e20bc7f3310caa493ba310d6972885d3fef215aa89d5fce62fb85543d7aeb26bde2e6a8d SHA512 d55455aaa1208c488463806c8a0444c88521aa43ab5bc2715bc4c3cc366e9d3f3953d5f8d0c92b3dac36b82584484ad82335825c17f4e65f0e7265881e601dcc
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.9.ebuild b/dev-qt/qtlocation/qtlocation-5.15.9.ebuild
index bafab2b62af1..9d1dfc4c7725 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.9.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.9.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
 	MAPBOXGL_COMMIT=5a07e1967dcc925d9def47accadae991436b9686
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 948e2f66ca96..3c21c8390a0b 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -6,7 +6,7 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz 3831184 BLAKE2B de436e
 DIST qtmultimedia-everywhere-src-6.4.3.tar.xz 5941312 BLAKE2B 968dee6e258621b81d61c8fdc16ca069027d778b6d6c3ca5bd7590c8c7b72210df6217bf7cfc4c6520085b4bc3baf8edec003f9eb844191f90940897a3f25a87 SHA512 1e3d6d9d78acf10863fe2d4624ed044d86149fe8a72c8c47150975eff6f76edcb8a7d4dcdb73ab127ed3cc4414b7f7100b0e9e9c633e50c90ef3c0d36134d9b5
 DIST qtmultimedia-everywhere-src-6.5.0.tar.xz 6042164 BLAKE2B b1126411a816da38c206edc36b8d3a5f3e24db389b30aefdfdccb516faf60547e6bc19d773930d7ddc4c678978b71217781abb429113a54800a0640dd3787ea7 SHA512 fe0dd9a534d30fa47129c4dbefb789ce1fc5b3d2a59b7583c986262a26a0638e2147edc77cf7c484af9c01acce9aaccaaa4a406c12bde324555790a956859341
 EBUILD qtmultimedia-5.15.8.ebuild 1569 BLAKE2B b7eeabacb879f077f0db4fb02fd9115eff24dee71731e6e1892e0d51ccc03ba5bcad41ad65f19df19583e71e8ba1ffeb6542c1f919560088d8cefe7eef085228 SHA512 b9d4cb637cd6ae1d8785472f7b62c8f80de4bef1e4762335af2c417953c75cb0c32eda13580ecbc863cad8f4c9b6bbfbeceeafb05b69bded4ca61c9a77c32f03
-EBUILD qtmultimedia-5.15.9.ebuild 1513 BLAKE2B ddc3353bd3ecba84b617499d14834123d0663a91b87f62eecfa83763cd1f505917aa0c120111ccafd3e8ee5e409714cf12ef1e1f8796fd9e4db8137e05fe34c5 SHA512 7d09d411af11c4378510d1a11f30f52ba73add20adfd713e2a6a9f1f440d1bf4ae4f1a62efa71534026fea9fe2bc6f6beda92b42ed7fa35d37704beb229e61cf
+EBUILD qtmultimedia-5.15.9.ebuild 1511 BLAKE2B f773c6effa7a370b2e48a3af434486ab29251e2f50d71a56862ffa35e2eeaf13f63314980464bd59489ae862122435ffa453e8c29b0010b51c970dfd97ad3d8a SHA512 f9a8ba144b8ec74364cb9b5dc0dad015c01c9e24f2217d01a331c7456bf8cc4128d91f4c3e5c81ff07003760126499c2edfafc127ca2ec1f0ce590934f240a21
 EBUILD qtmultimedia-6.4.3.ebuild 772 BLAKE2B 992e1c2af7e095cefcfa4d5be13479b0921246582787b3adf2e69afd113f2da43c67cb97c2aa4ed848f1587389d58e6e3b08114c4310a10a180ddb838e6fe598 SHA512 aaf6d58763fb8892f54885dc9e83d7c524b41a3a71a0a06d7a01a4e5a7f0791cb8be1ad5de490e4b0d4c391b3a05d265dd9f9e93dc32d68eb94293a71b8c24b5
 EBUILD qtmultimedia-6.5.0.ebuild 772 BLAKE2B 992e1c2af7e095cefcfa4d5be13479b0921246582787b3adf2e69afd113f2da43c67cb97c2aa4ed848f1587389d58e6e3b08114c4310a10a180ddb838e6fe598 SHA512 aaf6d58763fb8892f54885dc9e83d7c524b41a3a71a0a06d7a01a4e5a7f0791cb8be1ad5de490e4b0d4c391b3a05d265dd9f9e93dc32d68eb94293a71b8c24b5
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.9.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.9.ebuild
index 1c4277fe276e..fa632e8ac0df 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.9.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index cdfef7d09432..1e62deefb764 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtnetwork-5.15.8-r1.ebuild 1601 BLAKE2B a818051bce6c4692e25a8a3a8cec6bc50d3bd044c9c7061af4f1e3aa4ae47300d7aec513004e822b5085f96a01e4eedfb238a21397238a071948ba7817ad104f SHA512 df891de4e05ea00942e3b1d42d2eb86f23fc4763d5fcb9034ec5d0750ad163637e01814eadb4dcb39677313a15b0a01cc08c0a18f7f6c24b4093ce474f58376c
-EBUILD qtnetwork-5.15.9.ebuild 1603 BLAKE2B 7d5e2094493a25ddc961ece8a3b1b9c30eb1ae84bb7cec316473f14a36f45aecc41b97f0d2f43ba6aac160b506cd82b6cee08bf8d857d1498c3cbab2285a929b SHA512 2b85b8604dd4419dd145a668a3e07900aed04b472ac218f53625bf1c1f2ad0f7cdc6bf8479b0de84657f11da8cc649aa73bd2d8457325ba7a5ae7059bf9127d4
+EBUILD qtnetwork-5.15.9.ebuild 1601 BLAKE2B 9cf47cc0adb7c85a2538161f2281e6e8dd4160b6aee2bc245e5837c1367a348478e17bca059d7d131b95ff6559c40ffb9641e72edce61134734637bd19471c33 SHA512 47873673446842b0afbbf0837ecd00aa8d7cd4d7cce5c095923a22a28fc8a419ec933b5e189b68b0be38b67b2677293d809ba26fa8a5b447c4f574129cacae7d
 MISC metadata.xml 877 BLAKE2B eefc4aa477bcc6ffb2a2fb0711861a9bd7c79af5c5febe0205da57a3fae7206f3ae96dffb8b57e15dfe2f1e26891691886e02984654556d3d53a269dde5ce757 SHA512 dad0239dceb378c1ad4f52c287fb5d61cc248ac533a3df3673b30c0f332eb5cd3a34255052afe2a42084bf1c1d6a1ee501723e43eb268ab5e215fb37f90bcf36
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild
index a7ebcf59139b..036915079867 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 5db6eee2e071..6592a9bdb94f 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtopengl-5.15.8.ebuild 681 BLAKE2B 38ff1848a7e3775d35d4ffe8258599fdb65ed8a66b15dd561c52bd3364b0aee62f5f67b02f68132305ae4e432835888db27282d8e26f03c7d46914e63286bf23 SHA512 b3cc280f0d5f5e1bff84a992615f5ed12640208e664158aff322362ab38876c7077fc574fc9ea032f4648767467466dee2e3448688d20a525ebc90e929a9ab5f
-EBUILD qtopengl-5.15.9.ebuild 683 BLAKE2B 16cfc8474e3f710eab15560949bad1657f6fa761ece05f193a3dac80a65aaa35053422020f18527f6f457731151bd25c4fba5f5fcb9a7948b18fd19aba7c9476 SHA512 79bf7aeaeb1f8a6fc55a90ed79f896620afdd6320e6fafb180f3685767b5bd652a43576ec71d49c992d58189015b9167e27765c9eeba98f8ded19440c6b82949
+EBUILD qtopengl-5.15.9.ebuild 681 BLAKE2B 38ff1848a7e3775d35d4ffe8258599fdb65ed8a66b15dd561c52bd3364b0aee62f5f67b02f68132305ae4e432835888db27282d8e26f03c7d46914e63286bf23 SHA512 b3cc280f0d5f5e1bff84a992615f5ed12640208e664158aff322362ab38876c7077fc574fc9ea032f4648767467466dee2e3448688d20a525ebc90e929a9ab5f
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.9.ebuild b/dev-qt/qtopengl/qtopengl-5.15.9.ebuild
index 09c22f5e6493..49829274f9c1 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.9.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 82d463859003..89e2c21bed2a 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -3,5 +3,5 @@ DIST qttools-5.15.9-gentoo-kde-1.tar.xz 1024 BLAKE2B cc4cf05962b9d29aeb34f18df53
 DIST qttools-everywhere-opensource-src-5.15.8.tar.xz 8898368 BLAKE2B ea99e5bdf86d6d48fabd45bf55a48e5604d1a1e938a12838d3a928449d41354c4986401e7f159718432004f7357e28c88d7939f32bc2942bda1cb3abb8e28c33 SHA512 1248b61e21d1bab30c6f8380af0b83ffd2c5f4e75b2906f561f8aae3a8be2e426ca4ffa28164d64a90cc75c570652229847c7009b7aec63c6ba8e977dbdd4f4f
 DIST qttools-everywhere-opensource-src-5.15.9.tar.xz 8898188 BLAKE2B 9ba8c3cab5669d2bfba782efdcd31d8a853ab7b42b653d4cfe9d30d16bedf6ed7cd34f4bbce8a52c40b555693db4e763cb454fadb8fc1630ca0d2ac969f4edca SHA512 ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
 EBUILD qtpaths-5.15.8.ebuild 515 BLAKE2B d380c0ccdc0e96c559ecdb1c1a10d32452f474622cd7f7ae21def1aac4ee99c8f6b3b59dbab8cb717a29d02261cb6849b3cfcdfdc8fd6bf339a48a5a3be7784a SHA512 2043e0f07b18d984c15bfb29a47fa194e9b1a969a9ffffa144bedd592f218fba93263c1396bb447072371fb0a0b83e007a9569fbb05fb93cdcdc205233c68406
-EBUILD qtpaths-5.15.9.ebuild 517 BLAKE2B 16f65bec5055f5cbdde93b77f1d453e47a8183bba58d28d6b181a8b4f12170a972ff93fb1125fc76e70bdbd78eb64cb36b7586af1e6072c0dadf054e35226a5c SHA512 20fa0ef79bb771d99e249b1939c9075900bed2a9e7f29d9a9cb798afc36e40ef6b0ca04a9d957d632829dbf1537c1570887ca4eaf7ace293141895bed0a72a53
+EBUILD qtpaths-5.15.9.ebuild 515 BLAKE2B d380c0ccdc0e96c559ecdb1c1a10d32452f474622cd7f7ae21def1aac4ee99c8f6b3b59dbab8cb717a29d02261cb6849b3cfcdfdc8fd6bf339a48a5a3be7784a SHA512 2043e0f07b18d984c15bfb29a47fa194e9b1a969a9ffffa144bedd592f218fba93263c1396bb447072371fb0a0b83e007a9569fbb05fb93cdcdc205233c68406
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.9.ebuild b/dev-qt/qtpaths/qtpaths-5.15.9.ebuild
index ca2febd4e0bd..6e0a73485942 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.9.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qttools"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 4985253539fa..b042389eb3b8 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -3,7 +3,7 @@ DIST qtlocation-everywhere-opensource-src-5.15.9.tar.xz 6552244 BLAKE2B 5091aef5
 DIST qtpositioning-everywhere-src-6.4.3.tar.xz 1494352 BLAKE2B 07535cf8f53fb2d4a103ffb25f5d80343c01bf69eb7fb78debe6713ca5bbc6fdad760b4c97f4a3c394e3270f0e5345b03c87474e3aad183135cd0b8cd15301b1 SHA512 ad8fa75430ef94596673de15c1067bcf648c76a5e938348b26ee44dae97f17c3d36e5a283a9ee78760be57df3d1390f36f476e47f26928dd72e466e469c795a7
 DIST qtpositioning-everywhere-src-6.5.0.tar.xz 1454336 BLAKE2B b56bae8b2ecd8d4409996dd31ebc4ef471eaf1462469c38f700a16c5ae132ca2bfbb92d9904af3b11359ab02a21a8abe72f9ebe5cab07c9af8472027c7fd34dc SHA512 c4ba9c6a1b73eb5db74eb405d2a5814e18309ad353536116bbf9042aa58d31607683593d797b78e662bb246941baa61f1856357b1a6c2fc1bf0a7bcf18fe921e
 EBUILD qtpositioning-5.15.8.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
-EBUILD qtpositioning-5.15.9.ebuild 879 BLAKE2B 0af54b28c9909d0431e6b948e115471d48b24a940b29648e45ee36de972c17f769dcdc51c020a64ae4b321f259d76ecc8febf211632d868be40629d65ad7dace SHA512 ec99d63e62f598042b50994bafeefb90c617461e4d7abab0ec67b893677b89c1dda391c12e075d1b7e89c6e97d06105101713ffda842bdac17b3f84143b171a9
+EBUILD qtpositioning-5.15.9.ebuild 877 BLAKE2B 901e07cc2a16f98840d7361b5db7611406a275116728fe65f28012e03b90f9b797291508623e8ab5a28a10c88d2f8e917145e149ed494355706e12f9b44260d7 SHA512 79aee05d67010aecd2a0d4c802a39bea7f4d63a1a2009ade3df0343e8081c568a374728c818539a23f37e17acd98f47de1cdf825263fb25fcb5bf0988dc13db6
 EBUILD qtpositioning-6.4.3.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
 EBUILD qtpositioning-6.5.0.ebuild 407 BLAKE2B 3716cd42cd651a9bcb3377f4c1b7c2b5b0d3ed96868f12e0761fc63d382796b06c03765d3e852c50be529943e8d9b5cc434ffcdf4d5ee2927ba368c382b141b1 SHA512 d02b98de4f1dc0136eaf9962d8d1eb9cbd1338657a3d903777e8e0da37535eb451fd3c3eae27135c9a3fa274abf4f34f6752dfd9305c86fb87fd64d47e1d6148
 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.9.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.9.ebuild
index f44b99ab897c..d079b04bbd99 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.9.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.9.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index ef6bd551c0e6..fce906af959f 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtprintsupport-5.15.8.ebuild 821 BLAKE2B 2a6c1c5ba9ed3195e60d87d97907ac493e248025442d9f19d0d393b67bb75630127d2f03e48d5ec70a3952cdb2ebdb6e6c831720a77e056d6718f1a97e7af261 SHA512 90fd858e040d7f5876ff2ed64436275d03903f282e8f41416ff6caff1b20fa2785f76bfdc563f8dde0047bb21d68354b9509ca512739ec15f8b0856e5a40dce9
-EBUILD qtprintsupport-5.15.9.ebuild 823 BLAKE2B ead391fbcdab6e9770494170b68d3de435489694ff4e9c391e3f43decaa6d2b8c82cc9fa17e5a6809335c3a6eb2a9acd8123e08bd908be870fccccdfc6eb9511 SHA512 ec150e9169512d6b37e184448bfe425fb743127a10bd595bcd82315cb3099ddec99a4382819a46e06047f885bf848584a657ed18b841818d9a43c68e14672647
+EBUILD qtprintsupport-5.15.9.ebuild 821 BLAKE2B 2a6c1c5ba9ed3195e60d87d97907ac493e248025442d9f19d0d393b67bb75630127d2f03e48d5ec70a3952cdb2ebdb6e6c831720a77e056d6718f1a97e7af261 SHA512 90fd858e040d7f5876ff2ed64436275d03903f282e8f41416ff6caff1b20fa2785f76bfdc563f8dde0047bb21d68354b9509ca512739ec15f8b0856e5a40dce9
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.9.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.9.ebuild
index 4355ed0488d0..60d3e760ed20 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.9.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 89ff070d1adb..432231cee0ed 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,5 @@
 DIST qtquickcontrols-everywhere-opensource-src-5.15.8.tar.xz 5985268 BLAKE2B bd32fa8a90e90c299a73e2af237736e4576055f69e9b6b82fdb4e88ae7fa6a59c847e603567bf618e2132e474d679a420a9f29256727eec1d994bd4022e36f0a SHA512 4b93b1cc69f455bc0e3e06e9702a25791f1dcd9f3b5454ce791ab66cbc5a9ad2f3a91cf664bc2e66369c64d8d52555a02262bc8333866f1d5ff9335de1ea4040
 DIST qtquickcontrols-everywhere-opensource-src-5.15.9.tar.xz 5983564 BLAKE2B b32abf18cc58c9096d7578ab6dc3f71105ccd99901590f35f1311d179ec2200c5d24577c7e8b5103002451695b26707cda69fceb181d3dd3fd2d9f6719ef8bf7 SHA512 62c732414aa3660ae6c702a533e3ed090a293a6ecfc0bcc75b54d3dc9e0ecb657002e3f840107a07a1d749938148c0e63cd9f1021831f6c44ab133f9780b9c88
 EBUILD qtquickcontrols-5.15.8.ebuild 772 BLAKE2B 1d54d2adfb72539c4d2898390588bc75348b048144d05a659f052fc5a3206b01df79016c6bd141f9b3e684b81c1fd96e5f081dbd61732583eedcac12f49eb09a SHA512 569773cc8039061e538c937051507fe9a96a73bd2b56bfa7aea006be150204304ac31210628740cc8725cc85b0ea71dfe0d856a350e391351f61aef1325549cd
-EBUILD qtquickcontrols-5.15.9.ebuild 774 BLAKE2B af1aaea0c35014b9ee1438252d31debd5e5742cf335b932b32f549229cfe8288b6cee4b09b0ca2ce1d27a91b5af637a6a7e66b770d2a0d345550584d5cfaa541 SHA512 12186fc73cd08c909cc9d8fcfd3026c6fe03a6d34fdcba5236ca6d61b6b316c8fead81c1af25c791d1a412efbd8a848248f88d7f96bced673e6ad8f155653a62
+EBUILD qtquickcontrols-5.15.9.ebuild 772 BLAKE2B 1d54d2adfb72539c4d2898390588bc75348b048144d05a659f052fc5a3206b01df79016c6bd141f9b3e684b81c1fd96e5f081dbd61732583eedcac12f49eb09a SHA512 569773cc8039061e538c937051507fe9a96a73bd2b56bfa7aea006be150204304ac31210628740cc8725cc85b0ea71dfe0d856a350e391351f61aef1325549cd
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.9.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.9.ebuild
index 245284375661..e404149eb84b 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.9.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.9.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index b87268dfb969..fa01190c74c5 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,5 @@
 DIST qtscript-everywhere-opensource-src-5.15.8.tar.xz 2665424 BLAKE2B 9992c7cfc60f3889d23273651d14aa46b527155b3632b0a53bc2417ee9597acf7ae166c9bd50568fb327a073918072e85fbf1d3288d6af866acfe7c6a1bbb850 SHA512 977bb6d134c499e010d96383fd2e81c10c2864af305770353b378af1eb81debe6bd4cfa304b296ce100af87155066ce7a09b68d83c74de6e4113e2b01a1c5638
 DIST qtscript-everywhere-opensource-src-5.15.9.tar.xz 2666040 BLAKE2B 5303481d431dc5850b728654d96758f161afa6f6cdd2c9ab40f226e8e998c6d83fee298fb0f9ea67669b9218a845eaf2f25546dc9c0da0dbda14ebd03a0a23b6 SHA512 83a69b3f428fe8322c4ff5bf96736f8e76c0825b06742ef000c22bd0c71598c648b03481f40d86d5233d74096b34c5158a576731a06f12e01b680fd42e31c602
 EBUILD qtscript-5.15.8.ebuild 685 BLAKE2B 8fce470e213da03bb8cd26bc2b8039467119d93249a3b63cfbd0b76c5115a7a64b10e6cf84e10e51431b5a6a9881e02547c44ca18b1d9e945761a3a2c541751b SHA512 b5002b066d0a77a68cbd5ab31944d1065a65634fcc9845efd2c41e9e85f9887abdebd8e5d288db24ab262b176e86b2832e24d8843b264c505b3edf0e99b57c41
-EBUILD qtscript-5.15.9.ebuild 687 BLAKE2B f3668f56ca1a1dc7ebec4495d167e9b92b49892ec328c93f8b1cfd5a71e2b757a855ce71906b26ee76966c4fc45b8ded7ba6676b58c41125696278fcf88a490c SHA512 4312aa8f2696c76fc1e3d84ef0f5d1ba5980c0ad1fec190bcecea02dc50b1e359c597fcfd068546d09b8d151d0224bb60d3d446c1f314e93aaf8b3e8adda5ce2
+EBUILD qtscript-5.15.9.ebuild 685 BLAKE2B 8fce470e213da03bb8cd26bc2b8039467119d93249a3b63cfbd0b76c5115a7a64b10e6cf84e10e51431b5a6a9881e02547c44ca18b1d9e945761a3a2c541751b SHA512 b5002b066d0a77a68cbd5ab31944d1065a65634fcc9845efd2c41e9e85f9887abdebd8e5d288db24ab262b176e86b2832e24d8843b264c505b3edf0e99b57c41
 MISC metadata.xml 583 BLAKE2B 5389c382561f060259c9eb626a98fa6d1861a33cffb3ca62899cfb6f1b020d6841314edd05c4fd0e5f05593f6015af8826f1d087078754a3dd31ae72be7da4aa SHA512 f8d07eb515db1b455670371655c572aac73653a2d1af68d8a226ecfeaf77b62737114a66bc41375cf7f32d575df792a685298487a90c650b6c6dfb4a7c113181
diff --git a/dev-qt/qtscript/qtscript-5.15.9.ebuild b/dev-qt/qtscript/qtscript-5.15.9.ebuild
index bb7e958be3be..add246d867ea 100644
--- a/dev-qt/qtscript/qtscript-5.15.9.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.9.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 10fb93827bef..fb964681e53c 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,5 @@
 DIST qtsensors-everywhere-opensource-src-5.15.8.tar.xz 2058928 BLAKE2B f6af6fe7c26d54af9785d54eab76b7ac274723f648b885e723fd048f5870fe6f550dd57125c6fdfd0ad9e814be66155a0342fa73327b0e58b105ca891b5d10af SHA512 333bc05dd3bf4ba8ca4069279bf5e73f59475dd0d6e0411f16dc796f4cceb4354a7730be931ad868ef7052ebf8e36e151155dbe6576e9f33a38494bb589611d9
 DIST qtsensors-everywhere-opensource-src-5.15.9.tar.xz 2058448 BLAKE2B 81dfea81186b4ea77e469f6c4f351aca55134d794267fdb2f9c3a31e622208b3eeb99bff53ef5832ca18fab449044734629e782969b3b44e2087f9f5ccddb8f7 SHA512 beba10a61e6d9f31dc9f24826b4a01b48fa656d424a97164c59d7be9a9e063f1b0820f95c157651ca0cac60d6f9aa188b90a122be565bcb488e7f0e42887140d
 EBUILD qtsensors-5.15.8.ebuild 566 BLAKE2B e798853d8e80272c044a99cec1afc8bb006ce73552d642d7b9852a55b3e018875fdf8bcdcef2a001ecbfbafd0cc2e36350d41bf93bce93e35b7a5e081a607ed8 SHA512 1927fa1e7693842aa7c08e604bc3033bdfabf28411ca6d748ac8a26f432187f14b8c10dc9a5a51b631b71d7f81048c893d700110fcb2888da02268b4529e7e4c
-EBUILD qtsensors-5.15.9.ebuild 567 BLAKE2B 77979c734c926762f5aacea30627d03f243bb0e973cb3715422ed764902fb881bbc90567eeb1e98750e44dff4ce7a2bc549c930a39408a7876db7bbdfb8ab7d0 SHA512 67e59cb0dea72b460b46235c0836800e1ecc94b042ba621f097f341bf5c0b587dde4ecd006a6ca84acbf94b8612c9271e6614f83c16d99695e03569a3760c39d
+EBUILD qtsensors-5.15.9.ebuild 566 BLAKE2B e798853d8e80272c044a99cec1afc8bb006ce73552d642d7b9852a55b3e018875fdf8bcdcef2a001ecbfbafd0cc2e36350d41bf93bce93e35b7a5e081a607ed8 SHA512 1927fa1e7693842aa7c08e604bc3033bdfabf28411ca6d748ac8a26f432187f14b8c10dc9a5a51b631b71d7f81048c893d700110fcb2888da02268b4529e7e4c
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtsensors/qtsensors-5.15.9.ebuild b/dev-qt/qtsensors/qtsensors-5.15.9.ebuild
index 9ceb709bfdf9..60d0f95eed77 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.9.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.9.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index fa0d8a6c29b5..17795622725e 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -3,7 +3,7 @@ DIST qtserialport-everywhere-opensource-src-5.15.9.tar.xz 323496 BLAKE2B e471854
 DIST qtserialport-everywhere-src-6.4.3.tar.xz 319400 BLAKE2B bfdaf61f1cd7dcb3d931a5c06e21575d38f5e265746998227459193638a4a285c6138ce78fa0766f84a9030fc807edb390de85d530980406d04ff083af8fa62a SHA512 4871035b714732e7a40579c9a31b0cd955ec9360a996bbffeb16781a89b8df55d9be4408947832f2c6c39646f4d3b64cfb0bf91a83fc73e1808defd108048cd4
 DIST qtserialport-everywhere-src-6.5.0.tar.xz 278816 BLAKE2B 2c7eb8ccba32f88db419e6d870fff73290bdbb4aaaa55d4fb916d4d373d81499dd6aa2dab1d0f4bc621e575301b7b8f5213ed339f6c03fc93c5eab152158da1e SHA512 6d20025bedcd4f049f99efc775380d1d3578daa59e8f008961fa0e5c495d57992265917fad5471b917f60a4eb4e72491184e1281021320aed94cbedde22f2d71
 EBUILD qtserialport-5.15.8.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
-EBUILD qtserialport-5.15.9.ebuild 567 BLAKE2B 68e6d2d9a31e1beea17feb5a86fcae35719ae060484e0abf4ae157c01671ffe1f09585a831091a435a1d5c0713ce7c40c82bfad8893332275aa92c43f782b611 SHA512 841153e9416e936e5696de7be958054f7f149562ae57058f1b75a1df8c7fc93e6b4e65d1a69202ebc3060be1d2c497a897736e9fbe814f1e1e473ff3f40610f4
+EBUILD qtserialport-5.15.9.ebuild 565 BLAKE2B 380cc83e92be8bd256a5e652a5018380da908a30a20a8676c3701caea63dba343b99edd1f67458ebb5556ca49cac3f0b766b0237c66b01e7b8087246ecda4bdd SHA512 acfee3720971a49241a821201849b840e1d019ed768e58da252a5e519bd142d9166e4551330ed8d21184a1b899d8175dbe1bf251f4a938d13d971514ca4063df
 EBUILD qtserialport-6.4.3.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
 EBUILD qtserialport-6.5.0.ebuild 354 BLAKE2B c466c01402820d11e4f2423c21d0569c62e4b64f1fc04a0be37654d42fea6cbb8f71303f8eca98e20a7f3c22fc63d28ac11b0a0b3cfeb1037800e81f50fda09a SHA512 be88e72c9bfdc86c3786fc729681c62885bc291483dc9a53b4000217e8d569929a5e5ff035785bab7fedbbdf2c609a2e241a5bd89b7d4c9970fde3c11c6acb39
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialport/qtserialport-5.15.9.ebuild b/dev-qt/qtserialport/qtserialport-5.15.9.ebuild
index 93f0c3f2ab18..a7fe26dea225 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.9.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.9.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index e5bb1ae43517..bf2860cae734 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -3,5 +3,5 @@ DIST qtspeech-5.15.9-gentoo-kde-1.tar.xz 1040 BLAKE2B fee7bf8280a4b8ca6f9769a7f1
 DIST qtspeech-everywhere-opensource-src-5.15.8.tar.xz 103728 BLAKE2B f771a0e9ac4ea9520542ade764480c1c3d280a24b424f01ffb31db7a8ba0a6fc98009369edafbe7bdbbc18089d92beda18eb62da43da640b7833f154aef619e7 SHA512 01b625f44ea0ce799ab338f76ca17701025f288b0e83d8d36f5ad0f8b1fd505bb3fa109ace6942c19b0d5734e01aae1c69b28f7da98f986066dcd0ae0d175cee
 DIST qtspeech-everywhere-opensource-src-5.15.9.tar.xz 104024 BLAKE2B 76aa0f2c0e2093bae51cdfbdadbabe87719958bc730d11f7f160e2441ae9c3b6797c3b81a8c034068639fb1a56339b7122b52c0a4323d1b90778b1f39398baf3 SHA512 c614798cca4485d9880fe8bc19df563b29673f8fc111ce8129e8e1a8f1c8f769f76c9a7754e8cde43e7223ef7fed899bff9e91bcebe113281eb44f39aa7bfe4a
 EBUILD qtspeech-5.15.8.ebuild 730 BLAKE2B 9ca79158cacdb395d0e845f8504a1846889bae0eb116af6255016b2b88f6ab30b5d511575e13561c3cc3941dc9bc3e8832472d90d1ac0471af2cc55bf64d5dde SHA512 4222158b97630d34ede62e8d0116834442fe72509ed0763fec33ce0306ba1689afec8e57ce732e140410e31a42bf6403c8ec6fc2dd3aefb8895058d8d3c44323
-EBUILD qtspeech-5.15.9.ebuild 731 BLAKE2B 015858e320124e977399e9e8862524bcbd186337374e8ccda21de0578e863c1ae32e96144fb0b64c0bdb32885331bb65dd36e55d33ab5a4d35a3786bcb400bd3 SHA512 bc6439e2a06ccad452792de5bdb8acf7b7bbea34fae7222be8ade1ae7b079b387e38344661acd5dbd4b314edac087e99e6fd6e0c53cd33de19addb0556ab1d8a
+EBUILD qtspeech-5.15.9.ebuild 730 BLAKE2B 9ca79158cacdb395d0e845f8504a1846889bae0eb116af6255016b2b88f6ab30b5d511575e13561c3cc3941dc9bc3e8832472d90d1ac0471af2cc55bf64d5dde SHA512 4222158b97630d34ede62e8d0116834442fe72509ed0763fec33ce0306ba1689afec8e57ce732e140410e31a42bf6403c8ec6fc2dd3aefb8895058d8d3c44323
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.9.ebuild b/dev-qt/qtspeech/qtspeech-5.15.9.ebuild
index 00e87a9fd0a5..080e2f22739a 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.9.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index e6449c4cf78e..7217f83570ee 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtsql-5.15.8-r1.ebuild 1260 BLAKE2B e0511026fbfdd2dd75d2535c2ad435768231c401c5b85c4ab64b075a39b5a541a4cd09b091fac5aa02161cda7cecb1ca6675f8c7b9ecc659ba65ad0866ae24be SHA512 2e8c7ffa831281c8b72f5bfacc7700ac94f1b7df7f68f77179e4f97a782e03dc166f909c98e784189143d66849baa330adf18e08e450b7b42fb3b1467b48d553
-EBUILD qtsql-5.15.9.ebuild 1262 BLAKE2B c4af5055276320b9bd3eda23a7b607d527ebedfaad54cc0ed79795c60f57040d6498888dddfed4bbbed38ff19a829fa9c9c2a504bb88446111a35250c0e7f2b2 SHA512 083200bb3263da0c6d9c829d1700c18e3ca0f4f396cd7a90fdd7579e05ee67ea12b24571741087784633f5f4da5b3979e3ee241f68da4da52a94f9b103d30b3d
+EBUILD qtsql-5.15.9.ebuild 1260 BLAKE2B ab11a2826f1b72ed2f025844b610077093d8c58cf23424b151d996cbdd2f3e166323155f769c2f1d9de152a4b8c3a4e9679e14907e0480328af5424a78b7b0c1 SHA512 17d08dd34218396024ecd09540cb2ccdf2d92008b04a9143000f47f02aa56d0ca7652a3a431cfb43c5fda88c3305eca9580b749e5876532d077183463de0801c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.9.ebuild b/dev-qt/qtsql/qtsql-5.15.9.ebuild
index abc842af2bc3..d4bfc51740fa 100644
--- a/dev-qt/qtsql/qtsql-5.15.9.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index e8b20b10ae8d..d49a6045de3e 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -5,7 +5,7 @@ DIST qtsvg-everywhere-opensource-src-5.15.9.tar.xz 1889044 BLAKE2B 0163c88701d51
 DIST qtsvg-everywhere-src-6.4.3.tar.xz 1726464 BLAKE2B 06a6911980abe0a756ca0901a1ca00145632b6ab724e8e8211bb9130e65d47f60bbb8732e437c197176ec9886b3b0003578508606feb956497a6089e94fd98d7 SHA512 75c20eff54f45e5a501ea965677b708e211a3fa435d3304868ca1b6e3cf0b4ef89e61631e4936b1ef789a06be1d3d43ec9db64be2498159eecfde1cce21e76c0
 DIST qtsvg-everywhere-src-6.5.0.tar.xz 1727556 BLAKE2B 275442f9a00b65d51789e52ec13e9bb61825c8ce55a2262a78e110fc225a3f8622d3436d580d4e89db99db93884b60d8201d032823032de6311caa41a767b200 SHA512 ef317b9b3621b5554df20bc570b67392f9c0ab37929b4c9dc0e9902c1b63763aff5d9bdf50b50f7c0a3c9f74c513a53553744dda68d8d29f593fc70f787f1009
 EBUILD qtsvg-5.15.8.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15
-EBUILD qtsvg-5.15.9.ebuild 498 BLAKE2B af436f562e893ef050733d7aa1028cfa92e76c5d8fc0b22944e39791b1e0560b3feeebc1b92c66cda28c7de351f95a8170af781313e78d7ce997a4980349ef18 SHA512 89d6e4f755821aeeb8e885c88598287fcf7a43d8bed2e7f2261afcdbe4edb97b76ad15efd799d67282c7a302f590b3a28337c4e97c1a0dcd907cb10883053ca7
+EBUILD qtsvg-5.15.9.ebuild 496 BLAKE2B a9a417892487c84120f966f2bd06d84f7348e069ec3917aca6c88c33345109bf127802e01fae1da95a5945fc7e44db8f3a2f3b7f6b699fcfbcc3367b082f2563 SHA512 b94101d98d128f952a0bdc6b14e04c76e492d6925e06d6c0d97d077f908196d944169a196a28e4aac384c261c93a6b5fa2dd94646c4186b392fd1ec57f885e15
 EBUILD qtsvg-6.4.3.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
 EBUILD qtsvg-6.5.0.ebuild 342 BLAKE2B 9e9ecaf7a291e80c41e1698e0e8cb4798422e17f95ca4bef5e9523c81db42fd2cd971f193d12b999401f96c8293b54fe8b8d5bbf33f636b3d31e78c3e6b65c92 SHA512 f9f43ca3a2b52c25bbc6ed1438fcbe8458e3b47cda7a08c060cb5dd27315dce0434aa6d542ff58070de2ede5f703f2d951f60bb35827638a5ff52ffc4e2c69fe
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.9.ebuild b/dev-qt/qtsvg/qtsvg-5.15.9.ebuild
index 851fbcc27d68..c48a7a2c4ef2 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.9.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 9556c253e916..a1c5ecd332e4 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qttest-5.15.8.ebuild 575 BLAKE2B 4ad78b66a4202969b64b267105eaa1ed8a8485e1f4b506c0ef29e6034cfa096c21c9390bd4202064e75375f7a100856c0ac50ee6ef8e8def65826f3e4395b60b SHA512 61b2e64fbb2aab878415f433ece090af1be043ced5513f9e31d9827ecc77ddaf09767bb1fabadab4d70d51d3d16b2ba06dd7a019865aae00ee761a5210cc9eda
-EBUILD qttest-5.15.9.ebuild 577 BLAKE2B 2173c45c9b1cc0fcfb0e17ef6a848bee0d9dbecc3cb0e8ec0ff84a1725736d184e5068de05fef183574cc3d6bf50bb55764341eb05206222d506042e32b83eb1 SHA512 e2665c21ed07277dbe0b5196757c6623ff1b6b534585c53f69505cb3f307c607f2b0b03aa66180d36a73325d111cbc35106c2f496da9b023dedcdd289c36dbcb
+EBUILD qttest-5.15.9.ebuild 575 BLAKE2B 4ad78b66a4202969b64b267105eaa1ed8a8485e1f4b506c0ef29e6034cfa096c21c9390bd4202064e75375f7a100856c0ac50ee6ef8e8def65826f3e4395b60b SHA512 61b2e64fbb2aab878415f433ece090af1be043ced5513f9e31d9827ecc77ddaf09767bb1fabadab4d70d51d3d16b2ba06dd7a019865aae00ee761a5210cc9eda
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttest/qttest-5.15.9.ebuild b/dev-qt/qttest/qttest-5.15.9.ebuild
index 27388041158f..9fdbb0035b4d 100644
--- a/dev-qt/qttest/qttest-5.15.9.ebuild
+++ b/dev-qt/qttest/qttest-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 76832bd76e31..42a7a2dfd27a 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,5 @@
 DIST qttranslations-everywhere-opensource-src-5.15.8.tar.xz 1634516 BLAKE2B af00a2147ff44629e259eb4e93140268a82117c996ea49ef8ab90cce3d7277877ca58ab9e679abaa136f054ec21a75d8c2e86a83729b6df38b95cd06df662fbc SHA512 384767c1726db54935c982452b03002e209f4b090b3374c725617a3f5f3af70e8d895b7826039fa04f537fd4e0491a143190fb580298c74edaad0d72b8545917
 DIST qttranslations-everywhere-opensource-src-5.15.9.tar.xz 1635128 BLAKE2B 79eb450dcc69c2321d2f8c53f32c648c2f7c51ee16377c8267012617ad9f0dd047a6b2df5661163192486ce008626d12a516b92ea401e45a1bb5703c0136aa8e SHA512 58168e68529bd84f363d5c46182be45f5ef143e44c6878326a2d05ada7b70adc812c8d024ca8650ac52a1e2d6dc22788b57d4f5527de7d8619d34ebbba71165b
 EBUILD qttranslations-5.15.8.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506
-EBUILD qttranslations-5.15.9.ebuild 381 BLAKE2B bb945f9d244fe8cee69e65789373d87bb40116e6275c4a9226023f6248754ab737238295bd62b242309d8a5c97b8f4d36ba82b4b5b8b4b9f7ced26aacb9b47d4 SHA512 d8d19b2984bf7db8b3230115c4543f07f3c4d12b9ef6a94e2e1ce49a9a31ea05fa8d0f136cbea6329eb5ce16951e7ea1f2a0e0ceec799ea67f1eb042a4d4ac3e
+EBUILD qttranslations-5.15.9.ebuild 379 BLAKE2B f7a1f63d58d4a09bdf92cf91f2ec0c546a8626cddc7bcc9d55c70eab8db038d3ae6912e0909f660099af7d4998e99353d0eda9d98da253f7021b8008c1d30b41 SHA512 bf741516c6b8ad79fac401a29befc1004926ce203460b0c5f261744c70db5bcc0047b9af8f36153668b1680fefcbd80f50840623d5379be43ce059e1373c4506
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-5.15.9.ebuild b/dev-qt/qttranslations/qttranslations-5.15.9.ebuild
index 8e1f86801783..8fbbdc860827 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.9.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index cf9fc3c9650a..bff34cb46929 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -6,7 +6,7 @@ DIST qtwayland-everywhere-opensource-src-5.15.9.tar.xz 567564 BLAKE2B c5a0d39cdd
 DIST qtwayland-everywhere-src-6.4.3.tar.xz 836240 BLAKE2B 30e3a3847328006eb580d043880556e7eeadd165fd599ab3921810360e2e2dffdea23e5aea4282cdf58b8d12f1392d70840016a187f561b3cbd6f704b1d7553d SHA512 15d74d057c09a734dd10617d018f4dc54e6be4fef5dc96d6eefd6b3f47952bbdb98bc39cbc9545c7ae1a9ec87a512a72d2f019ee47210bfab8cbae0cf01e4ae4
 DIST qtwayland-everywhere-src-6.5.0.tar.xz 1058628 BLAKE2B 57bc21809e00e53c9c1bc2f3b536154adbb73f2dbd09aaf2aa92bf950e67160a740e572467f3831c4b4af9d4a1f3f6c89e64fbe5e3482f826025d488c8399e9e SHA512 d0a9b3cb5f93b99b20eca98512ebc8b6b8453df822e2aad7cd38169cd22ab1661ac0fc14223679174e8dbeaa63c2f3013287fef1b8ef620aa23ff6abbb6b730e
 EBUILD qtwayland-5.15.8-r3.ebuild 1002 BLAKE2B a7bdae0b7a75b8478865e7d0221b62cae60268082ae42641795d7f6943e5f83d962f066ca7c7c594cf8836006c3c8368d2e4505ea63880e25e4d0d2949e081bb SHA512 0b559c13304298aa39ee15ef696d11ed76386de39df95db01f1d62c82f7f5c7d40751f57e5a3e3a6a5e7ab03e81fbff71e84daa52bad4cbece2fc17a6b0eafbc
-EBUILD qtwayland-5.15.9.ebuild 1100 BLAKE2B 54cba3ff516cd1fb095d3a395cf01216543a5a1725c18bc0ebd6e41e3bb82a4f7c036bffe5a9ec0d001a51a86174e5bd7287f8b9c69c78e8333d63773342f022 SHA512 769407e4ad79bb6f362317cb412bc1005c6b689aede19cf110c10974ee12717e32f79d6e3578097d32d2e76f08b791660e2f56a822973627a18e1d7ab864a4df
+EBUILD qtwayland-5.15.9.ebuild 1098 BLAKE2B 32cb659241ca8c1a1ff731cddc0dc654b4fd6b1c42aa8038a8a37410da2b23a1893da1b49b1f7a21ab85769262bff739ab9df5ed19109f9e5456c2a52a577eb2 SHA512 def9ac79924d3359448ee55bf2bd2187236361b3bda8f4f27018079b6d3771b4a55deba28529e1776359228132571932a1f8eb34a2ea20f9ff27269f08a55724
 EBUILD qtwayland-6.4.3.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e
 EBUILD qtwayland-6.5.0.ebuild 438 BLAKE2B b419dc79923c1f81cf59b47d3f95cf43372260430cd16593089229011756c78663d062ce5b23464df27753427257bcea89ed745c0f8f0a4a1b7e7328dad60441 SHA512 a6d1cd0314a2dbcd74e3a4cc3ba2cba7b4145331c0b7617fe387cbeea4d9cb0643ab20d897df6953a21274771d3e64a6e99dce79bf41d33383508fb7b037c32e
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.9.ebuild b/dev-qt/qtwayland/qtwayland-5.15.9.ebuild
index 41522ac2fa2d..5d7a06fb773f 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.9.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest
index 049fd4284865..1307f6412845 100644
--- a/dev-qt/qtwaylandscanner/Manifest
+++ b/dev-qt/qtwaylandscanner/Manifest
@@ -1,5 +1,5 @@
 DIST qtwayland-everywhere-opensource-src-5.15.8.tar.xz 568268 BLAKE2B b4e982015e25104b3270b48a180b5726ba85e83fd9616422422d8729dc09bc94bbeecfe2096e388eadb0930e4abfdd3b0349eba2bd1d8f742f0c74b5e72aeac5 SHA512 6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d
 DIST qtwayland-everywhere-opensource-src-5.15.9.tar.xz 567564 BLAKE2B c5a0d39cdd746e2aa6cd011ce04baa7f1f30e21c935877a684f07d5c2a0d3446e80569fa33c3fa0953b1bea86aefd64f80fda5164f3ee5648b74c2e0e8d369b9 SHA512 d108d63ceeb3b1a8905ad7f53a7271fca6a3506679d352b7290cdf8c00e1c180b6c561ee013a674002b89e23f58cfb7b909dfc5a8fdec6cece7e0a782be77978
 EBUILD qtwaylandscanner-5.15.8.ebuild 501 BLAKE2B 35d756a902245e8169243b5784698968b8df3c7f6c4b56296cd7a740f0d79d34c4e821c65a002f1cb3086b73b71483e636e554227a4521e884bc8ab6b743b2bb SHA512 4f960ba2f7f569d8c02b7aaa1e0b75402b65bd68d23c9fe27ede4237d4c2dedb41cf635e1b2b05b40ae0feff912bdfcaf111c3aa951c55aa7216ed2ec168307f
-EBUILD qtwaylandscanner-5.15.9.ebuild 503 BLAKE2B f7add77c99fe514dcaa1457bed9eb97c7b7aa302bdcbcd2550750743222e94ee6d03693a09fe37252e308229e7daceb097e11ff11c8adc43bc472fe47fe8063c SHA512 ac3a0604d42f601d827231e69a5de01e638f4738cd6386a1c18678a4f6f8a3d618a7e080f56595ad6c875abae9e279df8f18503fe8ede42de056ead6dfb618e9
+EBUILD qtwaylandscanner-5.15.9.ebuild 501 BLAKE2B 35d756a902245e8169243b5784698968b8df3c7f6c4b56296cd7a740f0d79d34c4e821c65a002f1cb3086b73b71483e636e554227a4521e884bc8ab6b743b2bb SHA512 4f960ba2f7f569d8c02b7aaa1e0b75402b65bd68d23c9fe27ede4237d4c2dedb41cf635e1b2b05b40ae0feff912bdfcaf111c3aa951c55aa7216ed2ec168307f
 MISC metadata.xml 352 BLAKE2B 7354be163c38b0299856f17a85621782e367e3186e0cece5d55a29d4848ba95a7d0ebc4e1614b9ffa3de21bad70c7c7ecc86fd81a0cb83038c619a1e763fc211 SHA512 cc03c3e78ee03f9be941ce1b54ee4ffa5655c933d2cd4c2bcc252a447632ed0587d41c4d07b9e1738aed5526b4f0b934342cb99d196ba3b0f49b762bf1de7c7b
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.9.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.9.ebuild
index de8e4aed5efe..0e42e1d104e1 100644
--- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.9.ebuild
+++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.9.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 79cdf2fc72ae..46478a67ba72 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -5,7 +5,7 @@ DIST qtwebchannel-everywhere-opensource-src-5.15.9.tar.xz 211032 BLAKE2B ea8f4c5
 DIST qtwebchannel-everywhere-src-6.4.3.tar.xz 213316 BLAKE2B c026006d72d50a3f61dc20f8456a23eb2cdf4d3b1230b2495457d8fa985a861ff4161da0157f9150f7e044a49aeeba4d01c104e865e8b2c4a709bc5f7732b604 SHA512 6bab95a2df742c6ff023a72a3b192e7c5e56e23834dc7513aadc09d5ce0fadabf4b5590a9911b1dc8c83a7e1c984c4ac57c6957a3fa168de10af5d540d7d6af3
 DIST qtwebchannel-everywhere-src-6.5.0.tar.xz 213524 BLAKE2B abf90eb2b8106dc822e942e9c3964d89914b599994bd2f7f4332c479974451f77b6bdc13b3125f868edb79b9291146cf954cdb7bd7f0db217169afa491eebe2e SHA512 146bf4b190a5d9af36f17cff9340df8faa2465ccb47fec767157d4c47a9ff4554bd3917d6694da1ee6914e34ac3793b6c99673712b12b65b1f3e9f59e274933f
 EBUILD qtwebchannel-5.15.8.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8
-EBUILD qtwebchannel-5.15.9.ebuild 600 BLAKE2B f451b7901d980bb81ae1988d7377d07f863d71b16ee32047b03b3e16fd1799ce8d7b82fdcc559a2703816ee349d7c7b872d260f1e2e98214fbcf13016fc5a533 SHA512 94a6dfbb2e91da57e8c4a77a745a5040fa584785160451b22250b284d279407390fc0f7c7291c17011f00aad1ba6b3c5c0c29c12563270b36ba6f0eccff1d410
+EBUILD qtwebchannel-5.15.9.ebuild 599 BLAKE2B c61043201e33bea4827e7726a31ef0f631bba2799aaf76f9aa849d58f2b958e9053a6d73438906c92ef5ff160cf69cf568692ba566fa55d513154c7fbb385a31 SHA512 62b65e38d50d9d337a4e6979ff758211350f720c4b7072d02213133a88e017f8996f69aabd0a22a495c0c86b5e6c19a4117f771ce1f58877413fcd57613e4dc8
 EBUILD qtwebchannel-6.4.3.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
 EBUILD qtwebchannel-6.5.0.ebuild 353 BLAKE2B 8acf032c4f6a40fe3d5b4698bdb480ce1535050c18de467654afda382f3c8ba8665116d728f41a6209ba0dacbfaa270cc9b7ed1e43d6ace9cb9d65e7a968d1dc SHA512 e2f8854c859d70482c8086f75435362200271d5e9b2a80a1eeaf1e90cd70e860d8fc8b8132e7afe76fb83afe3f123a2ce036ad05b65a0cf7f44ec46bfcbc34d9
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.9.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.9.ebuild
index a73fb4bde0bd..67025ec27c72 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.9.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 97da51024dc9..2ca74460548c 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -5,7 +5,7 @@ DIST qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz 260972 BLAKE2B e485977
 DIST qtwebsockets-everywhere-src-6.4.3.tar.xz 267624 BLAKE2B 4b33f472b7ef3745fe7e85cb942203de6139d3e0e2a553e92bb3659473e9ae12d6f7460da78da925189b202a65df69788882c7bb3ab0fd9b432d376082774091 SHA512 231135ac75f704aeebe5286cd30640bacb6192f08785ac94fe848d6d5164597db314054c9d48a2300e9967c609681802b82055ab6bf806b3a351d891d3855bf3
 DIST qtwebsockets-everywhere-src-6.5.0.tar.xz 266852 BLAKE2B 1354a5c5d6cfe6b016c78541271e2327a73886205fad1124ace93bd8e60d0a07b1ac763205d0259e43db21dabe028c10140ce00f634c3d3054db8d3e4fb58cc9 SHA512 b13a6c385573cd19cefa48dfd6be1066c09b046f5a54d2c61fda3ab83903dc75b2f3fa0aa45f9e56610526214a64416f90d955becf2aff90611387a605314b67
 EBUILD qtwebsockets-5.15.8-r1.ebuild 578 BLAKE2B 7fdd1091164c81cdf972e95caacfcd2520c7201597ed16580b91a11c3a26af86bf97a45ec95cffbf6348ee80b563b05497083d99e0eea7ac23c5c634f5ab93ba SHA512 f46ea8af383efb3c0b4e9a671296e4b585bc6bde71abede3b8eb6303e203af3e74228f110cf8544113d24178ff11abbe5f111e18ee4c301f212af7dbac0027aa
-EBUILD qtwebsockets-5.15.9.ebuild 579 BLAKE2B 5f07581fd57620abc9559b8cdd6281c1527b74b0f816042295d69f3f0bd9f04bbe81c4203c4e875d1076f528682c9ebad51ccf071b1dae2e5a8a58e6c42c4d43 SHA512 a0dfc8a93a0f4af6440f39d8681eb172e3777d4eea9eb13f6351ea3034d50d7903c5839b4758a28b88bb79615bfbaf18ec792609b83716ce0f5092814bf5ceca
+EBUILD qtwebsockets-5.15.9.ebuild 578 BLAKE2B c89a75bff2dc425ed95717e37c667136a5082535d19fd58b341e7da4b210224bf9142da7abbf24130abc4c4e36ee4e5f59eb32505c0be39cf22c8bbdaedd8261 SHA512 b5baa375f6484fd77203b7402fa3e1555a214e6cca44405b44eadf0e201e546026af97675dd01daf8513ddc6a575a4f30a4ed1ba23985cd200058e631d593369
 EBUILD qtwebsockets-6.4.3.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
 EBUILD qtwebsockets-6.5.0.ebuild 370 BLAKE2B e65adfc17559000bea71d0ccc60f8aea62c926cf25d53bd1fb151c45cd40a2217d0257722110f4fc1c0b72188c1f3a80d244014c0355ccbc57ba384c28d1f1b8 SHA512 eae0d900b94e583514d1958dac60f1ecfd7da80c2b45b6accad4946af435d872a1e8102a4ae5bf3bdd91f53c585e5fcb09c7d3bc8e0c6b8408a338da2b186b17
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild
index 9ffdbd92afef..0a97ba4446da 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 inherit qt5-build
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 275689bba0b6..5b3759b33936 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtwidgets-5.15.8-r4.ebuild 1200 BLAKE2B 57e9f18072ffad18c20740250b0b448f96aaf35d3049bce3294cf53214cf76e137a1822c473ab00f9da91330b71b7539cb8cb41eb2d876987110d5f0b2b95aa7 SHA512 e5f16b55d009c67da5bf754daefe4334119339d5dbaa5e239e7e8b51f3f042491d2f478153807be1259c4176c5e2f5501b9c90501bed300de7982adec203db12
-EBUILD qtwidgets-5.15.9.ebuild 1202 BLAKE2B 2345c775f4216011db325e0b4fa06ca2ea4f0eefabc14ad21a36ec6baffb58ee0eb7d4c275f6d12408802fe41875e997222939fe0965280e95db0c05f3d65c6f SHA512 426e800afe14747c43ff54e4f70924e773ecafc75142a65307245e68a23b9a62fb086e2eb84569180c0f56b422ed7a4ca00f986c38f5111b18b0c77eaee6cd3d
+EBUILD qtwidgets-5.15.9.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.9.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.9.ebuild
index c16bc111fa5a..b05623690f56 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.9.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 8baea277ba41..3683cbd20f7d 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,5 @@
 DIST qtx11extras-everywhere-opensource-src-5.15.8.tar.xz 145692 BLAKE2B 1499791b2f119cffe60dfbfb7c9633f90d9d59b0c3c92392d1f35261d8ceffbddbc7b30a1521f0d15387522409b4941b91b20eb8ec4caab9db030760a7de6d8b SHA512 a7b2cd611ec863b43cbf16a09868a9543b4dfc3c40b21c23317a3520345a9464e2ad34f884f3619fa67fdf563bc2d1a8b31d97d063766a8988454ee4a8c8e1fd
 DIST qtx11extras-everywhere-opensource-src-5.15.9.tar.xz 146036 BLAKE2B 416bd175cdf750d14f1864ee0c011ae0402c9b02e3dfcd762cba4236284f4aa289ff873eda4ce4e28f08c7b359a0349f9fd4fa6cd8f8c12178aeaf4bbe7192ac SHA512 695e23626f1d3b51fa4d20d0845be749581b0cdf3633598f457cfac4d790e3d52881f5e51e35a95d42f481a73ddc7d50a22d562c65a0bca2a9e586615ab6ec7b
 EBUILD qtx11extras-5.15.8.ebuild 459 BLAKE2B f1e1f7e45d1d4b3e165855d11539dce6a0cb1c600328bc2630c2311b48075d81e3698b0b3fa44ebea06ff00fa52f7c337f8b54256b344bf2136a09268b6c16a4 SHA512 b06c033f629022a9309d809184905c8cd621c6c5d5e08b87ef5fa3eec4df26555ac8944dc067a61ba96d8a8865bfdd4b73bad0bd43eef71e53efb6a2c0d8c6dc
-EBUILD qtx11extras-5.15.9.ebuild 461 BLAKE2B 116be9264ecfb5bff17641697d45719a2ad1777dc0381bb5a3218ac7a01f161b192252372cefa3c69b0d20e70754fe0efabd834fcd432588b84655f3c3420e23 SHA512 d172350d4823e9f747868fa4f8090d3475767fc5fe8934310d8087519cd6a72f55ec9677ffee334e6548d6081c4a2ea46da1086c9d30abb62ea5ecb918c55da0
+EBUILD qtx11extras-5.15.9.ebuild 459 BLAKE2B f1e1f7e45d1d4b3e165855d11539dce6a0cb1c600328bc2630c2311b48075d81e3698b0b3fa44ebea06ff00fa52f7c337f8b54256b344bf2136a09268b6c16a4 SHA512 b06c033f629022a9309d809184905c8cd621c6c5d5e08b87ef5fa3eec4df26555ac8944dc067a61ba96d8a8865bfdd4b73bad0bd43eef71e53efb6a2c0d8c6dc
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.9.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.9.ebuild
index 5786964d3f82..19ec12ce89b4 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.9.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.9.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index e1f084bfa139..81933a19118b 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15.9-gentoo-kde-1.tar.xz 748840 BLAKE2B 6601efaba2bd9f64edec9ab24a
 DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
 DIST qtbase-everywhere-opensource-src-5.15.9.tar.xz 50389220 BLAKE2B b1692f5907b7a262a8cad33d45935d76f72f2fb78b970b57fba76ef9f6789d1d7a435278a450ff1f3556c0846fa8dd8295707ead6adf21af6cd17fbe7f0d82f8 SHA512 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
 EBUILD qtxml-5.15.8.ebuild 525 BLAKE2B fbdd6a3735f16c73fd025e8f7fe610011fe8f4fc545ff2ef4e4d3f5f7d1785676eeba17e74bfee2212570d5f09718c4410ebdc0fca10f702c627b032c7b2dbf4 SHA512 e7688982c68d59f6a451df4a56d31bf7748a4f9df1acef67de670d9b3f8eb6ecd0844df99e51d77719144fcdf7ffe9a9ce4b068247756bbcffe45828d8deaea2
-EBUILD qtxml-5.15.9.ebuild 527 BLAKE2B 4319d16832284dcf27ad1053982eac30509466fa95691acfff33fe7e671d69f5a85d147b4e8eb88f6bf5aef8f2e579f39f7fec3aba63c4979ae89762f96ce85b SHA512 6c47a0fc413af23c207a9a8ad19b1118807bcfec3979f66b3f354ac4843678dfed07b640bede7b8b311c1bee4bff08a83bb4c48eb3767aebe1300cfc95caa8f5
+EBUILD qtxml-5.15.9.ebuild 525 BLAKE2B fbdd6a3735f16c73fd025e8f7fe610011fe8f4fc545ff2ef4e4d3f5f7d1785676eeba17e74bfee2212570d5f09718c4410ebdc0fca10f702c627b032c7b2dbf4 SHA512 e7688982c68d59f6a451df4a56d31bf7748a4f9df1acef67de670d9b3f8eb6ecd0844df99e51d77719144fcdf7ffe9a9ce4b068247756bbcffe45828d8deaea2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtxml/qtxml-5.15.9.ebuild b/dev-qt/qtxml/qtxml-5.15.9.ebuild
index 20ab9b30c80a..3233393b5e1a 100644
--- a/dev-qt/qtxml/qtxml-5.15.9.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.9.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 if [[ ${PV} != *9999* ]]; then
 	QT5_KDEPATCHSET_REV=1
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 QT5_MODULE="qtbase"
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 6220cf2036e5..4670b52c0f66 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,5 @@
 DIST qtxmlpatterns-everywhere-opensource-src-5.15.8.tar.xz 5210520 BLAKE2B 7a812012a4c1c08cbb63ef7da78ded596d8c6640bd52379a19d177638b6672e121c611bdb95220b34577945fda4b6dae781cf8353c406cb0b5f6b97daff53201 SHA512 150a1425b763d42d8fa8f06a520ed5280ac6d7874e5ef0b617bd5a452ea1899d96909a4d04bae030256f7acc8a76f6f434a7aafd0a0756abf3f1534ef4a0a0b6
 DIST qtxmlpatterns-everywhere-opensource-src-5.15.9.tar.xz 5190900 BLAKE2B 54b13cf0662a11b145b98b0a90dfe52962994f8c5c59ce3f6d09c8654d92e7f0ff0bf4d335810220b896065acab4a28ab016d35fd125c67522a6c9b440291319 SHA512 60cdee139c04dbd2c381f65fcd579af0b2b6f40234870a782c8b7342c8d0caf92fef94acb959260e4ef615b2c60b5527cd44b8efa85f04ceb4a3659a47a0ee89
 EBUILD qtxmlpatterns-5.15.8.ebuild 808 BLAKE2B ef039715c4b5ce13e0667c1674069fbf650aa588c756a663cec7e589366220f1d8fda1d357deba8b129e3a68f29b42598adbd1708a50d0cad533897090ee8caf SHA512 4697ce50c1ef059088d0448dfa78c1fe93e8a06363e232caa2b32fe49c36dcd014d2585145037ede28c442ece84e1ba6e8114272b509889c4d67116df7da2502
-EBUILD qtxmlpatterns-5.15.9.ebuild 810 BLAKE2B dcefafbb74c7df9481a6879190dde21ba2f4c58b241bda6ff70bfd723d5d04fba511bf402753f9905d4c84e33aad4b966fd3924694973b206b0a61e42922d49b SHA512 c2db9b26cb939db44c7b4202d45691f391f2edc591ba8ad6f5dfeceec032a9e907f9e591c83e2f5c9a7060f67ed89c55c71cb99626ef373289b0198cda366673
+EBUILD qtxmlpatterns-5.15.9.ebuild 808 BLAKE2B ef039715c4b5ce13e0667c1674069fbf650aa588c756a663cec7e589366220f1d8fda1d357deba8b129e3a68f29b42598adbd1708a50d0cad533897090ee8caf SHA512 4697ce50c1ef059088d0448dfa78c1fe93e8a06363e232caa2b32fe49c36dcd014d2585145037ede28c442ece84e1ba6e8114272b509889c4d67116df7da2502
 MISC metadata.xml 590 BLAKE2B 2f67cb5fc0572aa19ed1775ac6a1cf2de7aae77141a76f81ad00d9620c0ba4238c1058ed53bd6332f8862f24cb59f3f23984df84d062c295868f3914ad8efb8f SHA512 50bbcf3579ec5613429e2a7c613e41ccd79d04f0ed7bb2e5db1ae22868aea8922f0b3509bc4fe91ab7cbc9ad6b86bb536993638d3562d811203814e64e2ae22b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.9.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.9.ebuild
index c3a56829c319..703536f145e8 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.9.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.9.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 8431f35ff65c..6201ebb8384f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index 033c680c739e..1774fdff71bd 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -1,3 +1,5 @@
 DIST mini_portile2-2.8.1.gem 28672 BLAKE2B b0ee9b2326260d9f0dab630da104443d23a696f1c2083d5f26acb0950991c0697ae4a62e4dae33fe5fd1cc0244b1094d002e8fff8ced037677be9a64f74699ef SHA512 600c25aa092993709842024006ba013308ca471c070134cc727184456871a4d8d3363448803cc513835b57de89e97fe536b6974ece50ff866b6d5e00b7edc308
+DIST mini_portile2-2.8.2.gem 28672 BLAKE2B f2c914e708d4e6a535cf821d52f7094627ab2d2e9f02f41a3d38b932d6cc97c452a597237d475014cf541c932f884292184aef85b853a6116326e1cc04460487 SHA512 a24131400bda6460dcd21cc9e6700eb9d79c6174ac2074b4b7c253ea7180d9f1c636342e1b9390c2ff4e35625079c988aed081ddf78ddd54a429eab4a892b1d7
 EBUILD mini_portile2-2.8.1.ebuild 624 BLAKE2B 9ed53905d337cfc22bb10b65b232f829a5af3b23fba0c33a4a0ba978dfaf821558b7bf3cd7e486a9a3df77b2d6636b08c4d155211d7f17d3ab4a77f3656084d4 SHA512 4e66280bda0ee310272193fe96ff9c90819fa0d661baa5e2be8c87ded4b09a5824a88f53d2f93882dfc27b72274d9044449aae7f8e958bd41c20a98482b657d8
+EBUILD mini_portile2-2.8.2.ebuild 624 BLAKE2B 2f54d59e427604ad478b8a38a1de369a88b7bfe2fb717906b02dab37d55fa796313a1bc60ca5305016bf219a703e63f652f7e3ea5f662ea037996cfff275f2d2 SHA512 4ea7636691996d10ca862bb83a78cf8fa6c2182f2fc78ce7c7b44d5abc7418f6e36c417cf26df80f62d9b49c8f36fefd9cca59006bd6edf2f1d2b6a0f0148dfb
 MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.2.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.2.ebuild
new file mode 100644
index 000000000000..e2cc32be3890
--- /dev/null
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplistic port-like solution for developers"
+HOMEPAGE="https://github.com/flavorjones/mini_portile"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitar
+	dev-ruby/minitest-hooks
+	dev-ruby/net-ftp
+	dev-ruby/webrick
+)"
+
+each_ruby_test() {
+	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
+}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 5e0859ce8832..6d3d4e67896d 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,14 +1,10 @@
-DIST rack-2.2.6.2.tar.gz 278839 BLAKE2B 30cb5607bba97ef3a6a20f917b82c46de734cd0c248ae20bf3af266814e32250cf6cd77aea49de28a24651335cdc888385968cb4b9937843ffd99cad2283e896 SHA512 73202990bad9e34da84c45f70c71c45bd6291960d58a04ee4b013835d5c5a8a066f36d31275913744a63cb9836c5071bb237b7f613a717794f49236c195107a8
 DIST rack-2.2.6.3.tar.gz 279185 BLAKE2B 4757add4f591a5e9baca2db060736f1369b04be547a834360a5d84d210db2c550febf654eb6ee9878e38d802227b94e7ae2c38bfe4c5fa045582d905ade61c4a SHA512 e69de4dcbb97c9481ce55e3d1c43c7b1393314d2c42fbd7660abb939b74453ea77a4bf1eaaab2a7c9ac2cca46fc3ebff40eb5cd91b6567f50e3a05e2d40dac24
 DIST rack-2.2.6.4.tar.gz 279212 BLAKE2B 381baa25cad48603891c0b40c463843d112b380d0e99cb985ae2d6d59b84dfe9dd33865bfcf3602af81cfe54f8e0fa57166dd4764069b2de054dd1826b3da993 SHA512 3b7cc5ed8b74d8e03a343fbc13c808f7cefe185330e6d020aebbcb6d4852b2485a1b780e14c8593c02fa264ba31b3005c47c6c5d9a432cbf5bc7ec208e279f4a
-DIST rack-3.0.4.1.tar.gz 787073 BLAKE2B 532bd36dcb521da8387d464dca0983417a9a89a4d365e5652894003e38ffdf5939a903510be73aaf607c6a695909058aaef311967e6d66c525b26af3ea4c5e82 SHA512 6cfb35d78901fdb5e7b4571eb6b37b035014cfea705aeff280a73930793e53cd6d2d9b51ae86803567884b5509af358c95687eecc222a5df61dc80d0ada019af
 DIST rack-3.0.4.2.tar.gz 788276 BLAKE2B 9934c4e448ee09c9a910ef8259957737e4d213d7ae5b37380b87441eb00845f2793e23fa16da26a5fe441e8449a95a5893cc52a019087402e7cae7559a2f6fd5 SHA512 9cd2c9bcf41a6203e72b63fbd0e78f4a0f461751e45e643f40a4f823f3922b05fc0caaa10fe79885cd8fa48948e79e0ccd5727f9abeca2a4052a737d4632e76e
 DIST rack-3.0.6.1.tar.gz 789191 BLAKE2B 1431e6e97afa503a03dbf3deed67e438b00ad0b74d93df91d248235bd135c7bc6f45da3d488f531b9f00a62f9c193bfec0e301507250543abc1f66db6fe69b8e SHA512 afcc93723c797bbf7a231e70ef8336053443dc8028bbb26bb58d4e1c17ed6a53d178d56fc9b2d33be5bde88ab634fbb233ac133b8a991258469c564afdd5758f
 DIST rack-3.0.7.tar.gz 788611 BLAKE2B 99f4b7394c7b7d78ca3c7888369355437383ed5e3f3bea1bae7117019df5588a2c778270308309908223f5c509c97e6792b2edfeac6b3e3d6815e147bcdab375 SHA512 7ed94b59a4c8886ad94898eb1a7dd3e363fd1b2cecb79713ab744853e7c3da7a1d10034235a1aa5da4cb50c1a5d7c86c4d524ba2a328bbbb6289e9f1f7e37edd
-EBUILD rack-2.2.6.2.ebuild 1672 BLAKE2B 441836edc1a44c888fcecbcf6b462913e4734ecace1155ee3a4d63d865257d81e060c3a72f6d2dcad0559ee6270f6eccb6702174d76ad44e646bfdd52e12ea8f SHA512 d37cc4af348ca5faaa1d7267d0816b7e930f501bb82d3d6637d89cf37fd5485485bcb818977e143e799c67c3122b6b84eb0f5f6c4bd395a2329a54c24ce159a6
 EBUILD rack-2.2.6.3.ebuild 1672 BLAKE2B 441836edc1a44c888fcecbcf6b462913e4734ecace1155ee3a4d63d865257d81e060c3a72f6d2dcad0559ee6270f6eccb6702174d76ad44e646bfdd52e12ea8f SHA512 d37cc4af348ca5faaa1d7267d0816b7e930f501bb82d3d6637d89cf37fd5485485bcb818977e143e799c67c3122b6b84eb0f5f6c4bd395a2329a54c24ce159a6
 EBUILD rack-2.2.6.4.ebuild 1555 BLAKE2B 5e446143227bff5322d935cc1d3ee36d25584532e3152f0ef848b46850680e63073af86d50a56e4a7c3968a71f4be3ad08a3a0d42f39eede59ab14a55e02174c SHA512 456a52ae46898d656f498877913565cec18866d8faf0f39b5b356393a62d49007f7253b158166fc0506b35b1d95ac241ec277439b2e1dd35d1097eaa42f1c986
-EBUILD rack-3.0.4.1.ebuild 1293 BLAKE2B a6c99f5219f0a4b4fc194667233ea0a10e4cf4dbc0bf6d6f54d6caaecd6d42e0481ee5f5c9c35febfa0a6887addb90944772c36285b66240a6c7627aa3ce2ceb SHA512 3c908011fe5682f09369588d333b4d844e3d50b9f58f734dc5bb4f436d4221df222368f8625835e798ce5f139a058e58cd94871aca2a1c2c2a3072f0572925f4
 EBUILD rack-3.0.4.2.ebuild 1293 BLAKE2B 228f3d3c46693522823fc3df3e52caff783caa6c7eadaa19be9c34a38a3341b8a591116463b428d32dd9993c2ddfc0dda705a19fcd57882fd10c4171cacee0a2 SHA512 47f89a8b637974dbb56575fd196c393eba89697d2cffad2eda5ed91be40c0cc03810acff86f3eaeb0fe9d0bf6a9946a338cabce78baa3d24b10f5948cc006864
 EBUILD rack-3.0.6.1.ebuild 1300 BLAKE2B 77d4266dd5fe42759f88a0380718334b034918514bd8a9825816045113280fd37a7370ddac9ebcc262bb743eac6215032a9adcf78746feb1a1022f69734877cb SHA512 1b5711d7d327a21fa8539f27ef29761e88f633126372675398e3f6d83a7140f97139b4c5cb96edc6ec36978456881c68c2f8041e7ee6a502cfe41b86c66d7c49
 EBUILD rack-3.0.7.ebuild 1300 BLAKE2B 77d4266dd5fe42759f88a0380718334b034918514bd8a9825816045113280fd37a7370ddac9ebcc262bb743eac6215032a9adcf78746feb1a1022f69734877cb SHA512 1b5711d7d327a21fa8539f27ef29761e88f633126372675398e3f6d83a7140f97139b4c5cb96edc6ec36978456881c68c2f8041e7ee6a502cfe41b86c66d7c49
diff --git a/dev-ruby/rack/rack-2.2.6.2.ebuild b/dev-ruby/rack/rack-2.2.6.2.ebuild
deleted file mode 100644
index 40d0c44be96c..000000000000
--- a/dev-ruby/rack/rack-2.2.6.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-	=dev-ruby/psych-4*
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !!<dev-ruby/rack-2.1.1-r1:2.1"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
-
-	# Avoid test failing due to security version number usage
-	sed -i -e '/support -v option to get version/askip "broken with security version number"' test/spec_server.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-3.0.4.1.ebuild b/dev-ruby/rack/rack-3.0.4.1.ebuild
deleted file mode 100644
index 7aee70d2e0f0..000000000000
--- a/dev-ruby/rack/rack-3.0.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/webrick
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 241e70c1de74..0c5aced7d3dc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index abf1d17bdbdb..95959209ff7e 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,5 +1,5 @@
 DIST diffuse-0.7.5.tar.gz 509048 BLAKE2B f69d9afea243069bdb9d313059556cc83283cd037e2f32de4b1221a2b53c493cb8a0a9bf8b4fc4d8a50e94fc60fe6043d30e3b5e7b7ceb2cec8529d8e136db0f SHA512 466cdc834e1103ad794979a287838b5005379712ee1d77e400d5fe71dcf5e79097decb39e26b213669077a4a2a525444db99b5587929f01b8b2df9f31ec190fd
 DIST diffuse-0.7.7.tar.gz 620577 BLAKE2B 5c6cf09519e177404dd4d0fd8b27d176581ac08fb9d6dac5b4a90b130f7c28fce0f0f3802a99c7b3078e608f967a36851532d43f5e661854755242b5b23a64e8 SHA512 bf9576734ebd696252732b3b0ce6f1f18508a800520388459d9f27482a43251db879c2198c3a279bad9528afc08cf8e7f23a3253b58edad049db9b1c697fd6e0
 EBUILD diffuse-0.7.5.ebuild 1460 BLAKE2B 405a3c3da153d8e7686d2230905590b415b31dcbd04b8c70359f2ba0234fd827e7ff417eb8d3ce762b5255c1c12238fcb0d19c061f4ba9b715554ea2b2acc4db SHA512 e867b539c63292e9f5e96225a542bef4d4330c1f71036dde5112857f508844f47f918d768f01526771c25c3cded31c77255f970cb2c2834c3942e9e4f222e3ae
-EBUILD diffuse-0.7.7.ebuild 1461 BLAKE2B 50bf0e05f4fba26e1b0eb481c9f4051078e26da781430373e22d0d429b6b6b0d9bfac8702ed5a6f155247c88debf2148bb79fcbf8a4fb6a1ec6a503fdbb614b9 SHA512 0b08ca0ad8ee9cda56dfc11fdc827d4f2cc8be1f5513972118b02065853f37457f975e287f3a5927cd9e0a6ebcd874470d73aa9b75e0f9d03e829fd23c674009
+EBUILD diffuse-0.7.7.ebuild 1460 BLAKE2B 8a61d9e8f42a02bd9aa0e0011377d66e35a7dc7aa521b6aad125160be7fa28da705265fe076bb8d9896f771738c8d4dc3bf2cb9a0ffb798dd111a778a7b90449 SHA512 3a4d5eccd63958d1f35e2b9cafaafc7b232f6c678f94fd563cbed12d4ba653159632d87ab157a92e294c52ba7fa0a11036c35081e644d3e25d0bbba8a4f5eabe
 MISC metadata.xml 324 BLAKE2B f4889c3b688d5c75efaef149b263839d073cc9bb5af34143db1fe800459b42a4a2676e03af21bdff14e75a85e9cf20a8e2e6d9447678c45a849798e35d587811 SHA512 24b6f7a5010dea044356f4fec287c0faeae4d3aa7ed79c3d436c28e12edce917f5c34597d7efab39dd59b907baab8cacfd942e61ccf843248df093092cdacd32
diff --git a/dev-util/diffuse/diffuse-0.7.7.ebuild b/dev-util/diffuse/diffuse-0.7.7.ebuild
index 6e24a239ad9a..d7fd99579407 100644
--- a/dev-util/diffuse/diffuse-0.7.7.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index 4ff487d7627f..4494d4214153 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee
-EBUILD gyp-20200512145953.ebuild 1568 BLAKE2B e25aa6bb6bb3ec4965bb0cf690c93925aae60cbe29279b388ca6aa1f2c28a25cff8219a73536a10af3d100d7eba2a9a6978d290d7c7335e0eca60acdeffa5a4e SHA512 8c2b884a54ea7a09e0a12e02d659c807ad1ad0ead5b77e6567e1885e0f006543b2180545679a4a92a7028e6c19d83e36281c4bbe987857c38dcb5c042d70fd48
-EBUILD gyp-99999999999999.ebuild 1547 BLAKE2B f2045d50fc1ffff23a236996a04d55a128c47ed9edf28f5e62e0af6bec037747ad0afdf52bcdfbc0e3e25fc6b7b624659ae4bf85e5ccbee65572d243b83b39a8 SHA512 66521b122764567d9794cb5c95c9030913007df58a247e125e98e5d43183d0b6e15eebefe86115a0d45e04f7ae22d382832eab79d66acd075c901b3deb8e8d85
+EBUILD gyp-20200512145953.ebuild 1568 BLAKE2B 29b3da349729568513f69169f2579aa3f0b8c1a4012cd9923f60411b5cf393dad49843a9a652b1df81d0d1071d2a0b75dbaf89b9c9f2784af50c51e27dbc88ed SHA512 0a933de40a63bc55f3ca7bd12c5f2f25b3830417b82cb75feda9a52106a301ec3818d71799bfbd5f741e2cc7f88b8281ec4217e2f97b2d8b076b1d0e3c072939
+EBUILD gyp-99999999999999.ebuild 1547 BLAKE2B d24f57cbd2d852a0f13ef40b480933b108f0e36315675118b04c2cdf72dec8cb7e57eeb5af8ff7df69a3a3d06af19786136db581978cb4657d3ae1a5f86c6239 SHA512 f83b2df98b32028f8d6d777ddf2b03c861293c243723c9bf193949d1f33fcd6bde83eaa7db6707bbcddcba265a4c372678ac2b402c5b32c4d099a419d4e5062a
 MISC metadata.xml 383 BLAKE2B 11d9ccc1a7c12278a0087dd176b09d4ef34a9e9372b1a278e3dc19744605a424f02c38d4c311a4148e4938274780020d45f77a5497fab070e80e0e2e655516cc SHA512 c7c78ed2fbac6a1eaa4e6c9ac1bbca07e6d4584ed925d9a37b53e903ee29497e98720cb5eb94918c103288cdb61e4a586e758e6bfbf5f4ff97c8ff5ba54921de
diff --git a/dev-util/gyp/gyp-20200512145953.ebuild b/dev-util/gyp/gyp-20200512145953.ebuild
index 748f232c0c8d..f8a77f126c1e 100644
--- a/dev-util/gyp/gyp-20200512145953.ebuild
+++ b/dev-util/gyp/gyp-20200512145953.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL="1"
 
 inherit distutils-r1
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index 22b7cac6dc60..8861e63de779 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL="1"
 
 inherit distutils-r1
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index a2f60489b3dc..11024c7bb667 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -10,5 +10,5 @@ EBUILD ostree-2022.2.ebuild 2645 BLAKE2B 03f4a898d2553dc8fbd055c51b834270266237c
 EBUILD ostree-2022.5-r1.ebuild 2734 BLAKE2B 3207e4271ee037096ca6f6ededc1a6b809469881ab8783afe9e611b89056ead85218dce7737c3d47612cbb489e986b4ca0099808ca5e872fafcc67355b7a4ece SHA512 a35f7529d14f7fad61231dec92f8c9bc8d68e007e943e5c9df938265153a0ae74e2d73790649781824c59e65337e04c69a76e6c8d00b656256ced11646097ca5
 EBUILD ostree-2022.6.ebuild 2707 BLAKE2B fa93a723c40519dd94489574ca7930c4bcb05027b3bbab37507ef9ff91f2de0a6ec30214a5fa6cd38ae40f7f0662697b8f82164b94bd09d49a0f7ae8eeaa80c9 SHA512 6b262393e11f797fac5c29b70f1daf40032dd07d41741fa802064e5bca5efb2e600c0d5a33d520d17cc8c2e5e21eceff4c8171ed9722adfbb936902f81558cab
 EBUILD ostree-2022.7-r1.ebuild 2787 BLAKE2B 457bfaf6e4413f570e9d57d22da646cb36180c2bf3c585bbae39c8590c275cc34675533e2b6132bfdcb3fbeccb326c36ec67a6e197d273193b6df98ee31aa08d SHA512 4cfbb3df5f87f7510a6bfb158e92f2e388403c4db18758f7a4f0540fe740acb9fcb44cbcbce5f2825065355eadea41bb0890e66378ea4d27bc5d6a6b26a4e008
-EBUILD ostree-2023.1.ebuild 2783 BLAKE2B 419ba1b8228710bece888120eb87c5010c8ba75ce29be0094895fc46730f2bfee76b28ebe28ca13de9000c6a41544194f98806beb26b68fc86b5c6ad991def83 SHA512 1654163b8be523d1202d3bcfa9438901170f5ec0c445da28f310a36744a2decbd0f7a5252786b714f3a56616d75b73e7158066b8e9b90b03b403cdfe8d49869c
+EBUILD ostree-2023.1.ebuild 2782 BLAKE2B 24f1aaaf7798a7476bda04a02b196ed6110abe549a12f8241c2bca9e9c0d6c4a20eb5e8c54c56898a838353206825acc2725933073447f9f4f8db913f2d265d2 SHA512 06d4b96e908ca2cb8c2807f24bd3a654e324c8a2309d25f130a6526d8dff336c373910c498624909fc9bc38ffb4c7f1f33fca919617797cdd52b5833a1abb9d3
 MISC metadata.xml 1990 BLAKE2B 1c3e6400d24f0701211c0b8dcfba8d31c06b7c493cbe6eb2c5432ea818d0a0fbe863f8f1661eb386d179bb186cb7c970f7d7a3f8c9c42ea4b03b3d4ea0472a57 SHA512 04e37ddcd7348d43d475e04c996ee8b2e94c64143325dcfb21c5738b75f71ecd2c2ec64c8f91fbd06f5a6228671e90fdf10a939d4457abe4d0f88492435b4601
diff --git a/dev-util/ostree/ostree-2023.1.ebuild b/dev-util/ostree/ostree-2023.1.ebuild
index e2ac438200fa..8e2cb1c035f1 100644
--- a/dev-util/ostree/ostree-2023.1.ebuild
+++ b/dev-util/ostree/ostree-2023.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Operating system and container binary deployment and upgrades"
 HOMEPAGE="https://ostreedev.github.io/ostree/"
 SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
 
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 LICENSE="LGPL-2+"
 SLOT="0"
 
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index 35e83397c813..f5969cc906db 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,3 @@
 DIST rpmdevtools-9.5.tar.xz 96724 BLAKE2B a406581be0286a6cb4b611289820f5a2db4306b731b0963881091e27b04b213c155243aeb95eadb41a27ab7a481bf1464d27d31fb52c6b10c3cedb23c1b22d21 SHA512 d2a110e7557eb149113560d64b3ec1ce75e5ee5ee541de3b4ed88f2bf11ef0248c864383bbffb49f8c32920563704da94004a8f9c099ce3610e6168aabfe440a
-EBUILD rpmdevtools-9.5.ebuild 897 BLAKE2B c6c596650d48cf049d007374f3db531210f05665ef1945a223f5709988881eec1533455819cb0410f9a0ec68dd13f3fdc835d0dcbcc8e98a838426d7386361dc SHA512 01369a3a015807da6138e02ed72eaf49d2f72d04b4bea9d95ca5b5da9973bfeb60f5f742fd32cdfd807ac79d3434287a261f6c9e9bdf992a775077a702b0f9e2
+EBUILD rpmdevtools-9.5.ebuild 897 BLAKE2B 5f669fbfaa782aff236347cf58054adb5bbcc7c9ce539972de1613e135223ade5941b43e4770b8ef4945e16b5db132242b8b0c951032b529dc181d4c9da0c6ff SHA512 5a78a4ac5ef995890d4f3bcafc9bbb7cefb8f4c60fcecd8e72eb20c67325d1e9af9b959dcf70525e6df944d6c00afd16ec606ebe2d5dde758f8b97ceb4d0603a
 MISC metadata.xml 254 BLAKE2B 27bfad9e03763fd082b0adc7a602dbf9f51b6c6ede654b4fa61e434e9c9452a301259197291dd45bb6d5486e1797fd8c15383c4bf88f3a0a08c116dd9227b5d6 SHA512 a08ace91187b9c474aea7738fedcbb2a65e52a19f004a781376f04f7fa6c4b867e43645764854108ab21410b6675246b00514c4754e8f22732790e6fc6dbc2d6
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
index 2e08468ce5ab..21738f869519 100644
--- a/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-9.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit python-single-r1
 
 DESCRIPTION="Collection of rpm packaging related utilities"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 5734b1549817..fc1a8755d91e 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -10,5 +10,5 @@ EBUILD systemtap-4.5-r1.ebuild 3257 BLAKE2B f25793e2d3299e4c5a93282e7a244d8cec88
 EBUILD systemtap-4.5.ebuild 2816 BLAKE2B bed934ad563fd3199f326f08e55403aa06e8d9eacb2e0f150b7804ccedb0c2c66fe058852793d621e16bff95a9c0ea7fd2129f8f8a9936aab806cc943e3c6310 SHA512 268df687aa4f1b38e9db7bed329eb5f6c4c515ed70bdad988bfb989254d49bda8593d30d0e3e2a9b024fc665f9dc9b51f4f2cc3290a9fe80ca2da336997925c6
 EBUILD systemtap-4.6.ebuild 3264 BLAKE2B fc8fa81c78701af1ff88de7ddea53a50a43ab6e380dacdbe12ceaca9c604141509a0b6ff83b8c643522c4266454d30c15b1f301ef58f89ab6e9b7a8128ee2c16 SHA512 2bca91a28addbf51b9ebf46f94ad7388fcf63d1423b9d5c7a995e8ee9af325a5250ec37bdbe3e3ca5c1d566ccbc7dfad904231d2cba3a368e1e289c9a62cd136
 EBUILD systemtap-4.7-r1.ebuild 3280 BLAKE2B 120452ebf32d1b794319360498e1cb82c4d880ae5b4afdd6943fa241f8b5fdc1ffc55ca5e3cd1cac8f01df6446ade42112b7a8006c1cd7c92688da41a2c844ca SHA512 f8b924cf744bf8a95cfa14e0b027aa3ef04ff515f20136879210690c4fff3d27f588c889900d0bff01736fb3835d475c030d73c385884815243c7439f67259bc
-EBUILD systemtap-4.8.ebuild 3281 BLAKE2B 259ccd0cf5e69b551aa82fe785bd1a4ff34a6c34ea116686226f3714b9139d7c9ec8eb7fdbc7bfd80e8a96bc30771698a498220e833862464a5cc1947bc7c8a1 SHA512 bb30730e388fc2bc3f741a16faa1575ccd2b48621d4b17b2bb22b38f7ee423be10b6f7c5d98b49c1a99148ae6535c56c73d12ea843b788e1ded66ed2914e83bc
+EBUILD systemtap-4.8.ebuild 3280 BLAKE2B 3df1b7041908984eb23fa9a61e6a3dc97a56316797987cd619834d5c66b0e0e8b9046730d804e1e1077f3738939f4c8fa1ae65b26b0e36a3eb9e6cd6c651eb1a SHA512 9eaac26fe33c19d5f6adcdf3f4b6be4b71707d1205a8e0ff087315c7c6767d84332065f5ec735947d787ba3e8be22aaab071dd95bb3e189724cd42e024dbc364
 MISC metadata.xml 303 BLAKE2B 5db95d500a08d656d0221a474d297c8357712f19334f45db347e36f14a10365d65777e0d24c68f75d4855b3ee1778dca1ecf4a05b19d2dd3975acf25a12b4523 SHA512 27261bc875c881495a9b0e1fffc811dff40b763a9e6453ca47143cb8d7d867682becd7266f8d559ad8c32bb5d7de9698341055d483f3e6a68b107895aa174b77
diff --git a/dev-util/systemtap/systemtap-4.8.ebuild b/dev-util/systemtap/systemtap-4.8.ebuild
index e5dd4e3a67a4..a38eb34da1ac 100644
--- a/dev-util/systemtap/systemtap-4.8.ebuild
+++ b/dev-util/systemtap/systemtap-4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 CDEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 087a7d230951..53a229284d6c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 36b652d8f27a..efdad284fcea 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -8,11 +8,11 @@ DIST ImageMagick-7.1.0-62.tar.xz 10359080 BLAKE2B 6f0c91f81cd7c43017b3b58b5bea03
 DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B ed02f36d0014f2699db5df0eb1cf3b18ccbdbee92e3a3bcfb85084672faeb984c6bb27cdf46349768f936ac91ebac744aa00fa3a95fcf1f02a4969f315d2079d SHA512 52aa9aca4d987ee8f2142ce2e192230465399435d0cd7e64683349d0da1f52f2fbd03a2c667605c0c9da66435f84df173c60b7eb93ecada691e801e08dd9fd48
 DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3 SHA512 99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea
 EBUILD imagemagick-6.9.12.77.ebuild 7426 BLAKE2B 71d71047513610da3bb50f973ff3b8968718a0df69d2e443f81b42addf1a12bf5c422219ad92d4b8a0a996402890c605f3b439c8d11d199d2176c3f218e3b46f SHA512 e9b5e34dccbb20d2365787372006f128ddfeeffeea7cfece03911ffa191c69b324d6e32acd6593befd911a7c8384c3cf4f2b0cdf2d596f7438fe50942f529121
-EBUILD imagemagick-6.9.12.84.ebuild 7434 BLAKE2B 35b81957b99859ca85ab40f7c72ae808650220700e7d207ee1d97cebdbd79196cde4fd602640645ddffb60d9c769a2e8cd87a59e55cf36f4588682e1489b631c SHA512 cc84cacfdbaf6a72b1e56c345f22f0537e497b3dcb7a15279db6ac60dd8c6dd8ebbd9e4d4dc5e72bd82ee6a567e5da7ddf5eb50b85923374517aefb30853be99
+EBUILD imagemagick-6.9.12.84.ebuild 7427 BLAKE2B 75d308c477f3245be679774257b731b842ce33976c31c97c8d269adc7657bf20980d9fba33a236c837ceecb34c13227a5af168da4b7e63dc7550df055684b8bf SHA512 d0a24662a22e2e506e08953197f719e0d02df69fa0326d54d769a7241de2d9fc45d35af1ff607e69da79639941a5c1ef09be5f7425a46931079f306250352e2a
 EBUILD imagemagick-6.9.12.86.ebuild 7434 BLAKE2B 35b81957b99859ca85ab40f7c72ae808650220700e7d207ee1d97cebdbd79196cde4fd602640645ddffb60d9c769a2e8cd87a59e55cf36f4588682e1489b631c SHA512 cc84cacfdbaf6a72b1e56c345f22f0537e497b3dcb7a15279db6ac60dd8c6dd8ebbd9e4d4dc5e72bd82ee6a567e5da7ddf5eb50b85923374517aefb30853be99
 EBUILD imagemagick-7.1.0.62-r1.ebuild 7780 BLAKE2B 2657812e172c8df3de26c88687c54cf3f892ee8817b6a2b3ffeb8179a6915fd4888858f1489fe1604944051714a6d9e3a72b3824fb49b44af1f31aa4ab458a51 SHA512 8c429466771721f800714051adcf5f8b8990e6ffb6bb7df399a6e594d9d67d79e0fbc4886a84bb9d9d7f93fec8dad9a06bfe1c785103fce0e6af914ee9a320f9
 EBUILD imagemagick-7.1.0.62.ebuild 7719 BLAKE2B 59c7465caa1d4e165f9e26fbd701e20cd7c09e9609859713c43a68366b028abce4f247823419bf5b6a3e5057ae3687be940ed01879e96bde9a35ffb6111da286 SHA512 246d9c907a4186857cb66496f3e1ddb2a10d3558a8b9580f7e1229a20e81fd30f0f47f7f70152db559c707ee7863e83621ca08a841ca382ce29cdedb22b7feeb
-EBUILD imagemagick-7.1.1.6.ebuild 7780 BLAKE2B 2657812e172c8df3de26c88687c54cf3f892ee8817b6a2b3ffeb8179a6915fd4888858f1489fe1604944051714a6d9e3a72b3824fb49b44af1f31aa4ab458a51 SHA512 8c429466771721f800714051adcf5f8b8990e6ffb6bb7df399a6e594d9d67d79e0fbc4886a84bb9d9d7f93fec8dad9a06bfe1c785103fce0e6af914ee9a320f9
+EBUILD imagemagick-7.1.1.6.ebuild 7773 BLAKE2B b02a8687ede47e24b83aa84c515e747f54729b3edcfd5520af125046f12196ff26f4a2de6f8a8dddc1422fe950fd22a5d1899c709c64b5fc756ab98f589956f8 SHA512 7a80ab8ba39c6fca31eb3d2489bc785e786e46c1e0e7b51427788e500b809ccbbaa7aa48dfb7eeda7adf09a2fc1166e643d5882d16d09c2a1c8a417c349cff90
 EBUILD imagemagick-7.1.1.8.ebuild 7780 BLAKE2B 2657812e172c8df3de26c88687c54cf3f892ee8817b6a2b3ffeb8179a6915fd4888858f1489fe1604944051714a6d9e3a72b3824fb49b44af1f31aa4ab458a51 SHA512 8c429466771721f800714051adcf5f8b8990e6ffb6bb7df399a6e594d9d67d79e0fbc4886a84bb9d9d7f93fec8dad9a06bfe1c785103fce0e6af914ee9a320f9
 EBUILD imagemagick-9999.ebuild 7780 BLAKE2B 2657812e172c8df3de26c88687c54cf3f892ee8817b6a2b3ffeb8179a6915fd4888858f1489fe1604944051714a6d9e3a72b3824fb49b44af1f31aa4ab458a51 SHA512 8c429466771721f800714051adcf5f8b8990e6ffb6bb7df399a6e594d9d67d79e0fbc4886a84bb9d9d7f93fec8dad9a06bfe1c785103fce0e6af914ee9a320f9
 MISC metadata.xml 1260 BLAKE2B ca25d6d7f6286db6fdab38bbbda7c519b28733923a6f2a3f1ddcc79436d149111dc853aa1e44d805bd9e0f97c0e76496bfe815c4065d581390ceec849610d67a SHA512 128ed34ce2e6ee36977f4990bc2be2ded256b3516bab9e91640f29f985a34f59de7835414aea4752257f6228c8b1796bb68b51ae9e4453ce078cd63cb383c2d5
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
index b8d2fa1c3ff7..2b6f9396e544 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild
@@ -14,7 +14,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
index 085bd89a9b6a..af2f06173c2b 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild
@@ -14,7 +14,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 933b38522f51..261a80da3bf1 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,7 +1,9 @@
 AUX inkscape-1.2.1-poppler-22.09.0.patch 3129 BLAKE2B ad2125d617b7e06618ec97301add563fbf1aa99873a6da144438ac94cd79e715be3f7403e3af7769bbd13614bccbe855ac3c76dcac9f533fb745a6c538444b54 SHA512 937dd6662e86ee13d04ff5c2007d71f10bf7ed84f8a8a8162138d054076b85d9b2c835f55dc217b7abd688ee4524711f3ef907a5dce641beacd0e9f8c6514de9
+AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e18e21d2a0649d1801979ee08b2428a1b9ae8850a09cacaa2121a25069d763758123f0c550e1e7dac2a91c04198eb6bc960f SHA512 ccc4a593c903ce467e0076a8b036aac421a3f5a943815d6d7cf91c48acb07d49c76fb73b58ad01fc3a3f45af2c6e4bc78d6a13848ed3f91de42c3a074b1aeb17
 DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
 EBUILD inkscape-1.2.1-r2.ebuild 5251 BLAKE2B fe6bfdbdc8de16ead4e418b91ac13a188d67c3607e7ddf3fa875b749df77894a4de8f96a6be990ae158c222d32ba4e3c2f6242e82224393d40cf98477a97b22c SHA512 070d799f453068cd4c1604fffbae7922373aeb386e9b7522c7860bba61ba82f4a81e342fd494a97b94931f8608d1e29ae48b05d076c89950b50fb7e942ec4a7a
-EBUILD inkscape-1.2.2.ebuild 5192 BLAKE2B 8e08e2c45a8ec683d6b5e0adad6e8d4baf752fa8266b2b69f87cc9d60ac72797628d93a2e21177164a3440ffc3696d029bc037eba68781ea37df568e697bf389 SHA512 c8115344d566d53ff1639a718fa28eec479e9ebb47a084de4272865fd1725ed1c6cc86c53739813b89f5efeaae79cd5017575c8c06375fe55826c4674dbefe5b
+EBUILD inkscape-1.2.2-r1.ebuild 5251 BLAKE2B fd6ec2774783bd2a1aee418e6b8cfcafb9e40d2374efa2abcbd0d91b55a5066804c942d5e719277fa3f858f3877e035a9ffc8e895f4d18f10a11196af1940c10 SHA512 56f5545f6793d330a7a6d00a2695696621ec280fe886f53985283d38848bf931cec49884fe3e979dfc7b47850e27eab6836bc1bad840ca6a87d4f713fd564643
+EBUILD inkscape-1.2.2.ebuild 5191 BLAKE2B c58c4b176348764e9029041bca751ea6cea29835496a1404e7ecb6e11974f254bd3e2b1c0b0ebf32b3882d35113ce507261b552438ac4367335ac52e675f9dea SHA512 d4376393b1c826464497783a694d4884079362e4dd0f4762fc059aec1a4b35b3eeab3a350a3b56307e390809e7f416f558796564daaaeb14a905bdb5aac1d700
 EBUILD inkscape-9999.ebuild 5097 BLAKE2B de3a9a36fbb8e9c2b0b1695e1fc93780f5bfa7882f42c30c612ed449b532c23a53b96a63c354fc45c10488fe792d8855ed641c238a5f6aed63b319387525e8b2 SHA512 6bd47fdd4984b1f6b4cdc0888540414102b6be7351802aa5f7565189793f308ba1f96588b1663cef19703d0d8a736404014ed918629a664dee4b123061eaff97
 MISC metadata.xml 876 BLAKE2B e8998be1909e5848fd13fa4a8c4e2d9a424c818c3a41ebdd0a5807f572f9d0037900ac2516d107b9ab016410c25bc4ca3225e832ef17bd6b345d6471d5b5f0bc SHA512 f9a8581f7f401a40b100f61e67adb032859b2c70bd49eaa60b13a18cf24cc24e3a2704e227cba5590aad4bbaf705f3a4bf8c6ffda75f473c39bb8177af4aca6b
diff --git a/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch b/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch
new file mode 100644
index 000000000000..c219a6e45273
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.2.2-fix-compile.patch
@@ -0,0 +1,46 @@
+https://src.fedoraproject.org/rpms/inkscape/blob/rawhide/f/0001-Fix-build-with-GCC13.patch
+https://gitlab.com/inkscape/inkscape/-/merge_requests/5108
+https://gitlab.com/inkscape/inkscape/-/merge_requests/5111 (version which got accepted upstream)
+https://bugs.gentoo.org/903867
+
+From c68f5f9cade8a890efefcb4c2e0fc57762211286 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Fri, 24 Feb 2023 14:01:18 -0500
+Subject: [PATCH] Fix build with GCC13
+
+GCC 13 now complains about this line:
+```
+src/ui/widget/selected-style.cpp:111:6: error: statement-expressions are not allowed outside functions nor in template-argument lists
+  111 |     {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
+      |      ^~~~~~~~
+```
+
+However, it is not necessary to strdup the string constant as the value
+just needs to exist indefinitely, and it will as a constant. While C
+doesn't mind the `const` difference, a simple cast will silence C++'s
+higher strictness.
+
+And in fact, the other use of `GtkTargetEntry` in
+`src/ui/drag-and-drop.cpp` does the same cast.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+--- a/src/ui/widget/selected-style.cpp
++++ b/src/ui/widget/selected-style.cpp
+@@ -100,14 +100,8 @@ enum ui_drop_target_info {
+     APP_OSWB_COLOR
+ };
+ 
+-//TODO: warning: deprecated conversion from string constant to ‘gchar*’
+-//
+-//Turn out to be warnings that we should probably leave in place. The
+-// pointers/types used need to be read-only. So until we correct the using
+-// code, those warnings are actually desired. They say "Hey! Fix this". We
+-// definitely don't want to hide/ignore them. --JonCruz
+ static const GtkTargetEntry ui_drop_target_entries [] = {
+-    {g_strdup("application/x-oswb-color"), 0, APP_OSWB_COLOR}
++    {(gchar *)"application/x-oswb-color", 0, APP_OSWB_COLOR}
+ };
+ 
+ static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries);
+-- 
+2.39.2
diff --git a/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..b608d9a3e9b7
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.2.2-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 test visio wpg X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/cachecontrol[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.2-fix-compile.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
+	)
+
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}
diff --git a/media-gfx/inkscape/inkscape-1.2.2.ebuild b/media-gfx/inkscape/inkscape-1.2.2.ebuild
index fcc109b4a36d..d9588370c24a 100644
--- a/media-gfx/inkscape/inkscape-1.2.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 9b33e46d37f4..104855b1948a 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -17,5 +17,5 @@ DIST sane-backends-1.1.1.tar.gz 7447569 BLAKE2B 02ac1822beabb12f19ce2d7c053f0f72
 DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1
 EBUILD sane-backends-1.1.1-r11.ebuild 9418 BLAKE2B 7727aa8295717b1878fed4a4d2cb83ac80eff01dcc7a62496578a809c7d1ecaa420f2c34d1c8d1ad82f586b405c2dc0ac09fa1b75cb37a89fe76e6fda5458cd2 SHA512 1b6997288e6b7ba80bc2bcffb35ef712866ea843bd3d497f7da50d48cbd1a5ab1f2db524f75398316a93f82c4d186ab8c48173236627460d4d34ee93963a7d1b
 EBUILD sane-backends-1.1.1-r13.ebuild 9580 BLAKE2B eee749707bda40f20fd558b00153ed78f34052eb5bc4f59dd097e2d0874b4b992fbc901b9e75927c3a1f71c0a03da4cef71cdf8c102cb1ead500a4827ffaf50d SHA512 147b85daacc23cd66320c866c13ccb01a5ad5bda5a9c163d6d0cf4ca130adb588e07b2d28a58b2ffc2232a310777864301f1dbd481703e1fc59dbd2368b481b8
-EBUILD sane-backends-1.2.1.ebuild 9390 BLAKE2B c1f1ba9d817e0b98f388bc66d128716eed7a6c42d8828351dc554fc104591ec3d81d624bb515948dee4f23d95296fa7ab1b365314ddf72f0756983f986580074 SHA512 9bc2b0e69088cdd9195226e76d483bd7f5adbf1537749a520da8b7a4100ba965804ad31c08619ba18d15e9ed57f8aad3fd3523734fc2c1d878e983cd091adc65
+EBUILD sane-backends-1.2.1.ebuild 9387 BLAKE2B 94310a064dc6874ce20cbdb6873c82d37ecf5343772788410a8e7f67fcae7df6bc1c2bd258978c6845e7608dfe1188fa3994174a387553235677257ff07c1adc SHA512 adc8fb1f68f23d7cb644f69c1f5ed553cbea7bef269096d44b8a3b4e4eb3ab967be1904a70cf39d58f586593021ede4a13fed136a796bfd49de212646c94a845
 MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37
diff --git a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
index 98a3e730bdff..e5b01f2eadf0 100644
--- a/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.2.1.ebuild
@@ -128,7 +128,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1f
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6d86a21aca41..baa5e51238d8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index fb71b3c654fd..06172edbc5e3 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -3,5 +3,5 @@ DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e21
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137901071 BLAKE2B 1e260eeba062026c719499425a3f7e3c2ccc7bd662725b6cceab4332d2d026bacc7df4c904cb776637ea60f9e2ba854d6e5010ffdc2a1621ad943b166d8402d3 SHA512 e7f7741d1cfadb3ea9ec5bab0b2556c58424c2dd89f938d5e93aeb99bff55479b11faa19cda4a481339be60de73317faa95e190d34d493c7825f706f4e57e73c
 EBUILD openimageio-2.3.21.0-r1.ebuild 4893 BLAKE2B 6e40644a0db91883ba48270859d0ff981d0e085c6f61f333de946c139ca764bb5500af8846c88207c4e80f5085544f1c6dbceea690975b0d960462a93d81a57a SHA512 c2361b1b3a27a81856407c744a4ecd581ebebc5662ce8aba146ef134ffc58e8d01b3d1383c335eeedc6d90ef4eacb71d4c7d987c278787e7a1040f215b7709be
-EBUILD openimageio-2.4.6.0-r1.ebuild 5607 BLAKE2B e5d55d4303b9e61791b42c54fe9e0eadcd19d550dd6fa2ae0240a380b1c60806a84cc6bd65ce79f124c9bdcf0d370510fce658af20b044817903c0c242d411bc SHA512 e0368c17eb8139f1c2b9a6614c7199e1aa85e34437c0616969bcaecce221af423f916fba2c62c313144daed421c62e3301a5941dd509319102b9f2af09997d28
+EBUILD openimageio-2.4.6.0-r1.ebuild 5605 BLAKE2B 3046ad6172baa0a92af29780bc2b7dc931a2fee46f2fdc60ab9838dfa407ffa2a7e32040369f7b8084a656c1473b7449acd5b7f4ddc6ba57bba8f8b0827503c0 SHA512 49f32ebd2fe7f0d82b8ccc17252915d6aa4089bbb373183c5b8b6a2df8376af208bc9abe0263f954728ce59cd8aed3a2200c4b94856af811e2dcd89bfafacf84
 MISC metadata.xml 724 BLAKE2B 057b0c63428b1860a3b11442b9687b136a749935e3d0bb2e27eca00245d1d9e6f3e40aa796b723664b9b320d8c958a345812199ed04f8d1a476364a80c76e355 SHA512 5243cd4cac10b569e1488226b61c98012af13f50e32c023176e6a2ba29f7804e164b4774957b35f212bad62f496bb466b242d6bc1be44ca3ea0909371b9d5415
diff --git a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
index d4f2d31f4b64..5db8e9efc01d 100644
--- a/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/oiio-${PV}"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 X86_CPU_FEATURES=(
 	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/portsmf/Manifest b/media-libs/portsmf/Manifest
index 192e8b53bf71..e2b7e12912ce 100644
--- a/media-libs/portsmf/Manifest
+++ b/media-libs/portsmf/Manifest
@@ -2,5 +2,5 @@ AUX portsmf-239-revert-extern-to-static-change.patch 1456 BLAKE2B 9859e993af1179
 AUX portsmf-239-set-correct-cmake-project-ver.patch 706 BLAKE2B 1e5036ee1e7ff278209659708d4535a05d8f569d2f0609d439e937d48b5fd8bfaf1bdec2712d2fa66deb450ddcf6dbb7fd476e1a68c7d0d6b7461d2e8c7fb13b SHA512 32c43ab24ad5d4a9e1546f811f1c013dbe2e2790a4fb24eeeb59876ea7393981f589a9f73d00cf4ddf1e558559ce86c1c9145623187ef8cd63dedf10ca95cd20
 AUX portsmf-239-set-correct-pkg-config-ver.patch 1216 BLAKE2B 8362c220d4b544fd723a72c8a295ed1b01fc9c6719f4163e9c6ecc0317e0d2375778338a3e1a3bdc28bd8ac9d93d493aed3bebe0e867a11ce622f64c3fbaebdf SHA512 6b7a61b7ecd79ffc3188b994b9d78e9834d73a51b748e77552824a92b49c699aab3afb010411c323acc15995f3334b1f15d90cf216805d96eff51cfade1e278b
 DIST portsmf-239.tar.gz 82753 BLAKE2B 3085d45fb106db38be72c74a2f4a5579e0aec590c19db1482f32562e8b3044dc997a34afe1a6027b0e0ae59ee8d44a76e51d8f44b4cbef2dfe1c6667cd9611ee SHA512 522ef6e92de6497c66d6b9adf2b6b4e419024d26fac421096718b024ea0e183d322d3f0cd9fc357e0ba983371cf313d7a0b93b8b24aff5c9cb1ab61c915725ff
-EBUILD portsmf-239.ebuild 1100 BLAKE2B 54a22cf477aaa136fdf29b70a9d32176cdeb7d399842a8f56c88f07c935f0de893afde4d0b06b8d48e2f8b5e4fd70e1784973ab4f4c0c359a798f4f7b133f4e8 SHA512 e2c0dece944f691b4793a966f9764d3e6e895407d59f5cacf1d3cea182260b475c473927da73adc8c9b22e733fb8bc8cb40183a0c9aca96e8f12ba74efef6490
+EBUILD portsmf-239.ebuild 1099 BLAKE2B a8b5d4f91be07d2f1e32beafae4edbed4113700504208160d4e84fe39aecfd749e8d7dec1f1939bff9dd4b4df7c33fa7b80bd16767c68f49f93561c841e28cf8 SHA512 b0c951c718479a1187d48cf0591025ef672f9a6811889c4d93a7330b2088e111093b2451bb5359eac63f0f67befe4d96fa3670c7a4cddc026402308b5277c35e
 MISC metadata.xml 434 BLAKE2B 9951a58bb91b176c7ccc9ed3ac8c54c1014b24fe91ede23dfd588c537806a97cfd70c98edac1a2963b601fefe03b2822f18531c3e4b65d0dcb9048e5e4e2d9f3 SHA512 95b6a981ea49fb62f9f1ca706b02173eceb67f53cb5e0d84d224fbd2cb28341fe2d7665ff82e80ce9185242a548a3ff176d076355c3b19116bf58e8f9b4ccd6c
diff --git a/media-libs/portsmf/portsmf-239.ebuild b/media-libs/portsmf/portsmf-239.ebuild
index 082f1b493008..62e1c55e02d7 100644
--- a/media-libs/portsmf/portsmf-239.ebuild
+++ b/media-libs/portsmf/portsmf-239.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 S="${WORKDIR}/${PN}"
 LICENSE="MIT"
 SLOT="0/1"  # SOVERSION in CMakeLists.txt / SONAME suffix
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 24dd42fcb847..3bdfcb2037df 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 17e853588ef8..60a88cc95ee9 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -11,13 +11,10 @@ AUX audacity-3.2.3-fix-rpaths.patch 5961 BLAKE2B d48471ba4cea8103fd1caef6e3e1335
 AUX audacity-3.2.3-remove-conan-threadpool.patch 1681 BLAKE2B d5b32185ae961c1ab49fd28410de857b7e3eddaeebf2435dd77c526912ff06a604500c8af2357dc8c601fc032823c74beec4c207cca58fa074d950de6cace6fb SHA512 4a4ee937be644587114e9e097178859ae369e3519475224ea22095ecf51971215b7873b3d9f05ff4f6dcb12c31741448381621c250e159824c818fa61238f0c1
 AUX audacity-3.2.5-gcc13.patch 550 BLAKE2B de4b1bacbc3606562c9989df8631fd20c97538be05a9a00e1aa6b323de7c07ab38fef05eb47449e47966e54d9ae089e53cf799508666f63c79462306176b244a SHA512 76379252380237cf5c39476a4502a8bfb575740ed1094bd9ed79e2e890710c7a0fbad9209691d5d95c4b96d737383155f3877a061af33deb7d873d9d25f83d2f
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.4.tar.gz 57016943 BLAKE2B df36f5f7162cc6303b2bcb4861f0b418fd3dfd97a8d664b9c0fe1e84b57df5342864a82e7652c2e706e723b6eb6faded50a0ce4fb96f36ac1e6ba48726db40a7 SHA512 d69459839760f0db7d23ad5ee5601e0a0b8e918a7f9ad6773bb45b525f732d09ff0fc6ca59c6400b62d7b0b905411dd97673b6d6f2102c9ed549e9f833b60a96
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.4.tar.gz 22251911 BLAKE2B ba2cf1a3b13f59bf03014fd301e3e50654d39fa0a79076760b68edca725513ea18c7be6e68452471e25274597e0629fff2964a135a81d1c54e0c0ae7b55f94fc SHA512 6f2d6339dfe150a1eb57a42a957154237c6ade0beb0a2a06ed2c59b5d23ff6b40d1dea0bc91851951a7df26aeb1c43c79f85ac71ba5361165f8524dbf1301424
 DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa33337b5d0b6a00e14bd420d6f064515455055233a45f5ebf47 SHA512 9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-2.4.2-r3.ebuild 3964 BLAKE2B ad71e2a7c308660527a10a2e756c99752a35b6b1f77e04a1e28143c2038d080249c543d92ec2ed4b72037549dd8aa87959b9bea87e466f3eeb8625de9defd950 SHA512 94fc4f9012e63998628ae0c28d0d3d04f80422651af6a6ee9bd2907648923a7c5cf0179e49a047e9f7809ee1f52614e7e393eff3d93e8d218fa567c5ede2b809
-EBUILD audacity-3.2.4.ebuild 6929 BLAKE2B f4ceb2ebd0c3a5c6e9b70b5b89ee571cf625549cb0f3be54763307cc084971ad28b67f92bc5b6e612632eb545de99b65fb0b8ee1a6c6444d1baf3d9627b9dcfe SHA512 b2557f22c5a8508899debd35f5f3c891fb1bcffdf3e10c68223248c248701730d1f6d8923f9d405ef9aa4d1354bbae368f303b60c819e6429a9f5068b09d3e36
-EBUILD audacity-3.2.5.ebuild 6979 BLAKE2B 73572e00e3a77240b8b2a92beab27c641c3f7a8d796377576f93e54fa9c83cfd3828971e08d2888f176f1f293a50184fec5ba328f248f7aceaaf08144bfeafe1 SHA512 74a1f5125dd66aa71ad5e6ddc2d1a35c7eba1ec51c6d7c07b164cdb1a8af1193b5382009552bff4998521952df4c7d439b0477b2a5cec9315dc5d1b914867c23
+EBUILD audacity-3.2.5.ebuild 6978 BLAKE2B a1d06a7dab83d0e440104ad8c2e3bfdbf948588c72dae178710788f614c2a8d7b38afef46fbfc9b3a50ddf78ac5c5694aaeb44c501ae18735fce0a344de92c56 SHA512 fe149b7b4558e1739d573dfe03ee66908570bbf0616bebf0213064a857b2999d8b0452d26e790518b1a5acd52744d0a1d8bc4cac391db6fe099ebcd28733bc04
 MISC metadata.xml 1512 BLAKE2B 277533c5356fb9fee5f353c14f43886e2823cf11f50deff855e31b039e197dd9daeab65dd133461e468f6bf2862b72e910ea36f67bceedec00a5e2234a386db5 SHA512 f66ee862c1fa473e825afc68186b1e2ecc3e7f4bb49272fde63b7b52afb2075795632c0690dd37ded5390a180720297d12b33360f34a4050640080b906ea0a28
diff --git a/media-sound/audacity/audacity-3.2.4.ebuild b/media-sound/audacity/audacity-3.2.4.ebuild
deleted file mode 100644
index 9b1ee5735698..000000000000
--- a/media-sound/audacity/audacity-3.2.4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit cmake wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/"
-
-# A header-only thread pool library, without a build system, about 100
-# lines of code.  Probably not worth packaging individually.  Check
-# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
-MY_THREADPOOL_DATE=20140926
-MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz )
-	audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# GPL-2+, GPL-3 - Audacity itself
-# ZLIB - The ThreadPool single-header library
-# CC-BY-3.0 - Documentation
-LICENSE="GPL-2+
-	GPL-3
-	doc? ( CC-BY-3.0 )
-	audiocom? ( ZLIB )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-	opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
-
-# dev-db/sqlite:3 hard dependency.
-# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
-#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
-# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
-#   for libuuid
-# portmidi became non-optional: building without it results in build
-#   failures, even with some of the Debian patches.  It's probably not
-#   in our best interest to fix that as a patch series.
-# glib, gtk and gdk are all directly relied on in the source, not just
-
-# Libraries used at runtime via dlopen:
-# - dev-libs/{serd,sord} - for LV2 support
-# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
-# - media-sound/lame :: For MP3 export
-# - media-video/ffmpeg :: For generic FFMPEG export
-#   This one has the interesting property of many versions being
-#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
-#   Current support grid:
-#   - Lavf - 5[789]
-#   - Lavc - 5[789]
-#   - Lavu - 5[2567]
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/glib:2
-	media-libs/libsndfile
-	media-libs/libsoundtouch:=
-	media-libs/portaudio[alsa?]
-	media-libs/portmidi
-	media-libs/portsmf:=
-	media-libs/soxr
-	media-sound/lame
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	sys-apps/util-linux
-	alsa? ( media-libs/alsa-lib )
-	audiocom? (
-		dev-libs/rapidjson
-		net-misc/curl
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac:=[cxx] )
-	id3tag? ( media-libs/libid3tag:= )
-	lv2? (
-		dev-libs/serd
-		dev-libs/sord
-		media-libs/lilv
-		media-libs/lv2
-		media-libs/sratom
-		media-libs/suil
-	)
-	mad? ( media-libs/libmad )
-	mpg123? ( media-sound/mpg123 )
-	ogg? ( media-libs/libogg )
-	opus? ( media-libs/opus )
-	sbsms? ( media-libs/libsbsms )
-	twolame? ( media-sound/twolame )
-	vamp? ( media-libs/vamp-plugin-sdk )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	mad? ( !mpg123 )
-"
-
-PATCHES=(
-	# Equivalent to previous versions
-	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
-	# From Debian
-	"${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch"
-
-	# Disables some header-based detection
-	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
-
-	# For has_networking
-	"${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
-	"${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	local header_subs="${S}/lib-src/header-substitutes"
-	cat <<-EOF >"${header_subs}/allegro.h" || die
-	/* Hack the allegro.h header substitute to use system headers.  */
-	#include <portsmf/allegro.h>
-	EOF
-
-	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
-	if use audiocom; then
-		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
-		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
-		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
-	fi
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	# * always use system libraries if possible
-	# * options listed roughly in the order specified in
-	#   cmake-proxies/CMakeLists.txt
-	# * USE_VST was omitted, it appears to no longer have dependencies
-	#   (this is different from VST3)
-	local mycmakeargs=(
-		# Tell the CMake-based build system it's building a release.
-		-DAUDACITY_BUILD_LEVEL=2
-		-Daudacity_use_nyquist=local
-		#-Daudacity_use_pch leaving it to the default behavior
-		-Daudacity_use_portmixer=$(usex portmixer system off)
-		-Daudacity_use_soxr=system
-
-		-Daudacity_conan_enabled=OFF
-
-		-Daudacity_has_networking=$(usex audiocom on off)
-		# Not useful on Gentoo.
-		-Daudacity_has_updates_check=OFF
-		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
-		-Daudacity_has_threadpool=local
-
-		# The VST3 SDK is unpackaged, and it appears to be under a breed
-		# of a proprietary license and the GPL.
-		-Daudacity_has_vst3=OFF
-		-Daudacity_lib_preference=system
-		-Daudacity_obey_system_dependencies=ON
-		-Daudacity_use_expat=system
-		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
-		-Daudacity_use_libid3tag=$(usex id3tag system off)
-		-Daudacity_use_ladspa=$(usex ladspa)
-		-Daudacity_use_lame=system
-		-Daudacity_use_wxwidgets=system
-		-Daudacity_use_libmp3lame=system
-		-Daudacity_use_libmpg123=$(usex mpg123 system off)
-		-Daudacity_use_libmad=$(usex mad system off)
-		-Daudacity_use_wavpack=$(usex wavpack system off)
-		-Daudacity_use_libogg=$(usex ogg system off)
-		-Daudacity_use_libflac=$(usex flac system off)
-		-Daudacity_use_libopus=$(usex flac system off)
-		-Daudacity_use_libvorbis=$(usex vorbis system off)
-		-Daudacity_use_libsndfile=system
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_midi=system
-		-Daudacity_use_vamp=$(usex vamp system off)
-		-Daudacity_use_lv2=$(usex lv2 system off)
-		-Daudacity_use_portsmf=system
-		-Daudacity_use_sbsms=$(usex sbsms system off)
-		-Daudacity_use_soundtouch=system
-		-Daudacity_use_twolame=$(usex twolame system off)
-
-		# Disable telemetry features.
-		-Daudacity_has_sentry_reporting=off
-		-Daudacity_has_crashreports=off
-
-		# See the allow-overriding-alsa-jack.patch patch
-		-DPA_HAS_ALSA=$(usex alsa on off)
-		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
-		## AFAICT it introduces no deps as-is, but that could change.
-		## Similar goes for PA_HAS_JACK.
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/help/manual/{m,man}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
-}
diff --git a/media-sound/audacity/audacity-3.2.5.ebuild b/media-sound/audacity/audacity-3.2.5.ebuild
index 0d2e26a3d311..8a011864b2d7 100644
--- a/media-sound/audacity/audacity-3.2.5.ebuild
+++ b/media-sound/audacity/audacity-3.2.5.ebuild
@@ -31,7 +31,7 @@ LICENSE="GPL-2+
 	audiocom? ( ZLIB )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
 	opus +portmixer sbsms twolame vamp +vorbis wavpack"
 
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 2f8934b1975f..39dfecc94556 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,5 @@
 DIST qtractor-0.9.31.tar.gz 2009829 BLAKE2B a7c3da14e8b77bd6ebc61514fa8f4c1aee59a113758526b58d0e861f628bd2b0710c9990855e69264ffa05003ea22abe84c4ce29820f8436b4f2d9806fa6901a SHA512 bd86b0c0568b2f318aafb09b33bfd6e1956c622b3a6d743455baa4cbcd5c496f6849159b88bfc27fa726966fd76114a0211418486da937e356eeac248f7c4d47
 DIST qtractor-0.9.33.tar.gz 2014555 BLAKE2B b2de591c8be935403f8c54682758a891bd9ead07626aede7d1015915941a0558e9f9aeeed3cda5b2b60c52637a80d72e10edc6d29c5d05d87bcfaca31df58e7a SHA512 cb5f26e124a3b43afeaa7f175338ea54ffdd907ee95935c9188ed890afbfea7706fcd45cf6f3c208abfd93ddfbc1ec6fbd1ee2c11a5505f45c97d98950944811
 EBUILD qtractor-0.9.31.ebuild 2504 BLAKE2B 38434a737c64dfe61dca5992d7464be1fdf913e8aa9d1683caa0cdba18f44db432b3103c590fb2667dc43762c6aee1da9feb65a110d815f040e8c31387e3c1fe SHA512 44ab440cce00e1eb5447880649ab292391ec9a737c2e3444ef15e26c744afed70449bca8ccceb022238c6e421bd7418dbd5fa8d0ac5fa530013e094d7bf896af
-EBUILD qtractor-0.9.33.ebuild 2506 BLAKE2B 46d09c6cd1d134e986c05c9b33315df426683c25e589c8a15463d7b3e0ab732819eebccc0f078beb64f6669786b4bfe34b8d6dfc86a5709fbf925a727a8f219f SHA512 930cd1fa23ebdc64148530c4abe214f5c06dae1e3651ca065be9a6fa51843dff03ee1ff2df599e946112bd61b5f7f02ab6f5d4d76e9b8f1ce21aa0b400dc3496
+EBUILD qtractor-0.9.33.ebuild 2505 BLAKE2B a9b047cdc029a5934a42ee5bd6801e9e1ae203f8df2a29d8c21f64d0460a537db6be2ea9f0d3d8b8dbd129f451aa89ea4485ce87d3d6159deedef3093bf41dc5 SHA512 a30912eb7eb5b2e242e635c4228328d1752dc80c5db456064293cadf474548c903741fbca22249f7bb789f3ab51914ef141967708aad52eb426acb79bd480374
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.33.ebuild b/media-sound/qtractor/qtractor-0.9.33.ebuild
index 0a0f707f34eb..dc3b65c599d8 100644
--- a/media-sound/qtractor/qtractor-0.9.33.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 092d00b5c484..abdc29b48675 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7c466f11fac2..8c21c3ae10e9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 May 2023 03:40:01 +0000
+Mon, 01 May 2023 09:39:54 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7d9e6c84c8b0..7f39db046e2d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-05-01T03:40:05Z
+TIMESTAMP 2023-05-01T09:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRPNJVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRPiOxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC/4Q//Q2neFnWzMXLjQoMJnGwx3qMPzHBXL1bGY+BWg4jbCTKw5otyeOJmB6Es
-I0dEh80MaEPCO7oyl+6kha9iufogRlwTFOdzEo04qWN9GnjAPNU43mm+2My0Mi9e
-pqgdxXREP4P3XfjTSKZ+SfyW5TRvwQWDU3fZ2lR58b9+eW+cw+wk4jNPa27YTjmI
-j5cUc6Tph4ukDiK0K8Zj/vRhXt+QaaTGZLH9XGay5kGtA/LdUX3TzBFQyUOEF3Og
-jh9TuqcBe7BZIs3q9yrzZxyGRi2sgVF364bW94xgYmwJ/oOCLNQ/bHXKpxiG03Bs
-55saZN2PNfdeGig77YreXGxqv8DdAqXGNXMggaYEAadrvwsCBsIYXB+wMZkvK4hI
-NaMROU5cfApqZlx3QcYen8lcAc/bpAOS6LFo0dw4mLQuYauHTDbCtN8PRSpuRPS4
-IZNbZhXK0n3h0iJgNuLfXn9uCjwdxTIp/N/JYbSp9d9CqtoMq4+rBSKPy6pG7qOd
-exzX0CpKOLiXYi9WdR0YOnWWmFK3i5ilsqPYqzkquRDZeRxET91Z1oNm1B7CuGk7
-tpaSEbdCegKIgnDe2oAPORlEFZ9nVzJ5eU3FC87Ms36hqy1U5Ap9KmG3TpVqjVop
-XtZbR0Agxoz5a2sUikHMa8cll8oAPLw33YnKDhw8uO/9Fnis7JQ=
-=kzi2
+klBKrQ/+LCSV2hOwiKjafA1nE7wwI+kDJSsa4YNzmeBbr1p77zjLG0CtIFSMkyRn
+ahigTFO1Q/vZo1hJRlK0MDwzo6FLtZf5SbeTmJsATE4/8AfdtxGDmRKnV4bubYFf
+tsfBzvCbbnICyeLpB9skwzXYyCsVfxadfTyMEeDyojMi4BQQcPpmZ9eAU6yGI82l
+YICIhO6LeS1kBfUym50Sp735/pWno5jMptZCxUE6oqGQXMz0GuW6F2Gc5rXDYLjG
+17hKCPr5+HOOf/Ll2ESunLBaWl+TMKN1WRrtlbxOdKkcV+Me1/2HvVsN0QMzkidJ
+hJZ2wHQb9tUpQ0rGfsRDwa2z23k1BpT+u96s7ds3d54aZHbRKV7mYpBm9G7FDkcR
+Nubk4anPypVibzZgvZvfaQY4EJDTCYKlFauFlk6HygOlpxUOHYTNLn6zaKewh+On
+yVfm04mjtucaRFn9jjMt9ReaiF19W5cFc4wwQp1bZryTGa9Hec7vRIkzCMzx+HN8
+ZUBSqwTlB18YIHnXLIuTbhk5b3/BmqdwRYOZEdgnP+F10K+rnYrXHJ4GdVddgtIz
+XWteH38LBgdxfPY8xfqMpwqE9n9pvK+MckA7MrvtUMh5oEcJI+5jFBP4KsRyVOY2
+uu2LHI/4+W8xsiZ3t+l4FUru5I/jikfzlFmBmb0pHiiE1XgDRc4=
+=EmkB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7c466f11fac2..8c21c3ae10e9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 May 2023 03:40:01 +0000
+Mon, 01 May 2023 09:39:54 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b834788bc0dd..8efe3afd6c4e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index b4068dc3fea2..337ae6e9ece1 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/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index 6aa7137c4a4f..fe7650a42339 100644
--- a/metadata/md5-cache/app-arch/patool-1.12
+++ b/metadata/md5-cache/app-arch/patool-1.12
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Portable archive file manager
 EAPI=7
 HOMEPAGE=http://wummel.github.io/patool/
 INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/patool/patool-1.12.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=237eba4a427da78f89c680d79ff8265d
+_md5_=d4b6ddc652247d397c72d29a29df5adb
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.10-r1 b/metadata/md5-cache/app-arch/snappy-1.1.10-r1
index 221e945f57a6..8d7df12482c3 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.10-r1
+++ b/metadata/md5-cache/app-arch/snappy-1.1.10-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/snappy
 INHERIT=cmake-multilib
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://github.com/google/snappy/archive/1.1.10.tar.gz -> snappy-1.1.10.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a795cb798efb897d2c50cb4a7bc466e7
+_md5_=48f7a62a21d6c99c716b8667495b7ef1
diff --git a/metadata/md5-cache/app-arch/tar-1.34-r3 b/metadata/md5-cache/app-arch/tar-1.34-r3
index 96029797c288..18a6c223d6f7 100644
--- a/metadata/md5-cache/app-arch/tar-1.34-r3
+++ b/metadata/md5-cache/app-arch/tar-1.34-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/tar/
 INHERIT=verify-sig
 IUSE=acl minimal nls selinux xattr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 PDEPEND=app-alternatives/tar
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.34.tar.xz https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz verify-sig? ( mirror://gnu/tar/tar-1.34.tar.xz.sig https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz.sig )
 _eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=a1658bfa276a7e9fe504c5d8faf27e90
+_md5_=2c1407f2df87c75b9a899826b19fec50
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9e87a4550a11..fdd2555e2ee7 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/devmanual-0_pre20220326 b/metadata/md5-cache/app-doc/devmanual-0_pre20220326
deleted file mode 100644
index ede8c0998f64..000000000000
--- a/metadata/md5-cache/app-doc/devmanual-0_pre20220326
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-libs/libxml2-2.9.12 dev-libs/libxslt gnome-base/librsvg media-fonts/open-sans || ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) test? ( >=app-text/htmltidy-5.8.0 )
-DEFINED_PHASES=compile install postinst setup
-DESCRIPTION=The Gentoo Development Guide
-EAPI=8
-HOMEPAGE=https://devmanual.gentoo.org/
-INHERIT=python-any-r1 readme.gentoo-r1
-IUSE=+offline test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=CC-BY-SA-4.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/devmanual-0_pre20220326.tar.xz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9bd0d0569abc21b3fcb8f49d4b86ca26
diff --git a/metadata/md5-cache/app-doc/devmanual-0_pre20220625 b/metadata/md5-cache/app-doc/devmanual-0_pre20220625
deleted file mode 100644
index c8de46058187..000000000000
--- a/metadata/md5-cache/app-doc/devmanual-0_pre20220625
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-libs/libxml2-2.9.12 dev-libs/libxslt gnome-base/librsvg media-fonts/open-sans || ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) test? ( >=app-text/htmltidy-5.8.0 )
-DEFINED_PHASES=compile install postinst setup
-DESCRIPTION=The Gentoo Development Guide
-EAPI=8
-HOMEPAGE=https://devmanual.gentoo.org/
-INHERIT=python-any-r1 readme.gentoo-r1
-IUSE=+offline test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=CC-BY-SA-4.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/devmanual-0_pre20220625.tar.xz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=50c1c6f233af56c9745aad9877b8ac85
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index e7682f7e653f..0284c0773c2b 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/virtualbox-7.0.8 b/metadata/md5-cache/app-emulation/virtualbox-7.0.8
deleted file mode 100644
index cfadd5d04827..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/tar-1.34-r2 >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3592 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.8 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-libs/libpulse ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
-LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.8 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.8/VirtualBox-7.0.8.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 gui? ( !doc? ( https://dev.gentoo.org/~ceamac/app-emulation/virtualbox/virtualbox-help-7.0.8.tar.xz ) )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=750db4750db5be50e3876a832bb9e87f
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 2fd757270812..8e7fd242d7ba 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
index fddbb0af5113..ea00307f8657 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Eselect module and wrappers for wxWidgets
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-wxwidgets.git/
 INHERIT=multilib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.4.13
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114.tar.xz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7f7a033be76a8a9fe878c7a706f5cbdd
+_md5_=d91a09c68b575815a3499c746891f68a
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 16bd5151c9e4..d301ef184ce2 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1 b/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1
index 4862aef3380d..f9bd7d94b1ad 100644
--- a/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1
+++ b/metadata/md5-cache/app-forensics/volatility3-2.4.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/volatilityfoundation/volatility3/ https://www.volatilityfoundation.org/
 INHERIT=distutils-r1
 IUSE=crypt disasm jsonschema leechcore snappy test yara python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-python/pefile-2017.8.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] crypt? ( >=dev-python/pycryptodome-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) disasm? ( >=dev-libs/capstone-3.0.5[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) jsonschema? ( >=dev-python/jsonschema-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) leechcore? ( >=dev-python/leechcorepyc-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) snappy? ( >=dev-python/python-snappy-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yara? ( >=dev-python/yara-python-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=test? ( yara ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/volatilityfoundation/volatility3/archive/v2.4.0.tar.gz -> volatility3-2.4.0.gh.tar.gz test? ( https://downloads.volatilityfoundation.org/volatility3/images/win-xp-laptop-2005-06-25.img.gz -> volatility3-win-xp-laptop-2005-06-25.img.gz https://downloads.volatilityfoundation.org/volatility3/images/linux-sample-1.bin.gz -> volatility3-linux-sample-1.bin.gz )
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e0611a2c5718a81c60b98e289d71d470
+_md5_=975446bbaaae8e71951a5a5ed392da42
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 826583535377..39f459c2e8c8 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0-r1
index 8b22fb632109..39017d5ab9ef 100644
--- a/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0
+++ b/metadata/md5-cache/app-i18n/man-pages-l10n-4.17.0-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/man l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man
 REQUIRED_USE=|| ( l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi )
 SLOT=0
 SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/4.17.0/manpages-l10n-4.17.0.tar.bz2
-_md5_=a052a4529b4a396613193fe59067de98
+_md5_=50811f0aed9c767cf9b6f533380fe7b7
diff --git a/metadata/md5-cache/app-i18n/man-pages-l10n-4.18.1 b/metadata/md5-cache/app-i18n/man-pages-l10n-4.18.1-r1
index 7761dfeb1ab8..542a5aaaba48 100644
--- a/metadata/md5-cache/app-i18n/man-pages-l10n-4.18.1
+++ b/metadata/md5-cache/app-i18n/man-pages-l10n-4.18.1-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/man l10n_it? ( !app-i18n/man-pages-it ) l10n_ru? ( !app-i18n/man
 REQUIRED_USE=|| ( l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sr l10n_sv l10n_uk l10n_vi )
 SLOT=0
 SRC_URI=https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/4.18.1/manpages-l10n-4.18.1.tar.bz2
-_md5_=101eea1be4fb51cf9acc222fc1208d63
+_md5_=fa543adbe27850daee1d53b74b7c5758
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 727a8c16fed2..5dd7b781eb22 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/golly-4.2 b/metadata/md5-cache/app-misc/golly-4.2
index b6490f521812..f6cddc17d420 100644
--- a/metadata/md5-cache/app-misc/golly-4.2
+++ b/metadata/md5-cache/app-misc/golly-4.2
@@ -6,11 +6,11 @@ HOMEPAGE=http://golly.sourceforge.net/ https://sourceforge.net/projects/golly/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop python-single-r1 toolchain-funcs wxwidgets xdg
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/opengl x11-libs/wxGTK:3.2-gtk3[X,curl,opengl,sdl,tiff] python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-4.2-src.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9781f6a6956d1fce56159d896f60dcc6
+_md5_=fda6bb17d57813de21cc48672354c233
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index d48687b57f55..6a34d1d00111 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/thefuck-3.32-r1 b/metadata/md5-cache/app-shells/thefuck-3.32-r1
new file mode 100644
index 000000000000..4af15001c61e
--- /dev/null
+++ b/metadata/md5-cache/app-shells/thefuck-3.32-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyte[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Magnificent app which corrects your previous console command
+EAPI=8
+HOMEPAGE=https://github.com/nvbn/thefuck
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyte[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nvbn/thefuck/archive/3.32.tar.gz -> thefuck-3.32.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=b00348a43d3e4cefb2b9e063f8bbf2f2
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c258088008b5..deb4f842e37e 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/dblatex-0.3.12 b/metadata/md5-cache/app-text/dblatex-0.3.12
index 32d86dbde7b4..2155c9c096ff 100644
--- a/metadata/md5-cache/app-text/dblatex-0.3.12
+++ b/metadata/md5-cache/app-text/dblatex-0.3.12
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://dblatex.sourceforge.net/
 INHERIT=distutils-r1
 IUSE=inkscape test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/dblatex/dblatex/dblatex-0.3.12/dblatex3-0.3.12.tar.bz2
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=40b600379846acefe71740f94ec80418
+_md5_=41d98391cf0b3dfc1cd38dd6156a31cb
diff --git a/metadata/md5-cache/app-text/gspell-1.12.0 b/metadata/md5-cache/app-text/gspell-1.12.0
index 2088c82779f8..5fb303c13c03 100644
--- a/metadata/md5-cache/app-text/gspell-1.12.0
+++ b/metadata/md5-cache/app-text/gspell-1.12.0
@@ -7,7 +7,7 @@ HOMEPAGE=https://gitlab.gnome.org/GNOME/gspell
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2 vala virtualx
 IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
 REQUIRED_USE=vala? ( introspection )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gspell/1.12/gspell-1.12.0.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7bda511a9a080e79faad6f2e542e7f50
+_md5_=073a95f476884cc274c37952b71fe5a8
diff --git a/metadata/md5-cache/app-text/tree-2.0.4 b/metadata/md5-cache/app-text/tree-2.0.4
index d38a3627eb3e..9e879e914d81 100644
--- a/metadata/md5-cache/app-text/tree-2.0.4
+++ b/metadata/md5-cache/app-text/tree-2.0.4
@@ -5,7 +5,8 @@ HOMEPAGE=https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProg
 INHERIT=toolchain-funcs flag-o-matic bash-completion-r1
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
+RDEPEND=!app-i18n/man-pages-l10n[l10n_fr]
 SLOT=0
 SRC_URI=https://gitlab.com/OldManProgrammer/unix-tree/-/archive/2.0.4/unix-tree-2.0.4.tar.gz
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=192403d7402d1a04a766eb2f6cc15aec
+_md5_=7a5369dc8487a0ee9941861a1533bee8
diff --git a/metadata/md5-cache/app-text/tree-2.1.0 b/metadata/md5-cache/app-text/tree-2.1.0
index 4a2619b37a18..50c8e6a0a2a1 100644
--- a/metadata/md5-cache/app-text/tree-2.1.0
+++ b/metadata/md5-cache/app-text/tree-2.1.0
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitlab.com/OldManProgrammer/unix-tree/-/archive/2.1.0/unix-tree-2.1.0.tar.bz2
 _eclasses_=bash-completion-r1	59cf54afadd3b37d31d9d85c7d7d8067	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5e2a1a520052f3d18409394dd0402e94
+_md5_=bd06ccfe4cce05cfd92223cc82cd1785
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.22 b/metadata/md5-cache/app-text/xapian-omega-1.4.22
index 89c698e7d612..06a97afb14f8 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.22
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.22
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-libs/libpcre2:= ~dev-libs/xapian-1.4.22:0/30 sys-apps/f
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=8
 HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-libs/libpcre2:= ~dev-libs/xapian-1.4.22:0/30 sys-apps/file sys-libs/zlib
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.22/xapian-omega-1.4.22.tar.xz
-_md5_=cc44e93307b37258e603329c514247c4
+_md5_=40170540f3ded1a162d69dc53b8fd382
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 7bef9297df5b..7e61861c1fbe 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-5.0.3 b/metadata/md5-cache/dev-cpp/libxmlpp-5.0.3
index 4c27737d6265..d481e721abf2 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-5.0.3
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-5.0.3
@@ -7,11 +7,11 @@ HOMEPAGE=http://libxmlplusplus.sourceforge.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2 meson
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.7
 RESTRICT=!test? ( test )
 SLOT=5.0
 SRC_URI=mirror://gnome/sources/libxml++/5.0/libxml++-5.0.3.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4d6d84d2647dffb06a9b651e99b98796
+_md5_=3929bf9f48435e7b25779a61f2be2795
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 41efa4625785..a4ff4a19e259 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/lmdb-0.9.30 b/metadata/md5-cache/dev-db/lmdb-0.9.30
index afd7162902f2..f8c5e257cb05 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.30
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.30
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://symas.com/lmdb/technical/
 INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=OPENLDAP
 SLOT=0/0.9.30
 SRC_URI=https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.30/openldap-LMDB_0.9.30.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=02df7651ba9cd39232e0147586dd22fb
+_md5_=f8d3e461d314b5fd2a78b67a858ee9c7
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 030d4d89d2c9..cab26da9cdba 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/efl-1.26.3-r1 b/metadata/md5-cache/dev-libs/efl-1.26.3-r1
index 4552e8ace8da..832028d1371d 100644
--- a/metadata/md5-cache/dev-libs/efl-1.26.3-r1
+++ b/metadata/md5-cache/dev-libs/efl-1.26.3-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.26.3.tar.xz
 _eclasses_=docs	7b9e167549c44efa7994614f33ba6d7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=924224f493790051e36b1833641381d8
+_md5_=8b83306d58011ce5be0ba5b7e9158975
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.10.2 b/metadata/md5-cache/dev-libs/libcbor-0.10.2
index 0ce002dcfc99..a598223a4713 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.10.2
+++ b/metadata/md5-cache/dev-libs/libcbor-0.10.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/pjk/libcbor
 INHERIT=python-any-r1 cmake
 IUSE=+custom-alloc doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.10
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.10.2.tar.gz -> libcbor-0.10.2.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0006beafb9ca019eaacfa499e52c278c
+_md5_=6ee7fafe85802d4a62251310c86038f7
diff --git a/metadata/md5-cache/dev-libs/libfmt-9.1.0-r1 b/metadata/md5-cache/dev-libs/libfmt-9.1.0-r1
index 1958e3a05e72..4ef108a3c3a5 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libfmt-9.1.0-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/fmtlib/fmt
 INHERIT=cmake
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/9.1.0
 SRC_URI=https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz -> libfmt-9.1.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d386ff992f2f002dae5b8d8b26b9a00e
+_md5_=2d8d1be9b879f690bd06ad9c7a44385b
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.16 b/metadata/md5-cache/dev-libs/libical-3.0.16
index 0a1e63f2b7de..d77de6076b6c 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.16
+++ b/metadata/md5-cache/dev-libs/libical-3.0.16
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libical/libical
 INHERIT=cmake python-any-r1 vala
 IUSE=doc examples +glib +introspection static-libs test vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:= glib? ( dev-libs/glib:2 ) sys-libs/timezone-data
 REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.16/libical-3.0.16.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=caa33d02222fae286c553bf7e2cbf3a2
+_md5_=d288642c43731468fa89c53e49709b78
diff --git a/metadata/md5-cache/dev-libs/libpqxx-7.7.5 b/metadata/md5-cache/dev-libs/libpqxx-7.7.5
index f102909c7fa6..32c7a10abb73 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-7.7.5
+++ b/metadata/md5-cache/dev-libs/libpqxx-7.7.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://pqxx.org/development/libpqxx/
 INHERIT=python-any-r1
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-db/postgresql:=
 SLOT=0/7.7
 SRC_URI=https://github.com/jtv/libpqxx/archive/7.7.5.tar.gz -> libpqxx-7.7.5.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=51c8d4c8dcb16fc2b1e298c3292c35e2
+_md5_=75260b4299b765b36ecab6129773b61d
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.10.4 b/metadata/md5-cache/dev-libs/libxml2-2.10.4
index 8e0c62dee4e4..b1414a28ed85 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.10.4
+++ b/metadata/md5-cache/dev-libs/libxml2-2.10.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
 INHERIT=flag-o-matic python-r1 multilib-minimal toolchain-funcs gnome.org libtool
 IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libxml2/2.10/libxml2-2.10.4.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=43639e8cdd18a67dfe1fe2c01f63cfe2
+_md5_=44af3a78e97d52e9adb8368380cdf933
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.11.1 b/metadata/md5-cache/dev-libs/libxml2-2.11.1
new file mode 100644
index 000000000000..698c4e5719ae
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.11.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
+DESCRIPTION=XML C parser and toolkit
+EAPI=8
+HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
+INHERIT=flag-o-matic python-r1 multilib-minimal gnome.org libtool
+IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/libxml2/2.11/libxml2-2.11.1.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=404279c67ec2c01a1dabeb0348f9c468
diff --git a/metadata/md5-cache/dev-libs/libxml2-9999 b/metadata/md5-cache/dev-libs/libxml2-9999
index 36046c050fda..aff9bb3e6c4d 100644
--- a/metadata/md5-cache/dev-libs/libxml2-9999
+++ b/metadata/md5-cache/dev-libs/libxml2-9999
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 DESCRIPTION=XML C parser and toolkit
 EAPI=8
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=flag-o-matic python-r1 multilib-minimal toolchain-funcs autotools git-r3
+INHERIT=flag-o-matic python-r1 multilib-minimal autotools git-r3
 IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 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=MIT
 PROPERTIES=live
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ae7eace0f311f5c7d9b98481b5fc6818
+_md5_=54c676cc5cb5dfafee7920d99b7992d7
diff --git a/metadata/md5-cache/dev-libs/log4cxx-1.0.0 b/metadata/md5-cache/dev-libs/log4cxx-1.0.0
index 72d176a50538..5a5fb5899cd6 100644
--- a/metadata/md5-cache/dev-libs/log4cxx-1.0.0
+++ b/metadata/md5-cache/dev-libs/log4cxx-1.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://logging.apache.org/log4cxx/
 INHERIT=cmake
 IUSE=odbc smtp test
-KEYWORDS=amd64
+KEYWORDS=amd64 ~arm ~hppa
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/libfmt:= odbc? ( dev-db/unixODBC ) smtp? ( net-libs/libesmtp )
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=mirror://apache/logging/log4cxx/1.0.0/apache-log4cxx-1.0.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cad377dabd1241405e8a6adc2c006be2
+_md5_=b987773df9b54dd8fcc9f3eeae4a4924
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.22 b/metadata/md5-cache/dev-libs/xapian-1.4.22
index 033d50a01460..ec846f25203e 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.22
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.22
@@ -4,9 +4,9 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=8
 HOMEPAGE=https://xapian.org/
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.22/xapian-core-1.4.22.tar.xz
-_md5_=2e307aa5c11b92350d3d8b0d1fa41ef3
+_md5_=ffed75bd03fda232359bf10624c1f92e
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
index af7450c472f8..8c8c3536eae0 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://xapian.org/
 INHERIT=autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.4.21 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) mono? ( dev-lang/mono ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) tcl? ( dev-lang/tcl:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) ruby? ( || ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 ) ) php? ( || ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.22/xapian-bindings-1.4.22.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=95b5c2bdf037b5af6930c34b9df16427
+_md5_=5c9494d689abc0a0fb2044a511c0c264
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.4 b/metadata/md5-cache/dev-libs/xerces-c-3.2.4
index dec666fbbe39..d3e84ba2cbe8 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.4
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xerces.apache.org/xerces-c/
 INHERIT=cmake prefix
 IUSE=cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=curl? ( net-misc/curl ) icu? ( dev-libs/icu:0= ) virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.4.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=04e2653167d05f30fd67e31ba50e3fb5
+_md5_=fc5cee082de0b74b952204d5a56dcc27
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e2fe119f733c..4270cb9c7513 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/cachelib-0.10.2-r1 b/metadata/md5-cache/dev-python/cachelib-0.10.2-r1
index d5709d41c499..3f71533e736e 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.10.2-r1
+++ b/metadata/md5-cache/dev-python/cachelib-0.10.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/cachelib/ https://github.com/pallets-eco/cachelib/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets-eco/cachelib/archive/0.10.2.tar.gz -> cachelib-0.10.2.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6a7c5c0e9ba0b607bd7961f24e4c4cc4
+_md5_=48824440172ab605d2a80d9f569d02ed
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1 b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
index 2f755f41b286..94d9d9f0c3bd 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/colorclass/ https://github.com/matthewdeanmartin/colorclass/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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/matthewdeanmartin/colorclass/archive/v2.2.2.tar.gz -> colorclass-2.2.2.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cd736c9dff3e52aa33d3472a2f126d18
+_md5_=db09c5f7f7d27d05a708c31a7156d55c
diff --git a/metadata/md5-cache/dev-python/cryptography-40.0.1 b/metadata/md5-cache/dev-python/cryptography-40.0.1
index 7adacc59ba07..98b8e091d7ba 100644
--- a/metadata/md5-cache/dev-python/cryptography-40.0.1
+++ b/metadata/md5-cache/dev-python/cryptography-40.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 INHERIT=cargo distutils-r1 multiprocessing pypi
 IUSE=test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016
 RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-40.0.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/asn1/0.13.0/download -> asn1-0.13.0.crate https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -> asn1_derive-0.13.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.24/download -> chrono-0.4.24.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cxx/1.0.86/download -> cxx-1.0.86.crate https://crates.io/api/v1/crates/cxx-build/1.0.86/download -> cxx-build-1.0.86.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.86/download -> cxxbridge-flags-1.0.86.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.86/download -> cxxbridge-macro-1.0.86.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.54/download -> iana-time-zone-0.1.54.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/libc/0.2.140/download -> libc-0.2.140.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/openssl/0.10.48/download -> openssl-0.10.48.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-sys/0.9.83/download -> openssl-sys-0.9.83.crate https://crates.io/api/v1/crates/ouroboros/0.15.6/download -> ouroboros-0.15.6.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.6/download -> ouroboros_macro-0.15.6.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pem/1.1.1/download -> pem-1.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.53/download -> proc-macro2-1.0.53.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.5/download -> scratch-1.0.5.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.8/download -> unicode-ident-1.0.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.46.0/download -> windows-0.46.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-40.0.1.tar.gz )
 _eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6fabb307ba6099efab87e61ac5fc4e9b
+_md5_=41e5308d5ab6fec03adf5c5b653354ba
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20230430 b/metadata/md5-cache/dev-python/diff-match-patch-20230430
new file mode 100644
index 000000000000..44f9a107e8b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20230430
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Diff, match and patch algorithms for plain text
+EAPI=8
+HOMEPAGE=https://github.com/diff-match-patch-python/diff-match-patch/ https://pypi.org/project/diff-match-patch/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/diff-match-patch/diff-match-patch-20230430.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=acf9c4abdbcfa4cec2af6e1f02989870
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.1.3 b/metadata/md5-cache/dev-python/dkimpy-1.1.3
new file mode 100644
index 000000000000..22136a3d6e5c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dkimpy-1.1.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/authres[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=DKIM and ARC email signing and verification library
+EAPI=8
+HOMEPAGE=https://launchpad.net/dkimpy/ https://pypi.org/project/dkimpy/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/dnspython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dkimpy/dkimpy-1.1.3.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6b89f978ca6a356632b87d86983cfab0
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r5 b/metadata/md5-cache/dev-python/docopt-0.6.2-r5
index 780f08037659..d487baccce71 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r5
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/docopt/docopt/ https://pypi.org/project/docopt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c493a8dc4abcc77f8855986f64c83662
+_md5_=9f1317112b87f44ce09c520e1db2fd9b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.75.1 b/metadata/md5-cache/dev-python/hypothesis-6.75.1
new file mode 100644
index 000000000000..3435fc9c795c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.75.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.75.1.tar.gz -> hypothesis-6.75.1.gh.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=1de1e7c8955419e81685923bf1492ecc
diff --git a/metadata/md5-cache/dev-python/jc-1.23.2 b/metadata/md5-cache/dev-python/jc-1.23.2
new file mode 100644
index 000000000000..daf916906729
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jc-1.23.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Converts the output of popular command-line tools and file-types to JSON
+EAPI=8
+HOMEPAGE=https://github.com/kellyjonbrazil/jc/ https://pypi.org/project/jc/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kellyjonbrazil/jc/archive/v1.23.2.tar.gz -> jc-1.23.2.gh.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a0f90753eb8f872aebd568dc607de29b
diff --git a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6 b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
index 28d99293ab72..d2a19752b026 100644
--- a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
+++ b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_mathjax/ https://pypi.org/project/jupyter-server-mathjax/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyter-server-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5d4d516f74b47fc2565020ec1ddae2e4
+_md5_=cc87c0f9279f4a689311b8ef41c83820
diff --git a/metadata/md5-cache/dev-python/nbdime-3.1.1-r2 b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
index 02e2dde24c76..d9ae3c2092f5 100644
--- a/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
+++ b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbdime/ https://pypi.org/project/nbdime/
 INHERIT=distutils-r1 pypi edos2unix
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-3.1.1.tar.gz https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch -> nbdime-3.1.1-jupyter_server2.patch https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch -> nbdime-3.1.1-py3.11.patch
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=682c9d4f11ee480dbe684144a6a43d1b
+_md5_=a682ad2c8dd4afd5feca03a3281c4422
diff --git a/metadata/md5-cache/dev-python/nbdime-3.2.1 b/metadata/md5-cache/dev-python/nbdime-3.2.1
new file mode 100644
index 000000000000..19d1898c60bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbdime-3.2.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tabulate[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Diff and merge of Jupyter Notebooks
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbdime/ https://pypi.org/project/nbdime/
+INHERIT=distutils-r1 pypi
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-3.2.1.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=98be735fded82cf3e754b4bda7d65ff5
diff --git a/metadata/md5-cache/dev-python/nbval-0.10.0-r1 b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
index eabc798c5697..acb6f94d27ed 100644
--- a/metadata/md5-cache/dev-python/nbval-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/computationalmodelling/nbval
 INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/coverage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbval/nbval-0.10.0.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=750188551f4241cd828b8633d096db6d
+_md5_=f085f47d08c3a57aace6e72c8802cbcb
diff --git a/metadata/md5-cache/dev-python/pygame-2.4.0 b/metadata/md5-cache/dev-python/pygame-2.4.0
new file mode 100644
index 000000000000..5efaf61d4587
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame-2.4.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( media-libs/fontconfig sys-apps/util-linux ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads,video,X] ) !X? ( media-libs/libsdl2[threads] ) test? ( media-libs/sdl2-image[gif,jpeg,png,tiff,webp] media-libs/sdl2-mixer[mp3,vorbis,wav] )
+DESCRIPTION=Python bindings for SDL multimedia library
+EAPI=8
+HOMEPAGE=https://www.pygame.org/ https://github.com/pygame/pygame/ https://pypi.org/project/pygame/
+INHERIT=distutils-r1
+IUSE=examples opengl test X python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/freetype media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/portmidi media-libs/sdl2-image media-libs/sdl2-mixer media-libs/sdl2-ttf X? ( media-libs/libsdl2[opengl?,threads,video,X] ) !X? ( media-libs/libsdl2[threads] ) media-libs/fontconfig python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pygame/pygame/archive/2.4.0.tar.gz -> pygame-2.4.0.gh.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=eb3be7e8654b1f468f82aa4263cedba2
diff --git a/metadata/md5-cache/dev-python/pymilter-1.0.4-r3 b/metadata/md5-cache/dev-python/pymilter-1.0.4-r3
deleted file mode 100644
index 652d8169d980..000000000000
--- a/metadata/md5-cache/dev-python/pymilter-1.0.4-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) ) test? ( mail-filter/libmilter:= dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=mail-filter/libmilter:=
-DESCRIPTION=Python interface to sendmail milter API
-EAPI=8
-HOMEPAGE=https://github.com/sdgathman/pymilter
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=mail-filter/libmilter:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sdgathman/pymilter/archive/pymilter-1.0.4.tar.gz -> pymilter-1.0.4.gh.tar.gz
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b2c1a8850d859b613b663c44f8d2a2fd
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.48 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.48
new file mode 100644
index 000000000000..2faea2ea2fb2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.48
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] )
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=8
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.4.48.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=479eb2f2fb86dcd31a10ae3fe0629a58
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.12 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.12
new file mode 100644
index 000000000000..7741bcd36cb6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-2.0.12
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) ) test? ( >=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] )
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=8
+HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-2.0.12.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e0da2c044e09257b0c44eb91aa2a03a7
diff --git a/metadata/md5-cache/dev-python/tabulate-0.9.0 b/metadata/md5-cache/dev-python/tabulate-0.9.0
index f9222d2eabb9..e7a761f94581 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.9.0
+++ b/metadata/md5-cache/dev-python/tabulate-0.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/astanin/python-tabulate/ https://pypi.org/project/tabulate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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/astanin/python-tabulate/archive/v0.9.0.tar.gz -> python-tabulate-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=79d1876b446f378ca63979a36481110d
+_md5_=38b320e1c9f7f194518fd514b21b8979
diff --git a/metadata/md5-cache/dev-python/wxpython-4.2.0 b/metadata/md5-cache/dev-python/wxpython-4.2.0
index c56e40743479..37190c3bcb01 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.2.0
+++ b/metadata/md5-cache/dev-python/wxpython-4.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.wxpython.org/
 INHERIT=distutils-r1 multiprocessing virtualx wxwidgets pypi
 IUSE=test webkit python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.2-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test !test? ( test )
 SLOT=4.0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-4.2.0.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=1716ac727003b38258c673c118ca670b
+_md5_=a0579e3cd3f3bc144ffd965e8bab0433
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index e2d24d034280..724f4e56794c 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/assistant-5.15.9 b/metadata/md5-cache/dev-qt/assistant-5.15.9
index 1c11d8d3cfc6..23cab1882d49 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.9
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*[png] =dev-qt/qthelp-5.15.9* =dev-qt/qtnetwork-5.15.9* =dev-qt/qtprintsupport-5.15.9* =dev-qt/qtsql-5.15.9*[sqlite] =dev-qt/qtwidgets-5.15.9* !dev-qt/assistant:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=eaf0ddf623ffc17bd0015bd00d67b51c
+_md5_=667cfd572f1120452c161434d206b273
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.9 b/metadata/md5-cache/dev-qt/designer-5.15.9
index af3983322cf3..b5c70076d865 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.9
+++ b/metadata/md5-cache/dev-qt/designer-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=declarative debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*:5=[png] =dev-qt/qtnetwork-5.15.9* =dev-qt/qtprintsupport-5.15.9* =dev-qt/qtwidgets-5.15.9* =dev-qt/qtxml-5.15.9* declarative? ( =dev-qt/qtdeclarative-5.15.9*[widgets] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f41dc64dbdafcc9f43967ababd61201d
+_md5_=a7bba5baa3d6d69511872c9762a78331
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.9 b/metadata/md5-cache/dev-qt/linguist-5.15.9
index b6f509fe1344..e54d491d8bc8 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.9
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/designer-5.15.9* =dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*:5=[png] =dev-qt/qtprintsupport-5.15.9* =dev-qt/qtwidgets-5.15.9* =dev-qt/qtxml-5.15.9* !dev-qt/linguist:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f9e7a53c2cf37daf3a023beea69fdb67
+_md5_=5a1b9c7aeb3e89cfd1532d7ca8257638
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.9 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.9
index 4c9fe0bc07e9..5a23d52f4678 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.9
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*:5= =dev-qt/qtxml-5.15.9* qml? ( =dev-qt/qtdeclarative-5.15.9* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=e363e7f9b2d31adc2b23c36a1e2f078d
+_md5_=9f007ba3809bbd7753f5cb27ca27261a
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.9 b/metadata/md5-cache/dev-qt/pixeltool-5.15.9
index a048ea25524e..a2e57cb785fc 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.9
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9*:5= =dev-qt/qtgui-5.15.9*:5=[png] =dev-qt/qtwidgets-5.15.9* !dev-qt/pixeltool:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=8c52991c14b585f0b5377ea82e86f5c5
+_md5_=00e7d23318afffaad3704f219def6fc1
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.9 b/metadata/md5-cache/dev-qt/qdbus-5.15.9
index 3334e45f4321..9f46b69ac388 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.9
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* =dev-qt/qtdbus-5.15.9* =dev-qt/qtxml-5.15.9* !dev-qt/qdbus:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=a00f579184fdd375fe694eb7f7c594a1
+_md5_=623b02773f6327175ae2cb42c4d18be9
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9
index 65bbf8481add..869033991c78 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=desktop qt5-build xdg-utils
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdbus-5.15.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtwidgets-5.15.9* =dev-qt/qtxml-5.15.9* !dev-qt/qdbusviewer:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=433a9f1e8e92cc862ad7cfb0dc3a0caa
+_md5_=a388ac309dfd8d2d8c48598305960887
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.9 b/metadata/md5-cache/dev-qt/qtcharts-5.15.9
index 0c05db404b9b..adc2f91fad09 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtwidgets-5.15.9* qml? ( =dev-qt/qtdeclarative-5.15.9* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtcharts-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=70571a05fc79b47239d34088f41d119b
+_md5_=5ae4dd718da86d96ede6324da0ef6cbe
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9
index 039fa9bb7070..636d9391a82f 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.9
@@ -6,11 +6,11 @@ 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
+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.9*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=8bcb43382b3dbd681d982d93db7f60d5
+_md5_=97cb5cce52eb17bd1b931a3eb8bb00dd
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.9 b/metadata/md5-cache/dev-qt/qtcore-5.15.9
index a67669fbc637..4985ff48a0ea 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info flag-o-matic qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=50149aabbc734dbb80dcdc7e923e0785
+_md5_=0ff89fbdb7d9f33123a4641831b3835e
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.9 b/metadata/md5-cache/dev-qt/qtdbus-5.15.9
index def88401f2f1..632bb618b616 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.9
@@ -6,11 +6,11 @@ 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
+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.9*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=087fa29dd6b4e43277e69299aed98998
+_md5_=6a6f3d70ce776e57e71d1d143c553f28
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9
index 1117791eb7d2..5f6f9fe0e143 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtdeclarative https://community.kde.org/Qt5PatchCollection
 INHERIT=flag-o-matic python-any-r1 qt5-build
 IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* =dev-qt/qtgui-5.15.9*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.9* =dev-qt/qttest-5.15.9* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.9* ) widgets? ( =dev-qt/qtwidgets-5.15.9*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtdeclarative-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=afa85504fd0ce4f71d1b33d7d1da8d55
+_md5_=2603bb8aeea1c5cb4cf71ac94d12828e
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9
index 5163ca963c1e..671e16d546ff 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.9*
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=fb39e7a4dc2674453e6cedcfe7ebedda
+_md5_=6dbaff199c1043ab625676d375c0d648
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.9 b/metadata/md5-cache/dev-qt/qtgui-5.15.9
index 00162e295555..fcc73242ad28 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.9
@@ -6,7 +6,7 @@ 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 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
+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.9* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.9*: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.9* ) 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.9* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.9* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=f12632378aaffd8b7edc914fe7792746
+_md5_=0d811fd0bc7cf44dcf412ec17efab50b
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.9 b/metadata/md5-cache/dev-qt/qthelp-5.15.9
index a3d2f73207cc..d7481395d14a 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.9
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*:5= =dev-qt/qtgui-5.15.9* =dev-qt/qtsql-5.15.9*[sqlite] =dev-qt/qtwidgets-5.15.9*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=de308d476b3e1b0de226602d921431f2
+_md5_=ff85e31c7b037ef6cb8a99d44c37b651
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.9 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.9
index a717e73dd10f..b9873858ab30 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.9
@@ -6,11 +6,11 @@ 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
+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.9* =dev-qt/qtgui-5.15.9* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtimageformats-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=1b8178a6909ff599baac14d9a97bf033
+_md5_=0e341f796ad9748dea8df76be8af3f34
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.9 b/metadata/md5-cache/dev-qt/qtlocation-5.15.9
index 112a2c070bf7..020a752aafb7 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtlocation https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtnetwork-5.15.9* =dev-qt/qtpositioning-5.15.9*[qml] =dev-qt/qtsql-5.15.9* sys-libs/zlib
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtlocation-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.9-gentoo-kde-1.tar.xz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/5a07e1967dcc925d9def47accadae991436b9686/qtlocation-mapboxgl-5a07e1967dcc925d9def47accadae991436b9686.tar.gz -> qtlocation-mapboxgl-5.15.9-5a07e196.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=a82ce3c747726c12f6dc86425371e7c8
+_md5_=30f23a7e3b346e0bb965e5cadba66624
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9
index 6a8973a92306..55c2631c5d36 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtmultimedia https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* =dev-qt/qtgui-5.15.9*[gles2-only=] =dev-qt/qtnetwork-5.15.9* alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-libs/libpulse[glib] ) qml? ( =dev-qt/qtdeclarative-5.15.9* gles2-only? ( =dev-qt/qtgui-5.15.9*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.9*[gles2-only=] media-libs/libglvnd )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtmultimedia-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=b122d5517f3de4328b0f3f228ebda73e
+_md5_=b82b2f15fd1bc869252a0726d46e1d84
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9
index 62b35412efa2..b0bb89deb8dc 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.9* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.9* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=947ff1cf3b4e181e40ad06e66d1d7be6
+_md5_=6ec2ebeb8a05548e587d552579b01127
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.9 b/metadata/md5-cache/dev-qt/qtopengl-5.15.9
index 79da443da907..54b63011ad4e 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*:5= =dev-qt/qtgui-5.15.9*[gles2-only=] =dev-qt/qtwidgets-5.15.9*[gles2-only=]
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=2f1fe1740130f4686e8495fddba1b661
+_md5_=a504a2265bbf0824152c5710f37d03aa
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.9 b/metadata/md5-cache/dev-qt/qtpaths-5.15.9
index 95cb3391cbe6..6cb6a3d37846 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttools-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=61eeb0096ebf11fcae283e234c425a9f
+_md5_=bb04c76023070e74edeacd9bd911013f
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.9 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.9
index 4ec85b01893e..ea8a8ddd112a 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=geoclue +qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND==dev-qt/qtcore-5.15.9* geoclue? ( =dev-qt/qtdbus-5.15.9* ) qml? ( =dev-qt/qtdeclarative-5.15.9* )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtlocation-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=ad5873807f3723e12d216af4da74da14
+_md5_=682971f3f24dc14a5bd855a41f2e93e3
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9
index 560520e04920..58204a03cb86 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.9
@@ -6,11 +6,11 @@ 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
+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.9*:5= =dev-qt/qtgui-5.15.9*[gles2-only=] =dev-qt/qtwidgets-5.15.9*[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.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=c8f00b9cfcaad9f283fc4a4b47a333bb
+_md5_=c69d6fed55dcea554359dbd0ac3108af
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9
index c63b96aaa36e..6a4c1afb0771 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=+widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9* =dev-qt/qtdeclarative-5.15.9* =dev-qt/qtgui-5.15.9* widgets? ( =dev-qt/qtwidgets-5.15.9* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtquickcontrols-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=4aaa3607e27c71f45ada20294157e969
+_md5_=7bedc5969b2323d43b4a6f4b813f2f52
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.9 b/metadata/md5-cache/dev-qt/qtscript-5.15.9
index 4e252c10b672..7d70f0670828 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=+jit scripttools debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9* scripttools? ( =dev-qt/qtgui-5.15.9* =dev-qt/qtwidgets-5.15.9* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtscript-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=939f02ffd7c1b8ad6321bac1f978ae9b
+_md5_=775aff96333c9c4dab816bb5ca4aa691
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.9 b/metadata/md5-cache/dev-qt/qtsensors-5.15.9
index ca4c18eba32d..43401f23e2ce 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* =dev-qt/qtdbus-5.15.9* qml? ( =dev-qt/qtdeclarative-5.15.9* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtsensors-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=282e68553d446305d9a95224d6d045aa
+_md5_=a45a647cd8072864f8915aadd41f58a4
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.9 b/metadata/md5-cache/dev-qt/qtserialport-5.15.9
index 5e89e903e640..163ef2c8a82c 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtserialport-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=7b2645c14599f46d9acccd049b4560ff
+_md5_=a73dcc531bbd1d6f61429fd8b3737015
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.9 b/metadata/md5-cache/dev-qt/qtspeech-5.15.9
index 6c2dd2424ad4..5e8ce5478abf 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtspeech https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=alsa flite debug test
-KEYWORDS=amd64 arm arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.9* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.9*[alsa?] alsa? ( media-libs/alsa-lib ) )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtspeech-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=64edba330dbaa870f2cc1a9943d441dd
+_md5_=a2dc98eb7c0835c71f16acfb7347e941
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.9 b/metadata/md5-cache/dev-qt/qtsql-5.15.9
index 5a42b87f5017..8886cd6936d7 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.9
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*:5= freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=fd0f86f35ef8b394b0c9753c85b57d54
+_md5_=db60a2578343b23f551598b6709ba469
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.9 b/metadata/md5-cache/dev-qt/qtsvg-5.15.9
index ba164b4ca7a2..dcdc50429d1d 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.9
@@ -6,11 +6,11 @@ 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
+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.9* =dev-qt/qtgui-5.15.9* =dev-qt/qtwidgets-5.15.9* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtsvg-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=a881061e9694c4fbd696af04088335c2
+_md5_=5c481e67c749433cedfe05c280a1d1b4
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.9 b/metadata/md5-cache/dev-qt/qttest-5.15.9
index d59a957912dd..2ff21c4fa381 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.9
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=c160862b083cce600397ae94596f1ae1
+_md5_=973370e0ab430b748b93a6b49fc07264
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.9 b/metadata/md5-cache/dev-qt/qttranslations-5.15.9
index 9b8ea1fcfc9b..ad607b096e63 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.9
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qttranslations-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=dc650e830514783ab827b5c67d0b02d2
+_md5_=8828e3df3c3e1dc5f1d130b9bcae1e2b
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.9 b/metadata/md5-cache/dev-qt/qtwayland-5.15.9
index 735f51914fd1..d744dbbff579 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.9
@@ -6,11 +6,11 @@ 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
+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.9*:5= =dev-qt/qtdeclarative-5.15.9*:5= =dev-qt/qtgui-5.15.9*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.9*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
 RESTRICT=test
 SLOT=5/5.15.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwayland-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=ebbd5bc4908a5e0035e0d0f0a24f3609
+_md5_=35349b9703552173aac72518f3623960
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9
index 85c8c3f0a834..5c2ca26dc88d 100644
--- a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9*:5= !<dev-qt/qtwayland-5.15.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwayland-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=ebec75534ac18bace0e1c66279c70d77
+_md5_=e106c5d257a7ab2d592d548fe2d03ad6
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9
index 0168d5040b8f..7b6edf5f7492 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebchannel https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.9* qml? ( =dev-qt/qtdeclarative-5.15.9* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebchannel-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebchannel-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=edab5dc74245b30ff9bf3aedcfc64b27
+_md5_=7f4192d6370abf7e24f6a0e98c01c916
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
index 7a76653c7287..ca0839031eef 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebsockets https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=qml +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* =dev-qt/qtnetwork-5.15.9*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.9* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebsockets-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.9-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=ef05901972e9006df10e4a83f005a887
+_md5_=fff8ee3ba86f6940fcd8930a3f0ef5a4
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.9 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.9
index 9ae388edd3f9..2ebd2fb01b56 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.9
@@ -6,7 +6,7 @@ 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
+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.9*:5= =dev-qt/qtgui-5.15.9*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.9* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.9*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=b6c22d553df0b18a91b49545c8be9a81
+_md5_=a9cc0fb524c5d85cbebfd02992c31b9f
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.9 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.9
index 8d8529a55dbf..16c6794175d0 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* =dev-qt/qtgui-5.15.9*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtx11extras-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=8813700b6ee03e0adf386bb0c6ef2cf1
+_md5_=13f708fa0fac97b6ee11db2403c6f907
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.9 b/metadata/md5-cache/dev-qt/qtxml-5.15.9
index 4399d0377493..e8e35776b494 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.9
@@ -6,11 +6,11 @@ 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
+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.9*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtbase-everywhere-opensource-src-5.15.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.9-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=05b350a42d5430a44ab68a327736af5b
+_md5_=653342e75b2a47fab6b62f2200a4f223
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9
index 4783f2a0f8cf..53b9131c8e87 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=qt5-build
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+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.9* =dev-qt/qtnetwork-5.15.9* qml? ( =dev-qt/qtdeclarative-5.15.9* ) !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qt5-build	32a219742d30540701630d44e86b65f6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=4b61fe790d6fc7ba4b51ada7d21a6975
+_md5_=cf709308ab1f9c28ea0abc8a55e02aa1
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 84a7a0d87c4b..25c46029628e 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/mini_portile2-2.8.2 b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.2
new file mode 100644
index 000000000000..7ca27d50ca76
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mini_portile2-2.8.2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/minitar[ruby_targets_ruby30(-)] dev-ruby/minitest-hooks[ruby_targets_ruby30(-)] dev-ruby/net-ftp[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitar[ruby_targets_ruby31(-)] dev-ruby/minitest-hooks[ruby_targets_ruby31(-)] dev-ruby/net-ftp[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitar[ruby_targets_ruby32(-)] dev-ruby/minitest-hooks[ruby_targets_ruby32(-)] dev-ruby/net-ftp[ruby_targets_ruby32(-)] dev-ruby/webrick[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Simplistic port-like solution for developers
+EAPI=8
+HOMEPAGE=https://github.com/flavorjones/mini_portile
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2.8
+SRC_URI=https://rubygems.org/gems/mini_portile2-2.8.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c3cfe1aaf1ef89865358175a07d01266
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.6.2 b/metadata/md5-cache/dev-ruby/rack-2.2.6.2
deleted file mode 100644
index 2155292dc46a..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-2.2.6.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] =dev-ruby/psych-4*[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby30(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby30(-)] =dev-ruby/psych-4*[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby31(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby31(-)] =dev-ruby/psych-4*[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A modular Ruby webserver interface
-EAPI=8
-HOMEPAGE=https://github.com/rack/rack
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) !!<dev-ruby/rack-2.1.1-r1:2.1 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=2.2
-SRC_URI=https://github.com/rack/rack/archive/v2.2.6.2.tar.gz -> rack-2.2.6.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=06f87ca3e22308f420ec3a45815b5831
diff --git a/metadata/md5-cache/dev-ruby/rack-3.0.4.1 b/metadata/md5-cache/dev-ruby/rack-3.0.4.1
deleted file mode 100644
index 3e8bfc167900..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-3.0.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby27(-)] dev-ruby/webrick[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby30(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby30(-)] dev-ruby/webrick[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby31(-)] dev-ruby/minitest-global_expectations[ruby_targets_ruby31(-)] dev-ruby/webrick[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-DESCRIPTION=A modular Ruby webserver interface
-EAPI=8
-HOMEPAGE=https://github.com/rack/rack
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=3.0
-SRC_URI=https://github.com/rack/rack/archive/v3.0.4.1.tar.gz -> rack-3.0.4.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=35d173875d98a8e2841c1a4da08553b6
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1d870a4122be..ec47fbb6a5e3 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/diffuse-0.7.7 b/metadata/md5-cache/dev-util/diffuse-0.7.7
index 4d309a99592b..9040b23d8ced 100644
--- a/metadata/md5-cache/dev-util/diffuse-0.7.7
+++ b/metadata/md5-cache/dev-util/diffuse-0.7.7
@@ -7,11 +7,11 @@ HOMEPAGE=http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson plocale python-r1 xdg
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_targets_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,cairo] ) python_targets_python3_10? ( dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,cairo] ) python_targets_python3_11? ( dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,cairo] ) x11-libs/gtk+:3[introspection]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/MightyCreak/diffuse/archive/v0.7.7.tar.gz -> diffuse-0.7.7.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=abf3af322cfcd985e246e1bac0943e24
+_md5_=96d4d0d79fdd86335aa10cf43565a140
diff --git a/metadata/md5-cache/dev-util/gyp-20200512145953 b/metadata/md5-cache/dev-util/gyp-20200512145953
index 2d3804544874..cd20ba1f6e4a 100644
--- a/metadata/md5-cache/dev-util/gyp-20200512145953
+++ b/metadata/md5-cache/dev-util/gyp-20200512145953
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.7.0[python_targets_python3_11(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=GYP (Generate Your Projects) meta-build system
 EAPI=8
 HOMEPAGE=https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp
 INHERIT=distutils-r1
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=BSD
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://home.apache.org/~arfrever/distfiles/gyp-20200512145953.tar.xz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bea499046542eaf70e1ce2d93c70dfdb
+_md5_=8d78486a4e71fbb7a55483b45fb04574
diff --git a/metadata/md5-cache/dev-util/gyp-99999999999999 b/metadata/md5-cache/dev-util/gyp-99999999999999
index 71294b27b689..4e26aa87d229 100644
--- a/metadata/md5-cache/dev-util/gyp-99999999999999
+++ b/metadata/md5-cache/dev-util/gyp-99999999999999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.7.0[python_targets_python3_11(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=GYP (Generate Your Projects) meta-build system
 EAPI=8
 HOMEPAGE=https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp
 INHERIT=distutils-r1 git-r3
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ed82525d6a54cfdca1bc64605ba8df38
+_md5_=e998e2709b035b727e353db022370476
diff --git a/metadata/md5-cache/dev-util/ostree-2023.1 b/metadata/md5-cache/dev-util/ostree-2023.1
index 62accd8fba26..d1b864829704 100644
--- a/metadata/md5-cache/dev-util/ostree-2023.1
+++ b/metadata/md5-cache/dev-util/ostree-2023.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://ostreedev.github.io/ostree/
 INHERIT=autotools systemd tmpfiles
 IUSE=archive +curl doc dracut gnutls +gpg grub +http2 httpd introspection libmount selinux sodium ssl +soup systemd zeroconf
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=app-arch/xz-utils dev-libs/libassuan dev-libs/glib:2 sys-fs/fuse:3 sys-libs/zlib archive? ( app-arch/libarchive:= ) curl? ( net-misc/curl ) dracut? ( sys-kernel/dracut ) gpg? ( app-crypt/gpgme:= dev-libs/libgpg-error ) grub? ( sys-boot/grub:2= ) introspection? ( dev-libs/gobject-introspection ) libmount? ( sys-apps/util-linux ) selinux? ( sys-libs/libselinux ) sodium? ( >=dev-libs/libsodium-1.0.14:= ) soup? ( net-libs/libsoup:2.4 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) virtual/tmpfiles
 REQUIRED_USE=dracut? ( systemd ) http2? ( curl ) httpd? ( || ( curl soup ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2023.1/libostree-2023.1.tar.xz -> ostree-2023.1.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5c8ebc5a62da20a7c2fb44d4b806c38f
+_md5_=aa8f22cb06b4dd371e2a2e6ae31cee32
diff --git a/metadata/md5-cache/dev-util/rpmdevtools-9.5 b/metadata/md5-cache/dev-util/rpmdevtools-9.5
index e1c16fa18013..adb18dadad0c 100644
--- a/metadata/md5-cache/dev-util/rpmdevtools-9.5
+++ b/metadata/md5-cache/dev-util/rpmdevtools-9.5
@@ -1,16 +1,16 @@
 BDEPEND=sys-apps/help2man
 DEFINED_PHASES=prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-arch/rpm[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-lang/perl:* python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/requests_download[python_targets_python3_10(-)] )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-arch/rpm[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-lang/perl:* python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/progressbar2[python_targets_python3_11(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/requests_download[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/requests_download[python_targets_python3_11(-)] )
 DESCRIPTION=Collection of rpm packaging related utilities
 EAPI=7
 HOMEPAGE=https://pagure.io/rpmdevtools
 INHERIT=python-single-r1
-IUSE=emacs python_single_target_python3_9 python_single_target_python3_10
+IUSE=emacs python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-arch/rpm[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-lang/perl:* python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/requests_download[python_targets_python3_10(-)] ) net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-arch/rpm[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-lang/perl:* python_single_target_python3_9? ( dev-python/progressbar2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/progressbar2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/progressbar2[python_targets_python3_11(-)] ) python_single_target_python3_9? ( dev-python/requests_download[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/requests_download[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/requests_download[python_targets_python3_11(-)] ) net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-9.5.tar.xz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=85bed5b565e8d3efed2bcb26089b93d6
+_md5_=823cf90dc733f74075599c5757b7c6f4
diff --git a/metadata/md5-cache/dev-util/systemtap-4.8 b/metadata/md5-cache/dev-util/systemtap-4.8
index b5a18fc93281..980ed14ec71b 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.8
+++ b/metadata/md5-cache/dev-util/systemtap-4.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.sourceware.org/systemtap
 INHERIT=autotools linux-info python-single-r1
 IUSE=libvirt selinux sqlite +ssl test zeroconf python_single_target_pypy3 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-libs/boost:= >=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:= sys-libs/readline:= libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) acct-group/stapdev acct-group/stapsys acct-group/stapusr
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/ftp/systemtap/releases/systemtap-4.8.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=162c092674f008d4c97fec997b96fffd
+_md5_=75ee0c4f86acfb97d5c425abae546827
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index e09d3627f7a8..1ffc989e6e06 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.84 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.84
index da9d8062ab0b..f8e69d28630a 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.84
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.84
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.imagemagick.org/
 INHERIT=flag-o-matic libtool perl-functions toolchain-funcs
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6.9.12-58
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-84.tar.xz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=61f56fcea645d959cb9340d9d27c94f8
+_md5_=b5cb487f05661dba17b213fbe8327b79
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.1.6 b/metadata/md5-cache/media-gfx/imagemagick-7.1.1.6
index 4a39bb5bf3d2..565708085258 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.1.1.6
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.1.1.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.imagemagick.org/
 INHERIT=autotools flag-o-matic perl-functions toolchain-funcs
 IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.1.1-43
 SRC_URI=mirror://imagemagick/ImageMagick-7.1.1-6.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0b372ac57b461b3fc1f4b24a7ddc14f5
+_md5_=f226365df8d6722cde2f9aa2718c7eaa
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.2.2 b/metadata/md5-cache/media-gfx/inkscape-1.2.2
index cb70fc69321b..a89442ece490 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.2.2
+++ b/metadata/md5-cache/media-gfx/inkscape-1.2.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://inkscape.org/ https://gitlab.com/inkscape/inkscape/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake flag-o-matic xdg toolchain-funcs python-single-r1
 IUSE=cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= dev-libs/boost:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_9? ( dev-python/cachecontrol[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/lockfile[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cachecontrol[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/lockfile[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cachecontrol[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/lockfile[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] media-gfx/scour[python_targets_python3_11(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.inkscape.org/dl/resources/file/inkscape-1.2.2.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=46ccceeebb8b72d047d458978925efc1
+_md5_=25b77e01ab40de5b1db20129f6d7e962
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.2.2-r1 b/metadata/md5-cache/media-gfx/inkscape-1.2.2-r1
new file mode 100644
index 000000000000..062c402abf7d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/inkscape-1.2.2-r1
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( virtual/imagemagick-tools ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= dev-libs/boost:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_9? ( dev-python/cachecontrol[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/lockfile[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cachecontrol[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/lockfile[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cachecontrol[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/lockfile[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] media-gfx/scour[python_targets_python3_11(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) test? ( dev-cpp/gtest )
+DESCRIPTION=SVG based generic vector-drawing program
+EAPI=8
+HOMEPAGE=https://inkscape.org/ https://gitlab.com/inkscape/inkscape/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic xdg toolchain-funcs python-single-r1
+IUSE=cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= dev-libs/boost:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_9? ( dev-python/cachecontrol[python_targets_python3_9(-)] dev-python/cssselect[python_targets_python3_9(-)] dev-python/lockfile[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cachecontrol[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/lockfile[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cachecontrol[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/lockfile[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] media-gfx/scour[python_targets_python3_11(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.inkscape.org/dl/resources/file/inkscape-1.2.2.tar.xz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=771888fa025d9579cf10d8992871b355
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.2.1 b/metadata/md5-cache/media-gfx/sane-backends-1.2.1
index b33de3313b8c..0ec563ca0ddf 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.2.1
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.2.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.sane-project.org/
 INHERIT=autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev
 IUSE=gphoto2 snmp systemd threads usb v4l xinetd +zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_lide70 sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_epsonds +sane_backends_escl +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pieusb +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_ricoh2 +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp 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 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 public-domain
 RDEPEND=acct-user/saned acct-group/scanner gphoto2? ( >=media-libs/libgphoto2-2.5.3.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/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( app-text/poppler[cairo] || ( net-dns/avahi[dbus] net-dns/avahi[gtk] ) net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snmp? ( net-analyzer/net-snmp:= ) systemd? ( sys-apps/systemd:= ) usb? ( >=virtual/libusb-1-r1: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(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
 SLOT=0
 SRC_URI=https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/sane-backends-1.2.1.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=573d06edbca248adefd8dee23d3849a8
+_md5_=5cbc7ca315577ab4f46061817b24e822
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 56518d12aadd..5ccb41beec75 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/openimageio-2.4.6.0-r1 b/metadata/md5-cache/media-libs/openimageio-2.4.6.0-r1
index e10ad43e75d3..9ea793efd798 100644
--- a/metadata/md5-cache/media-libs/openimageio-2.4.6.0-r1
+++ b/metadata/md5-cache/media-libs/openimageio-2.4.6.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
 INHERIT=cmake font python-single-r1
 IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.4
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.4.6.0.tar.gz -> openimageio-2.4.6.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz -> openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8dd887c516e163ddcc43898df821f704
+_md5_=d858c5c981af267337ed4a9d28ff07fe
diff --git a/metadata/md5-cache/media-libs/portsmf-239 b/metadata/md5-cache/media-libs/portsmf-239
index 8e120f6472a0..47f99de78bd4 100644
--- a/metadata/md5-cache/media-libs/portsmf-239
+++ b/metadata/md5-cache/media-libs/portsmf-239
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://codeberg.org/tenacityteam/portsmf
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://codeberg.org/tenacityteam/portsmf/archive/239.tar.gz -> portsmf-239.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=777cdf5875fb2e6772302062785134e3
+_md5_=b522e1f8a6bbcd7ec00a9e65aaddb41a
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index bde43263ec0c..0c25f98c8765 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/audacity-3.2.4 b/metadata/md5-cache/media-sound/audacity-3.2.4
deleted file mode 100644
index fbcb84e8ac04..000000000000
--- a/metadata/md5-cache/media-sound/audacity-3.2.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/unzip sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-DESCRIPTION=Free crossplatform audio editor
-EAPI=8
-HOMEPAGE=https://web.audacityteam.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake wxwidgets xdg
-IUSE=alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg opus +portmixer sbsms twolame vamp +vorbis wavpack
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-2+ GPL-3 doc? ( CC-BY-3.0 ) audiocom? ( ZLIB )
-RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=mad? ( !mpg123 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/audacity/audacity/archive/Audacity-3.2.4.tar.gz doc? ( https://github.com/audacity/audacity-manual/releases/download/v3.2.4/audacity-manual-3.2.4.tar.gz ) audiocom? ( https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-20140926.h )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7df9f452fb9d251de711bdb54098387e
diff --git a/metadata/md5-cache/media-sound/audacity-3.2.5 b/metadata/md5-cache/media-sound/audacity-3.2.5
index 3d32a31cb4da..973786a2c45b 100644
--- a/metadata/md5-cache/media-sound/audacity-3.2.5
+++ b/metadata/md5-cache/media-sound/audacity-3.2.5
@@ -7,7 +7,7 @@ HOMEPAGE=https://web.audacityteam.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake wxwidgets xdg
 IUSE=alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg opus +portmixer sbsms twolame vamp +vorbis wavpack
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=GPL-2+ GPL-3 doc? ( CC-BY-3.0 ) audiocom? ( ZLIB )
 RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-libs/glib:2 media-libs/libsndfile media-libs/libsoundtouch:= media-libs/portaudio[alsa?] media-libs/portmidi media-libs/portsmf:= media-libs/soxr media-sound/lame x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/wxGTK:3.2-gtk3[X] sys-apps/util-linux alsa? ( media-libs/alsa-lib ) audiocom? ( dev-libs/rapidjson net-misc/curl ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:=[cxx] ) id3tag? ( media-libs/libid3tag:= ) lv2? ( dev-libs/serd dev-libs/sord media-libs/lilv media-libs/lv2 media-libs/sratom media-libs/suil ) mad? ( media-libs/libmad ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) sbsms? ( media-libs/libsbsms ) twolame? ( media-sound/twolame ) vamp? ( media-libs/vamp-plugin-sdk ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 REQUIRED_USE=mad? ( !mpg123 )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/audacity/audacity/archive/Audacity-3.2.5.tar.gz doc? ( https://github.com/audacity/audacity-manual/releases/download/v3.2.5/audacity-manual-3.2.5.tar.gz ) audiocom? ( https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-20140926.h )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c72f44919313927e1986732869250991
+_md5_=6febbbc72cf6ed79a5e9e749db757129
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.33 b/metadata/md5-cache/media-sound/qtractor-0.9.33
index 5a185192b76d..6799a643935a 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.9.33
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.33
@@ -7,11 +7,11 @@ HOMEPAGE=https://qtractor.sourceforge.io
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
 IUSE=aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dssi? ( ladspa )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.33.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9329b8c4755299cf223de9f9218515f8
+_md5_=a0702656a0d0cf88605f166f48b9847d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index e5b27ce7d99e..76d655d26c04 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.11-r1 b/metadata/md5-cache/net-analyzer/wireshark-3.6.11-r1
deleted file mode 100644
index ecd1a960aee7..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.11-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=Network protocol analyzer (sniffer)
-EAPI=8
-HOMEPAGE=https://www.wireshark.org/
-IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins qt5 )
-RESTRICT=!test? ( test )
-SLOT=0/3.6.11
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.11.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5f36c500914c1f80478a396e13eded84
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.12-r1 b/metadata/md5-cache/net-analyzer/wireshark-3.6.12-r1
index 66a64754e929..41be42e68501 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.12-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.6.12-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Network protocol analyzer (sniffer)
@@ -11,8 +11,8 @@ KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins qt5 )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=0/3.6.12
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.12.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5f36c500914c1f80478a396e13eded84
+_md5_=1859dc20372130c2fbd2c087bb181991
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.13 b/metadata/md5-cache/net-analyzer/wireshark-3.6.13
index 79a24e2e7eb3..eba31433ebf6 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.13
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.6.13
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Network protocol analyzer (sniffer)
@@ -11,8 +11,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins qt5 )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=0/3.6.13
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.13.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=40101c147329d72a5994a15b85ba18b6
+_md5_=0701eb18d669a82b0982634a4bc79698
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.3-r1 b/metadata/md5-cache/net-analyzer/wireshark-4.0.3-r1
deleted file mode 100644
index d28abe6d1a2d..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.3-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( !qt6? ( dev-qt/qtdeclarative:5 ) )
-DESCRIPTION=Network protocol analyzer (sniffer)
-EAPI=8
-HOMEPAGE=https://www.wireshark.org/
-IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
-SLOT=0/4.0.3
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.3.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=73297fd7d9885a5b2ea49af0f6a3f35d
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.4-r1 b/metadata/md5-cache/net-analyzer/wireshark-4.0.4-r1
index c151b84bd09b..178c64b26100 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.4-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-4.0.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( !qt6? ( dev-qt/qtdeclarative:5 ) )
 DESCRIPTION=Network protocol analyzer (sniffer)
@@ -11,8 +11,8 @@ KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=0/4.0.4
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.4.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=73297fd7d9885a5b2ea49af0f6a3f35d
+_md5_=17af6743fb4734018ac2d2b02ea09580
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.5 b/metadata/md5-cache/net-analyzer/wireshark-4.0.5
index 454e9f4d2087..52ba93303133 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.5
+++ b/metadata/md5-cache/net-analyzer/wireshark-4.0.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( !qt6? ( dev-qt/qtdeclarative:5 ) )
 DESCRIPTION=Network protocol analyzer (sniffer)
@@ -11,8 +11,8 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=0/4.0.5
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.5.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=eb03b735b212754b9a7ec5f755d1fd9a
+_md5_=9c12140f94cf02cad9caf64eb1a44cf3
diff --git a/metadata/md5-cache/net-analyzer/wireshark-9999 b/metadata/md5-cache/net-analyzer/wireshark-9999
index 5ae6e4f1c06b..00feb0d86fd1 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-9999
+++ b/metadata/md5-cache/net-analyzer/wireshark-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pytest[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ) ) >=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 setup test unpack
 DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( !qt6? ( dev-qt/qtdeclarative:5 ) )
 DESCRIPTION=Network protocol analyzer (sniffer)
@@ -11,7 +11,7 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy:= ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=0/9999
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	fcaps	c0a086b957a1b183a8d136eabf02f191	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=67b785fa31e1eef46826e8c2c9ca1cdc
+_md5_=b2344250c97d5145c4a4e4fdfbe006fe
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 7c48495db805..a891175b8ee5 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/xtables-addons-3.24 b/metadata/md5-cache/net-firewall/xtables-addons-3.24
new file mode 100644
index 000000000000..17ee7fce03aa
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/xtables-addons-3.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=net-firewall/iptables-1.6.0 virtual/linux-sources modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) modules? ( kernel_linux? ( virtual/linux-sources virtual/libelf ) )
+DESCRIPTION=iptables extensions not yet accepted in the main kernel
+EAPI=8
+HOMEPAGE=https://inai.de/projects/xtables-addons/ https://codeberg.org/jengelh/xtables-addons
+INHERIT=linux-info linux-mod multilib toolchain-funcs
+IUSE=xtables_addons_quota2 xtables_addons_psd xtables_addons_pknock xtables_addons_lscan xtables_addons_length2 xtables_addons_ipv4options xtables_addons_ipp2p xtables_addons_iface xtables_addons_gradm xtables_addons_geoip xtables_addons_fuzzy xtables_addons_condition xtables_addons_tarpit xtables_addons_sysrq xtables_addons_proto xtables_addons_logmark xtables_addons_ipmark xtables_addons_echo xtables_addons_dnetmap xtables_addons_dhcpmac xtables_addons_delude xtables_addons_chaos xtables_addons_account dist-kernel +modules
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-firewall/iptables-1.6.0 xtables_addons_geoip? ( app-arch/unzip dev-perl/Net-CIDR-Lite dev-perl/Text-CSV_XS virtual/perl-Getopt-Long ) modules? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
+SLOT=0
+SRC_URI=https://inai.de/files/xtables-addons/xtables-addons-3.24.tar.xz
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	e02e2112f542b74962d5d264c60a08de	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=56dc1dfabb51266704fecfbb4ddbfc4c
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 672289af8e5c..ab9f9af85b64 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/btfs-2.23 b/metadata/md5-cache/net-fs/btfs-2.23
deleted file mode 100644
index f73fd2404d35..000000000000
--- a/metadata/md5-cache/net-fs/btfs-2.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare
-DEPEND=>=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= virtual/pkgconfig
-DESCRIPTION=a bittorrent filesystem based on FUSE
-EAPI=7
-HOMEPAGE=https://github.com/johang/btfs
-INHERIT=autotools python-r1
-IUSE=python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/johang/btfs/archive/v2.23.tar.gz -> btfs-2.23.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1d7221ad7d1160727f6a968d6518a409
diff --git a/metadata/md5-cache/net-fs/btfs-2.24 b/metadata/md5-cache/net-fs/btfs-2.24
index aa9acc893775..c489a02222ba 100644
--- a/metadata/md5-cache/net-fs/btfs-2.24
+++ b/metadata/md5-cache/net-fs/btfs-2.24
@@ -5,12 +5,12 @@ DESCRIPTION=a bittorrent filesystem based on FUSE
 EAPI=8
 HOMEPAGE=https://github.com/johang/btfs
 INHERIT=autotools python-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=sys-fs/fuse-2.8.0:0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/johang/btfs/archive/v2.24.tar.gz -> btfs-2.24.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e4ddade42b839700d1d51406e38402c1
+_md5_=d19f98c24616cce49e88dda4440df23d
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 784144d6b6d2..f1344c3cf517 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/getmail-6.18.12 b/metadata/md5-cache/net-mail/getmail-6.18.12
index b86aab50cb8f..0ceac3b56de4 100644
--- a/metadata/md5-cache/net-mail/getmail-6.18.12
+++ b/metadata/md5-cache/net-mail/getmail-6.18.12
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.getmail6.org/ https://github.com/getmail6/getmail6
 INHERIT=distutils-r1
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/getmail6/getmail6/archive/v6.18.12.tar.gz -> getmail-6.18.12.gh.tar.gz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=67f38f7c3139b467ef21084840e8fe48
+_md5_=46e797f3648acd6dbcba12e7822e45ec
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 427e54ca3ad0..136f5fbe8942 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1 b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1
index 5d87e5796e6d..0a9e3d97e46c 100644
--- a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1
+++ b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/sirilic
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/wxpython-4.2:4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/sirilic/-/archive/V1_14_3/sirilic-V1_14_3.tar.bz2
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27195fd5be17ee2aa5ba0c111dfccbac
+_md5_=084c4704c700f3486326b45dd905055f
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index c50caf554a12..fe8937dd7729 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.25 b/metadata/md5-cache/sci-geosciences/gpsd-3.25
index eed4b6b95278..05ec744bb330 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.25
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.25
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gpsd.gitlab.io/gpsd/
 INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev
 IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) qt5? ( cxx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.25.tar.xz
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=1d7f1b51379383f9d717ec7cbfbc0a7d
+_md5_=0ab2f5961f2fd87a40f7b1914b6cb2c5
diff --git a/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2 b/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2
index a8840823b211..d3daf1138130 100644
--- a/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2
+++ b/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://grass.osgeo.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop python-single-r1 toolchain-funcs xdg
 IUSE=blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-python/wxpython-4.1:4.0 x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) opengl? ( X )
 SLOT=0/8.2
 SRC_URI=https://grass.osgeo.org/grass82/source/grass-8.2.1.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4984f65f01e9ea9f8016fe67e3009728
+_md5_=dab8319ed4ca823e04e049efc8faae03
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a3e43505612e..73e17e5a8fc5 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/numkit-1.2.3 b/metadata/md5-cache/sci-libs/numkit-1.2.3
new file mode 100644
index 000000000000..fe34173e25d3
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/numkit-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Numerical first aid kit (with numpy/scipy)
+EAPI=8
+HOMEPAGE=https://numkit.readthedocs.io
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Becksteinlab/numkit/archive/release-1.2.3.tar.gz -> numkit-1.2.3.tar.gz
+_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ba0e2be918b70de3d17829bc510dcabf
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.3 b/metadata/md5-cache/sci-libs/pastix-5.2.3
index a9d78997050f..a0c254619f82 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.3
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/fortran
 DESCRIPTION=Parallel solver for very large sparse linear systems
 EAPI=7
-HOMEPAGE=https://pastix.gforge.inria.fr
+HOMEPAGE=https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix
 INHERIT=fortran-2 toolchain-funcs
 IUSE=doc int64 mpi +smp starpu static-libs
 KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
@@ -12,4 +12,4 @@ RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( vi
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/latestfile/218/pastix_5.2.3.tar.bz2
 _eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f0289bea2b6273ad99db4075c4d616c5
+_md5_=05adf0e9dfc05cd78468de9bdefb60a1
diff --git a/metadata/md5-cache/sci-libs/pastix-6.0.3 b/metadata/md5-cache/sci-libs/pastix-6.0.3
index 589c03ace8b3..f816df9d5c4f 100644
--- a/metadata/md5-cache/sci-libs/pastix-6.0.3
+++ b/metadata/md5-cache/sci-libs/pastix-6.0.3
@@ -1,17 +1,17 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/pkgconfig test? ( sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/fortran
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/pkgconfig test? ( sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/fortran
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) virtual/fortran
+DEPEND=sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) virtual/fortran
 DESCRIPTION=Parallel solver for very large sparse linear systems
 EAPI=7
-HOMEPAGE=https://pastix.gforge.inria.fr
+HOMEPAGE=https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix
 INHERIT=cmake fortran-2 python-single-r1
-IUSE=cuda examples +fortran int64 metis mpi +python +scotch starpu test python_single_target_python3_9 python_single_target_python3_10
+IUSE=cuda examples +fortran int64 metis mpi +python +scotch starpu test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-C
-RDEPEND=sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) virtual/fortran
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( metis scotch )
+RDEPEND=sys-apps/hwloc:0= virtual/blas virtual/cblas virtual/lapack virtual/lapacke cuda? ( dev-util/nvidia-cuda-toolkit ) metis? ( sci-libs/metis[int64(+)=] ) mpi? ( virtual/mpi[fortran] metis? ( sci-libs/parmetis ) ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] ) ) scotch? ( >=sci-libs/scotch-6.1.0-r1:0=[int64=,mpi?] ) starpu? ( >=dev-libs/starpu-1.3.0:0= ) virtual/fortran
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( metis scotch )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://gforge.inria.fr/frs/download.php/file/38205/pastix-6.0.3.tar.gz
+SRC_URI=https://files.inria.fr/pastix/releases/v6/pastix-6.0.3.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=18da5ad35260478c6db561acc8827ab3
+_md5_=f948772dd629f25fd08fca5911af856e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 26fdb0fe0aae..4d370aa40dc6 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/sysvinit-3.07 b/metadata/md5-cache/sys-apps/sysvinit-3.07
new file mode 100644
index 000000000000..aa19d03b6432
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sysvinit-3.07
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( app-text/po4a ) verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/root selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
+DESCRIPTION=/sbin/init - parent of all processes
+EAPI=8
+HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
+INHERIT=toolchain-funcs flag-o-matic plocale verify-sig
+IUSE=selinux ibm nls static verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/root selinux? ( >=sys-libs/libselinux-1.28 ) !<app-i18n/man-pages-l10n-4.18.1-r1 !<sys-apps/openrc-0.13 selinux? ( sec-policy/selinux-shutdown )
+SLOT=0
+SRC_URI=https://github.com/slicer69/sysvinit/releases/download/3.07/sysvinit-3.07.tar.xz verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/3.07/sysvinit-3.07.tar.xz.sig )
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=dd240160002a809aa61cd7052731be09
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index df312e8b3fbf..1a59694d451d 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/fio-3.34 b/metadata/md5-cache/sys-block/fio-3.34
index 7e501f3aa973..2bd9018552d4 100644
--- a/metadata/md5-cache/sys-block/fio-3.34
+++ b/metadata/md5-cache/sys-block/fio-3.34
@@ -5,13 +5,13 @@ DESCRIPTION=Jens Axboe's Flexible IO tester
 EAPI=7
 HOMEPAGE=https://brick.kernel.dk/snaps/
 INHERIT=python-r1 toolchain-funcs
-IUSE=aio curl glusterfs gnuplot gtk io-uring nfs numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_9 python_targets_python3_10
+IUSE=aio curl glusterfs gnuplot gtk io-uring nfs numa python rbd rdma static tcmalloc test zbc zlib python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) nfs? ( net-fs/libnfs:= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-cluster/rdma-core ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) gnuplot? ( sci-visualization/gnuplot )
-REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 ) ) gnuplot? ( python ) io-uring? ( aio )
+RDEPEND=!static? ( aio? ( dev-libs/libaio ) curl? ( net-misc/curl:= dev-libs/openssl:0= ) nfs? ( net-fs/libnfs:= ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 ) io-uring? ( sys-libs/liburing:= ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) rdma? ( sys-cluster/rdma-core ) tcmalloc? ( dev-util/google-perftools:= ) zbc? ( >=sys-block/libzbc-5 ) zlib? ( sys-libs/zlib ) ) gtk? ( x11-libs/gtk+:2 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gnuplot? ( sci-visualization/gnuplot )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) gnuplot? ( python ) io-uring? ( aio )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://brick.kernel.dk/snaps/fio-3.34.tar.bz2
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5c7efb989043209e09b4aeeb452cb057
+_md5_=9fee16b9bac2783549820d93564ad6e5
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7e352b1143a4..e9290acf176a 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/gdb-13.1.90_p20230325 b/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230325
index 3f277933d890..23a4a0656c4f 100644
--- a/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230325
+++ b/metadata/md5-cache/sys-devel/gdb-13.1.90_p20230325
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sourceware.org/gdb/
 INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
 IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd 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 ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+ LGPL-2.1+
 RDEPEND=dev-libs/mpfr:= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:= >=sys-libs/readline-7:= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-13.1.90.20230325.tar.xz https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-13.1.90.20230325.tar.xz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1d2803a278524814c383103f098901c5
+_md5_=c0142fe60a0e846dc309063bddbc6964
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 9daed7b5d4c4..6a39fa72f41e 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.20 b/metadata/md5-cache/sys-fs/lvm2-2.03.20
index f4ab02c245e4..d6f848154b4c 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.20
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.20
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://sourceware.org/lvm2/
 INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
 IUSE=lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) >=sys-apps/baselayout-2.2 lvm? ( virtual/tmpfiles lvm2create-initrd? ( sys-apps/makedev ) thin? ( sys-block/thin-provisioning-tools ) )
 REQUIRED_USE=static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev ) thin? ( lvm )
 SLOT=0
 SRC_URI=https://sourceware.org/ftp/lvm2/LVM2.2.03.20.tgz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=c3aa0db72407f8aa84fdd6a67f54475a
+_md5_=33389da700615782719714cddfdcaafe
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 3eaa2cc8c8f9..3e886c04243e 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/elinks-0.16.0 b/metadata/md5-cache/www-client/elinks-0.16.0
index d2db90e042d0..f9240db52a3e 100644
--- a/metadata/md5-cache/www-client/elinks-0.16.0
+++ b/metadata/md5-cache/www-client/elinks-0.16.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( net-dns/libidn ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Advanced and well-established text-mode web browser
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://elinks.or.cz/
 INHERIT=meson lua-single python-any-r1
 IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rkd77/elinks/releases/download/v0.16.0/elinks-0.16.0.tar.xz
 _eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fb15da62719159c75f84d860c8d317af
+_md5_=80474b931caa53d704f69bf3c66f930b
diff --git a/metadata/md5-cache/www-client/elinks-0.16.1 b/metadata/md5-cache/www-client/elinks-0.16.1
new file mode 100644
index 000000000000..3675940fc073
--- /dev/null
+++ b/metadata/md5-cache/www-client/elinks-0.16.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( net-dns/libidn2 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=Advanced and well-established text-mode web browser
+EAPI=8
+HOMEPAGE=http://elinks.or.cz/
+INHERIT=meson lua-single python-any-r1
+IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rkd77/elinks/releases/download/v0.16.1/elinks-0.16.1.tar.xz
+_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=bb7c9f0ad3e0c6bb05544c61543fd781
diff --git a/metadata/md5-cache/www-client/elinks-9999 b/metadata/md5-cache/www-client/elinks-9999
index 703e1e7d42b8..a3e6369a2083 100644
--- a/metadata/md5-cache/www-client/elinks-9999
+++ b/metadata/md5-cache/www-client/elinks-9999
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( net-dns/libidn2 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+DEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=Advanced and well-established text-mode web browser
 EAPI=8
 HOMEPAGE=http://elinks.or.cz/
@@ -8,9 +8,9 @@ INHERIT=meson lua-single python-any-r1 git-r3
 IUSE=bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
+RDEPEND=>=sys-libs/ncurses-5.2:=[unicode(+)] brotli? ( app-arch/brotli:= ) bzip2? ( >=app-arch/bzip2-1.0.2 ) gpm? ( >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) idn? ( net-dns/libidn2:= ) javascript? ( dev-cpp/libxmlpp:5.0 dev-lang/mujs:= ) 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 ) ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) samba? ( net-fs/samba ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) tre? ( dev-libs/tre ) X? ( x11-libs/libX11 x11-libs/libXt ) xml? ( >=dev-libs/expat-1.95.4 ) zlib? ( >=sys-libs/zlib-1.1.4 ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
-RESTRICT=!test? ( test ) test
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7cec2256fc91dbff4d72cb75ae3f1795
+_md5_=bb7c9f0ad3e0c6bb05544c61543fd781
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 119db37e877c..4b5534ff5ccc 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.21 b/metadata/md5-cache/www-servers/uwsgi-2.0.21
index 3751f22a3d51..6b826fe6d562 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.21
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.21
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://uwsgi-docs.readthedocs.io/en/latest/
 INHERIT=lua-single multiprocessing pax-utils php-ext-source-r3 postgres python-r1 ruby-ng
 IUSE=apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq +uwsgi_plugins_ping +uwsgi_plugins_cache +uwsgi_plugins_carbon +uwsgi_plugins_nagios +uwsgi_plugins_rpc +uwsgi_plugins_rrdtool +uwsgi_plugins_http +uwsgi_plugins_ugreen +uwsgi_plugins_signal +uwsgi_plugins_syslog +uwsgi_plugins_rsyslog +uwsgi_plugins_router_uwsgi +uwsgi_plugins_router_redirect +uwsgi_plugins_router_basicauth +uwsgi_plugins_router_rewrite +uwsgi_plugins_router_http +uwsgi_plugins_router_cache +uwsgi_plugins_router_static +uwsgi_plugins_router_memcached +uwsgi_plugins_router_redis +uwsgi_plugins_router_hash +uwsgi_plugins_router_expires +uwsgi_plugins_router_metrics +uwsgi_plugins_corerouter +uwsgi_plugins_fastrouter +uwsgi_plugins_rawrouter +uwsgi_plugins_sslrouter +uwsgi_plugins_redislog +uwsgi_plugins_mongodblog +uwsgi_plugins_logfile +uwsgi_plugins_logsocket +uwsgi_plugins_spooler +uwsgi_plugins_cheaper_busyness +uwsgi_plugins_symcall +uwsgi_plugins_transformation_chunked +uwsgi_plugins_transformation_gzip +uwsgi_plugins_transformation_offload +uwsgi_plugins_transformation_tofile +uwsgi_plugins_zergpool uwsgi_plugins_alarm_curl uwsgi_plugins_alarm_xmpp uwsgi_plugins_clock_monotonic uwsgi_plugins_clock_realtime uwsgi_plugins_curl_cron uwsgi_plugins_dumbloop uwsgi_plugins_echo uwsgi_plugins_emperor_amqp uwsgi_plugins_emperor_pg uwsgi_plugins_emperor_zeromq uwsgi_plugins_forkptyrouter uwsgi_plugins_geoip uwsgi_plugins_graylog2 uwsgi_plugins_legion_cache_fetch uwsgi_plugins_ldap uwsgi_plugins_logcrypto uwsgi_plugins_logpipe uwsgi_plugins_notfound uwsgi_plugins_pam uwsgi_plugins_rados uwsgi_plugins_router_access uwsgi_plugins_router_radius uwsgi_plugins_router_spnego uwsgi_plugins_router_xmldir uwsgi_plugins_sqlite uwsgi_plugins_ssi uwsgi_plugins_stats_pusher_statsd uwsgi_plugins_systemd_logger uwsgi_plugins_transformation_toupper uwsgi_plugins_tuntap uwsgi_plugins_webdav uwsgi_plugins_xattr uwsgi_plugins_xslt uwsgi_plugins_zabbix cgi mono perl go lua php python python-asyncio ruby +lua_single_target_lua5-1 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/libcrypt:= caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansson:= ) yajl? ( dev-libs/yajl ) ) pcre? ( dev-libs/libpcre:3 ) ssl? ( dev-libs/openssl:= ) xml? ( !expat? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) uwsgi_plugins_alarm_curl? ( net-misc/curl ) uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) uwsgi_plugins_curl_cron? ( net-misc/curl ) uwsgi_plugins_emperor_pg? ( postgres_targets_postgres15? ( dev-db/postgresql:15= ) postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) ) uwsgi_plugins_geoip? ( dev-libs/geoip ) uwsgi_plugins_ldap? ( net-nds/openldap:= ) uwsgi_plugins_pam? ( sys-libs/pam ) uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) uwsgi_plugins_rados? ( sys-cluster/ceph ) uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) uwsgi_plugins_router_spnego? ( virtual/krb5 ) uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) uwsgi_plugins_webdav? ( dev-libs/libxml2 ) uwsgi_plugins_xslt? ( dev-libs/libxslt ) go? ( sys-devel/gcc:=[go] ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mono? ( dev-lang/mono:= ) perl? ( dev-lang/perl:= ) php? ( php_targets_php7-4? ( dev-lang/php:7.4[embed] ) php_targets_php8-0? ( dev-lang/php:8.0[embed] ) php_targets_php8-1? ( dev-lang/php:8.1[embed] ) php_targets_php8-2? ( dev-lang/php:8.2[embed] ) ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) python-asyncio? ( virtual/python-greenlet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
 REQUIRED_USE=|| ( cgi mono perl go lua php python python-asyncio ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_pg? ( || ( postgres_targets_postgres15 postgres_targets_postgres14 postgres_targets_postgres13 ) ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml !expat ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) python-asyncio? ( python ) expat? ( xml ) php? ( || ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.21.tar.gz -> uwsgi-2.0.21.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	postgres	43fa70d2d8740e8e0149e6da1995ea28	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b30c77ab3a7f72d42b8412357481b918
+_md5_=bec7b91f9b410da3adc377487c934e31
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 77599e0291ae..25d00c91afd4 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xwayland-23.1.1 b/metadata/md5-cache/x11-base/xwayland-23.1.1
index f5efc7b9a516..8c8741164be3 100644
--- a/metadata/md5-cache/x11-base/xwayland-23.1.1
+++ b/metadata/md5-cache/x11-base/xwayland-23.1.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
 INHERIT=meson
 IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.28 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.109 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-23.1.1.tar.xz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=68fbb4bc6445424ca711af539214f377
+_md5_=54be764f3c4e38443d425f4f920889fb
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index ecb0e45bf4c9..6b8d3abec6d7 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r2 b/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r2
index 4d194a4e59db..6a21512ffbb7 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r2
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wxwidgets.org/
 INHERIT=multilib-minimal
 IUSE=+X curl doc debug gnome-keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 RDEPEND=>=app-eselect/eselect-wxwidgets-20131230 dev-libs/expat[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/libpcre2[pcre16,pcre32,unicode] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils ) X? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[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=[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(-)?] x11-libs/cairo[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/gtk+:3[wayland?,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/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[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/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/libXtst x11-libs/libXxf86vm[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/fontconfig x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-bad:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( dev-libs/wayland ) ) spell? ( app-text/gspell:= ) tiff? ( media-libs/tiff:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( net-libs/webkit-gtk:4= ) )
 REQUIRED_USE=test? ( tiff ) tiff? ( X ) spell? ( X ) gnome-keyring? ( X )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.2-gtk3
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1.tar.bz2 doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1-docs-html.tar.bz2 )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c12cc1da0ad003453adafbf87670362e
+_md5_=9b4cdb48b851aa969ce09c8af35f4093
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 25b4e5e7f615..0a8d7e23e5a4 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/fbpanel-7.0-r2 b/metadata/md5-cache/x11-misc/fbpanel-7.0-r2
deleted file mode 100644
index 3c485fab4317..000000000000
--- a/metadata/md5-cache/x11-misc/fbpanel-7.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig
-DEFINED_PHASES=configure postinst prepare setup
-DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) x11-base/xorg-proto
-DESCRIPTION=light-weight X11 desktop panel
-EAPI=7
-HOMEPAGE=https://aanatoly.github.io/fbpanel/
-INHERIT=python-any-r1 toolchain-funcs
-IUSE=alsa
-KEYWORDS=~alpha amd64 ~arm ~mips ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 alsa? ( media-libs/alsa-lib )
-SLOT=0
-SRC_URI=https://aanatoly.github.io/fbpanel/archive/7.0.tar.gz -> fbpanel-7.0.tar.gz
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cb31a31dbb3c31a29afdecc37d90fa2a
diff --git a/metadata/md5-cache/x11-misc/fbpanel-7.0-r3 b/metadata/md5-cache/x11-misc/fbpanel-7.0-r3
new file mode 100644
index 000000000000..cb6860dd559b
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/fbpanel-7.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig
+DEFINED_PHASES=configure postinst prepare setup
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) x11-base/xorg-proto
+DESCRIPTION=Light-weight X11 desktop panel
+EAPI=8
+HOMEPAGE=https://aanatoly.github.io/fbpanel/
+INHERIT=edo python-any-r1 toolchain-funcs
+IUSE=alsa
+KEYWORDS=~alpha amd64 ~arm ~mips ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 alsa? ( media-libs/alsa-lib )
+SLOT=0
+SRC_URI=https://aanatoly.github.io/fbpanel/archive/7.0.tar.gz -> fbpanel-7.0.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=285e323462967c64bc203c25e9d984e9
diff --git a/metadata/md5-cache/x11-misc/shutter-0.99.4-r1 b/metadata/md5-cache/x11-misc/shutter-0.99.4-r1
index 616c22049e52..681402fb85fb 100644
--- a/metadata/md5-cache/x11-misc/shutter-0.99.4-r1
+++ b/metadata/md5-cache/x11-misc/shutter-0.99.4-r1
@@ -6,11 +6,11 @@ HOMEPAGE=https://shutter-project.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop optfeature prefix xdg
 IUSE=test
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl dev-libs/libayatana-appindicator dev-perl/Carp-Always dev-perl/libxml-perl dev-perl/Glib-Object-Introspection dev-perl/GooCanvas2 dev-perl/GooCanvas2-CairoTypes dev-perl/Gtk3 dev-perl/Gtk3-ImageView dev-perl/File-DesktopEntry dev-perl/File-HomeDir dev-perl/File-Which dev-perl/JSON dev-perl/File-Copy-Recursive dev-perl/File-MimeInfo dev-perl/Locale-gettext dev-perl/Moo dev-perl/Net-DBus dev-perl/Number-Bytes-Human dev-perl/Pango dev-perl/Proc-Simple dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/X11-Protocol dev-perl/XML-Simple virtual/imagemagick-tools[perl] x11-libs/libwnck:3[introspection]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shutter-project/shutter/archive/v0.99.4.tar.gz -> shutter-0.99.4.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	prefix	eab3c99d77fe00506c109c8a736186f7	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d4c7eda0e16252d47deaec32e2d9bb30
+_md5_=a67fc556c0d6f30741dd2091002a61c6
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 5b0edd4c78ec..003d640d86e2 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.3 b/metadata/md5-cache/x11-terms/terminator-2.1.3
index 511d40769a55..2c8471721d36 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.3
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.3
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/gnome-terminator/terminator
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature verify-sig virtualx xdg
 IUSE=test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig test
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=~amd64 ~ppc ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycairo[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] gnome-base/gsettings-desktop-schemas[introspection] x11-libs/gtk+:3 x11-libs/vte:2.91[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.3/terminator-2.1.3.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.3/terminator-2.1.3.tar.gz.asc )
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9e8d059adf201ab58d0026a59b4f8e60
+_md5_=54d7a4791493e4ea4c49f1f102ca02b5
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 4294cb71cf41..26d9723fa7fe 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/xpra-4.3.3 b/metadata/md5-cache/x11-wm/xpra-4.3.3
deleted file mode 100644
index 5a1a92b70194..000000000000
--- a/metadata/md5-cache/x11-wm/xpra-4.3.3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-python/cython-0.16[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/cython-0.16[python_targets_python3_10(-)] ) virtual/pkgconfig doc? ( app-text/pandoc ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) test? ( python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) )
-DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
-EAPI=8
-HOMEPAGE=https://xpra.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg xdg-utils distutils-r1 tmpfiles udev
-IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( client server ) cups? ( dbus ) opengl? ( client ) test? ( client clipboard dbus html server sound xdg xinerama ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xpra/xpra-4.3.3.tar.gz https://dev.gentoo.org/~chewi/distfiles/xpra-4.3.1-tests.patch
-_eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fb97f8da2dea13221b3df40f30772104
diff --git a/metadata/md5-cache/x11-wm/xpra-4.3.4 b/metadata/md5-cache/x11-wm/xpra-4.3.4
index cb867e16d799..e70949e27e3f 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.3.4
+++ b/metadata/md5-cache/x11-wm/xpra-4.3.4
@@ -7,7 +7,7 @@ HOMEPAGE=https://xpra.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=pypi xdg xdg-utils distutils-r1 tmpfiles udev
 IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_9(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_9? ( cups? ( dev-python/pycups[python_targets_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_9(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pyinotify[python_targets_python3_9(-)] media-libs/opencv[python_targets_python3_9(-),python] ) ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) python_single_target_python3_11? ( cups? ( dev-python/pycups[python_targets_python3_11(-)] ) lz4? ( dev-python/lz4[python_targets_python3_11(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_11(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_11(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pyinotify[python_targets_python3_11(-)] media-libs/opencv[python_targets_python3_11(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( client server ) cups? ( dbus ) opengl? ( client ) test? ( client clipboard dbus html server sound xdg xinerama ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/x/xpra/xpra-4.3.4.tar.gz https://dev.gentoo.org/~chewi/distfiles/xpra-4.3.1-tests.patch
 _eclasses_=distutils-r1	ff196cc3d0837f4b97547cbf8abeec65	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=19aefa90c72eac88cb9938cf429d91b0
+_md5_=2ffa465f65b5732c30e93ebed0f1443b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7c0a8241e789..b2482f71e390 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-05-01T03:40:05Z
+TIMESTAMP 2023-05-01T09:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRPNJVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRPiOxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA/8w//V6JNlQ7B4QIXWt758NIJRmpIguwhcrFnu4HNhMVEho4P114iks/b8GK6
-e2Qrg45HdvK8h8EutIT1O6XdmjHHmKQjLuMmSxwzxS5+EsRAMwtK4rtiwNfxbChe
-SnZwvoiiu51C9kV2aMqo0qoDi0ADYa8TOfAHPEAjW/hRcqEuv5Av8QqfexZv0EzO
-JX1FUEPFnmzLPP3rB4WYDF7fB8dOnY4ITp1euiv20MlE3fHDHDYMIzxft66J1qRu
-AIb5yzWlODwzL3ISxYZox07IUaedSivykt/8r8U5WDmYZ0dzOTLNYLx80o6I9OGV
-NyGUhcT5Vfib4Mh9P5eqYkeGrHVYSi+fbG4CRp/unyf4O0jdp+BTo3g6TpuCBHOJ
-xD2XoW69szwNisxDkWlKkaxt4nnHkBOVPRYdGWC1vEayq7vQxmEvtfydT5leSN+k
-4UJLTodeFqCHXUjLiAVYPtaFU+IQoSJ7j3bnvrGZfvxkeBeeBS5SlS80/hNsDX/R
-WNIRQxuZPpMZ9jthi/HxmmJrw6bK4bAupgqbwykeFK1j398kJa19SI1MAes8AAFS
-iw5C6KXe0s/iARdc9qiiO2WLpNxkuCYqlKap/+v0t6Q2zWY6UxhuiQSamXc809i2
-IRL7v3VdhCts/MLWbCNFF8jN4t10UNompAXP55qFcoX/yvsEMis=
-=oeSn
+klAOJRAAp6lVazONT7My/K5zifJfFv7t8aTRKu66X4Ig6um0/Jv84Fn5wSBtU9jl
+erddVHzjA18KmeCpeYL/Upc0oK31EHyfBKTC8r8CNyMYY1v0O4+8foP8ksLcW4H7
+EOJv/Dz8mWXsL6aapB7finxXfMfLzdn+NtEDhjbHFXRnFUzedR/Eyyk3MaPtLwi4
+rjVEMbYUXheNK4zny3k/mG3UbIGRbom2rbNoy26NMVzSEdUkRWxvF7wScSnFyHEV
+9q7UKHYOI2NcCNa9aN8pPjMnjXDuyHboyE2plYd624UFmURpbrihj/uvuL6tLfD/
+dTyGz3+iXlL3TfgqCKU3SB9vWk3+H0y3UgYvdrQVQdmJTzv5BYArWtu/akY5LIbR
+gT6aXHlUjT6pE2FgbvuFEdfYM923VqTJ8BYK+uV5fX+RMVgJmQFiZcBrH7iDGxQq
+yM1ozzc8I9h6/V8MEOJBvlEWAdMwH8MKFojsX/uDaGpN7NEOSWImVHFgDfv90bqI
+On6wGKrlEapmZ/pVMhXxwU7x4UtW3z5/4kjD+3ZeSizCK6FLpYt35X0I6dF/lQXL
+QMhGo5unpmBRkiay4FcPXzKh+CnmJxhwYfmze79zIT9zlap30Y+uLc2ugMV4q0cN
+8Q5ik3g6f8y9r4zRpAc2S5vRadSB+xQvtU/P5cWllFMq6xfbEnQ=
+=P2nX
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7c466f11fac2..8c21c3ae10e9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 May 2023 03:40:01 +0000
+Mon, 01 May 2023 09:39:54 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index d5fffdfcb575..16e1fbc869ac 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon May  1 03:40:00 AM UTC 2023
+Mon May  1 09:39:54 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8cd26c5a5dc4..c0e87547e854 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 May 2023 03:45:01 +0000
+Mon, 01 May 2023 09:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c918d419f58b..0622e7ff7611 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-671b7530bfce3ddf318e505e20c14225ba6a3bf5 1682910892 2023-05-01T03:14:52+00:00
+d2386f75b347f0d4f60d72c03e5cbea0d1b138f2 1682933471 2023-05-01T09:31:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e9bb00b12578..cf1a2bf2bcb1 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1682912401 Mon 01 May 2023 03:40:01 AM UTC
+1682934002 Mon 01 May 2023 09:40:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7c466f11fac2..8c21c3ae10e9 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 May 2023 03:40:01 +0000
+Mon, 01 May 2023 09:39:54 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c32339222220..b55e7668efc3 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 0171fe0a6d24..cecaef9ed52f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,17 +1,13 @@
 AUX README.gentoo 188 BLAKE2B 1734362317f1c09b63ebb946961a3f31e5b785787ac3c4e026d71c95c14367f4f3df752706e0d04e14792c95c33c3829eea704806b3b14a96339819f8c2ad4f7 SHA512 92811e9bb6df95d87058e6b77ed09dd086db922721b71ea87af0fdfcc44e2585ef28cf264095d8645a9b5bb60a3990b21376f892305debac19a3f01518918959
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
-DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3 SHA512 f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8
 DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65 SHA512 a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8
 DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a SHA512 ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447dddda8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb
-DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb SHA512 ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c
 DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db SHA512 e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff
 DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1 SHA512 fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9
-EBUILD wireshark-3.6.11-r1.ebuild 7304 BLAKE2B 4d9c6b79475ccb2af4748b4d03dc88e5e8fc0c79a4a36ff640a19015d9dcba2acd816de8d0977d33df88ec3b1915ac86474003657389319da091a1789d30ebfd SHA512 4ebb14dd36cb7d6cbbc1ae0f4aa28819695471bfcb405fc19d0649415b71bf6f1d54db240d1f834d2795f368c3b9b94ed5b3591eca738e8dbc3caf007b05c936
-EBUILD wireshark-3.6.12-r1.ebuild 7304 BLAKE2B 4d9c6b79475ccb2af4748b4d03dc88e5e8fc0c79a4a36ff640a19015d9dcba2acd816de8d0977d33df88ec3b1915ac86474003657389319da091a1789d30ebfd SHA512 4ebb14dd36cb7d6cbbc1ae0f4aa28819695471bfcb405fc19d0649415b71bf6f1d54db240d1f834d2795f368c3b9b94ed5b3591eca738e8dbc3caf007b05c936
-EBUILD wireshark-3.6.13.ebuild 7309 BLAKE2B 0e3407d8acc23148c65e61c1440840e9f444a65804983852e8f25e6416c4c6f52c7e9a8da4523254d85b88045a269e412571207cf9e6ad69c08c07a73792fed5 SHA512 fb2a3f66740a3cc7d5c32deb9716749b709e97167c36c5b2f1f44cdabd5142a85e27615ceb906a235b785b3b18aff13ddf5a94073f39c07954a3e30acb0b303f
-EBUILD wireshark-4.0.3-r1.ebuild 7819 BLAKE2B e55672e361f2e49a4d5a7cb40884fe7e91962051c927b9fdb9b1d4202d54df77f2e75dc6d4bf778b1e8d1eab224a480da6a8375831b3c66c2c6f677701d8f89b SHA512 e94c424793bdcfa1025d1323eeabb3998ff3cb4586d326dddbedfad007fb7b90fe7735cef4897e69c2b2e0c0613a491dcd4a6f9b8632b0883ed240500eb5f3bc
-EBUILD wireshark-4.0.4-r1.ebuild 7819 BLAKE2B e55672e361f2e49a4d5a7cb40884fe7e91962051c927b9fdb9b1d4202d54df77f2e75dc6d4bf778b1e8d1eab224a480da6a8375831b3c66c2c6f677701d8f89b SHA512 e94c424793bdcfa1025d1323eeabb3998ff3cb4586d326dddbedfad007fb7b90fe7735cef4897e69c2b2e0c0613a491dcd4a6f9b8632b0883ed240500eb5f3bc
-EBUILD wireshark-4.0.5.ebuild 7824 BLAKE2B 3f1e2184258d907246349836c55717dec2bb291bee334f00a310823d4522be149b798f239516f352e2cb9562f55eb934ca46a0f01bb2496a8f897be291bcfd78 SHA512 f9aef31ff2b18347390887f614d3b28e4743179e75ada91251d2f8119041d33d9a6e4b02b8104ab4d61dc1325403066fd93c779a26190104d822a3ebb1614535
-EBUILD wireshark-9999.ebuild 7969 BLAKE2B 46629c629a7afcbac4da00e8a51096bc91db794bca1145f1931899287d5c2e9852f1dc0ba944a54b423f75746f3af3cc08e4f78b770e32bec58483f859a27144 SHA512 ad3875fd3d42932ca26c9bb6b016d3fc0aebc86cce83cdd067668e6077ded8699bd986df21e204975cfd09d7d08716814fd3f415c102b66bb23f45e07ede0fde
+EBUILD wireshark-3.6.12-r1.ebuild 7456 BLAKE2B 3b2654658b5af556620cd6a1bbf53dd7f29853e255d75933ed90cea393707d556c1b0179b87e86188fe20555aebc01bdc29e8bd22d65837a749045a1569951e1 SHA512 f289d58b96a89f9f3e0bdf5be1cf9eaac7082ac00d2d98ef7431762eee47049152c6248434b936748aaad2ac89a04f01f1dad658165cc392e8f7b3831aef05a3
+EBUILD wireshark-3.6.13.ebuild 7461 BLAKE2B 3b911e408c6c9c4a11a4d9bf358f4433b9e79dc6157b02be906643fbdf38d1cdb3f94e5d937be90849cac2d34251d0dfb99d062b43dd3961e0e8b0cbf2e4baae SHA512 90150b487e62d70e87c7cd597a27fd77098c11de4e6f9c66fc9a2359a7c9b654764aa5f8633db0530fdd30028f1b86cd63c9b69f532737517a322f3453e0ba53
+EBUILD wireshark-4.0.4-r1.ebuild 7971 BLAKE2B 60d8ff6a50c5af252631dadbe6f97fb6f1e4c3182080c78db8910aee02573c78c65b0477220c6f760fe8e3332bfb6b3c2c3e5b74dd7622463c4cc0140e1dea1f SHA512 07210f6a8c5dca8f26c4c5b32939daf8e59d2a23f8ce5831c4e23ea472d4a6771d3606a235e901508715765fe998d27cc779600b57c4e1abc6cb083e290002e8
+EBUILD wireshark-4.0.5.ebuild 7976 BLAKE2B 9f58e2b9fba8275aa34f69455db02e93a7c652a2713e69c608d150b11423d8bf42586760e81786b6d589b2f48260ea8ad1592c82e5c6fbd554624c8b9e57148e SHA512 116836c1a477aaf9e5f7b85bbd0d51ad524edf83251a4787d55c32403d8481f65ddc71eb26db8d4f015f1b0b352d55c322c417ca463b4c3c30960795fd21a7ab
+EBUILD wireshark-9999.ebuild 8121 BLAKE2B 895b7a15a0f9bc3a89fce4340ed38be878588389b9f368cdc94b63ba98bdbb213ca042734edf16d44bb5051c0fb93c23efd3b5d306fc791b710c8d9cebe18289 SHA512 17277123fb310f820750060d66fd80a60e658bbc64fc761085996966da66306628c395f1b25ab7a0774545ee2a9469345d84307b3acc252a35e48d3373defdc0
 MISC metadata.xml 5488 BLAKE2B d3d216dbc02421c620a6c7fcb04caede1ce604ad134fb9332dfb6f96ee3a7d39d3c2b14dfbd2e0be757f558ad5cd98f2440a415a9d74668fe482a7c18629e199 SHA512 e31157a17c7907f380248fe530114fea29be570f0bc6f2a15a7a898ace88534dd5b9d15ee8cf22920f8330910a629d035ca9afdde06a6b631479b2843c1d30ba
diff --git a/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild
deleted file mode 100644
index e037030ee391..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins qt5 )"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
-	>=dev-libs/glib-2.38:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy:= )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6:= )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)"
-RDEPEND="${RDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5 ; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=ON
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use qt5 ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index e037030ee391..0079012cf99c 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	plugin-ifdemo? ( plugins qt5 )"
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="acct-group/pcap
diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
index 0e8916b20943..1e4730af8694 100644
--- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	plugin-ifdemo? ( plugins qt5 )"
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="acct-group/pcap
diff --git a/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild
deleted file mode 100644
index b80599dfacbf..000000000000
--- a/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="Network protocol analyzer (sniffer)"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
-	fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.50.0:2
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.13.0:=
-	>=dev-libs/libgcrypt-1.8.0:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6:= )
-	filecaps? ( sys-libs/libcap )
-	http2? ( >=net-libs/nghttp2-1.11.0:= )
-	ilbc? ( media-libs/libilbc:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	gui? (
-		x11-misc/xdg-utils
-		qt6? (
-			dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-			dev-qt/qt5compat:6
-			dev-qt/qtmultimedia:6
-		)
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtconcurrent:5
-			dev-qt/qtgui:5
-			dev-qt/qtmultimedia:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-		)
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd:= )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy:= )
-	spandsp? ( media-libs/spandsp:= )
-	sshdump? ( >=net-libs/libssh-0.6:= )
-	ssl? ( >=net-libs/gnutls-3.5.8:= )
-	wifi? ( >=net-libs/libssh-0.6:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? (
-		!qt6? (
-			dev-qt/qtdeclarative:5
-		)
-	)
-"
-# TODO: 4.0.0_rc1 release notes say:
-# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	gui? (
-		qt6? (
-			dev-qt/qttools:6[linguist]
-		)
-		!qt6? (
-			dev-qt/linguist-tools:5
-		)
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	python_setup
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use gui ; then
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	mycmakeargs+=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex gui MOC=$(qt5_get_bindir)/moc '')
-		$(usex gui RCC=$(qt5_get_bindir)/rcc '')
-		$(usex gui UIC=$(qt5_get_bindir)/uic '')
-
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-
-		-DBUILD_wireshark=$(usex gui)
-		-DUSE_qt6=$(usex qt6)
-
-		-DENABLE_WERROR=OFF
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=OFF
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DBUILD_wifidump=$(usex wifi)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	EPYTEST_DESELECT=(
-		# TODO: investigate
-		suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-	)
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins "${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use gui ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins resources/icons/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index b80599dfacbf..6039d7e9573b 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -35,7 +35,9 @@ REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 "
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="
diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
index f22f7cd62c6b..36658422a00e 100644
--- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -35,7 +35,9 @@ REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 "
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 62593372fe05..2c6116786ce7 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
 
@@ -35,7 +35,9 @@ REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 "
 
-RESTRICT="!test? ( test )"
+# Tests restricted for now because rely on pytest internals w/ >=3.11
+# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740.
+RESTRICT="!test? ( test ) test"
 
 # bug #753062 for speexdsp
 RDEPEND="
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 85b99d2ad679..4cb3e6231d5e 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 3d3659d3e020..55bd7f524af7 100644
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -1,7 +1,9 @@
 DIST xtables-addons-3.20.tar.xz 333232 BLAKE2B bc6df6d6e56bd539dc649d312fe84a5fe9e4743d6b1f72f3b3bb4689cea91cef9051754d30e530fa3140b877a67b2f84490740e669993669a1ee515d0a434b8d SHA512 0a38c12159dd555a31f24dc5a74d012b27723925df827edffe2343f6b8e61e838b5dc4776bafe37587e9622b9da1e9cd4220e4f576d58e78eb21ad18a419fb2e
 DIST xtables-addons-3.21.tar.xz 333160 BLAKE2B 5847955ff1e64543d278cfd0572ea10f0395297f87005c1310c7c213a774f4b88b6fd89e41798c549074d93a162e82b5a0c89c493f0f96021546570697860050 SHA512 5ec30a14f7dffcaa87bbeb910b46ef5ba3bafc4b6f0ce1579eb21ca6395106fa9157b300f463b43169ea85ec9ff0d9a5377cb5ebc2bb2f637e2a1fe9ff61728e
 DIST xtables-addons-3.23.tar.xz 335776 BLAKE2B 9251a2b9707d93dae294dda24bac4f08b69b44486a5235c248f0f64d0ccac78bd6978c98ad9f83de53da1af75d4788b56ce3285a44c738346560ecfc64f8565b SHA512 f798ad74db6068ee50cae662f3de331cbc8654f0ab2b1d59ce3f7818795213e771702078e495f526a212ce8b9ba7920c04670cd5fb3ff51e693bf0161d2e2486
+DIST xtables-addons-3.24.tar.xz 335724 BLAKE2B c086616c0366346bd87813ae0fc561bdb8f892eecea19ef88c65afef5318ac6f75fec658e0c6595de5c620c965b2bd7f10e45ff3ec55ffb9ddf8e85643190e7e SHA512 08c3b87617e0124aef99a3953fc5e03e8d98be50ce70771e352509ec64263d5256f744489f10f39879630d9dc8d28f3c91173b4739c95bbd8d5ad56e33138eb4
 EBUILD xtables-addons-3.20.ebuild 5485 BLAKE2B 4ff44fbf607b7460e3e71f3df2e8eb78158dbb8209f155e4d2ca5d2f0d869a0e51a65f7598b5d8db902856e012b6ebd9963ac77c77c9bf838f69866d2c857922 SHA512 87160eb7b5c0ed3474ab18650b5e5819c5668a66a499ff0053eddd4535a30128cc7a38337176c17eaaf844fa399f89677b3639a7d4b0e22e8990e4cf431fb5d3
 EBUILD xtables-addons-3.21.ebuild 5489 BLAKE2B 7846313a632d02f50a8e929e13eba0fc0b67ba7ba6051decc650ad7799835602d486aa30116ff5cf9dcb6c8fd678a907a2b42b1a326a3917b1be78da7c588ad8 SHA512 1ad53a8b8841eb041a1ddfcee1cfb22f627f871235fbc9869fca2fb010f5d8d8648f78de860ea7c763adeeec66637b95794b97bcdb88e0a53197c92ffdd1a8f1
 EBUILD xtables-addons-3.23.ebuild 5533 BLAKE2B ded00caedf05de0cbea3d2be455247304b368545520504897108efad78352560e60af8510b37c2833de1ff3d90e01f444376efe1ef710d7919b8fefa4100cd85 SHA512 cbbeabd5cf2a57a79898f8602cb12df1fdabeaaaf3bfee5b1abf117b45af622b6dac3711728b4e2a8848d797e9ea68a9f2f1f29fb2bd75a880a48c699c7f6d5a
+EBUILD xtables-addons-3.24.ebuild 5535 BLAKE2B c6a2f10c61b1e467443be459a4f30d9a7fea1e99d5393c68dad0db96a3624e92bae69f2c63b4b03b389bac0c5e19cf4ed70f094d136309f8494229790ee21751 SHA512 621b436f0c32261588e8b8da3c8741064bde2afb5cf58cb896e0aa2dc2bc6e064ab084b85f061078c65973b56d436611d293d828d4d8e3539d24bdd751064b69
 MISC metadata.xml 698 BLAKE2B 64bcff2bb22f8b71b1acd94386eb10067dfd7be07d829f6e7e75a77da09b5999b8a53da6b9a1aca727dc7d32518fd11cd447ad19aeaec97f1eddfd9107b3d8e9 SHA512 99851425f9be6f3aa906d8d1d908a64a1354bc5b9d0ff771a016cc6b2c31ceb107a01ead4287db7cbaf20bb4661b372ee5454881b00ca5c01ef3b4b81073f9e3
diff --git a/net-firewall/xtables-addons/xtables-addons-3.24.ebuild b/net-firewall/xtables-addons/xtables-addons-3.24.ebuild
new file mode 100644
index 000000000000..fa9e154beca6
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-3.24.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_USE=modules
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
+inherit linux-info linux-mod multilib toolchain-funcs
+
+DESCRIPTION="iptables extensions not yet accepted in the main kernel"
+HOMEPAGE="https://inai.de/projects/xtables-addons/ https://codeberg.org/jengelh/xtables-addons"
+SRC_URI="https://inai.de/files/xtables-addons/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipp2p iface gradm geoip fuzzy condition tarpit sysrq proto logmark ipmark echo dnetmap dhcpmac delude chaos account"
+
+for mod in ${MODULES}; do
+	IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND=">=net-firewall/iptables-1.6.0"
+
+RDEPEND="${DEPEND}
+	xtables_addons_geoip? (
+		app-arch/unzip
+		dev-perl/Net-CIDR-Lite
+		dev-perl/Text-CSV_XS
+		virtual/perl-Getopt-Long
+	)
+"
+
+DEPEND="${DEPEND}
+	virtual/linux-sources"
+
+SKIP_MODULES=""
+
+XA_check4internal_module() {
+	local mod=${1}
+	local version=${3}
+	local kconfigname=${3}
+
+	if use xtables_addons_${mod} && kernel_is -gt ${version}; then
+		ewarn "${kconfigname} should be provided by the kernel. Skipping its build..."
+		if ! linux_chkconfig_present ${kconfigname}; then
+			ewarn "Please enable ${kconfigname} target in your kernel
+			configuration or disable checksum module in ${PN}."
+		fi
+		# SKIP_MODULES in case we need to disable building of everything
+		# like having this USE disabled
+		SKIP_MODULES+=" ${mod}"
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		get_version
+		check_modules_supported
+		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
+		ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
+		linux-mod_pkg_setup
+
+		if ! linux_chkconfig_present IPV6; then
+			SKIP_IPV6_MODULES="ip6table_rawpost"
+			ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+		fi
+		kernel_is -lt 4 18 && die "${P} requires kernel version >= 4.18"
+	fi
+}
+
+# Helper for maintainer: cheks if all possible MODULES are listed.
+XA_qa_check() {
+	local all_modules
+	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
+	if [[ ${all_modules} != ${MODULES} ]]; then
+		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
+		ewarn "Please, update MODULES in ebuild."
+		ewarn "'${all_modules}'"
+	fi
+}
+
+# Is there any use flag set?
+XA_has_something_to_build() {
+	local mod
+	for mod in ${MODULES}; do
+		use xtables_addons_${mod} && return
+	done
+
+	eerror "All modules are disabled. What do you want me to build?"
+	eerror "Please, set XTABLES_ADDONS to any combination of"
+	eerror "${MODULES}"
+	die "All modules are disabled."
+}
+
+# Parse Kbuid files and generates list of sources
+XA_get_module_name() {
+	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
+	local mod objdir build_mod sources_list
+	mod=${1}
+	objdir=${S}/extensions
+	# Take modules name from mconfig
+	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+	# strip .o, = and everything before = and print
+	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
+		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+
+	if [[ -d ${S}/extensions/${sources_list} ]]; then
+		objdir=${S}/extensions/${sources_list}
+		sources_list=$(sed -n "/^obj-m/\
+			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
+				"${objdir}/Kbuild")
+	fi
+	for mod_src in ${sources_list}; do
+		has ${mod_src} ${SKIP_IPV6_MODULES} || \
+			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
+	done
+}
+
+# Die on modules known to fail on certain kernel version.
+XA_known_failure() {
+	local module_name=$1
+	local KV_max=$2
+
+	if use xtables_addons_${module_name} && kernel_is ge ${KV_max//./ }; then
+		eerror
+		eerror "XTABLES_ADDONS=${module_name} fails to build on linux ${KV_max} or above."
+		eerror "Either remove XTABLES_ADDONS=${module_name} or use an earlier version of the kernel."
+		eerror
+		die
+	fi
+}
+
+src_prepare() {
+	XA_qa_check
+	XA_has_something_to_build
+
+	# Bug #553630#c2.  echo fails on linux-4 and above.
+	# This appears to be fixed, at least as of linux-4.2
+	# XA_known_failure "echo" 4
+
+	local mod module_name
+	if use modules; then
+		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
+	fi
+	for mod in ${MODULES}; do
+		if ! has ${mod} ${SKIP_MODULES} && use xtables_addons_${mod}; then
+			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
+			if use modules; then
+				for module_name in $(XA_get_module_name ${mod}); do
+					MODULE_NAMES+=" ${module_name}"
+				done
+			fi
+		else
+			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
+		fi
+	done
+	einfo "${MODULE_NAMES}" # for debugging
+
+	sed -e 's/depmod -a/true/' -i Makefile.in || die
+	sed -e '/^all-local:/{s: modules::}' \
+		-e '/^install-exec-local:/{s: modules_install::}' \
+			-i extensions/Makefile.in || die
+
+	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
+
+	eapply_user
+}
+
+src_configure() {
+	set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
+	econf --prefix="${EPREFIX}/" \
+		--libexecdir="${EPREFIX}/$(get_libdir)/" \
+		--with-kbuild="${KV_OUT_DIR}"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
+	use modules && BUILD_PARAMS="V=1" BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use modules && linux-mod_src_install
+	dodoc -r README.rst doc/*
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 1bb4de4d665e..390997daf425 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest
index d2c7ebcb6a29..18c90a76f71d 100644
--- a/net-fs/btfs/Manifest
+++ b/net-fs/btfs/Manifest
@@ -1,5 +1,3 @@
-DIST btfs-2.23.tar.gz 24292 BLAKE2B d834fe347a75ba9633464ef8d7952e557ade9d0008d2845bd72a0277c19fb83bb6aa59c2e97077f67c525fe7fb69509c2a1ba34a5fdfa9069f0915e2f3639a2e SHA512 f911b334367e619621677793342fe36247dc63a8bff6fcab65f0b64e1645bab2ede261a7e7c03c76e18ad75b9b485d8c422e99ffcbd6069ceeb5b5e590bf5f63
 DIST btfs-2.24.tar.gz 24328 BLAKE2B d143d25fd78706e60e7ad46053371140bc73a15e313ad35258aedc350614efe72c3662418da2ca61eb8c36a6f153db3477cdc0b5f290afd0eb361739b9d33f3d SHA512 33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c
-EBUILD btfs-2.23.ebuild 831 BLAKE2B a66ed3f1ccdb62d48ec2b075e3f23cbbf258b90d1da7f4af7a5daf5b1448a6c2586e167b78a860f98d05d3cbb5b289be84aed354a4d4b0028e9316ef152e9409 SHA512 e323f7c005dd73aacbf75d90c7c626c718d76499ce4e5aab7a41257a021cd16b7903534e1788adfbbe42baea93973be0bceb49c4bad8fa5e96b951fb5da3e842
-EBUILD btfs-2.24.ebuild 825 BLAKE2B f4ad9b4ec5c62dacc4b9ee6dae97e8c901350257009fbc4a92b15662fb2a31d84b8f2717651807b15557ac73b314ad8dc59cabd38ec5e2b24c68a77d180f5304 SHA512 81b3d43529d059a577f120ab33ff243c63a635f0243f9003d91f7288f9b8f1336da58e16f5291eacbb663bef933e2e4272ebca3e4f42a62d9b9b8ddf5b355133
+EBUILD btfs-2.24.ebuild 825 BLAKE2B 631cd6783a180267807dac5beaeb635d4420dd3c7c3f3176ae2d75bfef290cc9c978fd1b9eec2d53345a5047a72a2c79276223bbbf174539169de1343ed6af0e SHA512 3988c1f23ac63632d242eea0831d2181dd9a526f356a3a3d6819e1e8fa7fcade90814ba3c30369074c7adae7b194b8b482fcfeced76df87ac8d8ec73d9f077d1
 MISC metadata.xml 244 BLAKE2B 9f54ce24ff94456bd875b5386abf16c27313f10ba739afc1fc817f65fbf530a6562c2fc32caec6f1a976abab2715b98b674e167f23189653846fbb1f7352af5a SHA512 d3ddeeb221e464dfeb68c3ad361277c3711b9c1639246423454393c3158a6aae80757333d97698e938609fb21ef51f15fe1e8ecc6ebe7355c7a418df44f765c1
diff --git a/net-fs/btfs/btfs-2.23.ebuild b/net-fs/btfs/btfs-2.23.ebuild
deleted file mode 100644
index c44e9832d58b..000000000000
--- a/net-fs/btfs/btfs-2.23.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_9 )
-
-inherit autotools python-r1
-
-DESCRIPTION="a bittorrent filesystem based on FUSE"
-HOMEPAGE="https://github.com/johang/btfs"
-SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND=">=sys-fs/fuse-2.8.0:0
-	>=net-misc/curl-7.22.0
-	dev-libs/boost:=
-	>=net-libs/libtorrent-rasterbar-0.16.0:="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}"
-
-src_prepare() {
-	default
-
-	# don't install btplay via make
-	sed -i '/^SUBDIRS =/s/scripts//' Makefile.am || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	python_foreach_impl python_doscript scripts/btplay
-}
diff --git a/net-fs/btfs/btfs-2.24.ebuild b/net-fs/btfs/btfs-2.24.ebuild
index 67ad269c5e0b..efc0134c4d71 100644
--- a/net-fs/btfs/btfs-2.24.ebuild
+++ b/net-fs/btfs/btfs-2.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit autotools python-r1
 
 DESCRIPTION="a bittorrent filesystem based on FUSE"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d37251126571..ad252f5508a0 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index cc216c7b58ad..2e469a2332a2 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,5 +1,5 @@
 DIST getmail-6.18.10.gh.tar.gz 205481 BLAKE2B a0597db32ff2ce43bf96feadcba4d926d48898cc412ec96e8d62086e29a364f6b806f0279878b95976e3ca7b0966afb19cb59939ef8bea1627a230518ea28602 SHA512 feda9236d3a1a7ceb21ca293d41c9631fec5f8753be4ece6e1b6910c052d10a8466547977fb4d0452ec4ae9f89ebff36105e0fe5843d02b2af3fd4bcea36e6c1
 DIST getmail-6.18.12.gh.tar.gz 207087 BLAKE2B 916c7fe7d459c27001ae80fafb95c8ea561a3c1b7335d142678c94242e7602070bf1d93c56db52363fbf62071f261dd8df5ca2c9cb71f2e7c7b8eb2826fa1035 SHA512 8b58c3295831740cac854ccc4dabf9ff53a08f85648beeb50952fc895df7115304cdaec8c3f6f94e9ee828914268dd8f23978cae4f5d3f6eff9f48fa59d3f5de
 EBUILD getmail-6.18.10.ebuild 801 BLAKE2B 1fcbdfe8351cb4e9d7a28c16259bec34b25a9270515609948a21bded7269ae5d90ef452d6b7c335b92c4b5062b18f0d51c69990bca0e16e60bfd48c20fa362ba SHA512 567b2a0cef6b9f1d684830aee4b87972d3b07cd7fe427bdcfa06fa1012fcbb54e50b5415fa1ec9f9693ac633548b4e8398a929df2f9e1fdc964033878952c365
-EBUILD getmail-6.18.12.ebuild 803 BLAKE2B 1c1510f35e804b891f92b07b29957b8335d7342c577156f037ef43f1e64bdb7cdb241981b66e3eb1009474c1fdb9c8a2e9bd0e3560966811529162042e84c945 SHA512 257c0656356917b25676555b7d3a1cb20f9818b49633603bd95436bf4f72973f90e94b2d6dbb692a305db57d868c7c023cc38296332241850e98879cea00b738
+EBUILD getmail-6.18.12.ebuild 801 BLAKE2B e783cf1de04ac3522738636285eafd0e6e4e331ea3c18a79574bdbf627049077a721ec8d3f08a19bff9ca3db86f3fb958816a8c5688bf12cee3ba8552002c421 SHA512 c6874a5caf1d03add8bef8976968e40253ae053e16ff4019345f667b308d858cc3ce448ddec05311a49e120f11c6d86a3b8350726b7e23f4fa96c994430e7847
 MISC metadata.xml 693 BLAKE2B f4bff26e03232ebdd3b24bace01287e0afecfa9042c4cb33e8cd5356e9c74e3ed2e0b52814fff27bb94a8bec1756d13f97e4042bae4aa75cbcfba42a694171bc SHA512 26464fb11784bee2561f8814f3d991e4f9d0b31eb6413b34851472f78f7ceaf3994f648e5c3b59e1c470b7a3e9b6805c8f863c7d50b99ea8f2273679a4dfad67
diff --git a/net-mail/getmail/getmail-6.18.12.ebuild b/net-mail/getmail/getmail-6.18.12.ebuild
index e890841ed946..abb1453503f8 100644
--- a/net-mail/getmail/getmail-6.18.12.ebuild
+++ b/net-mail/getmail/getmail-6.18.12.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/getmail6-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 python_prepare_all() {
 	# Use gentoo version number (including revision) for doc dir and remove COPYING file
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b6f3248e9f7a..8a2db4178ada 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 6a4c92550347..770e4ad080b6 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-05-01)
+# media-libs/libjxl is not keyworded
+# bug https://bugs.gentoo.org/853628
+media-gfx/gimp jpegxl
+media-gfx/graphicsmagick jpegxl
+media-gfx/imagemagick jpegxl
+media-libs/imlib2 jpegxl
+
 # Matt Turner <tetromino@gentoo.org> (2023-02-15)
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
@@ -29,11 +37,6 @@ net-misc/openntpd constraints
 # Needs unkeyworded app-doc/halibut
 >=net-misc/putty-0.77 doc
 
-# Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-06-22)
-# media-libs/libjxl is not keyworded
-# bug https://bugs.gentoo.org/853628
-media-gfx/gimp jpegxl
-
 # Sam James <sam@gentoo.org> (2022-04-29)
 # Needs unkeyworded dev-util/umockdev
 sys-power/upower test
@@ -44,7 +47,7 @@ dev-python/click doc
 
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
-media-libs/imlib2 svg heif jpegxl
+media-libs/imlib2 svg heif
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-18)
 # app-text/nuspell is not keyworded
@@ -54,10 +57,6 @@ app-text/enchant nuspell
 # gnome-base/librsvg missing keywords
 media-libs/freetype svg
 
-# Sam James <sam@gentoo.org> (2022-03-26)
-# media-libs/libjxl not keyworded here
-media-gfx/graphicsmagick jpegxl
-
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
@@ -185,8 +184,6 @@ media-libs/mesa vulkan vulkan-overlay zink
 # net-libs/webkit-gtk has no alpha keywords
 app-editors/emacs xwidgets
 gnome-extra/evolution-data-server oauth
-# needs mail-client/evolution, depends on net-libs/webkit-gtk
-app-office/planner eds
 # needs gnome-extra/sushi, depends on net-libs/webkit-gtk
 gnome-base/nautilus previewer
 # needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
@@ -470,11 +467,6 @@ media-libs/gst-plugins-base ivorbis
 # remove mask if/when media-gfx/argyllcms is keywored here.
 x11-misc/colord argyllcms extra-print-profiles
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
-# requires app-office/unoconv, which requires virtual/ooo, which is not
-# keyworded here. Remove mask if this situation changes.
-gnome-extra/sushi office
-
 # Raúl Porcel <armin76@gentoo.org> (2012-12-30)
 # Needs testing
 media-libs/phonon gstreamer vlc
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 9c619d92ff72..da0808237ad6 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,10 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
-# Force host target
-dev-libs/keystone llvm_targets_X86
-
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # We have ready-to-use configs here.
 sys-kernel/gentoo-kernel -savedconfig
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 69516b492869..0e1ae1ff55f7 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -353,7 +353,7 @@ media-libs/libmikmod cpu_flags_x86_sse2
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (2014-01-04)
 # While globally masked, the needed amd64 keywords are already present
-dev-vcs/git -mediawiki -mediawiki-experimental
+dev-vcs/git -mediawiki
 
 # Sergey Popov <pinkbyte@gentoo.org> (2013-12-27)
 # Boost.Context can be built on amd64
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index d47933dac372..50f49d0c1d2b 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -42,7 +42,6 @@ dev-python/PyQtWebEngine
 app-admin/calamares
 app-doc/zeal
 app-editors/ghostwriter
-app-editors/notepadqq
 app-editors/retext
 app-misc/anki
 app-office/kalendar:5
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 4439dbfa5015..a08ded6acd27 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -46,10 +46,8 @@ www-servers/uwsgi uwsgi_plugins_rados
 # Michał Górny <mgorny@gentoo.org> (2018-01-12)
 # Those packages require net-libs/nodejs.
 dev-lang/nim test-js
-dev-python/nbdime webtools
 dev-ruby/ammeter test
 dev-ruby/jsobfu test
-dev-ruby/rails asset-pipeline
 dev-ruby/sprockets test
 dev-ruby/tilt test
 net-analyzer/netdata nodejs
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 36ce30e861ed..5bcf18647861 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -11,7 +11,6 @@ dev-python/PyQtWebEngine
 app-admin/calamares
 app-doc/zeal
 app-editors/ghostwriter
-app-editors/notepadqq
 app-editors/retext
 app-misc/anki
 app-office/kalendar:5
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index 12be1ef6aeae..9fe795360fe9 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # matoro <matoro_gentoo@matoro.tk> (2022-08-31)
@@ -10,10 +10,6 @@ dev-lang/ghc:0/9.0.2 llvm
 # Satisfy REQUIRED_USE on arm
 app-emulation/xen debug
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
-# Force host target
-dev-libs/keystone llvm_targets_ARM
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-16)
 # Force the host target
 dev-lang/rust llvm_targets_ARM
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index a0c7d38b987e..88af9d56772f 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -235,10 +235,6 @@ media-video/mpv -raspberry-pi
 # smallest wav files.
 media-sound/xmms2 mac
 
-# Ian Whyman <thev00d00@gentoo.org> (2017-09-05)
-# missing keywords media-libs/lastfmlib
-net-misc/gerbera lastfm
-
 # Michał Górny <mgorny@gentoo.org> (2017-08-10)
 # Requires USE=ipmi which is masked in this profile.
 sys-power/nut ups_drivers_nut-ipmipsu
@@ -440,11 +436,6 @@ sys-devel/gettext java
 # remove mask if/when media-gfx/argyllcms is keywored here.
 x11-misc/colord argyllcms extra-print-profiles
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
-# requires app-office/unoconv, which requires virtual/ooo, which is not
-# keyworded here. Remove mask if this situation changes.
-gnome-extra/sushi office
-
 # Markus Meier <maekke@gentoo.org> (2012-12-08)
 # mask app-office/libreoffice java extensions
 app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher coinmp
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 4392200bf91a..83a38f1693ee 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # matoro <matoro_gentoo@matoro.tk> (2022-08-31)
@@ -11,10 +11,6 @@ dev-lang/ghc:0/9.0.2 llvm
 sys-kernel/gentoo-kernel -savedconfig
 sys-kernel/vanilla-kernel -savedconfig
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
-# Force host target
-dev-libs/keystone llvm_targets_AArch64
-
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
 media-video/ffmpeg cpu_flags_arm_neon
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 9fb567a44715..1d63c9e8837c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -374,10 +374,6 @@ app-emulation/libvirt xen
 # Requires USE=sdl that is masked in this profile.
 media-video/mjpegtools sdlgfx
 
-# Ian Whyman <thev00d00@gentoo.org> (2017-09-05)
-# missing keywords media-libs/lastfmlib
-net-misc/gerbera lastfm
-
 # Roy Bamford <neddysegoon@gentoo.org> (2017-08-24)
 # Support for g15daemon still needs -9999 packages on all arches
 net-voip/mumble g15
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 9bc2a111363b..0ada1d4734f4 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -118,13 +118,6 @@ x11-wm/mutter video_cards_nvidia
 # We don't list "clozurecl" here since it's already in use.mask.
 >=sci-mathematics/maxima-5.44.0-r5 clozurecl64
 
-# Sam James <sam@gentoo.org> (2021-03-02)
-# Java build is extremely sensitive to environment
-# Previously stable-masked but moved here
-# Then: bug #483372, bug #508564
-# Now: bug #773913 (exposed by having a new ~arch ebuild)
-media-libs/libcaca java mono
-
 # Jaco Kroon <jaco@uls.co.za> (2021-01-08)
 # blocksruntime (clang -fblocks) isn't available on all arches.
 net-misc/asterisk blocks
@@ -347,7 +340,7 @@ media-sound/lmms vst
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (2014-01-04)
 # Mask until dependencies are keyworded (bug 497068)
-dev-vcs/git mediawiki mediawiki-experimental
+dev-vcs/git mediawiki
 
 # Sergey Popov <pinkbyte@gentoo.org> (2013-12-27)
 # Mask because Boost.Context library does not work on most of arches
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 3c27f7273b62..8f8ae5b1c7e1 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,14 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2023-05-01)
+# media-libs/libjxl is not keyworded
+# bug https://bugs.gentoo.org/853628
+media-gfx/gimp jpegxl
+media-gfx/graphicsmagick jpegxl
+media-gfx/imagemagick jpegxl
+media-libs/imlib2 jpegxl
+
 # Sam James <sam@gentoo.org> (2023-04-30)
 # Stacks on HPPA grow upwards and GCC doesn't support SSP or SCP there.
 sys-devel/gcc default-stack-clash-protection
@@ -38,11 +46,6 @@ net-dns/ddclient test
 # deps not keyworded
 dev-util/pkgcheck emacs
 
-# Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-06-22)
-# media-libs/libjxl is not keyworded
-# bug https://bugs.gentoo.org/853628
-media-gfx/gimp jpegxl
-
 # Sam James <sam@gentoo.org> (2022-05-17)
 # sci-libs/sundials fails to build tests on HPPA
 # bug #845222
@@ -55,7 +58,7 @@ dev-libs/libgdata crypt
 
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
-media-libs/imlib2 svg heif jpegxl
+media-libs/imlib2 svg heif
 
 # Sam James <sam@gentoo.org> (2022-04-24)
 # Requires dev-util/pahole.
@@ -70,10 +73,6 @@ app-text/enchant nuspell
 # gnome-base/librsvg missing keywords
 media-libs/freetype svg
 
-# Sam James <sam@gentoo.org> (2022-03-26)
-# media-libs/libjxl not keyworded here
-media-gfx/graphicsmagick jpegxl
-
 # Sam James <sam@gentoo.org> (2022-03-22)
 # media-libs/dav1d not keyworded here
 media-libs/xine-lib dav1d
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 17397f93894d..6a5a44bf9a60 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -43,10 +43,8 @@ net-misc/chrony pps
 net-libs/libpcap netlink rdma
 
 # Sam James <sam@gentoo.org> (2021-11-17)
-# x11-libs/libXvMC is not marked stable on HPPA
 # media-libs/mesa is not marked stable on HPPA
 media-libs/libepoxy egl
-media-libs/mesa xvmc
 
 # Rolf Eike Beer <eike@sf-mail.de> (2021-11-10)
 # The following packages have no stable keywords on hppa:
@@ -170,10 +168,6 @@ sys-apps/dbus test
 # noone actually tests it on real hardware anymore
 x11-base/xorg-server xorg
 
-# Rolf Eike Beer <eike@sf-mail.de> (2020-12-11)
-# not all needed sphinx modules are stable on hppa.
-dev-python/aiohttp doc
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
 # app-i18n/fcitx:4 not stable.
 media-libs/libsdl2 fcitx4
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 279c2eab13a6..5a9512a589c0 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-05-01)
+# media-libs/libjxl is not keyworded
+# bug https://bugs.gentoo.org/853628
+media-gfx/gimp jpegxl
+media-gfx/graphicsmagick jpegxl
+media-gfx/imagemagick jpegxl
+media-libs/imlib2 jpegxl
+
 # Sam James <sam@gentoo.org> (2023-04-14)
 # dev-python/sympy not keyworded here yet
 dev-python/nbval test
@@ -30,15 +38,9 @@ dev-util/pkgcheck emacs
 # net-libs/libqrtr-glib not keyworded
 net-misc/modemmanager qrtr
 
-# Sergey Torokhov <torokhov-s-a@yandex.ru> (2022-06-22)
-# media-libs/libjxl is not keyworded
-# bug https://bugs.gentoo.org/853628
-media-gfx/gimp jpegxl
-
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
-media-libs/imlib2 svg heif jpegxl
-media-gfx/graphicsmagick jpegxl
+media-libs/imlib2 svg heif
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-18)
 # app-text/nuspell is not keyworded
@@ -347,7 +349,6 @@ media-sound/rhythmbox upnp-av
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2016-06-28)
 # Missing keywords on app-text/gspell - bug #587368
->=app-editors/gedit-3.20 spell
 >=app-text/evince-3.30 spell
 
 # Pacho Ramos <pacho@gentoo.org> (2016-01-31)
@@ -451,11 +452,6 @@ net-misc/modemmanager qmi
 # remove mask if/when media-gfx/argyllcms is keywored here.
 x11-misc/colord argyllcms extra-print-profiles
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
-# requires app-office/unoconv, which requires virtual/ooo, which is not
-# keyworded here. Remove mask if this situation changes.
-gnome-extra/sushi office
-
 # Agostino Sarubbo <ago@gentoo.org> (2012-12-18)
 # kde is not stable, then no needs phonon backends
 media-libs/phonon gstreamer vlc
diff --git a/profiles/arch/loong/package.use.force b/profiles/arch/loong/package.use.force
index 12507b441cd5..20547d7e155b 100644
--- a/profiles/arch/loong/package.use.force
+++ b/profiles/arch/loong/package.use.force
@@ -7,7 +7,6 @@
 # Some packages are not fully ported yet, but preemptively added so we won't
 # have to revisit later.
 dev-lang/rust llvm_targets_LoongArch
-dev-libs/keystone llvm_targets_LoongArch
 dev-ml/llvm-ocaml llvm_targets_LoongArch
 sys-devel/clang llvm_targets_LoongArch
 sys-devel/llvm llvm_targets_LoongArch
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 698860b43111..a7996f8bafbf 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -167,7 +167,6 @@ mate-base/mate help
 # virtual/{jdk,jre} is not available on loong yet.
 app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript
 media-libs/rubberband jni
-www-client/chromium js-type-check
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
 # Fails testing at least with libssh-0.9.6 and mbedtls-2.28.0-r1, needs
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 334b1af2afcf..dfaf83be4cb6 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -154,7 +154,7 @@ dev-python/wxpython webkit
 
 # Markos Chandras <hwoarang@gentoo.org> (2014-01-05)
 # Perl is heavily unkeyworded on MIPS. See 497068
-dev-vcs/git mediawiki mediawiki-experimental
+dev-vcs/git mediawiki
 
 # Sergey Popov <pinkbyte@gentoo.org> (2013-09-02)
 # Not tested
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index 2f00ba841d82..58c203731555 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -1,10 +1,6 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
-# Force host target
-dev-libs/keystone llvm_targets_PowerPC
-
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is stable on ppc
 sys-firmware/seabios -binary
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index ebc5b4e0f9ad..48cb9bc991cf 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -258,10 +258,6 @@ x11-base/xorg-drivers video_cards_amdgpu
 # Missing keywords
 net-dns/unbound dnstap
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (2015-02-15)
-# There's no keyworded office implementation anymore.
-gnome-extra/sushi office
-
 # Mark Wright <gienah@gentoo.org> (2014-12-14/2014-12-24, 2015-04-01)
 # test dependencies need keywording
 dev-haskell/dlist test
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index b1ae5f61857f..3b2a56b9c5d8 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -83,8 +83,6 @@ sci-mathematics/singular polymake
 # keep masks here (for now?).
 # Needs unkeyworded gnome-extra/sushi
 gnome-base/nautilus previewer
-# needs mail-client/evolution, depends on net-libs/webkit-gtk
-app-office/planner eds
 # needs gnome-extra/sushi, depends on net-libs/webkit-gtk
 gnome-base/nautilus previewer
 # needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
@@ -212,10 +210,6 @@ sci-libs/gdal armadillo
 # kde-frameworks/*:5 not keyworded.
 net-irc/kvirc kde
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2016-06-28)
-# Missing keywords on app-text/gspell - bug #587368
->=app-editors/gedit-3.20 spell
-
 # James Le Cuirot <chewi@gentoo.org> (2015-01-12)
 # Java is no longer supported on ppc.
 app-text/texlive pdfannotextractor
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index c4a6c015a8b6..707fc0aa4058 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev (2022-02-16)
@@ -12,7 +12,7 @@ dev-lang/python-exec -python_targets_pypy3
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-27)
 # deps not keyworded
-media-gfx/gnome-photos flickr upnp-av
+media-gfx/gnome-photos upnp-av
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-27)
 # deps not keyworded
@@ -40,7 +40,6 @@ dev-lang/spidermonkey clang
 mail-client/thunderbird clang
 <www-client/firefox-104 clang
 
-
 # James Le Cuirot <chewi@gentoo.org> (2020-04-23)
 # Requires media-libs/mesa[llvm], which is masked.
 dev-python/pyopengl test
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 45cbf8086ece..d21d9c69385f 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -165,10 +165,6 @@ net-irc/kvirc kde
 app-arch/p7zip kde
 dev-vcs/subversion kwallet
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2016-06-28)
-# Missing keywords on app-text/gspell - bug #587368
->=app-editors/gedit-3.20 spell
-
 # Patrice Clement <monsieurp@gentoo.org> (2016-02-08)
 # I would need to keyword an awful lot of packages on ppc64
 # that would need Java 7 otherwise.
@@ -189,11 +185,6 @@ games-simulation/openttd openmedia
 # Masking USE-dep on it
 sys-cluster/vzctl ploop
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
-# requires app-office/unoconv, which requires virtual/ooo, which is not
-# keyworded here. Remove mask if this situation changes.
-gnome-extra/sushi office
-
 # Kacper Kowalik <xarthisius@gentoo.org> (2011-09-02)
 # Mask www-client/seamonkey[ipc] on ppc64 wrt #381191
 www-client/seamonkey ipc
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 94c362185132..a57aae057f3b 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-05-01)
+# media-libs/libjxl is not keyworded
+# bug https://bugs.gentoo.org/853628
+media-gfx/gimp jpegxl
+media-gfx/graphicsmagick jpegxl
+media-gfx/imagemagick jpegxl
+media-libs/imlib2 jpegxl
+
 # Conrad Kostecki <conikost@gentoo.org> (2023-04-23)
 # Needs dev-perl/Math-Int64 which is not keyworded
 dev-perl/IP-Country-DB_File test
@@ -27,9 +35,7 @@ dev-ruby/stringex test
 # Sam James <sam@gentoo.org> (2022-04-26)
 # eps: app-text/libspectre not keyworded here
 # heif: media-libs/libheif not keyworded here
-# jpegxl: libjxl not keyworded here
-media-libs/imlib2 eps heif jpegxl
-media-gfx/imagemagick jpegxl
+media-libs/imlib2 eps heif
 
 # Sam James <sam@gentoo.org> (2022-04-26)
 # Avoid unkeyworded dependencies
@@ -145,7 +151,6 @@ app-editors/vim lua
 media-gfx/imagemagick raw
 dev-db/mariadb numa
 # not tested yet
-app-misc/mc samba
 app-arch/rpm test
 # no ceph keyworded
 net-analyzer/rrdtool rados
@@ -164,7 +169,7 @@ app-portage/layman g-sorcery
 
 # Mikle Kolyada <zlogene@gentoo.org> (2014-01-11)
 # too much unkeyworded dependencies (bug #497068)
-dev-vcs/git mediawiki mediawiki-experimental
+dev-vcs/git mediawiki
 
 # Agostino Sarubbo <ago@gentoo.org< (2013-04-10)
 # It requires too much unstable dep.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 496b77420241..254cf12ccd2f 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -14,10 +14,6 @@ dev-python/pymysql test
 dev-python/nbval doc
 dev-python/nbclassic doc
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-03-07)
-# nbdime webtools require nodejs which is not keyworded here yet
-dev-python/nbdime webtools
-
 # Stijn Tintel <stijn@linux-ipv6.be> (2023-02-02)
 # Dependency not keyworded
 # https://bugs.gentoo.org/show_bug.cgi?id=892389
@@ -431,14 +427,6 @@ net-dns/bind dnstap
 # networkmanager USE masked due to missing keywords
 gnome-extra/nm-applet teamd
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2016-06-28)
-# Missing keywords on app-text/gspell - bug #587368
->=app-editors/gedit-3.20 spell
-
-# Pacho Ramos <pacho@gentoo.org> (2016-02-20)
-# Missing keywords, bug #551580
-app-office/planner eds
-
 # Pacho Ramos <pacho@gentoo.org> (2016-01-31)
 # Missing keywords, bug #560382
 media-video/ffmpeg snappy
@@ -470,6 +458,10 @@ net-mail/dovecot lz4
 # Requires wifi USE flag, which is masked for this arch
 net-misc/networkmanager wext
 
+# Marius Brehler <marfbre@linux.sungazer.de> (2015-08-13)
+# missing keyword
+>=sci-misc/boinc-7.4.42-r1 X
+
 # Pacho Ramos <pacho@gentoo.org> (2015-06-13)
 # Missing keywords, bug #513108
 net-misc/spice-gtk smartcard webdav
@@ -553,11 +545,6 @@ net-misc/modemmanager qmi
 # remove mask if/when media-gfx/argyllcms is keywored here.
 x11-misc/colord argyllcms extra-print-profiles
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-31)
-# requires app-office/unoconv, which requires virtual/ooo, which is not
-# keyworded here. Remove mask if this situation changes.
-gnome-extra/sushi office
-
 # Raúl Porcel <armin76@gentoo.org> (2012-12-30)
 # Needs testing
 media-libs/phonon gstreamer vlc
@@ -622,13 +609,6 @@ media-libs/sdl-sound mikmod
 # Needs krb4 USE flag for mit-krb5 (Bug #255579), and we believe it to be unstable.
 net-im/pidgin zephyr
 
-# Mask srtp for ortp because libsrtp is marked -sparc
-net-libs/ortp srtp
-
 # Ultrabug <ultrabug@gentoo.org> (2011-09-05)
 # missing keyword for net-libs/zeromq
 app-admin/rsyslog zeromq
-
-# Marius Brehler <marfbre@linux.sungazer.de> (2015-08-13)
-# missing keyword
->=sci-misc/boinc-7.4.42-r1 X
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index dc1d37b8163a..e15ff225dc34 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -11,7 +11,6 @@ dev-python/PyQtWebEngine
 app-admin/calamares
 app-doc/zeal
 app-editors/ghostwriter
-app-editors/notepadqq
 app-editors/retext
 app-misc/anki
 app-office/kalendar:5
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index 25906d738517..6cca49d603c2 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -18,10 +18,6 @@ www-client/firefox system-libvpx
 dev-java/openjdk:11 -system-bootstrap
 dev-java/openjdk:17 -system-bootstrap
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
-# Force host target
-dev-libs/keystone llvm_targets_X86
-
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # We have ready-to-use configs here.
 sys-kernel/gentoo-kernel -savedconfig
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 501fd8b50ce2..c7e1ce732ff0 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -189,10 +189,6 @@ sys-block/fio -io-uring -zbc
 # Unmask globally-masked flashrom drivers and tools which do work on x86
 sys-apps/flashrom -atahpt -atapromise -atavia -drkaiser -gfxnvidia -internal -it8212 -nic3com -nicintel -nicintel-eeprom -nicintel-spi -nicnatsemi -nicrealtek -ogp-spi -rayer-spi -satamv -satasii -tools
 
-# Christopher Head <chead@chead.ca> (2020-06-10)
-# Requires dev-db/influxdb which is amd64-only
-dev-python/influxdb test
-
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
 # clisp is keyworded on x86
 app-text/texlive-core -xindy
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 943f70b314ee..699b54e3ef9e 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -84,7 +84,6 @@ app-arch/unzip unicode
 app-arch/zip unicode
 sys-apps/util-linux unicode
 sys-process/procps unicode
-www-client/lynx unicode
 #
 # b) using libidn
 app-text/ghostscript-gpl unicode
@@ -176,7 +175,6 @@ sys-firmware/seabios binary
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-09-11)
 # All glibc versions that include RPC code are masked now.
 net-analyzer/snort libtirpc
-net-firewall/conntrack-tools libtirpc
 net-fs/autofs libtirpc
 net-misc/netkit-bootparamd libtirpc
 sci-astronomy/esomidas libtirpc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ade0af6a3a01..ee5372cd5898 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -74,10 +74,6 @@ media-gfx/kphotoalbum qtav
 # Fails to compile: https://github.com/libffi/libffi/issues/760
 dev-libs/libffi exec-static-trampoline
 
-# Sam James <sam@gentoo.org> (2023-01-10)
-# Needs last-rited www-client/dillo, bug #890244
-mail-client/claws-mail dillo
-
 # Joonas Niilola <juippis@gentoo.org> (2023-01-08)
 # Doesn't compile currently, bug #853094.
 >=net-dialup/freeradius-3.2.0 oracle
@@ -125,10 +121,6 @@ x11-wm/stumpwm doc
 # Particularly unwise given it parses data from network.
 net-libs/libproxy spidermonkey
 
-# Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-24)
-# Metamail last rited
-app-text/crm114 mimencode
-
 # Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
 # app-text/pandoc is not keyworded on most architectures
 net-libs/gssdp man
@@ -161,7 +153,6 @@ dev-python/pyotherside qt6
 # Mask the flag for now
 # Bugs: #643466, #674872, #832161, #855722
 app-emulation/virtualbox pax-kernel
-app-emulation/virtualbox-modules pax-kernel
 
 # Sam James <sam@gentoo.org> (2022-10-02)
 # USE=compat / possibly allowing sys-libs/zlib needs to be figured out,
@@ -243,10 +234,6 @@ sys-libs/ncurses stack-realign
 # Not ready for general use.
 >=www-client/chromium-104 pgo
 
-# Michał Górny <mgorny@gentoo.org> (2022-05-25)
-# dev-python/sphinxcontrib-openapi is masked for removal.
-dev-python/jupyter-server doc
-
 # Joonas Niilola <juippis@gentoo.org> (2022-05-03)
 # system-python-libs is HIGHLY EXPERIMENTAL according to upstream, and
 # still being worked on in Gentoo.
@@ -373,10 +360,6 @@ dev-lang/gnat-gpl:10 lto
 # Avoid running failing tests by default.
 sys-kernel/dracut test
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-31)
-# Requires Python 3.7 and old SciPy.
-<sys-cluster/ceph-16 diskprediction
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-05-09)
 # Dependency requires sys-apps/systemd. Will only be unmasked in systemd target.
 kde-plasma/plasma-meta firewall
@@ -546,10 +529,6 @@ sci-physics/root cudnn
 mail-client/thunderbird eme-free
 www-client/firefox eme-free
 
-# Rick Farina <zerochaos@gentoo.org> (2020-02-26)
-# dev-python/pyzmq USE=doc deps are not met with python2_7
-dev-python/pyzmq doc
-
 # Alexey Shvetsov <alexxy@gentoo.org> (2019-12-24)
 # Gromacs python module install br0ken
 sci-chemistry/gromacs python
@@ -683,7 +662,6 @@ virtual/mysql embedded
 
 # Brian Evans <grknight@gentoo.org> (2018-02-28)
 # Mask client-libs USE to force users to install alternative standard pacakges
-dev-db/mariadb client-libs
 dev-db/mysql client-libs
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-02-02)
@@ -806,10 +784,6 @@ media-libs/cogl gstreamer
 # gentoo bugs.
 media-libs/libsdl2 custom-cflags
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-07-13)
-# GL/GLES support in cairo is mutually exclusive, bug #428770.
-x11-libs/cairo gles2-only
-
 # Kacper Kowalik <xarthisius@gentoo.org> (2013-05-19)
 # Fails to build, haven't had time to debug
 app-doc/doxygen sqlite
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index aa5f3c6bc886..352a6c3ad5cc 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,261 +1,2 @@
-# Copyright 2011-2022 Gentoo Authors
+# Copyright 2011-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Kenton Groombridge <concord@gentoo.org> (2022-11-02)
-# SELinux policies 2.20221101-r1 were published in error
-# as they do not include any policy changes since the
-# previous release. Please upgrade to 2.20221101-r2.
-=sec-policy/selinux-abrt-2.20221101-r1
-=sec-policy/selinux-accountsd-2.20221101-r1
-=sec-policy/selinux-acct-2.20221101-r1
-=sec-policy/selinux-afs-2.20221101-r1
-=sec-policy/selinux-aide-2.20221101-r1
-=sec-policy/selinux-alsa-2.20221101-r1
-=sec-policy/selinux-amanda-2.20221101-r1
-=sec-policy/selinux-amavis-2.20221101-r1
-=sec-policy/selinux-android-2.20221101-r1
-=sec-policy/selinux-apache-2.20221101-r1
-=sec-policy/selinux-apcupsd-2.20221101-r1
-=sec-policy/selinux-apm-2.20221101-r1
-=sec-policy/selinux-arpwatch-2.20221101-r1
-=sec-policy/selinux-asterisk-2.20221101-r1
-=sec-policy/selinux-at-2.20221101-r1
-=sec-policy/selinux-automount-2.20221101-r1
-=sec-policy/selinux-avahi-2.20221101-r1
-=sec-policy/selinux-awstats-2.20221101-r1
-=sec-policy/selinux-backup-2.20221101-r1
-=sec-policy/selinux-bacula-2.20221101-r1
-=sec-policy/selinux-base-2.20221101-r1
-=sec-policy/selinux-base-policy-2.20221101-r1
-=sec-policy/selinux-bind-2.20221101-r1
-=sec-policy/selinux-bitcoin-2.20221101-r1
-=sec-policy/selinux-bitlbee-2.20221101-r1
-=sec-policy/selinux-bluetooth-2.20221101-r1
-=sec-policy/selinux-brctl-2.20221101-r1
-=sec-policy/selinux-cachefilesd-2.20221101-r1
-=sec-policy/selinux-calamaris-2.20221101-r1
-=sec-policy/selinux-canna-2.20221101-r1
-=sec-policy/selinux-cdrecord-2.20221101-r1
-=sec-policy/selinux-ceph-2.20221101-r1
-=sec-policy/selinux-certbot-2.20221101-r1
-=sec-policy/selinux-cgmanager-2.20221101-r1
-=sec-policy/selinux-cgroup-2.20221101-r1
-=sec-policy/selinux-chromium-2.20221101-r1
-=sec-policy/selinux-chronyd-2.20221101-r1
-=sec-policy/selinux-clamav-2.20221101-r1
-=sec-policy/selinux-cloudinit-2.20221101-r1
-=sec-policy/selinux-collectd-2.20221101-r1
-=sec-policy/selinux-colord-2.20221101-r1
-=sec-policy/selinux-container-2.20221101-r1
-=sec-policy/selinux-corosync-2.20221101-r1
-=sec-policy/selinux-couchdb-2.20221101-r1
-=sec-policy/selinux-courier-2.20221101-r1
-=sec-policy/selinux-cpucontrol-2.20221101-r1
-=sec-policy/selinux-cpufreqselector-2.20221101-r1
-=sec-policy/selinux-cups-2.20221101-r1
-=sec-policy/selinux-cvs-2.20221101-r1
-=sec-policy/selinux-cyphesis-2.20221101-r1
-=sec-policy/selinux-daemontools-2.20221101-r1
-=sec-policy/selinux-dante-2.20221101-r1
-=sec-policy/selinux-dbadm-2.20221101-r1
-=sec-policy/selinux-dbskk-2.20221101-r1
-=sec-policy/selinux-dbus-2.20221101-r1
-=sec-policy/selinux-ddclient-2.20221101-r1
-=sec-policy/selinux-devicekit-2.20221101-r1
-=sec-policy/selinux-dhcp-2.20221101-r1
-=sec-policy/selinux-dictd-2.20221101-r1
-=sec-policy/selinux-dirmngr-2.20221101-r1
-=sec-policy/selinux-dirsrv-2.20221101-r1
-=sec-policy/selinux-distcc-2.20221101-r1
-=sec-policy/selinux-djbdns-2.20221101-r1
-=sec-policy/selinux-dkim-2.20221101-r1
-=sec-policy/selinux-dmidecode-2.20221101-r1
-=sec-policy/selinux-dnsmasq-2.20221101-r1
-=sec-policy/selinux-docker-2.20221101-r1
-=sec-policy/selinux-dovecot-2.20221101-r1
-=sec-policy/selinux-dpkg-2.20221101-r1
-=sec-policy/selinux-dracut-2.20221101-r1
-=sec-policy/selinux-dropbox-2.20221101-r1
-=sec-policy/selinux-entropyd-2.20221101-r1
-=sec-policy/selinux-evolution-2.20221101-r1
-=sec-policy/selinux-exim-2.20221101-r1
-=sec-policy/selinux-fail2ban-2.20221101-r1
-=sec-policy/selinux-fetchmail-2.20221101-r1
-=sec-policy/selinux-finger-2.20221101-r1
-=sec-policy/selinux-flash-2.20221101-r1
-=sec-policy/selinux-fprintd-2.20221101-r1
-=sec-policy/selinux-ftp-2.20221101-r1
-=sec-policy/selinux-games-2.20221101-r1
-=sec-policy/selinux-gatekeeper-2.20221101-r1
-=sec-policy/selinux-git-2.20221101-r1
-=sec-policy/selinux-gitosis-2.20221101-r1
-=sec-policy/selinux-glusterfs-2.20221101-r1
-=sec-policy/selinux-gnome-2.20221101-r1
-=sec-policy/selinux-googletalk-2.20221101-r1
-=sec-policy/selinux-gorg-2.20221101-r1
-=sec-policy/selinux-gpg-2.20221101-r1
-=sec-policy/selinux-gpm-2.20221101-r1
-=sec-policy/selinux-gpsd-2.20221101-r1
-=sec-policy/selinux-gssproxy-2.20221101-r1
-=sec-policy/selinux-hddtemp-2.20221101-r1
-=sec-policy/selinux-hostapd-2.20221101-r1
-=sec-policy/selinux-icecast-2.20221101-r1
-=sec-policy/selinux-ifplugd-2.20221101-r1
-=sec-policy/selinux-inetd-2.20221101-r1
-=sec-policy/selinux-inn-2.20221101-r1
-=sec-policy/selinux-ipsec-2.20221101-r1
-=sec-policy/selinux-irc-2.20221101-r1
-=sec-policy/selinux-ircd-2.20221101-r1
-=sec-policy/selinux-irqbalance-2.20221101-r1
-=sec-policy/selinux-jabber-2.20221101-r1
-=sec-policy/selinux-java-2.20221101-r1
-=sec-policy/selinux-kdeconnect-2.20221101-r1
-=sec-policy/selinux-kdump-2.20221101-r1
-=sec-policy/selinux-kerberos-2.20221101-r1
-=sec-policy/selinux-kerneloops-2.20221101-r1
-=sec-policy/selinux-kismet-2.20221101-r1
-=sec-policy/selinux-ksmtuned-2.20221101-r1
-=sec-policy/selinux-ldap-2.20221101-r1
-=sec-policy/selinux-links-2.20221101-r1
-=sec-policy/selinux-lircd-2.20221101-r1
-=sec-policy/selinux-loadkeys-2.20221101-r1
-=sec-policy/selinux-logrotate-2.20221101-r1
-=sec-policy/selinux-logsentry-2.20221101-r1
-=sec-policy/selinux-logwatch-2.20221101-r1
-=sec-policy/selinux-lpd-2.20221101-r1
-=sec-policy/selinux-makewhatis-2.20221101-r1
-=sec-policy/selinux-mandb-2.20221101-r1
-=sec-policy/selinux-matrixd-2.20221101-r1
-=sec-policy/selinux-mcelog-2.20221101-r1
-=sec-policy/selinux-memcached-2.20221101-r1
-=sec-policy/selinux-milter-2.20221101-r1
-=sec-policy/selinux-modemmanager-2.20221101-r1
-=sec-policy/selinux-mono-2.20221101-r1
-=sec-policy/selinux-mozilla-2.20221101-r1
-=sec-policy/selinux-mpd-2.20221101-r1
-=sec-policy/selinux-mplayer-2.20221101-r1
-=sec-policy/selinux-mrtg-2.20221101-r1
-=sec-policy/selinux-munin-2.20221101-r1
-=sec-policy/selinux-mutt-2.20221101-r1
-=sec-policy/selinux-mysql-2.20221101-r1
-=sec-policy/selinux-nagios-2.20221101-r1
-=sec-policy/selinux-ncftool-2.20221101-r1
-=sec-policy/selinux-networkmanager-2.20221101-r1
-=sec-policy/selinux-nginx-2.20221101-r1
-=sec-policy/selinux-node_exporter-2.20221101-r1
-=sec-policy/selinux-nslcd-2.20221101-r1
-=sec-policy/selinux-ntop-2.20221101-r1
-=sec-policy/selinux-ntp-2.20221101-r1
-=sec-policy/selinux-nut-2.20221101-r1
-=sec-policy/selinux-nx-2.20221101-r1
-=sec-policy/selinux-obfs4proxy-2.20221101-r1
-=sec-policy/selinux-oddjob-2.20221101-r1
-=sec-policy/selinux-oident-2.20221101-r1
-=sec-policy/selinux-openct-2.20221101-r1
-=sec-policy/selinux-openrc-2.20221101-r1
-=sec-policy/selinux-opensm-2.20221101-r1
-=sec-policy/selinux-openvpn-2.20221101-r1
-=sec-policy/selinux-pan-2.20221101-r1
-=sec-policy/selinux-pcscd-2.20221101-r1
-=sec-policy/selinux-phpfpm-2.20221101-r1
-=sec-policy/selinux-plymouthd-2.20221101-r1
-=sec-policy/selinux-podman-2.20221101-r1
-=sec-policy/selinux-policykit-2.20221101-r1
-=sec-policy/selinux-portmap-2.20221101-r1
-=sec-policy/selinux-postfix-2.20221101-r1
-=sec-policy/selinux-postgresql-2.20221101-r1
-=sec-policy/selinux-postgrey-2.20221101-r1
-=sec-policy/selinux-ppp-2.20221101-r1
-=sec-policy/selinux-prelude-2.20221101-r1
-=sec-policy/selinux-privoxy-2.20221101-r1
-=sec-policy/selinux-procmail-2.20221101-r1
-=sec-policy/selinux-psad-2.20221101-r1
-=sec-policy/selinux-publicfile-2.20221101-r1
-=sec-policy/selinux-pulseaudio-2.20221101-r1
-=sec-policy/selinux-puppet-2.20221101-r1
-=sec-policy/selinux-pyzor-2.20221101-r1
-=sec-policy/selinux-qemu-2.20221101-r1
-=sec-policy/selinux-qmail-2.20221101-r1
-=sec-policy/selinux-quota-2.20221101-r1
-=sec-policy/selinux-radius-2.20221101-r1
-=sec-policy/selinux-radvd-2.20221101-r1
-=sec-policy/selinux-razor-2.20221101-r1
-=sec-policy/selinux-redis-2.20221101-r1
-=sec-policy/selinux-remotelogin-2.20221101-r1
-=sec-policy/selinux-resolvconf-2.20221101-r1
-=sec-policy/selinux-rngd-2.20221101-r1
-=sec-policy/selinux-rootlesskit-2.20221101-r1
-=sec-policy/selinux-rpc-2.20221101-r1
-=sec-policy/selinux-rpcbind-2.20221101-r1
-=sec-policy/selinux-rpm-2.20221101-r1
-=sec-policy/selinux-rssh-2.20221101-r1
-=sec-policy/selinux-rtkit-2.20221101-r1
-=sec-policy/selinux-rtorrent-2.20221101-r1
-=sec-policy/selinux-salt-2.20221101-r1
-=sec-policy/selinux-samba-2.20221101-r1
-=sec-policy/selinux-sasl-2.20221101-r1
-=sec-policy/selinux-screen-2.20221101-r1
-=sec-policy/selinux-secadm-2.20221101-r1
-=sec-policy/selinux-sendmail-2.20221101-r1
-=sec-policy/selinux-sensord-2.20221101-r1
-=sec-policy/selinux-shorewall-2.20221101-r1
-=sec-policy/selinux-shutdown-2.20221101-r1
-=sec-policy/selinux-skype-2.20221101-r1
-=sec-policy/selinux-slocate-2.20221101-r1
-=sec-policy/selinux-slrnpull-2.20221101-r1
-=sec-policy/selinux-smartmon-2.20221101-r1
-=sec-policy/selinux-smokeping-2.20221101-r1
-=sec-policy/selinux-snmp-2.20221101-r1
-=sec-policy/selinux-snort-2.20221101-r1
-=sec-policy/selinux-soundserver-2.20221101-r1
-=sec-policy/selinux-spamassassin-2.20221101-r1
-=sec-policy/selinux-squid-2.20221101-r1
-=sec-policy/selinux-sssd-2.20221101-r1
-=sec-policy/selinux-stunnel-2.20221101-r1
-=sec-policy/selinux-subsonic-2.20221101-r1
-=sec-policy/selinux-sudo-2.20221101-r1
-=sec-policy/selinux-sxid-2.20221101-r1
-=sec-policy/selinux-syncthing-2.20221101-r1
-=sec-policy/selinux-sysstat-2.20221101-r1
-=sec-policy/selinux-tboot-2.20221101-r1
-=sec-policy/selinux-tcpd-2.20221101-r1
-=sec-policy/selinux-tcsd-2.20221101-r1
-=sec-policy/selinux-telnet-2.20221101-r1
-=sec-policy/selinux-tftp-2.20221101-r1
-=sec-policy/selinux-tgtd-2.20221101-r1
-=sec-policy/selinux-thunderbird-2.20221101-r1
-=sec-policy/selinux-timidity-2.20221101-r1
-=sec-policy/selinux-tmpreaper-2.20221101-r1
-=sec-policy/selinux-tor-2.20221101-r1
-=sec-policy/selinux-tripwire-2.20221101-r1
-=sec-policy/selinux-ucspitcp-2.20221101-r1
-=sec-policy/selinux-ulogd-2.20221101-r1
-=sec-policy/selinux-uml-2.20221101-r1
-=sec-policy/selinux-unconfined-2.20221101-r1
-=sec-policy/selinux-uptime-2.20221101-r1
-=sec-policy/selinux-usbguard-2.20221101-r1
-=sec-policy/selinux-usbmuxd-2.20221101-r1
-=sec-policy/selinux-uucp-2.20221101-r1
-=sec-policy/selinux-uwimap-2.20221101-r1
-=sec-policy/selinux-uwsgi-2.20221101-r1
-=sec-policy/selinux-varnishd-2.20221101-r1
-=sec-policy/selinux-vbetool-2.20221101-r1
-=sec-policy/selinux-vdagent-2.20221101-r1
-=sec-policy/selinux-vde-2.20221101-r1
-=sec-policy/selinux-virt-2.20221101-r1
-=sec-policy/selinux-vlock-2.20221101-r1
-=sec-policy/selinux-vmware-2.20221101-r1
-=sec-policy/selinux-vnstatd-2.20221101-r1
-=sec-policy/selinux-vpn-2.20221101-r1
-=sec-policy/selinux-watchdog-2.20221101-r1
-=sec-policy/selinux-webalizer-2.20221101-r1
-=sec-policy/selinux-wine-2.20221101-r1
-=sec-policy/selinux-wireguard-2.20221101-r1
-=sec-policy/selinux-wireshark-2.20221101-r1
-=sec-policy/selinux-wm-2.20221101-r1
-=sec-policy/selinux-xen-2.20221101-r1
-=sec-policy/selinux-xfs-2.20221101-r1
-=sec-policy/selinux-xscreensaver-2.20221101-r1
-=sec-policy/selinux-xserver-2.20221101-r1
-=sec-policy/selinux-zabbix-2.20221101-r1
-=sec-policy/selinux-zfs-2.20221101-r1
diff --git a/profiles/package.mask b/profiles/package.mask
index aa8f2af580a8..66b04b7bba79 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,6 +34,23 @@
 #--- END OF EXAMPLES ---
 
 # Sam James <sam@gentoo.org> (2023-05-01)
+# Breaks dev-python/scipy build. See bug #905396 and https://github.com/serge-sans-paille/gast/issues/74.
+=dev-python/gast-0.5.4
+
+# Sam James <sam@gentoo.org> (2023-05-01)
+# Masked for testing. Other distros seem to have hit a bunch of new test
+# failures in various applications, and initially there were ABI issues in .0.
+# Also, the failure case for bug #745162 needs retesting to see if the patch
+# should be rebased or just dropped.
+>=dev-libs/libxml2-2.11.0
+
+# John Helmert III <ajak@gentoo.org> (2023-04-30)
+# STARTTLS vulnerability, depends on gtk+:2, practically unmainatined
+# upstream. Use mail-client/claws instead. Removal in 30 days, bugs
+# #769293, #807358
+mail-client/sylpheed
+
+# Sam James <sam@gentoo.org> (2023-05-01)
 # Quite broken, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109672.
 =sys-devel/gcc-14.0.0_pre20230430
 
@@ -204,7 +221,6 @@ media-fonts/font-bitstream-speedo
 # remaining ruby27-only packages for removal on 2023-05-10.
 dev-lang/ruby:2.7
 =dev-ruby/bundler-2.1.4
-=dev-ruby/did_you_mean-1.4.0
 =dev-ruby/rubygems-3.1.6
 =dev-ruby/contracts-0.16.1
 
@@ -293,13 +309,6 @@ x11-drivers/nvidia-drivers:0/390
 # https://github.com/igraph/igraph/issues/2311
 =sci-libs/arpack-3.9.0
 
-# Sam James <sam@gentoo.org> (2023-03-27)
-# The upstream tzinfo maintainers recommend using 2023a for now because of the
-# disruption regarding Lebanon's DST change. See https://lore.kernel.org/distributions/87cz4u2gmj.fsf@gentoo.org/T/#u.
-=sys-libs/timezone-data-2023b
-=dev-python/pytz-2023.2-r1
-=dev-perl/DateTime-TimeZone-2.580.0
-
 # Sam James <sam@gentoo.org> (2023-03-24)
 # Please upgrade to make-4.4.1 as make-4.4 has a bunch of issues.
 =sys-devel/make-4.4
@@ -337,22 +346,6 @@ x11-drivers/nvidia-drivers:0/390
 # Breaks too many revdeps for now
 =app-text/discount-3*
 
-# David Seifert <soap@gentoo.org> (2023-01-14)
-# Py3.8 only backports
-dev-python/backports-tempfile
-dev-python/backports-weakref
-dev-python/backports-zoneinfo
-dev-python/pkgutil_resolve_name
-
-# Sam James <sam@gentoo.org> (2023-01-05)
-# Breaks reverse dependencies: bug #889694, bug #888579.
-=sys-fs/btrfs-progs-6.1.1
-
-# Sam James <sam@gentoo.org> (2022-12-27)
-# Regression in listing subvolumes (no UUIDs), bug #888549
-# https://github.com/kdave/btrfs-progs/issues/562
-=sys-fs/btrfs-progs-6.1
-
 # Ionen Wolkens <ionen@gentoo.org> (2022-12-24)
 # Upstream dropped wxGTK support in >=games-emulation/pcsx2-1.7.3773,
 # and it now always requires Qt6. Masked given Qt6 is also masked in
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 454b5a7599c3..f883ab31fb14 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,8 +1,2 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2023-04-27)
-# https://bugs.gentoo.org/905152
-# breaks behaviour with -stdlib=libc++, masked for now
-=sys-devel/gcc-12.2.0
-=sys-devel/gcc-12.2.0-r1
diff --git a/profiles/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force
index c1677ba92529..12147203082c 100644
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2020-12-10)
-# Fails to compile without nls during link with undefined symbol for
-# _gl_get_setlocale_null_lock, related, but causing other issues:
-# https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24276d89d7c30abb460e786497fe7d50605bcdf7
-~sys-devel/gettext-0.21 nls
+# Jacob Floyd <cognifloyd@gmail.org> (2020-12-20)
+# Make sure we always use libcxxabi on macos prefix
+sys-libs/libcxx libcxxabi
 
 # Fabian Groffen <grobian@gentoo.org> (2020-06-08)
 # Do NOT enable tinfo, it breaks ANYTHING existing, and it also breaks
@@ -21,7 +19,3 @@ media-gfx/tachyon threads opengl
 # Elias Pipping <pipping@gentoo.org> (2007-11-29)
 # won't compile without
 media-libs/libsdl opengl
-
-# Jacob Floyd <cognifloyd@gmail.org> (2020-12-20)
-# Make sure we always use libcxxabi on macos prefix
-sys-libs/libcxx libcxxabi
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 66d93d42e792..33cb932e7164 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/sirilic/Manifest b/sci-astronomy/sirilic/Manifest
index a99aabfdd4e4..ef80db50bd1a 100644
--- a/sci-astronomy/sirilic/Manifest
+++ b/sci-astronomy/sirilic/Manifest
@@ -1,7 +1,7 @@
 DIST sirilic-V1.15.2.tar.bz2 120659 BLAKE2B 9b1753b91dad8f504e265967dc126a155f0d503354d65ffe75ccf5f6a782991a471181b81387810636b41f76b061d9ae78e5f6b463eeea38d51b24dd3bf5943c SHA512 1af1de3c160eba5d54f6c6569e93916b6066cff62af86ac49a085792d99dd04c3a086bc2eda1d8cc8b84003d90e0e85cbdc14382c129da5ee2c28166b6cd81d9
 DIST sirilic-V1_14_3.tar.bz2 100939 BLAKE2B 3eabbde3e0884d793c2b2f87464cbf4acac5382d4d088f30f67405a60d934b4de3fee99ebb8e955f9ba1412c4279fe9acdcd4a8cd9b76a666207684561ec6118 SHA512 e311097481ef60ddac568653816a12f11864f8beeceff5ca0dd9c6e4caaf5d69e1373659be19fa99984ef9797caca8a0c9cbb56adc3143e79f59b75010b306b9
 DIST sirilic-V1_15_0.tar.bz2 119272 BLAKE2B 0ded20e019e5f5be73f0b362b5b14712c242a99efab0a77cb60f3ad5835214b82e26a278dc23d185130f0ffbc4c243da792cda3ff10574cf9189d4162099e83f SHA512 2922b4a418310cd1bffd25ef9b61cb8be83834dfc0625b249fec2af9d08bdc73c63c2dcb9c74326ed0641ebcd8deba38e225ba5d455683ce5aa3fcd61dfec1cc
-EBUILD sirilic-1.14.3-r1.ebuild 589 BLAKE2B 0f2423519f0776833031cd30200e6f087c80edb43c3f66364d762cc23e3409f70811bb7bfbc1a5ec0a677c4a3c0eb6aea7353b310f9877b50cea3db21c48d532 SHA512 1aee01db4c94c47f44c291ffd9746f004bf2b5b379abd95bb6ea1db66a1ec12d16c2507d4f3216bcb1ba1ea6990bc4784fdac278707e8f1e05ea9a2b45cdc8dd
+EBUILD sirilic-1.14.3-r1.ebuild 588 BLAKE2B e25fce183367874f7026b0f81bf1b0158cb654ab164bf732f696ab08ee1a263e814bcba8d0cfa977fff78eaa67e68c70429a57865266f4468de57ac23beb36bb SHA512 7d9238a081ec0a32348ca99de0eadeab07065672d6713fa51f9cd2020044cdc6fc85c164198a2d464baae1d5da65b6d7591ea8fa8664c958dc1778bdc3f7ee0a
 EBUILD sirilic-1.14.3.ebuild 581 BLAKE2B 7e26ea42920608d1735de44cd6a7badb8d777e5882e222fd67cfcd4504d3f6a967e864283a2f96ed31a6fc2e77c4b42d2b9fb0ea2569186ddfea0ade56d98907 SHA512 483ce59507db120c7d99de4377c4c5b25f408b352ec179e7c32d492c5da2b521165e8442f485bca42db8565aa6ec71ef312b13b415fdccdfe457232c9de92225
 EBUILD sirilic-1.15.0.ebuild 589 BLAKE2B 0f2423519f0776833031cd30200e6f087c80edb43c3f66364d762cc23e3409f70811bb7bfbc1a5ec0a677c4a3c0eb6aea7353b310f9877b50cea3db21c48d532 SHA512 1aee01db4c94c47f44c291ffd9746f004bf2b5b379abd95bb6ea1db66a1ec12d16c2507d4f3216bcb1ba1ea6990bc4784fdac278707e8f1e05ea9a2b45cdc8dd
 EBUILD sirilic-1.15.2.ebuild 574 BLAKE2B ed62f1434af9ab3f3782e090bd8ed566562bd23fc5f575ca79388cdf2c4b5d130d45989b5f225c3f3da227249155071b04796d92bd8266cc02d4f73db8c92637 SHA512 66de082c8a6b8cd8ff2e5ccef1ee368d88284b6cc040fad74ca225951a7b31b7cbfd294f7914f15423695528aa035ee80f621583fe69a3beeaa6edde2f48c6d8
diff --git a/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild b/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild
index aa09957b96e4..9f600595d28b 100644
--- a/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=dev-python/wxpython-4.2:4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index cbb82f1ad5d2..f639d292a041 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 7f6004e0664e..bed37f87d8ef 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -5,6 +5,6 @@ DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a
 DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6
 EBUILD gpsd-3.23.1-r2.ebuild 6112 BLAKE2B 7dae0719258ebf22ac99055244279a39bbc989e0ad9dc96fa5c7a8f845637f0d04bc150b9b0150539e587371458cbe093e88420fa711379a05a22f889dd47178 SHA512 65b0549032ed7ad26f83d76e53a10f172be1bdf75d5d01df26e2bf03bb50aa10bb25e7dcb77fe280c73a06f00a1502e215e00a727d8aa56dd650e923c3de6f15
 EBUILD gpsd-3.24.ebuild 6318 BLAKE2B 66cf6b2f103a3ab3d1baee4e8247a082954072882dd916c270e7575b6b58f0d0dd8b1f6177a437fb34365fe9a4cbebe5e72371e78e8a5e311787ac306303d7f1 SHA512 68974bdf9e89d903d1d45548452027cf28ea2e2d5caa0fa156dc4a3b6d3718508687c7c913440221b305f543cd4da6d4d4db55798d8c60080ab35f58acac17d8
-EBUILD gpsd-3.25.ebuild 6311 BLAKE2B 4b1d2caf94590d57b325079dd758e1e2d4cf4f51d7fb2dde8a07bb1d8a07a26ae284fefedee07816bb11110262f90d1355869b5d4baf0dd565a018b92ea22a24 SHA512 bbdeea8bfcabc3e393a5c51d2f593b6d59b553b5db716fcbb35225b17a5be313919d0f953eb2fb0aa80676506d12d491e974bf19bab4a4af917771ce762e54c6
+EBUILD gpsd-3.25.ebuild 6309 BLAKE2B d86ab0bebdb3a5844697db9db045c59162670c6796fc530d6a2512b5606fcbac1917fe27f930602c47ec30848704daeae81300a1880018a5b24dec4c33fe3804 SHA512 2cbe0f857cdfabee9159c71ac0e7d0f19f68e8d7d8cb9dc308f33f36da75e3081ae904e310de7588aca18433f1f59d9c0288d26bb75b1d1640caa81e9046004c
 EBUILD gpsd-9999.ebuild 6314 BLAKE2B 1f3ef0da5c61c0cbdba65d316f5fed2330416e4441e046e3a996d9c3d242de0307172736b90a94fa02d8cc2ceb394755f3bce33ce808193432898d0c6fc1fb83 SHA512 93b022583f0ed90bb1391b4280d55ef2802e8535eb807ebeab7d8b737bfa5d5144624a42f1e63886e2c54505159db342eb18564e49450f2d350ab9e7035a5b3f
 MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397
diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 95012f056712..282f9aa71c12 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 8d00dd9f3042..785c72ab7765 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -3,6 +3,6 @@ DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea1
 DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
 EBUILD grass-8.2.0-r7.ebuild 7039 BLAKE2B 3a3d71eab47f8b6e756461698ca002b59d1c7d68de4b0c9dcb336ba7a20345eb0e0f564f2fcc30ad02285c235b899f85531a19dba0d204032b75c051db4c0a1f SHA512 4a45392b214a476579dbb7e71a3fe6e907498d625ca8a4659c590dbb1199c343e7f83155363b45f682411390c60554d8b5ff2f157d1f5d8b4b8c57e9ad53c920
 EBUILD grass-8.2.0-r8.ebuild 7405 BLAKE2B 8ed340e77927d627ae10df1715343b3f1f466252dfa3356d31c19e381b8a37289c26b72cf1f0559e60d67e0a23e2e4275f1987f4547569832559b47c76e2d5ca SHA512 a715a045fceabe0197278121b324fef1a3dfdd5a0e9f78941903f91f4cf90d3af9f1980ce9b8493db7050a8d104e3d4a2d71d7f36f83906f65e27a6fc3ce1158
-EBUILD grass-8.2.1-r2.ebuild 7473 BLAKE2B 0c544969daf3c657101c26d64a84985518d22d3d25868b5b2abf36b52e14c8e367324b0829e94d0da28edfdede16a82df5c3565c47e2f5c3fea2c023e6bb0f8b SHA512 f19c2a4aa49fff88cf2ac1930df0d34753ff65ed72ae2cdfeb3cf9b83b4b95ca28fd5f30305aee2c7b6faad5f6be59e0cb0990c7827c31bcb254ed947fdd9c86
+EBUILD grass-8.2.1-r2.ebuild 7471 BLAKE2B 45e7afaa159a80b3847238919c036c69854fb1905e7c8e2de05069aa9dbeef592449b752a0b2e08817b2b088b4e270cb4c19d00b1a0eae2eab859dac8637ce9c SHA512 f490e553ba9be346929203f07cc2ded5f1d05f43f71225a5741f4bc52e00309d3369d6601fdc0ce507a2d3dfb024a0911328edf83e825e842a0d4ef786dc1a7a
 EBUILD grass-9999.ebuild 7413 BLAKE2B 003369709d334b14b3c7cdd71e4d95296b209866d05ad80d825f000eb8e72c594181f4ea2542259625844c07a00f469b23c657a4f5b3fada69c0b686ac806fc8 SHA512 8a5680607a8c4ccea97e4cd977d208b6ce9520d1f03b0417b394d6c0cadf4474049ddeda44ecfdf55837ee66c6f0137e32766ace3ece6c3d930ae7de0b35d696
 MISC metadata.xml 1260 BLAKE2B f1947bde5f78b608d59997dfe2475021e1646f3c70d78ba9d9140642bff040107f0b202bf91f5ebb05191169274c2fd564889992dfadfcada6b95f4bd1c08e9d SHA512 6bcbe13f8daccb68ea167d7cc9797643ab9b50c1c183c52d53a7cacc4f9ddfbaac583426b13be47bed67bd5a3d6b99a9a8447886749b3f87e8d45420ce111538
diff --git a/sci-geosciences/grass/grass-8.2.1-r2.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
index b3f26da18821..3f2fa48bc572 100644
--- a/sci-geosciences/grass/grass-8.2.1-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
@@ -30,7 +30,7 @@ else
 	MY_P="${P/_rc/RC}"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1be0d174e600..2b973d8c8215 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest
index d756e2c38ed7..1228ab550990 100644
--- a/sci-libs/numkit/Manifest
+++ b/sci-libs/numkit/Manifest
@@ -1,3 +1,5 @@
 DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034
+DIST numkit-1.2.3.tar.gz 150900 BLAKE2B b729917dd0f1df2710c1eec9f4b6c34495fdb0c6f93271a1fc515fd9111848e80820ea385d96603c5b124cfc65b6d3a9912f13936fca218fe6b32cbee69832b8 SHA512 96317196477a4398432205be5b2eab5263e1f60213ff8b6e99e5a1e44ed1cbec2a535cb3b0c56fc7bb24aada59ad120a3befb802868854e9d15eced2f23d6659
 EBUILD numkit-1.1.2-r1.ebuild 592 BLAKE2B 472c1c3a700a9c5c46f8112318fe90f3cf9286aed84ffaee459d25bd91a0932bf43091806799beedbffb632226844f8c366b38614c337baba5d86fade6592ecd SHA512 a05e94c592f3e803cd06ba0fd0601f2a5f2d7726ba69dba4965487527711c646aa3c3da0f04d380aef1c2b43c73c92609705fcef0cea3a754493d3ed73666b5f
+EBUILD numkit-1.2.3.ebuild 656 BLAKE2B 9730e4af20d01c4845b83380d71e925eb6486c84c8a5ddae89d9afbf8422667e2ddebb033148569de81ef4f6373541924bac03424fb17a89228bdce753c1d774 SHA512 e0d01a4cb1224af6a00f80b7c8e4f9ddb75da9e1b0780ce62388cc33f3ae811b5464f9ad3dba357eac61fe9f878e91977afb8f7a58ebbb0a4c95ec019e5367f7
 MISC metadata.xml 500 BLAKE2B af9eab253bd3cfc520d5027f7a201f2b046c5433a297802607051a9292c58823d7819c51f0aa1552e894a317467b89089bdadde4f31394eba72bfffa0a7c21fd SHA512 b218c8d323e51bd06ecf3fed6621263597a61591e4890507b825e28a431c6045efed114bc91eca906405c84331ced93912c02d06b14c98368e5897b0d1856f30
diff --git a/sci-libs/numkit/numkit-1.2.3.ebuild b/sci-libs/numkit/numkit-1.2.3.ebuild
new file mode 100644
index 000000000000..84284156fb45
--- /dev/null
+++ b/sci-libs/numkit/numkit-1.2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Numerical first aid kit (with numpy/scipy)"
+HOMEPAGE="https://numkit.readthedocs.io"
+SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${BDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index e810691f1eb4..4905b350fa89 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -6,6 +6,6 @@ AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c
 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.3.ebuild 3398 BLAKE2B c26e416bd5f61131e5ebd6f88d022133ab29ee58614aeca17821a6436133cdf18260bd19f92da51060306163efc14b3da690c4ea9d4fc7aa37f85ffb8400515f SHA512 0af54a667650a29aa6921567346d00447bf08755e9c02a94dcd7aef4c5be2ad7138bd126b8a095b1063b3199ca92daf231ecb515560343951b38bc88ee424cb1
-EBUILD pastix-6.0.3.ebuild 2391 BLAKE2B bc5a8f6fed698b4fe73879d74da122d9e552d1f1da55575610ee263e9a9e7a958c505bbf88518643063acde1247419e35ca097e7fabc2f1ca1ffba6eceb3e111 SHA512 a34efb7ac8dc627bd9105f0d79707368f723981496075cec5d27a8fea4d4efeed584c14059b4e1f439116a802b8a59bada7b7b6739e0140425c2afd9b9db10d9
+EBUILD pastix-5.2.3.ebuild 3459 BLAKE2B e7ed9203e2c46b11898bfd0ea993effcf8805d19e939ce3719e5efa5d37424a1fc5c8db8c36a67f647ace5686f38d81313d26603f81b4bf44fa54a39dda9674d SHA512 6b076182d8392fe653925f0d431746c3ac0b3f21ba01b83c3ea666e673f36e7346afdcad15609b49d6a9e01b68115765dff89f69993ce8631734412d4495257c
+EBUILD pastix-6.0.3.ebuild 2453 BLAKE2B 8ab236555460a157b247d93dad98fd8e225807a28cd1f045dc6d433d929a24576950d232a52324ef74f7b66edbc67ee9a20ac2ce9377f6793c1d223d6c3a02df SHA512 c330980983da67fed249735bce6437bb8e976c485b17db9370fe2a3413cc162343a39af40cf412eef1228aa0941783b70ec67f7cb0d0892070c2a6e0a949b041
 MISC metadata.xml 1385 BLAKE2B 9045d18e4db81973c0f7fe5089e5c8134e3707a3bdf256d462bb07c7c4caa17e501ecec7600a293cdc595c422ab138a2ea3ffa155b38c5cc5be43962de9e0c5d SHA512 42f649f76c49c9d3fe605fd65b2d4ba1a1174c817282380735bcb4b410285256cc6029e8d74341b9e604ffc9e6d1cc43fcce056933c1432f60ea00fa959cf0a7
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 3d6c4757eed5..5c42ec738f5d 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ inherit fortran-2 toolchain-funcs
 # package id: change every version, see the link on inriaforge
 PID=218
 DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="https://pastix.gforge.inria.fr"
+HOMEPAGE="https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix"
 SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2"
 S="${WORKDIR}/${PN}_${PV}/src"
 
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
index 8d2a0e131f0d..8d0557f10591 100644
--- a/sci-libs/pastix/pastix-6.0.3.ebuild
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake fortran-2 python-single-r1
 
 # package id: changes every version, see the link on inriaforge
 PID=38205
 DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="https://pastix.gforge.inria.fr"
-SRC_URI="https://gforge.inria.fr/frs/download.php/file/${PID}/${P}.tar.gz"
+HOMEPAGE="https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix"
+SRC_URI="https://files.inria.fr/pastix/releases/v$(ver_cut 1)/${P}.tar.gz"
 
 LICENSE="CeCILL-C"
 SLOT="0"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 777911ed897d..4071c69e8449 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 2ca7433e4358..02d548cf910f 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -9,6 +9,9 @@ DIST sysvinit-3.05.tar.xz 234416 BLAKE2B 56cd57976c34194b07512e05f21782247d2f79e
 DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bdefdb319d6b74d14dbaa51538410eab9d336637c1b32cd8f27d45353b78f531ba7646157790e2563a38dbf396646 SHA512 ed7816281e81b7c568ee8e3b8a1b2eb3973751d5fc7f626bdfefbe28d0f0d67857862924dd000e12e6c12ed0382c27c1992d2d6326cc1fc3c94559f475402b33
 DIST sysvinit-3.06.tar.xz 252508 BLAKE2B 7fd2ba4bc0c8a15ddd7af2aaa1044e3bc8885a5e18a0a9c58c63897d0965d7430a9b529af4953618a9042cf13cca8a74a92ab02062c5de18d13fdf68328c11e7 SHA512 dc56ce12f18f7ecde6c9828e72dd8ab7afccd0f88ad4438d6a5b356a30b21e9ba9c796a4b2520a20a0c384f058be6bdb7b9b0df9786bbf65a80dff97c2be733b
 DIST sysvinit-3.06.tar.xz.sig 833 BLAKE2B 18a0af9a58ea10b1858a7d47867685e30749e335c0a88c6603fc78620d05579ff8fa1f6ccf9605140577793e4068dff50605d89b3e73e9d75b1f56c398fb5f7c SHA512 05101d4753daae73d67f1213c62b8be96c78418ce9a16f86cd23539ad124caecb8042de348aca4d752da8eb1a6b7f1bc1524489a4f0662db510c58e26ae8554c
+DIST sysvinit-3.07.tar.xz 263352 BLAKE2B 51943290c5f41ac6eb421a3ee1529d07bc127a44306973a2f3180079a28119001ad6b44c25156986fe249dd025f5eb1929189edfb5da72ee4fa64b5fd4cd5993 SHA512 57d8365ae9ab4e3b6ab948d1ac9a4f1fe86c4e86c06ea3b12fca7f7be88ef39b5e04787fbfec9417aaf06cff0db3a90e18e6a6135e205f7eb74a5e7c897491fd
+DIST sysvinit-3.07.tar.xz.sig 833 BLAKE2B 7a05a2d44a7006f61bb41abc8ae3d5207cc4558156e5cc553cc9477f4d1366bf847013e22c382aa9112b6c4c9c33d4a5465e73ca810a041c459a927d710dfadc SHA512 50047ce638fd5af19c3894c4dfcada3e1b2e359331b18f6dbc5f526e91f250b736625877362c7741dbd83c9fee79ec8e4e7a57c4aa72102c017b23518064733a
 EBUILD sysvinit-3.05.ebuild 5306 BLAKE2B b4e6a3e983add3f0ec16c5ad95454f8a709dc6972008b3ad5de92e3e9b0dc2976b170e4986895dab69fc1ef7014c0810d15ecdc9591c6e333490be485a4696ef SHA512 bce906a7487840595464f866f18d8e1b694e304c2b262e6406ec15b7fc898a90a520bdf4755bdcee0954f7689d7463b595965a19b5a57a11d1d41dedba27b78a
 EBUILD sysvinit-3.06-r1.ebuild 5528 BLAKE2B 11e89e1c0325eec2f3b4b2f151589ad4a40ba22608731d922240dfbd2b84b6470e7562cedafbab193aa8491857ad1b6346a3ff2fbe367ed50d7fc2f6c71279e7 SHA512 96b58a3334e704e334aadbcaae230661f51417b19c3ed19976308b6d1c8dd005e4f25e534af3455690080cded639e5e9f5b72e2ed2578df327952b71a8ad055e
+EBUILD sysvinit-3.07.ebuild 5536 BLAKE2B 63f5e481f3dad186163bb62d08299e42d6733f9c48be837f2f431e5a2838ea2a55f1ade82d5dda8f47a7e2b1fdef8643d97f5c6c0d1d46e9c2f3cc076dac4319 SHA512 0df41b232e2fb71a93d1434c6a7685c0c583aa4cb3506f6872a3fb0aa357905f356dde53d1de5aded027a5d35065895f783e58ce6f0f45a6cd3d6b217a98050b
 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89
diff --git a/sys-apps/sysvinit/sysvinit-3.07.ebuild b/sys-apps/sysvinit/sysvinit-3.07.ebuild
new file mode 100644
index 000000000000..bdfb54550c9b
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-3.07.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Dropped these because blank as of 3.02
+#PLOCALES="de es fi fr hu id pl"
+PLOCALES="de es fr pl"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
+inherit toolchain-funcs flag-o-matic plocale verify-sig
+
+DESCRIPTION="/sbin/init - parent of all processes"
+HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
+# https://github.com/slicer69/sysvinit/issues/12
+#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
+#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
+SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )"
+S="${WORKDIR}/${P/_*}"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} != *beta* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="selinux ibm nls static"
+
+COMMON_DEPEND="
+	acct-group/root
+	selinux? (
+		>=sys-libs/libselinux-1.28
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers"
+# Old OpenRC blocker is for bug #587424
+# Keep for longer than usual given it's cheap and avoid user inconvenience
+RDEPEND="${COMMON_DEPEND}
+	!<app-i18n/man-pages-l10n-4.18.1-r1
+	!<sys-apps/openrc-0.13
+	selinux? ( sec-policy/selinux-shutdown )"
+# po4a is for man page translations
+BDEPEND="nls? ( app-text/po4a )
+	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
+
+PATCHES=(
+	# bug #80220
+	"${FILESDIR}/${PN}-2.86-kexec.patch"
+	# bug #158615
+	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
+)
+
+src_prepare() {
+	default
+
+	# We already enforce F_S=2 as a minimum in our toolchain, and
+	# allow 3. Also, SSP doesn't always make sense for some platforms
+	# e.g. HPPA. It's default-on in our toolchain where it works.
+	sed -i \
+		-e '/^CPPFLAGS =$/d' \
+		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
+		-e '/^override CFLAGS +=/s/ -D_FORTIFY_SOURCE=2//' \
+		src/Makefile || die
+
+	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
+		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
+		src/Makefile || die
+
+	# pidof has moved to >=procps-3.3.9
+	sed -i -r \
+		-e '/\/bin\/pidof/d' \
+		-e '/^MAN8/s:\<pidof.8\>::g' \
+		src/Makefile || die
+
+	# logsave is already in e2fsprogs
+	sed -i -r \
+		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
+		-e '/^MAN8/s:\<logsave.8\>::g' \
+		src/Makefile || die
+
+	# Munge inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
+	local insert=()
+	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
+	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
+	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
+	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
+	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
+	if use ibm ; then
+		insert+=(
+			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
+			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
+		)
+	fi
+	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	if use x86 || use amd64 ; then
+		sed -i \
+			-e '/ttyS[01]/s:9600:115200:' \
+			inittab
+	fi
+
+	if [[ ${#insert[@]} -gt 0 ]] ; then
+		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
+	fi
+
+	delete_unused_locale() {
+		local locale=${1}
+
+		einfo "Deleting non-requested man page translations for locale=${locale}"
+		rm "${S}"/man/{po/,}${locale}.po || die
+		rm -rf "${S}"/man/${locale} || die
+
+		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
+	}
+
+	plocale_for_each_disabled_locale delete_unused_locale
+}
+
+src_compile() {
+	tc-export CC
+
+	append-lfs-flags
+
+	# bug #381311
+	export DISTRO=
+	export VERSION="${PV}"
+
+	use static && append-ldflags -static
+	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
+
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		cd man/po || die
+		po4a po4a.cfg || die
+	fi
+}
+
+src_install() {
+	emake -C src install ROOT="${D}"
+	dodoc README doc/*
+
+	insinto /etc
+	doins "${WORKDIR}"/inittab
+
+	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
+
+	into /
+	dosbin "${FILESDIR}"/halt.sh
+
+	keepdir /etc/inittab.d
+
+	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
+		install_locale_man_pages() {
+			doman -i18n=${1} man/po/${1}/*
+		}
+
+		plocale_for_each_locale install_locale_man_pages
+	fi
+
+	# Dead symlink
+	find "${ED}" -xtype l -delete || die
+
+	find "${ED}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	# Reload init to fix unmounting problems of / on next reboot.
+	# This is really needed, as without the new version of init cause init
+	# not to quit properly on reboot, and causes a fsck of / on next reboot.
+	if [[ -z ${ROOT} ]] ; then
+		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
+			ln -s /dev/initctl /run/initctl \
+				|| ewarn "Failed to set /run/initctl symlink!"
+		fi
+		# Do not return an error if this fails
+		/sbin/telinit U &>/dev/null
+	fi
+
+	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
+	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
+
+	# Required for new bootlogd service
+	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
+		touch "${EROOT}/var/log/boot"
+	fi
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 767e7a2b8efc..c0af7b59ada9 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index bfa9d20e8542..f16d714b0ebd 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -5,5 +5,5 @@ DIST fio-3.30.tar.bz2 6001772 BLAKE2B a4941cd415e6444bb9871274580efdf82281a1e52d
 DIST fio-3.34.tar.bz2 7049859 BLAKE2B 297fef62098bc3bc5476ebc7794566172c182059ce35d57a84bf87f6cedf08f234371d363fd08570e675eef9fbc7eae8d79755826d4312d543a16a144b4afc3f SHA512 912da2d7c7c4e0ad6c64a2e8c5254d23e5b6286c54d3ebf23d6bd2e0b5a9e4d2a53a75da3c807467b0fbe637b4ff23d64f1166fc45d6cce1d13d239f233548d0
 EBUILD fio-3.27-r4.ebuild 4214 BLAKE2B 538cd69c2b272539b13ad8092162719acee3b75adc8add267e51dbed4ddd72073b92641a274e2eb1f2029253b0821e154da01bcef06ebb9ce42e910f53e55ca3 SHA512 89134c77d4ca071bce113e19e9ec06f3ea51e0241f4a265a73c6f61da6db505288fb12fcbf06b38aaa2b72bfa60e029a3ca6f0aa55ec869df55962338720280d
 EBUILD fio-3.30-r1.ebuild 4309 BLAKE2B 0d6550feed9d63640193478f0a44500ef75f929132d10b811db060b028b2e0d608091a4816f57d6d47c325f835cffb4ec5baf1aff315f0a5c81c2fc77d6b5096 SHA512 ac56400040fa5f8cbb83e4c6e15a108fbfd5f24ddcef38207ce594275362fef9e81736a285f57aa14bc03c285b788876f8da338a495b13951e1def8418fc122b
-EBUILD fio-3.34.ebuild 4620 BLAKE2B 07a6d24ac8fafc48d63a2acc1ae5269db1b5e4d147cf7a550adadc9ba3b87d6466aa9f83ad3ca101152702f5df8aa23807b8286dac7b54cc1c91d2b9ce137a47 SHA512 7e1fd4413b254dfd193cf521049a542c6f91be4b3ec19e1431c563364a2372722ed64cd7807b32f42a1fdb5bf18fffdabe95b1dced049233e0d64ddb6cc45ca1
+EBUILD fio-3.34.ebuild 4621 BLAKE2B f5492e06f262806380ff87a458991bda586b48c2f32edf2ed511d18ca6f29eb629944bbc682bc50669deda3c76ca903ab1011bc0b1723322b637521aced6fc60 SHA512 01898d7c7819e4ac6ed7017957a90159fb29daec24384ea423194e9b633cd29ffb591b9edb96af91ac4dd0df79e33ff60b8ec465631f18e06d01b3e4fa32d556
 MISC metadata.xml 1293 BLAKE2B 609080b0f70ed898d1203afddf9e9dd850fdbd8111536ea9341a413fa6ca07a7314bd4088df05613d95b849f9fdcc2a1519a17d20e56dc46115e6d88bf07672e SHA512 76096ea48b59fc78624980a7b2721e1b43584eccaee4488a38a18d7ea4fa389423b684af0f015f2f0d73ae2989167a7caa4a02c9277e153f382f319780ab31e5
diff --git a/sys-block/fio/fio-3.34.ebuild b/sys-block/fio/fio-3.34.ebuild
index 110d723fece7..70dcf8277d1f 100644
--- a/sys-block/fio/fio-3.34.ebuild
+++ b/sys-block/fio/fio-3.34.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 77fdbd787f1a..1310e95abcfc 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 9ce66716f041..edd3a84347f7 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -11,7 +11,7 @@ DIST gdb-weekly-13.1.90.20230429.tar.xz 24806568 BLAKE2B 537faf7f354ac8adae87989
 EBUILD gdb-12.1-r3.ebuild 8100 BLAKE2B 48a993f5a5319bb9326a1f045b4b4ca2706011f77a4c1ef96c135bff3aacf3a7b2e20862645f443f7558c405ea1864e2d8251407a5e208fce6817e0079c6cc50 SHA512 9519decae94744ffa27371879b222f21be38036b8b5642be4a37fc5d2930e2f92ede7373b0e56f66208d57a6d36b94762e9395cd42e89c55bfedc90f05bf0e98
 EBUILD gdb-12.1-r4.ebuild 8344 BLAKE2B c56f2e234b67545f4e6fa0a1e3dbba092bac97dd0c3daaa3b8019b4da2e4636c07bb1e9a648880126ee83e487c325b944610cb5e5b64a37e9ad0f2d399b398f2 SHA512 f6c1be5d1ff4c59a29d0c2df98b60b13511e9f961afb32ecef86df1d7bdc40fbfc3e76826b6c6b4f34f34b5dcae7c3db37600fbf566ace89356ed29af327fec4
 EBUILD gdb-13.1-r1.ebuild 8580 BLAKE2B d0f7ca6e6015b066b1b87d2c6b12fdf30d7775f925285659220fdfc39e0f236cc9a194300a886c800e2d5a028043d8e67fb1f446961b28e733e7e0430cee4747 SHA512 e7725dd0bfbffb46b14503d93a94c663b4b1c2f0590d80d0cdf2752bdd93c71c046f00e3d47d1393b9cf3c88b867c824fadeceb540081ddc251b9dbaef47050f
-EBUILD gdb-13.1.90_p20230325.ebuild 8788 BLAKE2B 96ef2ecc3724ad46ebbd951ff2922e6c73b9887ac9d0c5a3a9ca0ee0da1338e7c3fd688f5579c9207f6c7a2223cf5145da8d8b8fb7187c8238cc9ee38889242b SHA512 5b57bf2d6a9e67793fef49252ce09766a11b53858dfb93d850163f1fbbae885fdf2d3dbd9983cfafce7455b8991971dd36fa25303161b108141475d81e46fda8
+EBUILD gdb-13.1.90_p20230325.ebuild 8787 BLAKE2B 4f9228804096303806c1cf74576d57172e781c26dfc692c7dd686f55c556590cfc6905aabefe841da4976fd045d440a90a6637536e6b214af343124202435152 SHA512 d4605ad79cc4311e87b22fb0f2849151413c287fa21bf1dd8834a966440698a3fcc5a476ca9819ac69bd5d80cf108de71d3fe2aa9afd7b4efd61c2957e953f49
 EBUILD gdb-13.1.90_p20230429.ebuild 8795 BLAKE2B b369222f7581157fcd4e9e79ff5dc4cd96c03c75e8db653392190591c333f9db8799c14fcaf997e63f641f0eaa064b2ea07a5842474f19b5cdf15095056054c1 SHA512 19d7836e7aa2bdbc4c799205679cd915fa662f5f7a2cea69b7b305e4e7f45b6f7fe822d06908fd7524b722a328aea3e285686987e79bce22090ffc772c32794c
 EBUILD gdb-9999.ebuild 8728 BLAKE2B 881f82277fc18f7ab5578b2e01af98576ef3bd2ef03b4443be43f96706682b09389e035556a9993bf853d1e9d709eee0f2db429233d762593aa38dc4a949fcf3 SHA512 3bfdf33a804d5eda3da26ad9f1e4bca7a6055861e90c143891eeb740c6598974d54df625c2b034003c03ae9261e8dd8e71fe692ddf2bb487e3ea1e8990de55e2
 MISC metadata.xml 1242 BLAKE2B 368d8798d7d3b610653f635eb36ee5517912e8a2cb392622b32ac0aa90f336e3b391ba25811dee110644e50fabec0d64f6bcf3b219cdd240ec806e709a198eed SHA512 192fa340899680413c3d6c886ecd7d2262475a33aecc452192e5fe1d8e3eb5cf17546e57181e720128cf9b39cd8e4b1b1a73cb1f0c9887866c0ce88b288636e2
diff --git a/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild b/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
index 07d4ba341651..0eb553e96e19 100644
--- a/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
+++ b/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild
@@ -72,7 +72,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 50aaa8930d9c..87d4024c5a25 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 6a66384db351..f9c4d9fc946d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -21,6 +21,6 @@ DIST LVM2.2.03.19.tgz 2732219 BLAKE2B 7a5bd024312f149d95361ea24a282c8c68e371687f
 DIST LVM2.2.03.20.tgz 2739763 BLAKE2B 4dc223eca1a370450c3985a5f962a2450a2ed08f1fa40af98d181a1530960a7caa3e896a3b54f0f333e2d6818bf35378b9c491a1488a4d3815959ab0e1f987de SHA512 202ff19f6ab1e1ecdf448beec6c7db1a80885efda1a6eeabf44cd2cea40577405c388eabd86f59f34c6e9e400188050bc6d1a5d5daf02f2beda87eee73cd1a2d
 DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde
 EBUILD lvm2-2.03.19.ebuild 9241 BLAKE2B f114cf3c515ed4190579ba66bda5a5c535e303127cf53df990249776459b84dc50baabcdbea75203d9bfa6baf6739dc7514a980627f592f97e539f35fd3a3038 SHA512 5dd73a9e6d611813b3058ba532b666fcc9fcd5b8d3b37a45a944a931b2c3bf622c6309cfab5c8a6a7e526f60d96d8d3101a6177cc1b4a13c47e77c422c63d659
-EBUILD lvm2-2.03.20.ebuild 9029 BLAKE2B 1aa068d934227a15aff0d75f829f8ecefb1c8189e66e60737aec62a43f975f079b3268f2339ecc209c7eb98349f3a1024257aae5a086b67339fc42c7ac253fb1 SHA512 b3563b8f5a7915c8646ec085545ee6665052b7a7e598a9bb2710d3bcf6903f0e5cb2561940ffb7d6d142e1ea0f0173992b238521e6ea5d2e8b61b12751743dff
+EBUILD lvm2-2.03.20.ebuild 9028 BLAKE2B 13a5d1643e7d24ed4d304dcfd8fe2aa41c620535fe7c71c3553b586f80c098b08b0150e12b3773abae0d348ecc990731ff199438ba4213bfbc3ea35e698c6262 SHA512 843264cd4052b7b7365674ff15144d2285f9adee072f003a5dea6ef15b09a92497c3915192a3287b626168795b66c5df4cac870169bbb2b6ffac1c4838fe43fe
 EBUILD lvm2-2.03.21.ebuild 9036 BLAKE2B 580358da638d0db89447c63186811c1224210648491265656a50ebb39c6d4e03d43fa940799bcdae6b305fa9fd0bf2ac553467207799101c68ad6cabfdc0effa SHA512 39d94908af99920e3130de180a6511782981d028e5ae5256bd1f0bcc2db05de958de8583ef6c4bfca30cca081ea4f4cab385f09ce1add4958d0cd2fc386ebf2f
 MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
diff --git a/sys-fs/lvm2/lvm2-2.03.20.ebuild b/sys-fs/lvm2/lvm2-2.03.20.ebuild
index 214dba4f7014..54bb67bf0723 100644
--- a/sys-fs/lvm2/lvm2-2.03.20.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.20.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN^^}.${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="lvm lvm2create-initrd readline sanlock selinux static static-libs systemd thin +udev"
 REQUIRED_USE="
 	static? ( !systemd !udev )
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2b125b2e76b5..94de4c16ce40 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 67951efce19b..9155e548d2e8 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -5,8 +5,10 @@ AUX elinks-0.16.0-fix-tests.patch 694 BLAKE2B c56212b531da4ddf4500a1e995a064e39d
 DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
 DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 SHA512 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
 DIST elinks-0.16.0.tar.xz 2029708 BLAKE2B b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8 SHA512 b1d6040b691610d596e0d1eae26bfe52d702272c71a2e5100ab7d6b05b24a0b88524d4fc7be3f6371e0bada1e6f0992da7505a72419ca642dec778424629a522
+DIST elinks-0.16.1.tar.xz 2037112 BLAKE2B f09bc57e943628c519f2f64858afa6557e991faaf0b3239c9d9be2bfc8df38ee01989625f7ffd04d1872edcd28fde738002ec7b38ad9371f7890d2c232ed00dd SHA512 2f75dc15c401e9f73cfff76983d3fd8714f0b85ca03c9fafe14b3e590c3ee11704e81728640a6f45d683c87223bf5819f276678b9fab97e1f8668745fcb70e1c
 EBUILD elinks-0.13.5-r100.ebuild 3790 BLAKE2B c1d8ad4eddb3bd0e1c5486a6aeef0b4734a4ac7fb593755623aa1280b1990f004c391be93563b7c897f95cfe5b36c0b491dc0f6840e1a1b85fc1ce8a15b5cc4d SHA512 48d7c6bd01639a1eca8f06109fdd794a3bf5bcfa0da87f282bee8c4b8955af962b935b0e460a8f0163adb51698afce356e193591d6595c5c48da96b30e6f9eee
 EBUILD elinks-0.15.1-r1.ebuild 3978 BLAKE2B e68df736488a299e8d28d858ea2bda36b73c2e1215ba19a738ebf35a1926824895c0f0659a7ff9e0ef8a9da8eae962dd74cbb86c8bdfd5b6bb6761db9731228c SHA512 4f58d448a4bfeae77309062e5da0dbec2e42da7fc34b9b226d6e9d84f9e261ccfdb8e7c7171543bc8e0c97f8c371de0595110d524f66187bb36d76dcd8ca7302
-EBUILD elinks-0.16.0.ebuild 4183 BLAKE2B e1d487b85bc9fafd8c2d524698b3d4e467a5257635426d1d8494a1147b6bcd119dd28b3d716be08758fcfd13da4bbfcb792ae71065221c96228f5b0a1d2fff3f SHA512 485c6f31422c4322b88084f2364e95f5a385287fdf0255ce11b533e3f0c63eb6d9e72a1871085e17c78eb3455a9d4b4141bb1746c6933109be02aa3c61c8d266
-EBUILD elinks-9999.ebuild 4156 BLAKE2B c3eb23223a409e006b3d282e551b1f3728977c128c42d0e14d3b8378b9d8dcf449609f01083af4da3f149b007c475f9a7b69439895e54d984f5da2fe333e2854 SHA512 d9347f8d348b3bf8d2bbc7a30a023360559c58412495d81de19676b2baa047f67ad3289c6aca0873a8df0ed59e0137f7eb0608f8e316388c368a6c3c06467a89
+EBUILD elinks-0.16.0.ebuild 4206 BLAKE2B 0a993e57daaa63cba9960da81afaefb611b0b7b0e09f86d266d031712584d5e610e7750a3335085a254766f471466d26ab47e57999064b2088ad218ee5e3a2a0 SHA512 58eb19d58748958b0a099feae17a6feff2d8c8bedab0c8ccef4cec35f5583af1dc778a1afb0cda44ddb4bedd7c32a8ad800f2bdc5f25ef219572c16700f4402b
+EBUILD elinks-0.16.1.ebuild 4195 BLAKE2B bee28f81331258a40257f5ca084958f7c33ba2dd5f1b7e13c0e0feb72bd05e20c03e898eee675fec766a569f76371f068810ba0157c1737d4995ed5d75ec5ce7 SHA512 02af9bd1f83dcd404abdf759c231f53d522a598f0714f0f58a8b8201a48319da3680dc2afbee0eeafeaa1f45a4299866e82f8a8645eabdcb458b4d43f96d2191
+EBUILD elinks-9999.ebuild 4195 BLAKE2B bee28f81331258a40257f5ca084958f7c33ba2dd5f1b7e13c0e0feb72bd05e20c03e898eee675fec766a569f76371f068810ba0157c1737d4995ed5d75ec5ce7 SHA512 02af9bd1f83dcd404abdf759c231f53d522a598f0714f0f58a8b8201a48319da3680dc2afbee0eeafeaa1f45a4299866e82f8a8645eabdcb458b4d43f96d2191
 MISC metadata.xml 1005 BLAKE2B 1e40dd6ba072df609a2ec93e5ae5af079137e19d38b058df45dbe63e4ecfb6facc9d89a206991713616d9c0671eece6ebbe8eeaa9e4c284e982bada17c149570 SHA512 432636be610931a5087b3ebcf70d250b212b8c4f7c236679a2a5207996393329b3db31432228fa6ac2e2fd8348d8e2c04dba9b817526ecbe314276f55e0dfe2e
diff --git a/www-client/elinks/elinks-0.16.0.ebuild b/www-client/elinks/elinks-0.16.0.ebuild
index ee2c6e22b5ed..f491cf7e61f1 100644
--- a/www-client/elinks/elinks-0.16.0.ebuild
+++ b/www-client/elinks/elinks-0.16.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -60,8 +60,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		net-dns/libidn
+	)
 "
 
 PATCHES=(
diff --git a/www-client/elinks/elinks-0.16.1.ebuild b/www-client/elinks/elinks-0.16.1.ebuild
new file mode 100644
index 000000000000..180537f142e7
--- /dev/null
+++ b/www-client/elinks/elinks-0.16.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+LUA_COMPAT=( lua5-{1,2,3,4} luajit )
+
+inherit meson lua-single python-any-r1
+
+DESCRIPTION="Advanced and well-established text-mode web browser"
+HOMEPAGE="http://elinks.or.cz/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rkd77/felinks"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn"
+IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.2:=[unicode(+)]
+	brotli? ( app-arch/brotli:= )
+	bzip2? ( >=app-arch/bzip2-1.0.2 )
+	gpm? (
+		>=sys-libs/gpm-1.20.0-r5
+	)
+	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
+	idn? ( net-dns/libidn2:= )
+	javascript? (
+		dev-cpp/libxmlpp:5.0
+		dev-lang/mujs:=
+	)
+	lua? ( ${LUA_DEPS} )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl:= )
+	samba? ( net-fs/samba )
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	tre? ( dev-libs/tre )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	xml? ( >=dev-libs/expat-1.95.4 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		net-dns/libidn2
+	)
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dhtmldoc=false
+		-Dpdfdoc=false
+		-D88-colors=true
+		-D256-colors=true
+		$(meson_use bittorrent)
+		$(meson_use brotli)
+		$(meson_use bzip2 bzlib)
+		$(usex debug '-Ddebug=true' '-Dfastmem=true')
+		$(meson_use finger)
+		$(meson_use ftp)
+		-Dfsp=false
+		-Dgemini=false
+		-Dgettext=true
+		$(meson_use gopher)
+		$(meson_use gpm)
+		$(meson_use guile)
+		-Dgssapi=false
+		-Dhtml-highlight=true
+		$(meson_use idn)
+		$(meson_use javascript mujs)
+		-Dipv6=true
+		-Dleds=true
+		-Dlibev=false
+		-Dlibevent=false
+		-Dluapkg=$(usex lua ${ELUA:-0} '')
+		$(meson_use lzma)
+		$(meson_use mouse)
+		#-Dmujs=false
+		$(meson_use nls)
+		$(meson_use nntp)
+		$(meson_use perl)
+		-Dpython=false
+		-Dquickjs=false
+		-Druby=false
+		$(meson_use samba smb)
+		-Dsm-scripting=false
+		-Dspidermonkey=false
+		-Dterminfo=true
+		$(meson_use test)
+		$(meson_use tre)
+		-Dtrue-color=true
+		$(meson_use xml xbel)
+		$(meson_use X x)
+		$(meson_use zlib)
+		$(meson_use zstd)
+	)
+
+	if use ssl ; then
+		if use gnutls ; then
+			emesonargs+=( -Dgnutls=true )
+		else
+			emesonargs+=( -Dopenssl=true)
+		fi
+	else
+		emesonargs+=( -Dgnutls=false -Dopenssl=false )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc/elinks
+	newins contrib/keybind-full.conf keybind-full.sample
+	newins contrib/keybind.conf keybind.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
+	docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
+	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+	docinto contrib/conv ; dodoc contrib/conv/*.*
+	docinto contrib/guile ; dodoc contrib/guile/*.scm
+
+	# elinks uses an internal copy of gettext which ships files that may
+	# collide with the system's gettext (https://bugs.gentoo.org/635090)
+	rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die
+}
+
+pkg_postinst() {
+	elog "You may want to convert your html.cfg and links.cfg of"
+	elog "Links or older ELinks versions to the new ELinks elinks.conf"
+	elog "using ${EROOT}/usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
+	elog
+	elog "Please have a look at ${EROOT}/etc/elinks/keybind-full.sample and"
+	elog "${EROOT}/etc/elinks/keybind.conf.sample for some bindings examples."
+	elog
+	elog "You will have to set your TERM variable to 'xterm-256color'"
+	elog "to be able to use 256 colors in elinks."
+}
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 887047f30005..180537f142e7 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -24,8 +24,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn"
 IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd"
-# tests restricted for https://github.com/rkd77/elinks/issues/203
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -36,7 +35,7 @@ RDEPEND="
 		>=sys-libs/gpm-1.20.0-r5
 	)
 	guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
-	idn? ( net-dns/libidn:= )
+	idn? ( net-dns/libidn2:= )
 	javascript? (
 		dev-cpp/libxmlpp:5.0
 		dev-lang/mujs:=
@@ -61,8 +60,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		net-dns/libidn2
+	)
 "
 
 pkg_setup() {
@@ -73,6 +75,9 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dhtmldoc=false
+		-Dpdfdoc=false
 		-D88-colors=true
 		-D256-colors=true
 		$(meson_use bittorrent)
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 63042115b68b..af3240305ba7 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index d6cbec9e9b7b..5fb9c9aaaa42 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -10,5 +10,5 @@ AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886
 DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
 DIST uwsgi-2.0.21.tar.gz 808494 BLAKE2B 3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532b3e8b537db80acc908fc26121b752e35ebc0bf9a542678843fd02ff54 SHA512 36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177a077338ec8af3ef0b8f8e220bc4fc7f8311dab8066e13cbcbb616f736c795
 EBUILD uwsgi-2.0.19.1-r109.ebuild 11213 BLAKE2B 0355b1cf1d3db7d56dc8964bee2e1dc1018a79cc9cd6b907f667d6d6050f302d112a4e78cb1350c846ea3d2e956e23b43eadfb9ddc736c8435f9b997fb651821 SHA512 0b316e49f3dad87c8ea82124269e46c114e66b7ec1d5fe5d1599588e78f672860a2d8d7f09df8ad6f1db1114bd43ec7c0acef2d0c12eab58960119f355ec6dfb
-EBUILD uwsgi-2.0.21.ebuild 11382 BLAKE2B 07603a38209d830086039f0b810cf6c0551390e1e9765620dba1679e03de051fd6be73c8811ac338ac2bb604e98f882124d812ec4b6d8676343ab6db99b8501e SHA512 71786a0242e5d34c21f781ab9f36ab22898f490ec56ea24111e0c63269d66e72f5fdf1da9af3cd115f7aa1781009ea5c7e65575464975f512d0bc83f6135e58e
+EBUILD uwsgi-2.0.21.ebuild 11380 BLAKE2B 0d70736207d8b0dae2a24f919078e58c74f6b575842d6b29b786df7c5aeaaf559cd7c4d2d2e4edd9beaf9835cc3339974b5f1a32f1785f5c2fae5ac310cb93a7 SHA512 717330ff687c43d491773a8a5d90a6d0c1396d1bb3ac5c0722addf6a77a42b989f38db465f5a904f51f352f1ec1b9c43cc770e7b9a5b3fd33c7dc16d0a871a10
 MISC metadata.xml 1245 BLAKE2B 3254a0e0211101ad9c353f6247424bb44df9ddb56bb152414b9fac2b515fe163e5163d2119bc040da1676b4d941afedf4a331a19e4cdbf794a7816d012abd328 SHA512 4e3dc2b9c9d7386ed6f132da703af971789c73af567f5333faca65e3194567ead794a84c28b5382eadb149ae4dcc7847e07bc02e3d84391b3b6cccc11e08e232
diff --git a/www-servers/uwsgi/uwsgi-2.0.21.ebuild b/www-servers/uwsgi/uwsgi-2.0.21.ebuild
index cf9f66a2b92a..879759d49167 100644
--- a/www-servers/uwsgi/uwsgi-2.0.21.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.21.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=(
 	ping cache carbon nagios rpc rrdtool
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 5845ed33cdb9..2927aaae48f4 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 5f7feef00b44..e162afe66aa1 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -5,6 +5,6 @@ DIST xwayland-23.1.0.tar.xz 1286056 BLAKE2B 19f3cee10f9b86a1ee4529f91de3125c303a
 DIST xwayland-23.1.1.tar.xz 1286460 BLAKE2B 2f0095510a15eab4096696fcfdbf0cfe6814b48bd5b5666701a61bc942ce2fe00555a7d5a45cbaec2066bbbfd9b863909e0398d3d6aaab1dfc0e78d1ea913080 SHA512 21c386847135c5cb4ac884926b0fbeb6ad21c9ee54752e0cdc8418e31a72872d81032159c1d91b8afb915aaaf65e80454342461d676996b2f3c535a37b0147f0
 EBUILD xwayland-22.1.8.ebuild 2148 BLAKE2B 18cef7685e1060f847a7af995453fbdb2944a3aee5a0f516362cda8abc919c2b4b703781f0caab9cc09ea86cf9454854c349467460a1ec11b35ef03d27039a60 SHA512 0d559bb84d07b6a4d16b35c268174dfd0d4eb5ca15eef5fe0ce64187d17f9842decf40ae61d73ad8983046e66f548c698b4f10f4741d6344727402f49b0c5b7c
 EBUILD xwayland-23.1.0.ebuild 2185 BLAKE2B d3db88021aa4a3347de59b409e3a68f12ac4064ddfd6af941b96d7f7f2d5278581fc59ac2b0cc25d542723c757a0de8588028e50ddfe27b680fe20815f1c3870 SHA512 2788a3592698f906b211d237da3b20acff26050a233600e1e63a4e2c16b4c674b456368164e16af040a5bf88c02e18cbaa48c3cdbd49a78b7748bdbde86820d8
-EBUILD xwayland-23.1.1.ebuild 2180 BLAKE2B 2a30041ed5f458ffdd72e0d31b87a0f0257b43fdab80b7991fef771580f0df70e4a6eb35c0ca8368155585954b8e31985c5de211f04aa295bcc1481744526430 SHA512 3accc4f5ea0f4bbd83e5e0b85937f0339796be9fd33049337b1f21db370fd4eb5b1a47c6b4052ba8f2f52a5f2dcc31267b737789c8ed25d40c613a79fdc56db8
+EBUILD xwayland-23.1.1.ebuild 2179 BLAKE2B 228f4234a40c45b54699176b0165902e968021e75b284bae5afff110a3e7eb4437cd8ef651d5a98d4e47226ba87e49186118eb18a412a68906f28c25f80b60fa SHA512 2d5b47ea010a3cad00e89d914a76004bd14c001e5cdaa324ef1438a47951da51c6aab34dce8eb46dcdbbcb6f08ea1acd799c3d5cfb052d5f112e24be0c620d5a
 EBUILD xwayland-9999.ebuild 2252 BLAKE2B 33c7487e426507767c262dcd0d74aa3384bb63c2cbaf6968a57c7c259a213bbd72d4d4b6f276132f8764fd2dc42f13a9db7eeab4ae78e5e570d19cf4386f0d6b SHA512 2650874f3f640d35b8f93e73c5b3463893d1b718d713fe9c7af3a9c18c8b9025b942d96335b16d88eecdc47885bb2876ffe84726a66765515be6a675237d15cd
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-23.1.1.ebuild b/x11-base/xwayland/xwayland-23.1.1.ebuild
index f3f3b8474649..daae70c691b2 100644
--- a/x11-base/xwayland/xwayland-23.1.1.ebuild
+++ b/x11-base/xwayland/xwayland-23.1.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standalone X server running under Wayland"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index c4958f9cd5a5..f5de0de3e457 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 5391f2bafce5..48f71e6db80e 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -21,5 +21,5 @@ EBUILD wxGTK-3.0.4-r5.ebuild 3752 BLAKE2B 57acf7f620095191b662e806496ddc5ed38fed
 EBUILD wxGTK-3.0.5.1-r1.ebuild 5495 BLAKE2B f3daf6569a27e61c3cb60eef9a29aea35305e48523ef6572639905e81757f12e5a41b9e93fecbfdcdb5bf55a29db7d47515d0e2c9c40630bc4b611fa4cc17665 SHA512 2718f47aed0f875407117f85b28f7ba385e2def712fe7be4256d94211ef0d56f7e5eee0f72cc94644500f93c6b5e75ea01c16009ea7065cf112b3d102c6c6a7b
 EBUILD wxGTK-3.2.1.ebuild 6886 BLAKE2B 00c0384db71bc25f73a390ab4c27c104b3b560e0bd149cf54cf2384830df82c02227afb556518e973c3eaf14a639119c5a0e6a87dd71d57d40edcb345da83223 SHA512 d234b1c37b35976fc7db54ec7f6663b1a7b22b9453ac2d0514033dd4093dd975593489912315f1244a7e94791e35a6604e211802e04f9152ec7f713f5edf89ad
 EBUILD wxGTK-3.2.2.1-r1.ebuild 7030 BLAKE2B dcfe33ba3c9b93274f8e1c9b37e313a892ac899fc0c1d4bb4fff2cf0187e7d47087d97b24187a39426f5769342ddfcc00c4ac4a9e61ac4f0e00758efe03cf2b8 SHA512 9ac0eb1da98f0f667e16c711f193508dcfe1120ff917a37646d6c273f025317c049de45ba7719ed8253ac56551e0bbbd369e16c488d8d61444efd5fe495577f2
-EBUILD wxGTK-3.2.2.1-r2.ebuild 7029 BLAKE2B e155dd5dc5657ca7eac4ffc86cfaf904ddee9f035ebd146f50a9e121f0eaf415920791a91c76948d61bc1f1a19e7af58b5ca7221856c2258b233a94e025775b1 SHA512 04138787db0dab93c7d65ca05b9f2eddd64f5ba5bc152148ad75a3be76971bd21a97a442a06550c1b890da92b7c6f054f57005be71d81db4f63ddf1478a04a2d
+EBUILD wxGTK-3.2.2.1-r2.ebuild 7028 BLAKE2B e7362d3a245bfa565b4aa509071790b2a2ecdea19d963a284995b3992021e74316b73aea3cc7be841c4ae98ca8955ef5a89ff68c8d9840a6a2f25f7e3cdb6e47 SHA512 527d95873ec66cebada98a4fb336c7696487d8d85a77028efffcbec3d432cc07a0f1d7ddecb6747bd1b5094ff6202a413b4ad7a861d8d6476600134d07f0c8ef
 MISC metadata.xml 756 BLAKE2B 336ffb3375ee9092de02d0808d0a44f7f5bcbc6e4a845c12b6466af0b91f3397c2b335e5433917361a060db43d6cb836cde0f87be2059214f314fa6726199e2d SHA512 190b72992c64b43b46e28ca2f730e1897a5f740ba211b859c816b4892256284feb579fbce06cb1939b774ae989dc68754f5a57f6375cfca50d7770d0c2ed47ed
diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r2.ebuild
index fdc058ddba73..202f3bedf079 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.2.1-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}"
 
 LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 SLOT="${WXRELEASE}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X curl doc debug gnome-keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit"
 REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) gnome-keyring? ( X )"
 RESTRICT="!test? ( test )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 9719ca54ee16..69ae262113cd 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index ebd63caef1da..fe4a3d28ce9f 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -6,5 +6,5 @@ AUX fbpanel-7.0-python3-shebangs.patch 2348 BLAKE2B 84c05bb718b5754d2679fa2b1807
 AUX fbpanel-7.0-python3.10.patch 410 BLAKE2B cd4c57ea9677062a127e698d248b9ec15b30a71c5c72ff953f40239ec63584d6011bf11cc441a75234a5b20188ef52ffc678296a952e7071dc6efc6975be42e8 SHA512 7a1ac51db1aa62ca7e49819e1dcadfe00e082692cb3c8662d6b0a218a011982b0a6731edd2118d7ddcd8fa58529d35bd63d6a4412067f535faa554127b40fd19
 AUX fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch 801 BLAKE2B 49a0d7217b5e44c902200d9fc4cee57d245386cbf400e21a24672b2c121578d09dd440d56f05483afbe3e6083bbe65fdafb162e35624d7bd0f7f34b1639d2737 SHA512 d4fc104faf4bc4c9ead54530c3e00e82d9ab3c356d635c824d206dd2fa64c64b8ff57594cb6fbbef9725df30f10994de3a213aff8f1eb7fc8b59cd08498e3148
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
-EBUILD fbpanel-7.0-r2.ebuild 1626 BLAKE2B 74712ed5e5b9c58d9a9c1c42fbed2a57520680b5a33c50f713bc1d983b290f98ca7f71b251cf0d5aaf83fd69c4722fcb6ec7ae3d6e509a856fac90cfa6af7aea SHA512 b53580bd4e9c1d876b0350d809bef7df9acb31f3b74b6d1fdcf653f4f4d667719a478de3a49b18b358351fac1e838c458255664a9a303a94c7a0ed4f1f1bfcf1
+EBUILD fbpanel-7.0-r3.ebuild 1594 BLAKE2B ca3022d9414c4013249bbd131890ac677eaea8bbab3f525b3ea3efba77c2da0613134a9449013aad6c63bb9c63bdf7e36262525d79a4596fca633db6da725b19 SHA512 33fa67f1c2ff4927cc4abe7b340ed4d4c8cc50b3a82a244a52ab0757e46ea0b1caa4b5a5f332b2b591dc7ae1ba3140af44dda65e44e7cebe7bc33df543a6d58a
 MISC metadata.xml 252 BLAKE2B cc4fe64f3e9531d55a19098705558d2e02a395279ba605d6c598ef6b9a13cb0a17cc9cdae4f9e2ea30f34abb58f0591b3c4f11a6e42b385ee7c0855251b37f20 SHA512 22086ac1bc91a06382f92625473824dd26f60fd00cf691ad3b587f45b75aadb9f0c66bb4af93ab02fe059b00f504770c642342d81dee9f01b950b99c1f85ea9d
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild
index be22542d46ae..ded711fabf0b 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit python-any-r1 toolchain-funcs
+inherit edo python-any-r1 toolchain-funcs
 
-DESCRIPTION="light-weight X11 desktop panel"
+DESCRIPTION="Light-weight X11 desktop panel"
 HOMEPAGE="https://aanatoly.github.io/fbpanel/"
 SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -49,17 +49,18 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
+
 	# not autotools based
-	local myconfigure=(
-		./configure V=1
+	local confargs=(
+		V=1
 		--mandir="${EPREFIX}"/usr/share/man/man1
 		--datadir="${EPREFIX}"/usr/share/${PN}
 		--prefix="${EPREFIX}"/usr
 		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
 		$(usex alsa --sound --no-sound)
 	)
-	echo ${myconfigure[@]} || die
-	${myconfigure[@]} || die
+
+	edo ./configure "${confargs[@]}"
 }
 
 pkg_postinst() {
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index d9c041d822d6..f849e8f9f79f 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,6 +1,6 @@
 DIST shutter-0.99.2.tar.gz 1733886 BLAKE2B 19596b5385a11f179c9fbbf81a97f2a5d9661d52d14f33be72595c26c096548095aa6cdbbc4932413f0a3103b30a78e2e870d2e7e904fb9cf0fd17ee43ad45fb SHA512 5fcb094f0e6f732da3648e58ef62aa1e5537132ffb0bff80972e1891f58fe5e63ec63bc7bec63e84268c095e3cd43d60d358be61e2d050dfcc49ffb042d34cfb
 DIST shutter-0.99.4.tar.gz 1734992 BLAKE2B 410e73f784f0d83638867132669a00fe89c06af622f3024e52b5b5700c1a431b4ad50f9066c267cd76f9be48ce6ff88eab4348d2d4dff28b4ae7e0267eb7bc41 SHA512 57f7fdc1066375942bd1a9db381a8ba6f24fafbd5e0853a4dd19016438ec2f3cb039ebe90038d282bc07f6e45af9cdbb6f180f55e43357231b41818b8555347b
 EBUILD shutter-0.99.2.ebuild 2164 BLAKE2B 5b07bd985c0187032a4d06d1b397ff2344f7cee5e3ec4bf6da71fc3fc5d23eea2f17f46e52a7007194a2d67066bf3bc04d7a8ec2804dc1a575370f3d0e4c69e2 SHA512 9a00d38a56f3c008e17c176e358a1a06d025525f5a0d07947fe4de938338b0cdd7a6f518ebc6c45d1f174315e912d96957af943d8e8e71465d46be9fd787bc57
-EBUILD shutter-0.99.4-r1.ebuild 2304 BLAKE2B b608665406515316038ba2c67066d65b172624b1a590fb7dd140b16068dc5480794b76aeb282a96ec4d703e15cda49235bca473e0cd40c6534bb397221bd4139 SHA512 41bffdef4ad5eefb76d2f5f131cffec5fbf1f75a89577def8d70913e19b1c3a7cf0e741f56d6740b5b874b0d132842cca582bcf220ce15cebd718a88e96dd35b
+EBUILD shutter-0.99.4-r1.ebuild 2303 BLAKE2B 6ec95a74676cbcac28da0af8ef7d196481317f0da08f0cdbc14a303b412db2df55c67dbb902559c99b71f01495c01b9b226f51365c9b7b0af7622517e58f305e SHA512 0f8127214057018065cd34c3c849c4ebb3216fa2c1b947ca1dcf02223f40c054bfd73fef9f08064b9a132235aff9ca23dc92b37f93ee8d2ddcb853e1a089e19b
 EBUILD shutter-0.99.4.ebuild 2311 BLAKE2B d0ebffc9595ccb120ea421839e484a6404c64a0bb7485be1c1abbbf17b9060e59855e940f1d1e5cfb18f7cc7533f4aac3ff06b850389515cb5b340e888f1a8d8 SHA512 26b79b23fc63d6f04568e81e95992b723bf1cd07150f40b476390848399bf74ff5d1b137afb604410f830aea4e20f1fc2614ea4b8bcd875aa90afc71a647d811
 MISC metadata.xml 492 BLAKE2B 3e3bf1dc04748435e212469e84d12040db18041c65e432a4ca994fef361bc100bfb7e5f284067ae7ff63cc090ce10b2e05d38a7c4bfbdd0e8fe673f77f3fae4e SHA512 bba85636de4594323daf1be7648c76ad3323b03ce8d093842ff61e95e1f2023094d0d707985d14d99dae6f346d9624eb4e9fb17b72c0e2507f93e61bb26fec7b
diff --git a/x11-misc/shutter/shutter-0.99.4-r1.ebuild b/x11-misc/shutter/shutter-0.99.4-r1.ebuild
index 2151903f4f96..a23ce36f39e7 100644
--- a/x11-misc/shutter/shutter-0.99.4-r1.ebuild
+++ b/x11-misc/shutter/shutter-0.99.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 99efb1521743..7aca5f41711b 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 6b28e361b3f9..cc66be41d3c2 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -4,5 +4,5 @@ DIST terminator-2.1.2.tar.gz.asc 866 BLAKE2B 3d998365e039935742635f049513f5c43cd
 DIST terminator-2.1.3.tar.gz 1046741 BLAKE2B 39ec3ca049d5fb532e420ab48a609bd254d626e1949b7c659c85a451054ec4c6f59c89940b2a618131933090fa70aa4441ab88abf2a302d84f6c9b2c61bb22c6 SHA512 79bdf22f068e14cd63e527f3671cd7b06f2685ef12594870aee170f858a8eabb21e63e7a9ef41fcc664e9b34e8f24b08e998de686be7bf47e0d4315c1224bb8e
 DIST terminator-2.1.3.tar.gz.asc 866 BLAKE2B 02ab0c100924da02f76bbf557b99743dbd03af727f67e4824afb099e6760b1acac468c31d4f083efa698738d697d834707fbed105eb0caf7db96438bc4818feb SHA512 48e450d5aa3bef23ec3381c3e24e5ab60b35aa76758cc9d1894a68f04d0f9784fee79e03500cff1473b5f7468816604a0e62b7ee709273d25167e54a8be08279
 EBUILD terminator-2.1.2.ebuild 1634 BLAKE2B 5b9c499b4c874c1e0cdd6bf066f71ca45df9299aaaafff05e092b88af9797af6d32cadc6aa9cdf1aa40ed389e5b55d4761f764fe9e1f217e37b1ac6315c1879f SHA512 7a64795659818e9a2909c10aa175424f72ef936e4c2cd23bc9063ddd90889e4bde9aa1def7ba591895071f44328d30b6c5052200517fbc2449e664b26e53db03
-EBUILD terminator-2.1.3.ebuild 1636 BLAKE2B 5e091fbac95bb6744d1d6b33fc47d8e780efbe700e3542d61447c630ff79b70e0ed3620817086f2aa44cb4b9a0f47938a91e0155b80ee93c900eec6f95ad9c86 SHA512 93e023c43bfed4d251acc0801f0316232127dad7b561e3e77e825ca7369a9b64bd6c6437b30b0c15f5b3b4f049183a77cad9326b369c157705c816157de8a852
+EBUILD terminator-2.1.3.ebuild 1635 BLAKE2B 319746e7cca2c1d67f141c3c3eff52a3ef4f7962bdc3d8b3eb8bc3a92abae8769d593eed1282ddcd615bffacd5e6f3a7265be4cfb2ef7a8a7e0b928c962b1d5f SHA512 2d135a4fcfbb6127fb8741d93946487480403fbaa8e80a2715fa298c16cd3aad39f27f6019a8c691ea31915001cfffcd99fee1e141ecc723bcb12e2fbc9c48fc
 MISC metadata.xml 859 BLAKE2B 315ffd413597c4b0b5e847e4869c330be0f9092f3c272dcb362fdce1b89423a65a887a6e63b2770253aa2125cc3e6368adb058491f0fd420594d315047279c83 SHA512 2a56b28dcc37b9697c778de2482b7e191fc83907f1e8930a015b3e60a8a672faeec18a6602565ad60c0883f7857b956a1abccf06800f4a4276f72cd643449030
diff --git a/x11-terms/terminator/terminator-2.1.3.ebuild b/x11-terms/terminator/terminator-2.1.3.ebuild
index 1f575225d276..ec123d80a362 100644
--- a/x11-terms/terminator/terminator-2.1.3.ebuild
+++ b/x11-terms/terminator/terminator-2.1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c5bcfea1c51b..06e7267b08b1 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 267e341f082e..bee4d5ff900f 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,12 +1,8 @@
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
-AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
-AUX xpra-4.3-cpp.patch 1273 BLAKE2B fc7b55d69242a4aaad4692959c67c4b2219b11d6e2cee32f7c6dd23d2efcf0727f7a3299d4f94032ad561876c4148a2c10ac260f9df208fab10766462b1738d7 SHA512 e4a11ef3518037695194e0b15e79dbe4bc2cc8c70780052c5660fd621d682936367fa17a998cc307a629eee5860a8e74cbb82cbfaa46cc2d0e6ec051058a43ec
 AUX xpra-4.3-no-service.patch 779 BLAKE2B 5232b103b47601b4340d6a863d2cd3cc6641a55d6c252702034902a4d5189c7df45b7d6280ae9bf2a3dbe8c96a73847f936032cc9b58c4bdd91025974fa84005 SHA512 d5045da20f4fdcb2b434f280c42b26ee1c8c280e4037a116c3edd0990a97acc5017bf428c4c222a1c38e23a6dd5709789ac80e62187144d334068deecc99d20e
 AUX xpra-9999-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
-DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
-EBUILD xpra-4.3.3.ebuild 5334 BLAKE2B 7421a2325b3fbc44ee454a63254a805849f3e083b3f5c759229fa2f0a6c990fbda3a09ebac0adea7d1e615b904f2a30176cb6e90318ff30bbacb49041888fc34 SHA512 cd5b41bb5326f6a2fec6c0303c0bb8e09082880b9351ee251fac8e6062ebf36c0f1a3bc1bb10e6c1d82a1d8acd7bcd9cbb06eaee650360bcf8ee9bcd47bfe51c
-EBUILD xpra-4.3.4.ebuild 5323 BLAKE2B a49a39a02472baa7fca0a53a87166690ab05f0de47fb6860e85eac3541881c275042b77ff190955c724692df0ae5dd55420c74d9aff4505b587a2ec446180983 SHA512 eda1413ffec13d0cd6cc497eebe64b2508d98175308a42153860d8dc035e25320e4102c75d1872b5f6e68a4fa8f21f4f0b5384e54c34f480be1c6c5af9eed36c
+EBUILD xpra-4.3.4.ebuild 5322 BLAKE2B f658b1301adcd6dec129281d1726d462e8a67293a9456d4bf1a87ebf94474db0ae228805e1181e9aecbc73c2e7dbdf2b0935ced91b89db9bc93913b3f8967532 SHA512 98486d33cc43b0bffa9ad52ea71653b92b4b405e91f2ebfd4db7854dace0e7bec41cd1d8503569a35c377def618fedcee78737cfde51d2b780e094ffc8be9756
 EBUILD xpra-9999.ebuild 5244 BLAKE2B 6a034de431da942de78d170fecfb84c492c35b86684ba5f2d171dd83002c600791fa559ed231ef82d7c39d5b90fb2835a4bcc7a9b9f8d4176ae7e893937f5b9e SHA512 6ff2e13ba7a414cf2b95a43fd1701162c77549b51dcebc406eb91a85b3e8ebce4a028f95f6b96d35521bab8b4027375a204db82bba5925369b9f747d1de5cf77
 MISC metadata.xml 1292 BLAKE2B 748b4713831cc4f2d6bbfb4f9c4d073b654772a64cbb3e0d5c52b9afcaaf9f1355d6ab7ab38f72a27cf7290f124e3d458320ad07847f9720568a60603b2abe4a SHA512 ecd2f89e7ae720dd11f3a36ebf90447ec2f4e326a5621618b7f4bf68189771823edc09fedcf197fe997af1aba48b5eaea62ac98d6fedf8bb6dac404da3aef85d
diff --git a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
deleted file mode 100644
index b1b2afb4e18b..000000000000
--- a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py
---- a/xpra/scripts/config.py	2021-05-19 16:18:30.475153200 +0100
-+++ b/xpra/scripts/config.py	2021-05-30 08:50:42.326953006 +0100
-@@ -159,7 +159,7 @@
-             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
-                     if warn_fn:
--                        warn_fn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+                        debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-                     return get_Xvfb_command()
-                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
-                 use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch b/x11-wm/xpra/files/xpra-4.3-cpp.patch
deleted file mode 100644
index 41f1263e3465..000000000000
--- a/x11-wm/xpra/files/xpra-4.3-cpp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 22 May 2022 12:00:01 +0100
-Subject: [PATCH] Most build systems respect the CPP env var instead of just
- calling cpp
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index f84d56c6d..7f0db3b69 100755
---- a/setup.py
-+++ b/setup.py
-@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch")
- print("ARCH=%s" % (ARCH,))
- 
- INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix, "include")).split(os.pathsep)
-+CPP = os.environ.get("CPP", "cpp")
- 
- from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
-@@ -2423,7 +2424,7 @@ if v4l2_ENABLED:
-         ENABLE_DEVICE_CAPS = 0
-         if os.path.exists(videodev2_h):
-             try:
--                with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h,
-+                with subprocess.Popen("%s -fpreprocessed %s | grep -q device_caps" % (CPP, videodev2_h),
-                                      shell=True) as proc:
-                     ENABLE_DEVICE_CAPS = proc.wait()==0
-             except OSError:
--- 
-2.35.1
-
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
deleted file mode 100644
index 2bc1844bb041..000000000000
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-		https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
-	KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( client server )
-	cups? ( dbus )
-	opengl? ( client )
-	test? ( client clipboard dbus html server sound xdg xinerama )
-"
-
-TDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/netifaces[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-		xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
-	')
-	html? ( www-apps/xpra-html5 )
-	server? (
-		x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-	xinerama? ( x11-libs/libfakeXinerama )
-"
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-		opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-		sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXres
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	brotli? ( app-arch/brotli )
-	csc? ( >=media-video/ffmpeg-1.2.2:0= )
-	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-	jpeg? ( media-libs/libjpeg-turbo )
-	pulseaudio? (
-		media-sound/pulseaudio
-		media-plugins/gst-plugins-pulse:1.0
-	)
-	sound? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	vpx? ( media-libs/libvpx media-video/ffmpeg )
-	webp? ( media-libs/libwebp )
-"
-RDEPEND="
-	${DEPEND}
-	${TDEPEND}
-	$(python_gen_cond_dep '
-		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-		opengl? (
-			client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-		)
-		webcam? (
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pyinotify[${PYTHON_USEDEP}]
-			media-libs/opencv[${PYTHON_USEDEP},python]
-		)
-	')
-	acct-group/xpra
-	virtual/ssh
-	x11-apps/xauth
-	x11-apps/xmodmap
-	ibus? ( app-i18n/ibus )
-	pinentry? ( app-crypt/pinentry )
-	udev? ( virtual/udev )
-"
-DEPEND+="
-	test? ( ${TDEPEND} )
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
-	"${FILESDIR}"/${PN}-4.3-no-service.patch
-	"${FILESDIR}"/${PN}-4.3-cpp.patch
-	"${DISTDIR}"/${PN}-4.3.1-tests.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# FIXME: There are hardcoded paths all over the place but the following
-	# double-prefixes some files under /etc. Looks tricky to fix. :(
-	#hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
-
-	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
-		-i setup.py || die
-
-	if use minimal; then
-		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
-			-i setup.py || die
-	fi
-}
-
-python_configure_all() {
-	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
-		-i setup.py || die
-
-	DISTUTILS_ARGS=(
-		--without-PIC
-		--without-Xdummy
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		--without-csc_libyuv
-		--without-cuda_rebuild
-		--without-cuda_kernels
-		$(use_with cups printing)
-		--without-debug
-		$(use_with dbus)
-		$(use_with doc docs)
-		$(use_with ffmpeg dec_avcodec2)
-		$(use_with ffmpeg enc_ffmpeg)
-		$(use_with ffmpeg enc_x264)
-		$(use_with ffmpeg enc_x265)
-		--with-gtk3
-		$(use_with jpeg jpeg_encoder)
-		$(use_with jpeg jpeg_decoder)
-		--without-mdns
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		--with-strict
-		$(use_with vpx)
-		--with-warn
-		$(use_with webcam)
-		$(use_with webp)
-		--with-x11
-	)
-
-	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
-
-python_test() {
-	export XAUTHORITY=${HOME}/.Xauthority
-	touch "${XAUTHORITY}" || die
-
-	distutils_install_for_testing
-	xdg_environment_reset
-
-	env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
-	PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
-	XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
-		"${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_prepare_all
-
-	# Move udev dir to the right place.
-	if use udev; then
-		local dir=$(get_udevdir)
-		dodir "${dir%/*}"
-		mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-	else
-		rm -vr "${ED}"/usr/lib/udev || die
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process xpra.conf
-	xdg_pkg_postinst
-	use udev && udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postinst
-	use udev && udev_reload
-}
diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index 32a4a46aacb5..3583260ace2a 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -11,7 +11,7 @@ else
 	SRC_URI+="
 		https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
 	"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )
author	V3n3RiX <venerix@koprulu.sector>	2023-05-01 11:19:44 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-05-01 11:19:44 +0100
commit	c3d14fe9accdf0b091e42f26a66ed7626ba8c24b (patch)
tree	354e4022d98ceadbdf02f98879cc8b1feb4d61b1
parent	149480f9f5548b5a0fdb457abd473f8d10f60f51 (diff)