gentoo auto-resync : 02:12:2022 - 08:55:37

author: V3n3RiX <venerix@koprulu.sector> 2022-12-02 08:55:38 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-02 08:55:38 +0000
commit: 5a1e5a6812ca9c9555657cce48fe09d2ffa44401 (patch)
tree: 5c040bbee9184b24f26b05031a2448e62f6df38a
parent: 2c4066122b66fa1eb3e37846f9a6e14529a553d8 (diff)
920 files changed, 4395 insertions, 7117 deletions
diff --git a/Manifest b/Manifest
index c43d368422f9..b6d95f06c537 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29781 BLAKE2B 8f7e20ba250d1a9a857cf606ba6037c00c03168f80197c50cdcea25a1ab974832384c2b1b72e245f79328031b3470406acf1a751a7f5f82c3b3fc2f363027b6d SHA512 17830de7dcdaa50fae9980c91d85276d64606e037e9b089223c667d8327af2a6b78c6ca893218a520060dc7be4fd171da9e9d919bd992aa90c78e328b59920f6
-TIMESTAMP 2022-12-02T02:12:19Z
+MANIFEST Manifest.files.gz 29779 BLAKE2B 49a6933b1f79549be3324bccbfdad65c0f4c98a96c895ce4afeecaed951dee9bff0d14e4cb653fc83b06883778d5fbf040839248df0b43823b49a1de56dde360 SHA512 76774e0d9fa4624405e90316217844447638f86f83cd37b42b82f3829ec0f71385e49fbe65bf4f35dd18951b1433730401459c1aefcf8be396efc256b4876e9f
+TIMESTAMP 2022-12-02T08:10:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOJXwNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOJst1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDAIBAAsKkP7JQ6oEhvoG21j20GBajvUe3E565OJgh2Rrwa0X6h3qcDO6AKAkyA
-xol1ERrwIX7vdWkSkC93BleTdtGQTXeYitdhc0WtYHt97aVk3+cgSOnx4x87ikm5
-ngW468lWGtDCo7VpMvC+vTjx6Lf/dA2erOxOUL0Gdexh66Y2Y+VZA4mcLHd0h4/N
-PuazIHIpWpTxB+hPhPDdsOfvY0YhEQyGdHguQHpug/S3u9Ea/7EQaYicasiMl52M
-YQVZy4hWFkAs38fxB2K+crVsirhZPEraYV91DjrovBdGJF3p28NOKSb4rXRik0hK
-99/al1lmNdLq5/zt0dzBWSt1pc3QJ4CahYOCSbS5q0nSKc62qenT8qmLi2Xaxlnu
-wf13NqEHhP8LlviS0nWIjrIsqWcBsrNb1YZOhEcUaE64W19VMJfW0n837tfDBKN4
-rwAAhvG9Ma2MjVnUT8CWZrzSGOYvavexIXZShK+hJaIvZNtEXkAzCPfw9GYE+QRJ
-f1rR5Z8i2ATpt8r+Iu7whXfU7Fa4Pts0nqyFE8CighmOSeBzwY4G+DAVQXAKxKMc
-zdmbicaMte05eCKJTkJB1/Bh5Rf9lml6ufVY4EfJyZzMSkBLgBW+G/C32PV39Ar7
-bMLUOj5D08e1h0b6tDDvCPyySh28DHNTdKWzOW45CabY/bk2c5s=
-=Ryo2
+klBTow//YL0nQaLHcbSfYWnrgIcpCyYwNNeZuKPUv312ZxtpHhN/gXX67Pp5BrpT
+q0RlmQz1bwYm85Q602f3NswqgJ6WnYxKiNoF+zkDG60f9YrfBhXPTQo2g5+ejSLL
+dGReFVIGzzI1vIwbLUiv/FjHzLmTknZrtcMnEf6Gw7amkZ1qaegZygoBnvCUEN6o
+T8y45zPcLN2Ji8n6gWcAPQRdsSofMur3UgoaaxLjVnmfYIODOk0dWuOxPhMkuZFf
+vbJ9T6oH5KgORW5Cva0jLRno6/tn7qSi17wmDJs4n17sLpXwaZoByWr9+xGU94Fj
+RVTDdnb6zPz9BDwOqAKhe/PsYpCwLbNQ00dKjKu67qqwJgszkYxyHuamFq5+xspY
+oJnQRHOdVCjioq53VxtwQvEuzO3xUa1unZcE1qJhvKWHYsotXt0vMVmADeFackeI
+mYa2z9sju5G7s1Kl5corH5y9THvWYTXHRE/Mo68IbQ/bQxUcQmVybYYadS1X98zS
+8ctzS9ypLKz+MKVJNH5VKY8XVFbEw4f9YRLSCtu31VwoXC7qrpF5bMmNi7IQsEFB
+AUQeHf4UC2Z6bjB6V33El1QyUkNY4JeByVgxLl1nYv0HCNLWQo3URV/YBI+aVIEm
+lYWe8X+LJnOOk4W/tLRS9jzm8ZeQzY9MeK0FJhxI9AUe3sijyts=
+=7l/3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a368222657bd..d7a3e1caa2d3 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 226d478dfac0..db1cbae6bc20 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
index 68595e79bfac..fbd6d21916c2 100644
--- a/app-admin/authbind/Manifest
+++ b/app-admin/authbind/Manifest
@@ -1,4 +1,4 @@
 AUX authbind-2.1.2-respect-flags.patch 812 BLAKE2B 44a82a62bee8bbc8d3ebb67cf7d618850690293c76ff9a0c0f70f0067fe646673adfc6932dd8972c41d81f51bfe7833593348971fb069652d920ec92f1039dfd SHA512 ec6fa58a06180f70d30abed32f0cfe94ec582dc9b286580ece222db99b1c7f936665567b918648efdc79e3e0c8b69a60043ed72c5f77479a2be2c5dd55c7b8e1
 DIST authbind_2.1.2.tar.gz 15279 BLAKE2B 5f9a31c9f51c307e9ad85bf14b436e1780d0c7dc5655ad3882e9596927862be0684d0a4a43c7d2e98a0d6a0d4c2552aaaf954ce32d3e9202bf5593ce501b5962 SHA512 85020af9703f8f39194a7719c50a51d75344db9ea99ecbc83c3c6bff0852ab1ea1cbd0b9bff6a2345e08a7bef9732e36890f33af08929e36dae8215dd070cc4d
-EBUILD authbind-2.1.2.ebuild 1237 BLAKE2B 9bd6ef57eb70c2fde8de896efbffb31f275f442e5fd68643484b1db5a6d8c96098c40c95238cb9b8b8799e955191e45da12205c26a7aac8c8b4ec42c8ebf99dd SHA512 8b11853f0eca7d1e7ef6fd6bde5b19f12205dc274fc44ada20b105edc93a6a2cfc598ed249f5880e0c3f0c994b0f0eb7549fa9c64b913c7e8c902202a1318829
+EBUILD authbind-2.1.2.ebuild 1246 BLAKE2B 17ce0aeeb46523aa0539a2df109c3ae3c613d00ace4fd3e171d92e7197ebea4da76bec2fa4413fa1d533438a8aee31fa71aa418986fb2f777a363f5099c97e98 SHA512 d27ceceb08c2f3f046a6e3d808924a51fccd2bbb1a1b4c7a94b954360113dd85203cbb6f5f6ab0f88113fc58c2f7b962e6d2be23d82a96c58d7c56210ad70ddd
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-admin/authbind/authbind-2.1.2.ebuild b/app-admin/authbind/authbind-2.1.2.ebuild
index d9479c70b7b0..3d27d3e0f343 100644
--- a/app-admin/authbind/authbind-2.1.2.ebuild
+++ b/app-admin/authbind/authbind-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-BDEPEND="virtual/awk"
+BDEPEND="app-alternatives/awk"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.2-respect-flags.patch"
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 480e018b3d2a..7b3255f9073a 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -15,5 +15,5 @@ EBUILD syslog-ng-3.34.1.ebuild 4889 BLAKE2B 1ae23a11a372441c56a361cdba6592551ac1
 EBUILD syslog-ng-3.35.1.ebuild 4890 BLAKE2B bba9a0ec5902ed72742980909971a79f4ee4bc1cb4eaaf0db620be55b17680a7d8878a931d68889b42d7451b9b36035bf61b0a7b941f3d8f07972c3dd7221e14 SHA512 152d923c2909be1353093320ecd29b47c330fd81374bf51c2c454b0cb65bff192713a21859be25a0c5412a5ef7731affa56b7e6054082f5503e6b11c784f4d61
 EBUILD syslog-ng-3.36.1.ebuild 4897 BLAKE2B 548434202912c1f7b1294b7af94896dca08e357291dc2cd348a07bdcd46aa08a724651c4b4c8ebd8eb606d27a99596815f001691445cd36c4ebac4bc2f8c201c SHA512 fcf2a450cdcb7398d055117192cab3b6c6a8368c81ed824a38afc3bd7b63344e6375513f1c31528e74fcd1f7577447e9a616be33441110e0457446287949ded6
 EBUILD syslog-ng-3.37.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
-EBUILD syslog-ng-3.38.1.ebuild 4912 BLAKE2B 42364de5ecdd051138ef0552363850348ff27cd61daaf862ab40857ecf51ece29fca8f2dc81f3c360c0f1d8c606fd3d7a1ab3baab097f52ac3c3c2696fccc009 SHA512 88539999285634ffb27146492ff342b310ecab24bf50e46fdc6715e8c9b73d8cf8356abef882f371c3074b8e769a4276f4a381559f1258f2e10bcde3ffdde2c0
+EBUILD syslog-ng-3.38.1.ebuild 4904 BLAKE2B 2feb4c8bfdfe6066995cad7b40bc8f06c0c4428dce5b95d9cbb9eb0a48ed111d0a001c31dafb748ab6c0825b74742ce865def4023c232d563b8284ec1d94dd6a SHA512 048213617d2ca0fa3d0e2c3249ee3a35df0c1f3fa586fd250365c58954340bee6a6d973f625eade79b8b597327fe94f3fdf8c6a08597945d86930315b3696639
 MISC metadata.xml 1285 BLAKE2B 91f0ecae07c9131f516a2b9dd6b71d021c84cde055ec58b21734b36f540f65b02452ac20dffaac4a3edc8942ad9a1a1afc3c9837ea4775d40d0d8b3d41083316 SHA512 80924020dccf9bd8d1a83d995af57644eaab761204e2b75a3ef997a2b7582506ba25f476b6203446d116af841629520adfa1cfe443c6e1547755e72956161eb2
diff --git a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
index 29cc2377063b..a672bed064a0 100644
--- a/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( python )"
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index a7f3ee4abcc9..dfcce434c13d 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
diff --git a/app-alternatives/awk/Manifest b/app-alternatives/awk/Manifest
index ad76b6e42b80..7c7ef08c6677 100644
--- a/app-alternatives/awk/Manifest
+++ b/app-alternatives/awk/Manifest
@@ -1,2 +1,3 @@
-EBUILD awk-0.ebuild 1592 BLAKE2B dd199aa3644d1567360e16397319b7d6d51e850245754fb4d05a5578e27939f4dca8812c3fa4f5fa5c83721309e7c06cc908925202d3caef7ff31a39d5ab8718 SHA512 688b29a30d105b381aa2ea43721008a3d4377261f06fff0cdaeaf0c7b72ff6eaef8261f52a1ea66695af24b16c9a3047861401fec6bbd9770b3d86195f346f93
-MISC metadata.xml 715 BLAKE2B bd5d943bc9fd00f7a4cc999d80cdf565a2138f5dbb95b51e8589384109b2abfbee478b4fb56b30fc16659a1a51a08b0353b30126004bfee28b9ce5217c68c6d6 SHA512 56434c9ce869659cf9d319fc4c2b6e394fde089657db78430c8b7a87d013f0716758d46349795fdb3be4183dca4d10f6631ae13853b658aae4be0a88e5570888
+EBUILD awk-1.ebuild 554 BLAKE2B 29fc3ad3018b3ce17a24c250e22789105c8a564fdda0c2185401fe999ccb2d33eae2afacef01042e3b58e968b906452e9fb623f0a804c0a0954042297146abf9 SHA512 53db324987a3b7dc3c49f4d5d2060b8d065aa5798be2084d75c5eea89344205118ca301ca21ecc438d45e28ea1eb60357d44c2fe0b52ae1602636bf85535d1d0
+EBUILD awk-2.ebuild 1592 BLAKE2B dd199aa3644d1567360e16397319b7d6d51e850245754fb4d05a5578e27939f4dca8812c3fa4f5fa5c83721309e7c06cc908925202d3caef7ff31a39d5ab8718 SHA512 688b29a30d105b381aa2ea43721008a3d4377261f06fff0cdaeaf0c7b72ff6eaef8261f52a1ea66695af24b16c9a3047861401fec6bbd9770b3d86195f346f93
+MISC metadata.xml 829 BLAKE2B bf4375b33e702c61a3f8553e1b63110acab32b68d4ac2d905b6dd12a2204484bc5c2f3a34b2ec127a6c60aac8c105949dbc6eb5ade3a1c8c959afdabdd3658a1 SHA512 32252970d3b12c7a5b9fc7c7ffae821908b9bd4101372e699c70e64572fd7563121427ed5971462417d8c2e6155e47f567ac3bb057d457d58648c5b4d2458974
diff --git a/virtual/awk/awk-1.ebuild b/app-alternatives/awk/awk-1.ebuild
index a17f47bf0746..cef6aea276d2 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/app-alternatives/awk/awk-1.ebuild
@@ -4,8 +4,11 @@
 EAPI=7
 
 DESCRIPTION="Virtual for awk implementation"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="metapackage"
 
 RDEPEND="
 	|| (
diff --git a/app-alternatives/awk/awk-0.ebuild b/app-alternatives/awk/awk-2.ebuild
index 01e69d65fbd1..01e69d65fbd1 100644
--- a/app-alternatives/awk/awk-0.ebuild
+++ b/app-alternatives/awk/awk-2.ebuild
diff --git a/app-alternatives/awk/metadata.xml b/app-alternatives/awk/metadata.xml
index 7c4c46c75e10..0cf5fbf0d2f2 100644
--- a/app-alternatives/awk/metadata.xml
+++ b/app-alternatives/awk/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f4346c34ebd8..3d7b8d6ff102 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 7ef317a8e22f..8586c9fd7cc7 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -2,6 +2,8 @@ AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40
 AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0b0271d43d3df43849cbcfe60a4fd4546fb5e69dbe95d6729b344f705b97483a5bc0c1d11edc21ce8e08bca6b SHA512 b6d3e5c6bf0e3605c3390b97bdd1f0747fff32eb7780a7ec967421841203a6cacb42ce16041bec84f88fa1eb2fd15b9235da1f37d517c9e7d876034a5bd79466
 DIST unrar-6.1.7.tar.gz 236798 BLAKE2B e33a7500b4a03a54f84b018ab90934366f52ef54c83257ed7fe4419ba993d2a8c21de26f445ae18d870aa5232cfbf1f5d8fbc0b3965803aeec6cac5e5a38e949 SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846
 DIST unrar-6.2.1.tar.gz 242918 BLAKE2B 55cd5d11caae2e6cef2a36f5656b76d96946d6d7df3f34d7c65cc31b43b820d955da4751666797f8147c6a7b20c3429527b2b1629842334d3bec6de49e1d6a72 SHA512 920819b4b3e76004492813b4c22309443976fe5e7c873032bc084603b902c6873775cb90cb173d78de3624a3161a2238c9ece1e817f6b7d915937e2e18d8def9
+DIST unrar-6.2.2.tar.gz 243051 BLAKE2B 3f76476d8cfd2fb56c6d98c8a5698c7dbdba518566384051f5b645fc5e0661ec662aeee713641cf180819984c6e1d3a44f16d8afa0c99d95ae8007916feb82ea SHA512 8edc659599f9e7a325e7db0ffdf57775295880c4368c4b37881390e0633b1f41d66799263e7cb85cc658e395b6eb0ff9e495aa0fd870b971422c4369a2e6c1b5
 EBUILD unrar-6.1.7.ebuild 1826 BLAKE2B 8d1bf4e45161d4d98462c23876551bdf9770bce19a8907a6151c293fc92ba5a19595efed02d0f1308517f774cb28496d0c0fd9b9819adaf3eb409da4162d1cc0 SHA512 b326b0c8cec1c02ce8deca83f111da38f059f238b0592a99ad572dc347e0f51b6ab19ae6443fe93f15dcf9699c1cdeb8582e412130595456e19688aec0473def
 EBUILD unrar-6.2.1.ebuild 1827 BLAKE2B f5d3bbd48deb31d4beea94d39567b7aa840fa3efa59cd44cea6e4fcfba4827cc55347ab34e2464f0f13327e95404feac27eae1347f626982ed01785b284f84ac SHA512 9bebd4b56d91b62b8209601fa55afbb6159757932239ae3a6fe8bb625f279219dce6904afc2491ba5550388f3935e9bee8ee058a71f3a1d1aa80d47431ef3078
+EBUILD unrar-6.2.2.ebuild 1832 BLAKE2B dca89de028e1410976d72ac5147ae6e2605075ad5643cbe04e0e548707eb1a2116c15b30b12527a09be3067fe425079dd344cf098770b92312bebff7d11ba325 SHA512 0e721466af729a7a0964aef37f5b329bb4a903d8c3ff2f06074694d43f4b45fc47b6348c1a56840bb027b4163ca8e4cc82ecf4fb7a0c6c7d500ca667399fcef9
 MISC metadata.xml 409 BLAKE2B a84cfacf4a852caa6f6389b380eeb700e1c44c4af68cb2568a27db21c2b577838d9c57269dcdb5f08dfa989617eca978520082d36153ea503a5033c4cc9446af SHA512 fcdf5a345b3eb2b5093b60def127dd48fed068bf5caa92dc52524b4e398d49c39d8ee686b3f0695c781ab2d0d3ba486baec23f74f80e581b7a2f77e0c5709eaa
diff --git a/app-arch/unrar/unrar-6.2.2.ebuild b/app-arch/unrar/unrar-6.2.2.ebuild
new file mode 100644
index 000000000000..e38b27b24a93
--- /dev/null
+++ b/app-arch/unrar/unrar-6.2.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/6" # subslot = soname version
+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 ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index a401ed4639b2..71d85285c104 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index 32e4e63caf93..d8dd03b230c1 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -14,5 +14,5 @@ AUX example_amanda.conf 635 BLAKE2B c02539af8d0692d8ebf80fae47979845a872bd151596
 AUX example_disklist-2.5.1_p3-r1 177 BLAKE2B 3060151252a44a4abf02764c19db8349ea63691495bda0ca2db4112844c5aea60e4f8b13e668d9a9ac3707f4f52407c8639ed8cca353eac72e8ca7d9cf38dcd5 SHA512 43fd73b55d48396e1863b23b20b84781aaa7e38200ee4fdbcb898c9a8c5479e24b8448a68ceac01bd6339202935bbf32f02e70a779ee989eeb368ec88d890ae3
 AUX example_global.conf 1377 BLAKE2B 712a3ce480b2cc5e0e47a168ac178621b1e655e9d9880c278dfd5aad9627db14f1f3f6be410c3abc4ce4bd33b0728db14d7832149c1643929bd1c53f27d2987a SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5
 DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
-EBUILD amanda-3.5.1-r3.ebuild 15844 BLAKE2B 51f63ded94813ac6b1315e616e65a3b1ca2228f7c1baa698c4b50e28781e8722ffb8dd49bc62ff96e5e5ce66c487072420c092dbc3ec84ff93335ca3a1352a45 SHA512 e233da6e0ccf9d79c06d75cdaa95ab489c8d042d5963b67b8e317efc06c75a87dd9ec9a843b2b3cdfdd9d9b3d7e2052ea5e2676a25a044d3d60458b3f909c1a0
+EBUILD amanda-3.5.1-r3.ebuild 15853 BLAKE2B 93b7c4d3d476d36c175944fcf36e51adc288984a2c65bcca67c2884d46456bbe452e469d71b35dc2e2ceb984e7cc2a419025ecd715d8b2874d1747e50e49d89a SHA512 f244d0b61b0c81c309e5cd5e817f6d0d45590f4dc88a80b3160b5eef001f99740d4f27e0033b3bd0d7bb1dac7c86b1c220b4531d187d487275e1aac822937a55
 MISC metadata.xml 996 BLAKE2B 10cd2eb3c98dabee523db57f2c5111b8edac5282b591a776e07675e2add9f6115abaed871d59b36516c1604cddad9068201d32184044eecf43863d19365305a7 SHA512 5a2c81c0d331dcc7862efdc24bd4f1e2e652157a78b9374300dc2f84fb7500b6cde5d4095cd33af8240d5fbc6d382b72beb31159d79b42333faa4c9283729525
diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index f838aa934335..53df15f23433 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	dev-perl/JSON
 	net-misc/openssh
 	sys-libs/readline:=
-	virtual/awk
+	app-alternatives/awk
 	kerberos? ( app-crypt/mit-krb5 )
 	ndmp? ( net-libs/libtirpc:= )
 	nls? ( virtual/libintl )
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index c1dff43d5bbe..2e7de26eab6e 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 6da0e658580a..26c6cbf660db 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
 DIST snapd-2.57.6.tar.xz 6889052 BLAKE2B 5d1190f3d1ccc6446f950cc95c09180707c3a96285bcdd197aef06b2d69cfef6daf85a93844f105dd434b29b73d3b9c832dfcbebcdc2451443eb5421046de849 SHA512 cd74fa92cddff3452448a50536ded504c68ca6f786b465b8561ccc43c02856742a895efb71bf92b8d125173e0d083faf61ca563f69da03ebf3c4df1b0b0b8d5e
+DIST snapd-2.58.tar.xz 6980916 BLAKE2B d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638 SHA512 555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
 EBUILD snapd-2.57.6.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
+EBUILD snapd-2.58.ebuild 5207 BLAKE2B d5b7ed960319879d8338e3fdae29406ae61ba4cf23dbc81c944af351c07907d9823e0c847dd3f436c53ffece6605bd87418186ab306436ea35984ed7f37fac3f SHA512 a9e5ad7c857b5d0a6e31eccebdc6e16e059ebc2ed5ca42afd15f0edbd8d51a2cf3776323b72fa31bcb4e3775f313d0a28f8f979e014ec16bd483bc999efd4ce4
 MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/snapd-2.58.ebuild b/app-containers/snapd/snapd-2.58.ebuild
new file mode 100644
index 000000000000..e6878325b6d7
--- /dev/null
+++ b/app-containers/snapd/snapd-2.58.ebuild
@@ -0,0 +1,179 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd tmpfiles xdg-utils
+
+DESCRIPTION="Service and tools for management of snap packages"
+HOMEPAGE="http://snapcraft.io/"
+
+SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
+MY_PV=${PV}
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
+SLOT="0"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
+
+CONFIG_CHECK="~CGROUPS
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~NAMESPACES
+		~SQUASHFS
+		~SQUASHFS_ZLIB
+		~SQUASHFS_LZO
+		~SQUASHFS_XZ
+		~BLK_DEV_LOOP
+		~SECCOMP
+		~SECCOMP_FILTER"
+
+RDEPEND="
+	sys-libs/libseccomp:=
+	apparmor? (
+		sec-policy/apparmor-profiles
+		sys-apps/apparmor:=
+	)
+	dev-libs/glib
+	virtual/libudev
+	systemd? ( sys-apps/systemd )
+	sys-libs/libcap:=
+	sys-fs/squashfs-tools[lzma]"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-lang/go-1.9
+	dev-python/docutils
+	sys-devel/gettext
+	sys-fs/xfsprogs"
+
+PDEPEND="sys-auth/polkit[gtk?,kde?]"
+
+README_GENTOO_SUFFIX=""
+
+pkg_setup() {
+	if use apparmor; then
+		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
+	fi
+	linux-info_pkg_setup
+
+	# Seems to have issues building with -O3, switch to -O2
+	replace-flags -O3 -O2
+}
+
+src_prepare() {
+	default
+	# Update apparmor profile to allow libtinfow.so*
+	sed -i 's/libtinfo/libtinfo{,w}/' \
+		"cmd/snap-confine/snap-confine.apparmor.in" || die
+
+	if ! use forced-devmode; then
+		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+			-i "sandbox/forcedevmode.go" || die
+		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
+	fi
+
+	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
+
+	./mkversion.sh "${PV}"
+	pushd "cmd" >/dev/null || die
+	eautoreconf
+}
+
+src_configure() {
+	SNAPD_MAKEARGS=(
+		"BINDIR=${EPREFIX}/usr/bin"
+		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
+		"LIBEXECDIR=${EPREFIX}/usr/lib"
+		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
+		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
+	)
+	export CGO_ENABLED="1"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+
+	pushd "${S}/cmd" >/dev/null || die
+	econf --libdir="${EPREFIX}/usr/lib" \
+		--libexecdir="${EPREFIX}/usr/lib/snapd" \
+		$(use_enable apparmor) \
+		--enable-nvidia-biarch \
+		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GOBIN="${S}/bin"
+
+	local file
+	for file in "${S}/po/"*.po; do
+		msgfmt "${file}" -o "${file%.po}.mo" || die
+	done
+
+	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
+
+	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
+	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
+
+	local cmd
+	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+	for cmd in snapctl snap-exec snap-update-ns; do
+		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
+		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
+		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
+	done
+}
+
+src_install() {
+	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
+
+	if use apparmor; then
+		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
+		keepdir /var/lib/snapd/apparmor/profiles
+	fi
+	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
+	fperms 700 /var/lib/snapd/{cache,cookie}
+
+	dobin "${GOBIN}/"{snap,snapctl}
+	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
+
+	exeinto /usr/lib/snapd
+	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
+		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
+
+	dobashcomp "${S}/data/completion/bash/snap"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${S}/data/completion/zsh/_snap"
+
+	insinto "/usr/share/polkit-1/actions"
+	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
+
+	dodoc "${S}/packaging/ubuntu-16.04/changelog"
+	domo "${S}/po/"*.mo
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_desktop_database_update
+	tmpfiles_process snapd.conf
+
+	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
+		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
+		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index fce8ad80e7c5..aa2b26fa32ed 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 64ba52ecdd65..01a92942d082 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -3,7 +3,7 @@ DIST dxvk-2.0.tar.gz 943397 BLAKE2B 7d59050e8ac3f9be311d11323cc0057d84c3b730360f
 DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
 DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
-EBUILD dxvk-1.10.3.ebuild 4265 BLAKE2B d830295fb402291d9fafa65539857dec4aa140f1b1c8ac15d863b15b85d58176b45a0a17c0fbc9c418d67445227705b3f73fbb872426011f1d80a89530f6eb3e SHA512 e103838702f73954b7afa6266759c762ea0a0048643a17904f1436b52588e41a5afa5b9818c3cc08491cffe9be1f8fddb8b45422c46f974ed9578398534ad6db
-EBUILD dxvk-2.0.ebuild 5239 BLAKE2B b01f9ed7682a575fe44ec6ec951d09ae209ca52df04c63ed61e5f542b7e5261a7ad032297981b7a93b244f3c1a22918de0f24c56e131f7a38ddd3dfe379f0572 SHA512 237c2fedd0aff29e9c56f050985653bf756ee8e1d7bc1b5c37c4f5e453e991078f7c96e6caa5f86a3f1a15cf3b62ec3f294a9bda9d7837907882751a3dc6f02d
+EBUILD dxvk-1.10.3.ebuild 4263 BLAKE2B a8598f535907eeb73a7ce5c2bd64ae2913aeabd6aea38ae34f7e9e06d0e287a5f0fff89850531f5ef1f779a48ad4c230cca292d5a39ad0a45cc7392325e0a08b SHA512 e16d4f84badc4b9224f33a93421b22dc5ec962bcb022baba0be3c087ea4e87f5e24f2e21499cb2163387674eb31dc139cd14366fd243a219d4a5d9852e26cf6b
+EBUILD dxvk-2.0.ebuild 5246 BLAKE2B 887e53f5dc1076ea127f4d97c69ae368f9408a51606451202e5b07b237f1294f307619662c1d2a03dd8b05909185e4562314aeafce8ba06e4b33ed73faeb221a SHA512 c7609c2998c588e6521a1b8487a963cbfdc0865ec5ad2e4f29c925f5fe9e40866ad00e41bef916fa27472d1061b94c8b030cec97a98d9fa460835d105dffa332
 EBUILD dxvk-9999.ebuild 5635 BLAKE2B 8eaad2471f58c6cdd612beac5b53c09e8c88d64726bf909c09803fd9492c5c1854323a5f308d2a7b1cd404d8377b26660e1339f53d708e64d72fd6f610c818af SHA512 658f01cd40b05f6bdf80ada09b6f1eadf7605b9cfefa6747b4f49a7a00015ccf2d75921def74ed424df053d15c38e117143983a6af93321e23baa512922be06a
 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-1.10.3.ebuild b/app-emulation/dxvk/dxvk-1.10.3.ebuild
index e69d7600dc0b..ec69c80ad8fa 100644
--- a/app-emulation/dxvk/dxvk-1.10.3.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
 else
 	SRC_URI="https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
diff --git a/app-emulation/dxvk/dxvk-2.0.ebuild b/app-emulation/dxvk/dxvk-2.0.ebuild
index 19174e20a451..918fbe56bad5 100644
--- a/app-emulation/dxvk/dxvk-2.0.ebuild
+++ b/app-emulation/dxvk/dxvk-2.0.ebuild
@@ -17,10 +17,13 @@ else
 	HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
 	HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849
 	SRC_URI="
-		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
+		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index 6a81d888b4bd..e562c5aeedc1 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -7,7 +7,6 @@ DIST aliasable-0.1.3.crate 6169 BLAKE2B c23840c7f1df86109e004aa1929d7355bd815c69
 DIST alsa-0.6.0.crate 68171 BLAKE2B b692d929e49765c59ae2fae7bbe8bef4393c393e384c5d84133f018123cfe1044c6fe6c1915423614957fe622553aaf9cb5c38a41d3ff93afa2c4f162a828252 SHA512 a63354da0e643a68e28e32293d48f866c071332b1d17cf8349a79f28e45d6b9566d22f30c3001a862ea26c2b757aa9440b3f52c826a40b29c7881d12416f599b
 DIST alsa-sys-0.3.1.crate 32748 BLAKE2B 0c4da9c343d622ddd521fe9332acf97c1ee4a202a909c7a0014a507148ab6ff82d5098660dcba847d938b296adde416ae420d454d6982c33a0456f37840d716b SHA512 6523d909c500fee433f934eedfdc200cfc52e1b55be09434665210c16bb9af3593d8b1346ace184b171c7135a7aa65fdac5ca8c68e64f9d20436e1d8fac961fe
 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
-DIST anyhow-1.0.65.crate 43585 BLAKE2B 4a808e60ffed900ef37d8fbf7ae97caec6fb81d23a8a5411c5c0143636652c41a9579b156ead5eab66d57c53be2bbc336cbd5f7b60c6c20cad389d45861d82f8 SHA512 86b83c88fbc343f4ff1bfba5bf91f3c5133fbed8276e78f4222b28e38ada79c4245e2780934897525b41cbd4b8a9d0bc9cbd8b6c2dd32544ba124d458f5a490c
 DIST anyhow-1.0.66.crate 43770 BLAKE2B 8d74397c47bd64c00f015cf7ee279fa020ea39191440208d77e4a5fdb35fca531e8bb9b765be223b24050d0fd1db76fa5b516146f450937f84a5c113c9eca997 SHA512 7b4078906df2805d491dc2f29c4eec85a9f43078c0dcd9c05261c2706ed655953b693c4f59fda62547681b29cda9ac7a0789f1359bb18110403cfe34e9fb0dc3
 DIST approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399 SHA512 c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
@@ -19,7 +18,6 @@ DIST atk-sys-0.15.1.crate 22726 BLAKE2B 8ba96f5eb203085b09201f47589b84a874bf9b9b
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base-x-0.2.11.crate 10755 BLAKE2B 0029779ba8f8802bda969949bd94168131b34ee5d26a4b97bd277b4723f284fd392b2d93b12ab618262ea2288821b3e8be01a97ba2939957ed5d6e74ddb4eda9 SHA512 4e623b05b9450d8c3613da857a144cba2ee724584b0baa6df2209750da1c6e66756b88b787e8d8764c72a3e9dcb411316ff6a70afdd6f80d59b4224209c277f1
-DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST bindgen-0.59.2.crate 206267 BLAKE2B de66347fcf2d538879e49c85d2db80e86a70e27d3c84464b52a840476a31edae0cfa3e1afaba33ef0b7abadcb1e23a2fe1420e3254e0de1f6848b575a9c96620 SHA512 14c49879c7443191b877957a4fd405c7f10a1e8b70016d91bf5fe33861fc5d71982a1c685c190e4f7922cedb6c8aefadac3b0b68cbe5578da791a8da6bfedf44
 DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
@@ -33,9 +31,7 @@ DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd8843
 DIST block-buffer-0.10.3.crate 10465 BLAKE2B 32f0089971bb759244b73a75bdbbeb2d24f0422e92ceb0ae0afe3c698e3fabb371112a2eba3dab16a3859420d492c0ac984bfbb25e59e0c31951501cc652aab7 SHA512 e29faab70f8f2965a58089728274ec34bc97d681526687868c9cb1a2c145db00717f97e77b79a04fa52bd76817d796e104b509cd2a3163085b214f8eb68ac04f
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
 DIST build_const-0.2.2.crate 4511 BLAKE2B 44316d3b468e73fbeedbaa1ae35705196f787707ea861355d926e7fbc97f759bc7fe0bf88d2e97fb9b981fc7347fe0e849ce2094f50ab53075b4dfe7522089f0 SHA512 47a9949b7196791af2507d6e3a28843da67621e5b56177d3b13477e070487cdd1059207588a55bf1a393df9118e71e3024b439a3c6281b6c12b5bdee66b237a6
-DIST bumpalo-3.11.0.crate 80945 BLAKE2B a740a674d0922794cc71b87a8bd686f677f8d0b38d88cc43467b7f8f6d1368ef5cff99bf10867d3c8af9b79b71deca7e5bfe78670b7890b04e468359780d8c76 SHA512 f747b5743bd2825c62c363ec49f1eccc492d7cf8cca8101aa9733f32489685c1777344dc6183f83c772f1067f9648b953d3ae1034976a14295f252f1ee7788fa
 DIST bumpalo-3.11.1.crate 81207 BLAKE2B ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292 SHA512 70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc
-DIST bytemuck-1.12.1.crate 38293 BLAKE2B f714ba0b4b0d693c5b26a3bcbe9de8c1496851a298bb70770e6284ed68caea61d7b8c14d67ed0e8b6d9146e76f791192fcfe11e897146203d5acf536b9721e67 SHA512 50626367364cf0cb33658f6cbb99675f1191ed3e7ad447bd7d2c24f360bd3524ebe1b2d1fcc7d78d1a0692408da8d95795b54efee91a87c55e8b54711a968790
 DIST bytemuck-1.12.3.crate 39835 BLAKE2B 70bb0459b80fceec7f3c16c70a251f3d0e77069d77468e80c8ab2c3fcb7596dfd072c2214008d78ed1bd1a19332ed312b50a77b9f57c4230f2815768497fabcd SHA512 4bd87ace983d659877792e4f463d7ccf16e5a524f2c9698728bd688bf9d0cc5651cf641f4d6d987c8c26be5e56d11d22537389ac76a8d49b4d6e25b6a2284c1e
 DIST bytemuck_derive-1.2.1.crate 13615 BLAKE2B d9c5be9fd2ddfb48316aa36e55d37deecf19a37981600351557c561576584b56902e73970cecc8a41d1592912a03821dc43770c2fba54f594dd2cac1a163bbfd SHA512 753ce9d718523e26e2464135040f0c6f82c24578d7fffa7352aea57707cd982795024773054392cff668a727d696d2b90f27147065ea80962254a7a76ab24c5a
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
@@ -44,27 +40,21 @@ DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a52400
 DIST cairo-sys-rs-0.15.1.crate 11280 BLAKE2B 382b488bccd8c01a0020f1b43462161092ad9bf1b280cab52f04cf2e8b4e52441f55f24fafc5f4ade8d8cda186eb0e5166c6a29f329f5a229cd0dcf06a4b827f SHA512 85e3eb317d410b96d8879d9f51e74a98918476e9c011dd4e2d482a602341d93e5929422e3ea9b9235360d9af5d991600de512b23fe01f1e1012610bebf513e88
 DIST calloop-0.10.1.crate 53614 BLAKE2B bfcf7c4e4784af20e94391fb4622f8c5f9b2581c03635fd9000a65fe6d7ea54352f2a92cbf2f0a2e326efd79b614f01473e59ea691e0d1414261652341e5df0d SHA512 f6626ff055f81472040cc756d43018264337a33ff22a8584a110a189371df2b507f918b49c9a2f5b7b880f00dac4e72e13612a5e8aa5b16cdffce2796de2630d
 DIST castaway-0.1.2.crate 7124 BLAKE2B 43b5cc2106028b9d69a79235e9b1431fb76de1c2c881a26c158be66f79dadbe67b03c4718a439bd0b48d9de70424872c890956bd6774dd7af88375b0807137be SHA512 548c192c8e746107e4aee4b1e392425a024ea6dac53468cfd399c7dfba01e26a1c2e4a6bb824846d57cd940b6b72e26b66525ddbb14a6e3fcf5fea8659ba88a5
-DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cc-1.0.74.crate 59410 BLAKE2B e53e0992395e6ae54a732ece8af7a7713afeec3488a303c545b4ec50459d049609cebe8652ed595bf86d4f3c23a16d7a19c7f73e6f6f42b13b1567cb34ea6078 SHA512 0cea38466818473b0c3b3c304eda797b018dbf644c084cdf07539c63557be4c38346fd10afc20fa65a099aa83fdb423972c987a080c68205abd9ef04166a8d3b
 DIST cesu8-1.1.0.crate 10555 BLAKE2B 4fe369d1247c3b30ff9beb644dbe2a517d78632191f3216bb83d632bc8857f9541a1b60d0bb583cf3fc0ae974f7c9d2b07fca5efe2057d9ef281de76fe810a49 SHA512 2d902b624c7ccfe3633c7bcf99b833b120c0ed7760ea825bfb2fa03ae90df543e637efd46e0743782b81e468e0fd3b534956ffca81f9bdfbf742ff3beae8f8b8
 DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886
-DIST cfg-expr-0.10.3.crate 39502 BLAKE2B 8945634ccd463a54991a8f8f7249a0ebce6e0a915a75d7dbee814b8914b1f323858a991cb346eac73707ad717a786bb9321427f03202d025722c8120aa782608 SHA512 9397c13b4f5bed2e287a4d18b0d8775ea328f97465059911746f0d47976fef3648b6729ebf4e07edad4a0b3592bdb41f437c942fb340563d747abc4e8895c9a5
 DIST cfg-expr-0.11.0.crate 39821 BLAKE2B 19a9c100105026ddb7e415f31f0d2ee20c431df02b155fc9e1975d586e4d1cc6f34a135a6962cdd6b95d7b5a56cad0a051bc5c3de9b5bd81b6ebbacbdb2c49c0 SHA512 92ef9c4f1ab0788295efe75cdced1a2a63503892fee1b63f8ddd5a6fc125b6046e17950f2ce060133a763640b992988a6899b15d397d3892f7a3298b3a3130d7
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880
 DIST chrono-0.4.22.crate 185570 BLAKE2B 10dfae2fe871a9910bf885b78aaf3e9ed1bcb87a40962d781c8ea407a945b837c665c2bb4e3d0562ac63d9e7bd5012804434642ee6f5c80e22bc816d4331f1b0 SHA512 de856679ec16afe035176b22125a00ced532d49c8babac0a88fa5f6e4a3d9e526a34ee8bf51639653fc313a5703a202b1be013aa16fdd72a505151d7aafa7c44
 DIST clang-sys-1.4.0.crate 38679 BLAKE2B d15bdae2142ed26b4f6bd037bd2062e8c4b7b87fc5b749b872a95ff1952d000066c255aa0984e5f9c4a5c88066db4a20cfd048db4ba5a59b331d5ffa5e9a281d SHA512 062189bb0a341e2e85de4987f4b564c1fc69e4005c9c42cfedb61dee5f48db9126a8114d1d97be1b9c21b8c885243751232fbe8cf532e1d2be593308fe45216a
-DIST clap-4.0.15.crate 204761 BLAKE2B fb8d3f5640c8699616466d80178ec12d94ee941ba7d9939b16d06aa6393be36707a56b9a16d326afff26e9268af48857be75b4e59de117b5882771d242769f04 SHA512 d0622b6200fc45e4998100158005d73ee325e48682f26e07b096f914205e5abe0cbb3c7472e04aab76f44a345fa8b8f5c213327375c6b8ef2f643b8b43d126d2
 DIST clap-4.0.22.crate 205175 BLAKE2B a0d0284c00b5011b8ce24a290444947970c784d13ad2273227a4d619d14bac7bcf9336911df5d49748b38ca29dcca211596630b5ed121a058492ff4e0463b616 SHA512 d6b54e31c4780be7d712bed266b2cee4ad1454c75d9dc542fac301156e1724ca07422228632d901b4e7590eda13ec2c8349ba59c5da12ac1991e9fac540d0c55
-DIST clap_derive-4.0.13.crate 27324 BLAKE2B 6e50a355491364edea17a4fff13e1a48ceaa7ef3f1922709cf379e963fae5a3f1c0e9884fde65ec7f115fa6939d41aac9b45cd1ba7fb6dd2d79eea68ca9b9ca2 SHA512 2bdfe728e61786350dbca12b9d6f3e4067e21e8595734218f8d6b7d01b44e538c8ebb3762bee87d4705fb26d1e39977b3857066127569c85d72f92e564185e5b
 DIST clap_derive-4.0.21.crate 27567 BLAKE2B cbef7e547b0d0a145ee7696a773e1dce541866dd4878797e9b810b7506dd11d75ae9cd2547b4c3330569390568a1039588406ee614b9eaa2b1a619951b0e67e5 SHA512 95bbddfd09de9dc1c64266743e9877aaed086be56f7e0f6e933dc5245724fead7163316a7bb4a744bc81597e4d079fb0abfea891766a17e0b1aafba011dd74df
 DIST clap_lex-0.3.0.crate 9671 BLAKE2B 4422495226da19cb7a793d364ba5539ec77f9d327e2f1627e4b547fee0625162b57ddc6bc50585f520d31ec289a53065a2b6e0ba66111959390f756143cd5fb7 SHA512 5e601d540e46e527f6a2ea1959fa5aa035ad823008806f3a5adb4785f1928de4c9fe04e61680c64bcb87ed32b2e991951ec27c5cc5acdcfae51cdc61767ff100
 DIST clipboard-0.5.0.crate 10009 BLAKE2B 17aaafeb92be0dfb4ccfdb80a3d909e57491cc0adceedf378196f7bbd006d245adfdd9b2d2e075c2c041aa57eb1a0e6e306032966c30e63f94d86b0f9f7a11ce SHA512 a02994e68bb4ecdb1ba3db05e095474e67df4d73f69c92ab096913f4bd0f47ec6b62c8f0210fd67bb466e293c765888c315770e447f5c6e9b2e5c69f71d3e48a
 DIST clipboard-win-2.2.0.crate 11079 BLAKE2B 5713e17a93eac4a1d299d42a6abe5db1eadbc90bf5e7c99e84b6b5febfc817bbc1c478533af8cbec7a8e58ebbc1a8f3d83bf351d105b55017cebab8048009390 SHA512 f869775bb2e6d84096034c26c888c9f671272232af74c02bda2a6c8f0d600652af581c0e94d875d8746b986314f61168bf7539042a65cb2ccbbf858141fa42e0
-DIST cmake-0.1.48.crate 15142 BLAKE2B 5566d196c7ebcaa6b4d91e3361d7c92eb9c60c0a940b6d581d8cfc547606781f04f77d707ed128a6a391ec46fe801a4f65acac3c7c9bc90e0e43cd9e1bd6be03 SHA512 c836208d43f4a716be6ef043a6b5f526d3961b9414f1419171895903491176a2a8dc2f271062667a7568c7deb2bebfe96541b4e4fe73c31aa9aa760557b188b9
 DIST cmake-0.1.49.crate 16717 BLAKE2B 4a2dfdbfe38c481715054db4bf3ade6339b033180e4e1560edd820b1d44a66cdb23e042db772ef28283dd4d9e73423d64c9bed791742f706771c309c1b542007 SHA512 ba8d65a757734d72c8c7c7f532adbe563b5caedb67140d100cde404d4bd206e227a9d408f122975b737d44cc76a9deebbf0b4a492d1bf03e3d5f1ce8a6d50fc2
-DIST cocoa-0.24.0.crate 39235 BLAKE2B 01078c3d96e88e0cac773f238d3d3144324594fd75cda87d18bc98d73f0a1acab4cd795471f4789d38b017e6cc90c0713bb33b0fdbdff36abcdc1cbae767da86 SHA512 accae0f676caa23c8d3fbc2e49365118a366c50a698ee9dce4ef194f1d391b3633cb789d65d5c2d1e43afdea5d7a82161f7e7042a9dab32747ecac29d1b1b20c
 DIST cocoa-0.24.1.crate 40445 BLAKE2B bb89242b81151d350a95832dfb1faef1c439f92803dd75e259e3b9b4568e5a8884c043d417fe9af4f0c552e6c52de9980046c6cc25f26d388455a8bf9946ba4a SHA512 ce69c3445652dc866c5078ed47129b191bf322355a3303acbb0a475ed7efd502dfd518338569e69c9b44d9ee77b6fb46307dda582fe6c2327dc691f32b85b6a2
 DIST cocoa-foundation-0.1.0.crate 10645 BLAKE2B 8ea7db02939a5cf1785b2770743d609e28da415fdf49b881b620e0ae289976a5a737056976afa7e616fc49c15ce535304d70ce91e79bd61c39ed024078012e61 SHA512 cf0e8188bd4d0310716aad9f1e2cc77e4098e85306bd2098bdcfd9720782bc558f503033074e0f076748074a9067a4dfea263ee5356074207739d81c4a052ba6
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
@@ -84,7 +74,6 @@ DIST core-graphics-types-0.1.1.crate 2530 BLAKE2B 2340e9e0147a904e5b439b3e9db539
 DIST core-text-19.2.0.crate 18446 BLAKE2B ea2d6e2adca87a9b7febd66230dbb49ef0775869bd25c4f9dadb756197e70286068f202b3f39010a0b33afa1f610871e241532b32db766e887caeba9b76c1645 SHA512 37bfa0c75849ada37fca77793a5791dce7dadfb9fd20b353e6761c12d0a7d06df3ffbd99efd8b6885356dad00e827e7fefffcbcfc49ccd0c5dda50717986f4cc
 DIST coreaudio-rs-0.10.0.crate 34487 BLAKE2B 30c2273082266de0e4fe7f7f6ea56673d954efed518e522a4ea73ffec12781cdfc92df3b98e836f407ead18cae441c37f2a32d30f585ef066acee3314965eb84 SHA512 efcf47cb4337b8b17c12419be9b024687da129b24320c7da7c4875279543a622855ea100797818065710017a2f195db817f3ba1cdd4826ed70315a50244abc1e
 DIST coreaudio-sys-0.2.10.crate 5434 BLAKE2B e572ef0723e86cc21d0a8ead3131537bd4a9ae0bbb2873885ed77f81ebcc3f307229b014cb6b73a3dd2a4b36928c86ca29ca1fc933e8e6d91a2a6f2caa2ac40f SHA512 3e1e61e9376a5cd9d99ef575fc0ed1c55314ec7ef8188189132751b9d9e093fc01f1cdf497a68519350a26466a9d9c08565d8a326a546e87053d15ff7c1e6d35
-DIST cpal-0.14.0.crate 95570 BLAKE2B 698104ff797e8428e467293e31061564720776f1669092df2b299f843cf22537f4786115eb5b8f3ea332cd2a24726092df44b336bc3a9d3ce9fe602f35126c8c SHA512 c0bf746555ebca000b59c5f758e413f554f22a2e6595729f51d65edbdb9bf385b213cdf03ae7b673563f7a40de9b690321e45c1b7086f2e24a28e6774cbe9d40
 DIST cpal-0.14.1.crate 96633 BLAKE2B bf0cab48f5c67b236d921b2fc486e23c7a477d6a57ecafa3dd1e360a693844ffd1d74843bf8b574833d871be99033969de08b4a5938cac3397d80e5cde0201df SHA512 696033b1a36c7f2ecb3bcee2cb692044e528611aba1d00a6c67e2b7808005d81d88aea78bc6c252122f448b9b37a4660ca5c08f97242b085d331ea2b0ee73eb3
 DIST cpufeatures-0.2.5.crate 11251 BLAKE2B 2724be40d3bc0e2fda957f645e1cd6472450dee68db3592ab607bdac444283f571f3c904e47981a3fdaa06cab4032734a54470e3dd6e1b67fd856daf010e1277 SHA512 d02327a27ca9fc3c587dcbd10da6b1370671cd7b1df8dfc9078b47180744d0572ef41a7ec205ae9f1c571e5b7f4bc81278ab4c6b076c6ccac0167100e346e74e
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
@@ -93,35 +82,25 @@ DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e835
 DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
 DIST crossbeam-epoch-0.9.11.crate 47900 BLAKE2B 2deb54409587df48e0686731dded6600816e4c2b82369c47fd2e00ecd59f29935cb3e7f9bf3457b99831bea088830a625370c4c07ce56cb78ccdc62a6ad7715c SHA512 3fff7ebe038993af5117460e0ff89318541afea8d16f3bb991cd37f9fabff58f1cf122a8163af03c275af4ba6802b264f516fbf12f9a9f8ec978f0f8024187a8
 DIST crossbeam-utils-0.8.12.crate 41785 BLAKE2B 486aaa80eb0fff5740690d8a63c7b41dd06c19cd141f4e12c8f133f5ffa93a121d4e24e19390851051ef07ba63480d9ce3bf751621ada3a420ab6982a0445e28 SHA512 0e1f17887615b1883c3a0c4f0fb908999d550bd0041e8333eebbe43a964838d948fc1e5892e4ebd31e59ad53e5fbb5ebf6741dc1dd8b61907429f691c84de2d2
-DIST crossfont-0.5.0.crate 31937 BLAKE2B 732e9dfc3a678416e0efa15b4914c95a4f9f250bad91c66476ecd19ca2d46cee50a89f6ee3f87f73f6f89d4c921c70e1ad4b430f4b8ba1084f462bcf339b0553 SHA512 f98af27674ca16622cf2c3a716f30e9aaa7090a2b463654f75273bb312e1ac0583b73a5385fe195ad6eebc909f0aec0f857e44832ecef964ead3f125c077bdec
 DIST crossfont-0.5.1.crate 31985 BLAKE2B 0442725c3cb06b24b7922ae38d50b07bd9f4566bbb8d6b16d26c80ec680cf887320b64c127b73ffd6ad79240ab654e78c21c7cb453eb061a01f59ea1275e6873 SHA512 0dbf63cbe316ab79f86186157994a1ba4dc6bb484a71ba9379db15280bd5899826b1fd2077513b3bd3427eb5ff54b0b445038c5fdf346047cbee7d8f6155140d
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
-DIST ctor-0.1.23.crate 10581 BLAKE2B 2b513672e4dd7310b5636fe29bdbc1978a4130c0e590829193a42397bd467ae119534375060d15b5d73e4a5f66a31ad34650faca6a3c190f6c0e9502aeea77db SHA512 fdbf3e6300d8a0cd33d1938804bea8b7eebfa8226767a7ebc9a824127aa3c0ce469913a63843b8d2043de3705b8e1fb5f4dc1db4ec387356b0a2b38f07cec224
 DIST ctor-0.1.26.crate 10803 BLAKE2B 93627949b92651243b7a763d3d45a22fafcf2147a30661c4cc017e222bfc2bc12b4071054e3079adc431fc8a5dd8b86a8d11c53c401be6db846a3d0d2076b9b5 SHA512 3a3d60c976ec02a9edfe04470af4b04b02601c48e2a007393cedfef5c13e22bca58630e9e885e635a71aabc3e0ad8fb70995876551cdbc6a31029d8d2bc2e86d
 DIST cty-0.2.2.crate 7230 BLAKE2B f8fc087e6a990a354a1de9a8d0c078757a512e13fb7ca0e337949a22c3af158111b0c1edb50857c0e97db5417943165e695b4f41c328948cb344614f922f214b SHA512 1b6fb2cac48ab796ddae5c51dd27c41ff584b2503ee15f1fdecf29ca92086826efca33d2467b5721dc1dc13b5103a76c0a320f416747230bb48d1b2c4ac784b8
 DIST curl-0.4.44.crate 91415 BLAKE2B 0193d51d0ebca5a9ac87a3a2537d573a15d8f0c47e0dba5ad3c0401dfe4a96e63c43a1be054433eb782f90ec61dbc60a12ba035e4fdb033eefe53860d41c3494 SHA512 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5
-DIST curl-sys-0.4.56+curl-7.83.1.crate 2954260 BLAKE2B 866e72ac131bdc9fcdcd294d065dcf295f6748d3823498d731ab47c8d2c4fd7d67bf76f65ba8091105da27ae03fbc08099b53b0d59bfd23d21be51639c6eb675 SHA512 631de8e5740d076599d33723656129c3790e170ac108c91f2b9d7e4a954ece205685e0339fbb87ae3416156d3089d6fff8d514096f213b99fa43d14750b69c08
 DIST curl-sys-0.4.59+curl-7.86.0.crate 2996584 BLAKE2B dd06c7cdf7740049558b8296d16e2485ee1b83692a94bdd2a037ecd45c0ec88c32bf48a26ea985c8de2de84296edf3f52092bfd3ab8338e10066e0a8defdc33d SHA512 048c5dbc3e1870c9b205c107e006c7112d01f4f7f03eb301ad9ca06ef29d03b08a840717ccc45883f19f1f6734958301375365653ccc6e45ff99151bd5e03b3f
-DIST cxx-1.0.78.crate 196217 BLAKE2B 4bce83b4d60df55da251ad66d22b4ba69c3a28d98cae1c0d069cd0b80434487407384f10a6499f343bec26be65026a487d2797b1b3396f5f43badb502321387d SHA512 3e8cbcf116aa1ea70f195256a787df4c6cabd73d4ecc3a6dd794e737805cb9e8c8c1731c57a25f1ba3ee9de3b132a5ff6b2e502b190abdc1a87a016955a3a1b7
 DIST cxx-1.0.80.crate 196811 BLAKE2B 5b48be59cc9a499bedbb3aada42bf7032c963c4ee8dfa670714f2c7d36cb3ae5c555c5936bc464a8c03e6433e274af6cf8ba05d5628f105464c475d1cac21b18 SHA512 f7054fe143fef4e32771e802bb547cd8e8a2f55e5035c3a84af4bf81b4ae4499d6737fef057667102cc9a6d683e681a0008ea1228d5948ee74a64563ece9b566
-DIST cxx-build-1.0.78.crate 83931 BLAKE2B 9b0a7a4a462c0cf0dcfc27934e7e8cb9f000edcc66710bbd87bf1621639a6f7a1cca34205dc1c4461f4ae99dbe2f2cd71538fe14bde12b613120310d400be706 SHA512 e4876022b69e0b18e0ab2c4c1e9c6205240d0e0229f243dea3e489796401aeec7237711cbf8e5e91ebea58283d5fd44dc28cd599a120bd3134c1743d312623c2
 DIST cxx-build-1.0.80.crate 83905 BLAKE2B 1e66b0a971da73eb9a48b5e1482f5fb96ac8ebc6a78a1e1a1b0e84631a7dd9422979fe4497491b0a935f5491ad3eead572b51c6724096bc4bcea62bc9d111a2c SHA512 634fc50dea8bdf70afb5b28648725b8f6a9aad88805182a27f83a475ff64fecfe8e6aba2d749daa1270b407d1fd0ab7062e5b05e20d96b9818a4b45c365142f7
-DIST cxxbridge-flags-1.0.78.crate 5634 BLAKE2B 363eb2f5458a2c2c0dd54fcb6cb52678cc0f2f70e2d1b1dc8376ddb006c80bc63fb87fbc42db9b8ee79807a2be3b5efdf0e80574179db79e89d2790932f2c7de SHA512 abfc71bbcc14a7ae4a9a84d7aea0852304e86f3c145cf6e53b7163da5fb7d4530cc0682676b64053c764f28eadcc7fa912737bdf6b9fd78cda30441cf907b6e8
 DIST cxxbridge-flags-1.0.80.crate 5634 BLAKE2B 474065d153068c1073ef7ae6f29eadfc61e4268cb5ddd68cb6d042a65db4bbd3d5fdd8fead37687d349134e4aa2bca78b969af1f9117b7c181b0848f133eb474 SHA512 20234f2e5892b0b39bcae8c0d0c45d41040c293b7477039b139b503a121c46dc2dd8ab522584794f0f41710173d601f34c5a49aa90ea7618046613b961ff1ed6
-DIST cxxbridge-macro-1.0.78.crate 59632 BLAKE2B fc0c187a21b6f9c90ea68a922b2f21f8e7df804bf85b5756d20ac9648f36799b529524adf318b63dcc7997f9d67843f6bea9cdbced7ef88246d0be6bcc38beea SHA512 7aa23bf027aff7f352fbf4e43dc2c0a6be38208f8447deb6fa0f6eaaa42c00b67282b716bd4ad847b388587eb0d5aa826deab8a6f661043b57ced6d406fd92d8
 DIST cxxbridge-macro-1.0.80.crate 59671 BLAKE2B f1784f21ea41d953de7eaeb3ac8095d92be35a99d12d861379dbf46395efb9fc1a1b9d61c1b750aa18c796d0757b800c7bb1fee8c1e7f78cdd1c02f8f493cd2e SHA512 a0a5cb2a2ca144295f287285ef5c7bf42f136500436cb4ccfc5fd9137e5ab60921a7dbeec9279e342a76c7204b70f45dddaccb9ad7c8ded0a108cfdb99273376
 DIST d3d12-0.5.0.crate 17059 BLAKE2B 7b3d2ac8a00fa8e68463aaee1a6307284b518fedaf98f1d85d579c1b9d0c947f1d6d72bcd14312d22c96d4a44e179b7202290fc56219669845e886e7e8804703 SHA512 b7d7cc195ebd6169a86270ebc729fd68bab23ad7220bf172e7a08e4b5e82b7ba5388c0c233d066687af8cfb00193c3d25da977f3ff796b1cf4368be68062cab3
 DIST darling-0.13.4.crate 20895 BLAKE2B 76675c20937450c47c1bda80170140930fc626d27d58b7dad3db33dce2e69457e2262189853141bdabeabf257d05d954f7dc1dbfa344276e05ee6dedfc8a2dab SHA512 7392896b97b80ad24d76a985f4b950668ba351498f48ef0722c783c28d43c4a4828f5f6eba7e754ca554b6662fc419e73bcb65d4b20037285a16e345fec9ef75
-DIST darling-0.14.1.crate 21844 BLAKE2B fb1fe8f63524f944acb0471ea4658fca55edb7aa4d7443739e5d7d16e917909d34cea6985f1d45429616a929839452cdd7b16b635d81c7ae6b4110bccad31d80 SHA512 2b2bfded33f23d042805e15f28befe6bf1329ed8984513a71ecd57a1d443414afb2ec4f9f92037a352fc358bf5aa02df33c21081e44bf5e8a2c62bd425bf703a
 DIST darling-0.14.2.crate 22141 BLAKE2B 63ec931ab42453ba0133c0b8a1f9d3bdab2638a9db2dc4329034b96632c8e580204fe12d426384c63c8523418725253f5f59e9193a94dd6f6d28e2dc50f4cb0c SHA512 7e2555a5a57b436651d5165868a93f318192226b487cd74d3feda5b472d9be4cf900cf46999b25ee8da4cba8df68f3f1c54b4a363eb66e69c73f25e73c62bfed
 DIST darling_core-0.13.4.crate 52937 BLAKE2B e038aea27b5b56f29cec8874132881ef589c869ffc974427924605b92436ef06f21c7ea748e97d9b719aa7156b3024e788968ac0cc6144d58eeace658b62a08f SHA512 96d431ebfb9d13aaff2c50f7ad7d5ac5e95813fac851e3e1d7739d1fd5b366fda32172829af88cabadb475f83b4500199167ede54bc802ca1e52137cf6c16c0f
-DIST darling_core-0.14.1.crate 53655 BLAKE2B fa48d25bc37e7630ed9abbe7c2df16e45e249fe388396e113882f699d53eabe49ca368011afdfc9a9eb34465f35a1de315937cf544b90c41ef265b884118fdb5 SHA512 e4f8d9bbac9d7be9e11d01cd965c0c398b68987572255761ae52eef7a5047ead452d880f1f6a4b4a7af014b819ecd88cba667cd169a802ff5fa9b61735c4f567
 DIST darling_core-0.14.2.crate 53924 BLAKE2B a10be266569d478eb73fe62d56ed94b9956a13fdd4f73c9d2253bd95fdbadcd1e0ee4b5ed2b00bd58c400c61ecdcf2601d8325017df32961bb30e602b8117b0b SHA512 33612950c7688b5ce102ab5aba0dee5470435f0491e4be5f9d862b70ef6f6034a08ec64a29553e0530f9b8f2f3cd540d26f32e49297a599c255668fb750ab621
 DIST darling_macro-0.13.4.crate 1910 BLAKE2B 432adc44108cce6a13adc9ec45ff9b7555eb4c0ac7f1000fdc8f8e9d1bc0ecfeb65b78f81438b097946aed8e37835f82028c1b16c1d466a124998139ae854df1 SHA512 908ea6459110da16e4ec6ac843659664ed4fa3fb2ea9b92274a738ff5994cf81fbb48403db609b9a70f39c3e288da4358ce369c66821122e3a6a0940473da94c
-DIST darling_macro-0.14.1.crate 1911 BLAKE2B c22bf421f89f4159a3df4245e050e58e01c22404c0bb9a7ceccdb47a0ff2abb02b6900d20744d6626ecb4bacd442c0915bcdf5678eb33890382390316a6e26b2 SHA512 450dcafc222f611902526e9d269224c5a5374b8e3f510c2b103fa6eeca240977d8dc53926c09d77245e041f140b9d1546ea840b19688e14d3ee53ccec8ae2d02
 DIST darling_macro-0.14.2.crate 1896 BLAKE2B b095af14bd90877101444983889fa3683ed7fd6fd8f6ed229c17840c840f26b9a74c5336358a6ecdaad364cc5f3ac123587dae79ff61ceea4270fa536a441fc1 SHA512 0dcf34807d2a6999d69d8176f70b2a7c2b31b03ad350bee7455a0711dd57c775ece9559376a36b07d986556e5d9512ba04aa3ce66298f82ecb3115bd6e38d258
 DIST dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz 621307 BLAKE2B 9f82ca484fb6c6f79e4c9ba3e9e3fef44410e95b138202d65cf0dbedfbdb21b93080c0d816626d624b4cb7f4f0431fdb350fc843cd3a6706672989f660225759 SHA512 da0bbfa6e9561182ca5e896d7d6266c2205ce7757215f0dd0a5044fad7f8d4589d68ffb7b4e8f37800a966bcab21750d9db27baeb5607dfd467375803f7f7b43
 DIST derive-try-from-primitive-1.0.0.crate 3267 BLAKE2B 89982f76ca79b1697f9538a4bc84b71b8e2fecfbdfcc9af2c1dc7566cb676dafe9dbd9c59ffd414ded35adf0ac23e1303634ce340a6353b3c04df238253de8ed SHA512 d7a8bf4d1e3e4117e831b70610e1906c78a07c6f3cd029b5a1e38b43c53aa0bb6ce31bc827ef154a9c0efa4f61aab15e627986212437d31b06b2ed7e35e0832d
@@ -135,7 +114,6 @@ DIST dlib-0.5.0.crate 5788 BLAKE2B 0c1bafa05ace4a51fa7f5d8db9cc46773c1da9948e6a3
 DIST downcast-rs-1.2.0.crate 11670 BLAKE2B 7d44d708c1ac068a02ea5d72dd3caa8a7f6d18b7ee653d520600acc9c52365824f5b8d3c68143d1d13aa438a18b16ff9975e15131cac7ec48b2d995184673d37 SHA512 b80b72f30b42c5e6b2bd33287f2dd22be5673b2fa5c1a8c75c5de224fc7eca46a55f2fce63c02d225dfbc94ac3462b4b2fec53d63331c70da6307ebcdcc6cb14
 DIST dwrote-0.11.0.crate 21715 BLAKE2B 8ef802f393939f95ba750e941fb5b6f908a2cdca41d3eba5a405214ab56b2fdba148106c0537034316d1d594fcd86a13774de1853c2dad2f27d0ef87ba21bf86 SHA512 b319820cffacbd55f27d74d4d8e7ae3f15d758f718611c354551ba526614f5221357269734840706170e26446efb8d504035859f47c68eb0a7a89444d08ffecc
 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
-DIST embed-resource-1.7.2.crate 13583 BLAKE2B 7776da8219ec73bb4ba890722ca87c92c0b07f0c64198f4b701d9815f8b6e04c0e05f22af25fa26fad325c7f9b60d0447ee6285b892c79396ac6c421246b8348 SHA512 db2d7eb090967edfde1053b245be75576ace1e8f52633bfe242f2cc95c64ba4f1b3f9f43cc86ce7e69f17321f57dfb87e7d64e641ac649e424aa4e346b7077d9
 DIST embed-resource-1.7.4.crate 13662 BLAKE2B 49692d914a5ee7a0861c9d0fda311733728da868fea03935d521123b44016ea37406d01883b9a82eed362c159259c9509ad887314b2868046212eae7fd1e12e2 SHA512 8de5347a1f619fd07c057d9d6b82b6829db0272f2d9f9eb12d32918a125bd4f11fe440086249bb170ad5c135dd05a90d348abaf29261d5e170a730558593ce67
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding_rs-0.8.31.crate 1370113 BLAKE2B aedcc32bafb95c54a034c6ab082d722834c744c33b525b176ad00ca2ede4157de6765f41e52678fb05a8a1271ed234933ac26a1bfb2cf08096420384ba88e0d1 SHA512 a9e582ab63d00bfd17c9f813f886c5908279fe4d23cdd70f79580931f3a0479162b78210a27b113a7bf6fbc4f8d62bbf098ef645d598fe0eaa428639c35cec31
@@ -143,7 +121,6 @@ DIST enum-map-2.4.1.crate 12203 BLAKE2B 6a1f36169a5a31cef903100b9031bca2f03c79ac
 DIST enum-map-derive-0.10.0.crate 3824 BLAKE2B 41e42f5ee9a3e95682f03bef63a99e9f03cccafc0ba3558b6d323cca0b07887502ac056db9aa494b040616ad669fc0a9cdf8c7146bfedcf9cb0de1fa3384f3e9 SHA512 260390d3083ede5835529f771e7ff2287e6e58c70f15eb41890fe295b0c54421830588819dbf334bdc1f9c42d9e94f0b2e777fd27d1a889a87f94944f89bce1e
 DIST enumset-1.0.12.crate 20341 BLAKE2B 2b787736e344e893940dc91cc1f9fb6465622caff9dc02ece44cf527ab632cc2fb981243e109e9969ed1a2b7df93d894d6be94f525b691a17ba8333a192905eb SHA512 1e03a918150546c203b1afaf34cd345f655d23753d828fbb0fe588570bf4cf74f500b1ffcc69199c60683797f9986443b999fa229fac50e0d290b2ac14fb0507
 DIST enumset_derive-0.6.1.crate 10713 BLAKE2B ea434d030f7b75ee2326cbf92b2275f8a3d9efba58c779bd02d538339a27b3321f79f5461386fa4aecaf4c1dfe3f70b75bbb90888ba997526be7c9c8b4d57550 SHA512 89c8d21e7ccb87fc2cc76e0447a00461b5669e3e29823cb4eb0e3671bce73ea0b6ba90ec58efa9d9ea536f4165a313fcc0d0bf4864b0987f31c42e8b4cce93ab
-DIST env_logger-0.9.1.crate 33425 BLAKE2B 86caabde93af971864275d97d80c14c195e0277d474fd3e93d5e1a510063def2e18680aa8ad1f934bb404fde55a5fe23170a3851e53d04a6925b9a8e19db5d62 SHA512 f97b63eb00e8565d8c6aabb306ed8a91ee4241ba35dd9b6e08e0029daf7fa5a54425553d4c0839e369e55fda2c85c9704f658fbb760a093f55c38429f6705d65
 DIST env_logger-0.9.3.crate 33291 BLAKE2B ab0f0f85771bbdc6c7709f7cd4c86d9eaf436b073ce614f9297f60e95b6c9e6141d8810d1dccc575893c796358ab65ba56a281630ab75350e8f421167e5d9c52 SHA512 a3ee86e77d980c2eefe4be32d75422aa0f9a60a43fd11bafaa3c9e556584cf65c36976a6aa650f87426edfd82de0cbb919e0906cdba6db8b486b4dd4b2583bbe
 DIST euclid-0.22.7.crate 75976 BLAKE2B a2f6c1627eeeeca9686b0bc520e08a69be403836c57a6926df04a717995828209c00164c216388a4fe25200dbed5931b0813400d1a42ea9398ac135a4824de59 SHA512 44c8be57191f6e88c2123210df474a70cdaab1b527a0b171a217cc5c791ea654643c2fd127fa6b13e20bffea494a10be73c767e8aa44f38060cd44d64618efb2
 DIST event-listener-2.5.3.crate 15392 BLAKE2B c56ed5eafa64014141e869dcf952e86f755eb35ed1722f8139260cb502ba226351ed1bea301618e94c9ca7f3309747057eb5f7d7986cfcdb7f6b79d13d52b439 SHA512 ddd67c1139ffe2aba95d763b73db0e2a9985dd2e57cf8f72030047d53d46d833df4b4192730cf0af4e060ce52e4f2df23aab6509abb94a6cd02e0d8cc3559d22
@@ -163,24 +140,15 @@ DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c0
 DIST freetype-rs-0.26.0.crate 105825 BLAKE2B cca261fa4406b316135140d4ec47fc0a70b4b346e7ef6ec5bf9517e679315b3dc858e186b32b66889a40c5383112757ebca2774f0310b8e6af5fbb7fc42779d8 SHA512 7369b75331450a6e778f8fe0e8ed8cdd388348824efbcad2377fee5c9c920353073a7e6c2d654d9734112d02f03c0edf7aae0c46bc30e18d94c5a4faa05db3a5
 DIST freetype-sys-0.13.1.crate 1917785 BLAKE2B e44b8ac0b8ff4b50db4bf995fd44238aea2946c47625a400937fba251fda27e38fc4bc03860a6e03ef328ced14bdf18b586c2f9fec89ada264b88d4f32aa8cf8 SHA512 098ed11f9ab9f2762bf003d81543f73d290bcce94e66ac147677ac80c369231a549104312331f4dd43e9483e63621514bf8c4e30d2db035e7689f65e5478e230
 DIST funty-1.1.0.crate 11631 BLAKE2B 37b246ed78132b52461dda9f3c1b52feafac998f6cd0ebc62408b90e5f826def1456ce820adc745aa1ccf07b281fde3df65af84eea561eeaf1ecedaebfab24b7 SHA512 771f42f601a0349a8e9344c8df552491c64af350b18eacc99463e972335d4a4c95416704ebf49e904503fb2d6f78bf201c8cb82fa20bfbf460ab1e7ed9f94a9e
-DIST futures-0.3.24.crate 51399 BLAKE2B 03eb55cdcadb6646d01a485efc9ca0c679d8a71186d1dd97b078772ca298939e147537692216e2601b7d42cebe0c961b3a6693d7059c7ca735efa28fac8be07f SHA512 91f3f1b121923c239b1e3042048fd420a35506b4c1ed6527bcff0fffa8153049a384c4e0b21d59944327552c094db8de8977036c61127b27948979e0da6df949
 DIST futures-0.3.25.crate 51664 BLAKE2B 8324abc819143df0f11e76ec19a50a9d6df87dd243610ca756d54f519058ddc25ce72a7652698dd3dbd00631eb50f05c7b4567cd87a65858fcb4ed89e2d51fe6 SHA512 1b41edee2927cc68da7101fd9ce8616a61b4102bc378429b8b53adbabda584a5e1df98bcdb2b0ec73466c5a51e996dead7b2d286c7025fcafaffe5e64d715997
-DIST futures-channel-0.3.24.crate 31963 BLAKE2B 2abaeb5249ce94271588cce9c6af9c96ba52d5a8900c69b5232e0e144e5e218bcd57788a3592e5b95aea84d73714552db131524d82de3655886f136789529c36 SHA512 2145a54fa7b89763c7c6352818b3e3b581190e131a3d3e7bf7b745a8e04ae6ecd9f5f1cc78ee65f7aabf1f786a25cae6b37d358cbbef34c494c34e217b84d7ac
 DIST futures-channel-0.3.25.crate 31974 BLAKE2B b0c8f2b3ac8b0b010aab83c6e8d2d7329d49b1c9727393f81f9af8c80b232508ff475fea86448540d2e9016d645ad8afb5bbf746e618078db78631a9b3616481 SHA512 1275e91c90a060a01922747d160435c04bba4686990912e5ba0a4fbbd91ebdbf4f5abbf3530e5f842445f7482e60afdcdbd836586b42f0277e5fdb1a2fcb7239
-DIST futures-core-0.3.24.crate 14618 BLAKE2B 381b5f9dd5249550a859ef83987121c1574c91a2498e0e96ccdc5657cdcadc770319a4b50200cf3138bd504fe537ab2d5c701bd97d3e0e39f4a9e75d4a7459db SHA512 d39b19f0c2109d7937d8dd7f6ee45144ca3662746189a5856e0f9a29bb255bc915214c008e97475046703fa90ea28343984575fba394a93dd782b95f09963e67
 DIST futures-core-0.3.25.crate 14623 BLAKE2B efc97e52dd0aeee34402018897a276a68cf94bf13fe37b4c0e4d971cc2dbc8cdf54d0744f0846049ff75192c0fcba906b3556f000fa8657f89a54d9356f8f578 SHA512 3b3c758c493255024df26a763023a5d403fcf1a9fd105b08c518bdd5891ada4fddfcbfc8cde6101157a209ab6d1555831bfeb49372b17e902b4fdd8a83cded4b
-DIST futures-executor-0.3.24.crate 17745 BLAKE2B 835a8f835c319e513443c0c947bae83c4a4d1656acf17af333063e33f96eafc76105d45798ccfff3ac2fc362bd54b785bcd2bd406a4830962e75ecb63d710c82 SHA512 fa6385534511ddfe73e4bc80081879b0a425041557d83b1d59f3e44f86ec279327532d732ed4daa4b13e74a11460fa7a99713b00563cdad153ea13c0dade234c
 DIST futures-executor-0.3.25.crate 17744 BLAKE2B 3ae27b7f4cca071c7f411e783781f2ba774da2d6ecfc9b8b9ae7cd9a4d81a58be3e9c967c1dfd24ab339b09d8d0f8cb10e5c3a7e34b5d1e9a96e28d2bc575869 SHA512 66b9bdce86c41d5574734a6878562fee45182a3a6ad3b5cf57895aabafa5ae610f440dd226887e547c3aabee792628a5f7b4406c4ddd909501afb66dcb26b64b
-DIST futures-io-0.3.24.crate 8910 BLAKE2B 67de3c0fbb671897b7ed64967e057b03a9b018b5dcb3d78af4945d4415cceb6a866bc04de2910d124452cc3175a6cc5651af979f8fbe6343f9b96e174cb31279 SHA512 63257cf13e99b8968a797dcce9d572722858c7c91c212a52d05badcf10440824ce9c450bfe5eaeef5528369339a14144a8e94d7e8b2fc717de26fa21a16f2848
 DIST futures-io-0.3.25.crate 8911 BLAKE2B 4100c46b7ac6908e849d3c50bce6d563419a2eea7d05d27844408287cd41bc29310754012031e3068c0d6b90307c9de36261400d438046af74d6a86b0e60f31f SHA512 ad19dc9de5e3559ac453478aa5d154c28a174a9d6492c028cf4d7c6d9e2ec1ce3ba80aa79c0035f82a1bbf86e55e4a65c9eae488bc5dabd399419cfa8cf652e0
 DIST futures-lite-1.12.0.crate 36032 BLAKE2B 16cd92362ddb217fd3c316f1104635b086abbf3b482b3381d62e3b5ddbd20122d1dadb48c83d3022db080d05352ee5a40f33978529bac3eb182b875f45cd132d SHA512 3d26148ed1c87926de51412a8d08e0619c64b85b610a74d6f61fcc1972dc0cbedb04c5824fcb4ef0a920c557ac81a0b2b4403ddb1c01e11648694ae56c28d72a
-DIST futures-macro-0.3.24.crate 11252 BLAKE2B 397a7675d735c9be21bdbb1f540445197f6cdf8c595c952483268cc19a9a06e673338f5713cc378b66f4a93bf5a8ba0d2edcce01390ffb9f0ec9337fd3b527d6 SHA512 05cdf441404a7656a092a0b9a9a2800412a8671e2d28b8b68b26e4b9121256acdf911851ea566847462e981ab4a2bbed3bba5500cf9560f3f61e6ce536afec81
 DIST futures-macro-0.3.25.crate 11256 BLAKE2B 310fe02b66c014c00dac0c4795ced9ca9bf46dc48f964f50d6300009df2db8505987849823faaa3a0dc312cac7cedfea0cb892d2b0f2c4445bbdd5471953115f SHA512 603863a3249df6dea4ed249b71236526ad506faa5cdc430b3a0c96845e21ffcf800407eb31ca7f0cd45c989bdc1ea68884233ab0fd0abd1d61700830293e968e
-DIST futures-sink-0.3.24.crate 7854 BLAKE2B c0cac5188d84de0ebdbe13419c30dcc38594b8edf9952468eb1e04dacbb2d7f754f5b555a1aed5fba9704978a294974c25cceee27a9e4ec6d90b031f324a3ac3 SHA512 4da560975ea2ce2d6cf01042f9a3a16401d769a34e2d8bfe2b0fffc818ac0c729464efa0c2d45ecd280aa7b74d7bab1d17a5670db3d2f4904e4b0a5f4cc463eb
 DIST futures-sink-0.3.25.crate 7854 BLAKE2B af109917de26c608b21d2fd1be304428a6d78095168a0b14eb709136789acda0a6bee4332802c3fa3f1e65ad9057e765b43728b8aa6ebd6bebeb2f25d5f96adc SHA512 fc318461bcec3344c0658135944ce7ebf6756c9d1950c2c5e3ab3ddc7d4ef5b0f0858d09f14d7bbc9a9fec7da19236a10dec0e125e5550c965bae95255eb0089
-DIST futures-task-0.3.24.crate 11836 BLAKE2B 1f697816b721f4a51150dc38909974c6c765231c451e0884ae41e1ca16df9b93a8890e1df3a5083330de73ffccc3cfeeb976644504e45306ac5ee99ef4cd87ad SHA512 a78a739176c20afac835ed7b1fec04772aee1f2127bf4a4d0e54bf1e78079e854794fb3cff5858108168d8d1bfef7da99221599c9c533bc3c3059ef07286d54c
 DIST futures-task-0.3.25.crate 11844 BLAKE2B 60635ba309e978f1b4ba72b29b9d5cce1d870d8398986eb1845d8194080ffd9845d8d2cde19ad0333843bc642cd08a8e5aa44b8c85763ef459c39de4a5cd5042 SHA512 d2278d52397390d7cc1028bcccf1aec009b16ffc33873b8a96cc4f456d7cf501b86660507489d8b284e0798e7fe68c04796471050b6fd2d0529c761d89f9efed
-DIST futures-util-0.3.24.crate 155823 BLAKE2B 6fd86340f0fb96240e28f3e3885be9e555675b879e844643352241de81b55cc67023746b4c3fd941b2b38cddebcef41efbf72581d41cd30e7aba8f0330ad503e SHA512 30cfa53bc58101948ca6e828839186575cd8b092a629bf59a7e4df205309f82d0cd4ec70340f5e98c76fecf604934e553562f7c79ef382ac8451c640bd95c5be
 DIST futures-util-0.3.25.crate 155866 BLAKE2B 574e7cddaae172827179c1d012c8088ea84141d453b154b4358350f53f94d13b776339b0fe16b6e18429e2f83cf5fa35bd5079537a044f240c1471014e3b6a2a SHA512 3e233a3093f3889af6bb5adf661c1cc32f821b00975bea05eee14c2b38e25974b65c10234eb060c52dea4c665ebd09895df666f8583559b7f7d7636070ea51a8
 DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
 DIST gc-arena-081b6883a522b38030b13744c80c84efbfcbae1f.tar.gz 26707 BLAKE2B be7546151f82c783663653c1dbf4b1c745d2a7e431223fc41151f992d849c96f6d357f0b2af329a4404f9eee4cff2afff79d35937fb57f5c9bfca9cca821ef58 SHA512 5a4c15d73deff8a55f125f00b89774ae306f760383d89fe011e05fd68e342bf5c127050e5059a119af7132298225de02dd665e82701b7da87620297a2478ad39
@@ -188,7 +156,6 @@ DIST gdk-pixbuf-sys-0.15.10.crate 9891 BLAKE2B 383e3cbed76a961218bec9d328460d620
 DIST gdk-sys-0.15.1.crate 73599 BLAKE2B becfd7c8e2525ae90402be8db2d59b9d4a7d5271d27a4f46740de8e6e1a932347094f8c7dc4df447a410bf24bee17c75090c3b3ca707093a8d8292bcc8d0a1e6 SHA512 eb543f348a4971a636f77bbac97d1d671de5591e6314ad41544cb33e4c2d480ff7d0e81ddb187649036f7b7b0e20c3bdd8e0a33fec1f9c30d156e719f0b25cc6
 DIST generational-arena-0.2.8.crate 20899 BLAKE2B 73cccc9e3b836ddd37e7f64b6389c7bec6763ac9c390a5a9b4adc9b35200e7d26d21ba0748fc808aafac52087f552a4c56e8e10ebf8d016507e1781c579f1e73 SHA512 a5e073a8d26aa32b617fb4130d2b9401c3a3d9ff51a2910f2de4de019ddfd2e5077f2489acb40330e640c573139c1c911ce59a36011bd439c011a3af922bdc1d
 DIST generic-array-0.14.6.crate 15889 BLAKE2B 7beac5446f5da4d077598af43c238eb7e71a12b0b91e6be5dbfc1ca33dc21d128fc93c9c8b18caac4b88830c8c8a643f2033acaca1d9a9f3d95329d042276156 SHA512 254e6fb6658f083f26e022916795c9ebfac241b9df2d811aac8316b17e1375e1c5aa54d72f1bf6c2627a88484a7df4b14eca231c90578e9aa3d9997047fa0f20
-DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST gif-0.11.4.crate 634244 BLAKE2B 537a21ed947889acde0c9b8a42a7d0308f2d9017e59145924e735aa046cc494b60b97cdf3b24d62d24159a47bd4b6bd2aa009f2871c0b4f6fecec020f8041398 SHA512 3de0534b35bd783b54715e7f8a92f2d8a22934949627716cc3ade3c8036489d2b9604292eeeeced820b149865bc44a5de9d05700ebace073b48737759b5296b9
 DIST gio-sys-0.15.10.crate 79552 BLAKE2B a2a0e6a809ffe57bb2d1f6deb072f0b4086ecf833b2e9b1d6e2c010445135918840522f57177d30487c1d19a27161aa37f2eee611b8bd9af4e41e021c425f2a1 SHA512 9a5f37afc4ee4fea2a9fb87005c2c51b1f22ba98c9ad88bcedf89b90bd1e3d6393ecea8b726b596dc298c5a4e7db1eb0503f0872db54c19c29069f5a2b1b30ff
@@ -209,9 +176,7 @@ DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b6
 DIST hexf-parse-0.2.1.crate 4662 BLAKE2B e1b6bfef243b07305d7a8f08c8dbdafb67dc50c284ae70ee7032ee8bdc4e72928b6f45344613db63bbaea49d883f0f54e1c09235fb951c1a65755946c557ff55 SHA512 76e64d95121b0c3cd534a0005df0933bf6430f50969ba7a72f6a8261c9b7830c00a65b9286315cf78dca4a23c02bddf75488004630ca9839cc371c43efc8cade
 DIST http-0.2.8.crate 105591 BLAKE2B 254dff38c4d7dff28e4ddee0769a2f5e2e9e4abc6aab38e965cb7efa4069d1b59d422f30fdc73b5db5bb6c3fd02633dbfdbefd59bfd6ba352c3e5c9241d39d97 SHA512 8e8d01803552299807b07a9fddb45d92af089e43344eecacf2bee07b0e745f33558d26a5cde987ac0dd50f939fdac2de6855c8b44f7362e86d05efdde8a7d956
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST iana-time-zone-0.1.51.crate 19397 BLAKE2B 9e29f255039c03361f9d0e1be83c71b984c4a3e980110ddae770381cb9a78f0ed6f90cccc2f8bd9553bc68e5f65d4d9194c8766fdd9da46c68172c78ddbcad8f SHA512 512606edca10e0489df59f25773edf68da63bf3295d4ab5f0313ae01ef21c3b21f867884dece838bbd75fe909155e90916f61ba9837f8131f0a610d6b21396de
 DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb
-DIST iana-time-zone-haiku-0.1.0.crate 6640 BLAKE2B 482f69182d7e835dc0f80ab2aeb0472ce8e8720b1f819f851dd888b6593ec68cc92bdd3901b6d6915be825e783780147d2f4f390a12e42be6ce259a8329681f1 SHA512 10028f4cc16f15456d1323bd72c1f60ab36b6928b3fd23de6074fc2fccdf570679e918163bac30371c14896416ac0cfbe51a32a3f8fc77298fcd8cbe828b7d7d
 DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
@@ -235,7 +200,6 @@ DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST lebe-0.5.2.crate 8422 BLAKE2B afa49a1945d623b34139e31406f4780a5ab7b3d34648caf5f73b1504dbec4c4c02fc3aad3fdcdf85509eb8ba733a131a96478d6b9494cc9f69048f9ae28eb880 SHA512 ae8fce41c9a934999dad672ad74acabac9d7998aac4f1d03b54910d4b941375b9e9721cb1bfc8cd7cfcc4206fc0b18d725b0ea256a3a10a125a8d5848ed761ae
 DIST lexical-core-0.7.6.crate 494385 BLAKE2B 417644e5e33a70aa4165cba77bad45c540aaf7bb2037a5461c691b646a5470c7ad68a60029ac50f1cf25de3b6928b3f491e9b7ef5cf5a7d3281d83fd33a173f2 SHA512 fcd7e4e073e6440183284f20a6305bbe4aafb5513a20b8ed793439e4b5a5519532a0605f31e42539f3e6236003254812b459a9b9c47b3c449f5c582dd62c3172
-DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806
 DIST libc-0.2.137.crate 606185 BLAKE2B 6724b7ddc2460fef1d0f20efee8726162d904b92987f9de2d3dda06c9cd49124c9fa43a9b39e84d78c03d217ed8ffd30e0dc55a4eb31970413d56fd58ea00adb SHA512 1ef979dc59a7ec4aad7229ec5b40be0ec9a8496c7a2177d325db62f3eab00d72c8d2277d517c0093e0750de12fbb4e45b67133604afeef9153b8e1d4aa0baac4
 DIST libflate-1.2.0.crate 40864 BLAKE2B 295fdee2e332552cfbac2ccd382552dc879fb441517a49083b8574868b28ffb7f8428b94b6cbca9b673cb8bf5e0cc4b22c0e10d2efe1d94fdb93d68dcf3eb287 SHA512 a5e0448e56ab5a219952a4b4efc3407c8419d8d9a255670f42b8f1bca7f7fe5774c2711025b18285c4f1310d26d0347ab2090b0f734bae43b569a0879f67d1f2
 DIST libflate_lz77-1.1.0.crate 5729 BLAKE2B 6e8bad43512e90544e3429fbbc707ee2a532a9d5451dd6c394278069d0f17ecc7711007dbb8a4c0afae3ecea2d872c677f21732d6d509d94ce485b188b05976f SHA512 ab0cba9d324d2f7bf2a741e8ef8b0ee7bfa85ab6ee63b9ccf6ff912461ca854d6b7467e527d74ee93a219d6dec5bcecc3e61eea83d4cf5b2452f9a0aa97cd95c
@@ -247,15 +211,10 @@ DIST link-cplusplus-1.0.7.crate 7576 BLAKE2B 9e8fc7f4b149a778c732469c6ef4663ad01
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
-DIST lyon-1.0.0.crate 3875 BLAKE2B 7ecebc2120e4e51a7a9bd8b5cbdad6c6dfc938e083380d42833538e2293469d5e0dbac049d07e9d4604dc84e82cf5c691a742f0d5024274b0109dee5ebc468ee SHA512 bd5fb89152966eb9bb300859671412f89047bf504e542140bfcb1e7dc3c389be78a1d45369a018274aed2150f6def0d6d1676644a6936d824b9e0d1e174d68b8
 DIST lyon-1.0.1.crate 3837 BLAKE2B b7a5a2be4e96ddd974974495a61e50e782f7d3c08d8b5e14b86a2e02c55a6a3848e332405ab61d2f7523eee2291e42869814f208d41efa28050f2ed79e2c8e95 SHA512 f9dbad320ccbcd33d692af4c8d7998745ab8d86d307058ce132432eacc9215c8cfe3c42a6d5edffa7942ef892199625be5a55bbfd13ce383c3e9f1465ae81ae5
-DIST lyon_algorithms-1.0.1.crate 29736 BLAKE2B 33a039797cd622089cdf5b717430bae8a48c4f7b0ad49e93f864fcbeb85abcf5fc92e3386b55dcd406c030f6285dee128288cf1c7dbf87d69dfb22ee4abbb681 SHA512 b259c0ddb48b42e01d246ce2114ee6fdf4f5ef6e3e5ef9c39e618ec096f7e0ecd4e11966ab14aefe24e4250514103d9fdcc5abec6d599f26c298c42c1d157799
 DIST lyon_algorithms-1.0.2.crate 31962 BLAKE2B 8a385e69051f74c9071b634aab8029e50a5fb5af353a84f4d233e922d8c9c8b2572d7c5bf49c8749b8d022d7c3c23799a8e54ecda3576de33839ca2805ba516a SHA512 1be59a72c53fcf43f6b086e9c044962dfdc5bdf347cf99bdf0f46a4a62453bfdccfbdd9482de5ffeb1c7547eb52534f24e8f08de9c3b56ebc569a50f64d54c48
-DIST lyon_geom-1.0.1.crate 52183 BLAKE2B 84b9bd6e0f3f79283205b699ef9097a5e10b99d4b3e3d9cfe5b4ddf0319a52db22ff4c748472b16e539da15582461598ae499153121171c1515885ee3edee037 SHA512 69c1c1d4a6e81dfcd6061654f9adb3fac3903f77d12cd0f071695f18de770e805c75148e8f8352ca6fa18615b04544246fc0105af71cac170aa5a7fb1d08917d
 DIST lyon_geom-1.0.3.crate 52205 BLAKE2B d2d133daa4e155a56f124d774f4c9b127383f3bd9d958c12befda785a44623589fcec22866d5fd1534683395cdbc7546aafb7d5af46a6aad994e5c777023a7f5 SHA512 dd64c4a3e8482be777d1e40723b717644d14b977931b049949832969eac6d09c7c8e8142eac2d17c8194d95567e6655df621e3d480641908805bac69065ee5a8
-DIST lyon_path-1.0.1.crate 35082 BLAKE2B 147a2a650cad9b35ff89cfea5082ed5a8c14fac515cfb48542b6ea6c1a806f7c33fb58f2222d3cc34e3b400421bfdff429a37eb9e01c5d776be2bdc97190d62f SHA512 88525db4fb68e55d12678bab753de8c59c8a25e0028242866c6d729ae343ecaf79a803a6438f4288aebec32e01e71fc45fa6fbe37038affca8fd0935f4f50c39
 DIST lyon_path-1.0.2.crate 35298 BLAKE2B d9456fb2a0a17eeb4a6a93ed3563608b7386352308146f05ca0a5c80ff46519f5adecd35872ddbfb7307cf5a7339f8c4d22accbe582b923092859ac6a644ea69 SHA512 58a645b44b219bca8df049e2d69544cddd90e4f36f0de9f6f17e829e14319bd1bf1c686f165266e05d88f7e4eafee0a036554fd570bfaa7effca7e27fb6716a3
-DIST lyon_tessellation-1.0.4.crate 181917 BLAKE2B 94e7fcb44d97d2456e5ee87cc158830900b37c8950978188f55d9b36a4af2ca88d4b5e6d0db593d8a1fb85bb6a8d8e2be416e798673ca233ac6398c4c1f79d58 SHA512 4eb2423f87c7703b234e99909cfb5e17df9c5cd0a636b86cd6a21734faac99aaabde260309cbe674c95a95cadf058ac3fcf9df9b76559481b27811afef45cb18
 DIST lyon_tessellation-1.0.5.crate 181901 BLAKE2B 2ee511ad1a580916c155539db7cc8689727a1e07334b27d8c7c82498dee53cb3ce950891788d9946f003d677d830a087fecf178dab82a970a72818f3326fae6b SHA512 228f73ce98e892e169d0c21875e8d9f527dbcedc6d245a3cb75a596f26821142dbdc531433002a59c2c5e467d3e3f5960de041bd9e5e220a313769a716371a3a
 DIST lzma-rs-0.2.0.crate 26439 BLAKE2B 448c25d1348054efbb879d278a8c15e9a3d6848b02752895908a0165114af39e09468ae190a935f9f59247f09bd12db9e74eaa6ec86821f53f377623bab90742 SHA512 74a00d76da2322d7e72a3a9cf9900a5fe861292f9afa4a363b2a9c6820801d504f1ab0a0e618a95e0b5b9d4933c8b060c125e061307601c6f62cada561edf8f5
 DIST mach-0.3.2.crate 19611 BLAKE2B 683aba7d140a3697933835efe4e2e5a6a107f0a6122ce4533bd9079c0de4346dd1a817abeca4372a44a85406a424af9deff87496e79359df4c8d9ff89daab7e9 SHA512 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
@@ -270,7 +229,6 @@ DIST minimp3-0.5.1.crate 8606 BLAKE2B 006005e9133a4665a7ea376d3b4ee8ed23384d14e1
 DIST minimp3-sys-0.3.2.crate 57182 BLAKE2B d84cf4833e7c37213450fd152d3e06916964ca843a006e867bccc91b7bd4534645c560633683b401de39407dcfb9449449ac156336031475c9b7b4a3c06d22b3 SHA512 7e8443b6b6b51d3a3696092ce4512f020be8922aad55e8de44e5d3469cce9949843b24210c741091dd89d909c31d8bfb59e3ac385abaca9e3ef60b07a0cce856
 DIST miniz_oxide-0.5.4.crate 53485 BLAKE2B 8836697bdc3707f89fa869e6b09a36ee4d83ce2ae0a53bc7b06bbad70ed7ac25f8f67d841f3f611f6756d891f0eddb0abf7fcaf87570f8ab32220f113583ea6d SHA512 589dac16ca9c2f94e6fa92b68bcf51d140f46562cbb3a1b791b75c59feae51da5ec16042604bbd6bcb7d7f0c7f75e98ea1af8cf42d177133a5eaa86429cf3114
 DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
-DIST mio-0.8.4.crate 93013 BLAKE2B bc9722d2211195dcfaf574d83b2967d299eb02ff40b4fb4df2eb6b08d78e018ae1a9e198f43268ab2d38733feaa8298e9736dec9fb9add66c401d57406fd1292 SHA512 b44675c90daa37336a25e7eef53cdc664e6f52590ed4955bac82641baf8099d3d94850da79d985255eb74b61a499b1ea4a9d7309f6ea4c41454b3dbb090b70ee
 DIST mio-0.8.5.crate 93993 BLAKE2B 6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc SHA512 e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede
 DIST naga-0.10.0.crate 447756 BLAKE2B 9232058317542c010e88133a973e3c0279526dee57750e572c72da498f0318966c4ba0ea7e1f6d6ddd641cfab1cc1e1059dfdef9377b199415e00eca359df342 SHA512 8bb20a742bd3a20694aefb0f9c20c911184aff3b38e230f6f6f88243e6bf1cf115e3c8d86165dfb7cf0bb61fcfff956064fec91fe202ee5040002b22b9ad1d35
 DIST nanorand-0.7.0.crate 18437 BLAKE2B f4aaf18b7cf32b385d97842cee234f0781bc2e55ca5662031204b999293d417e0ab2726eacff084dc6681ea5e46ce01335a1a5cfaa5e8bc6e602aacb1fd25252 SHA512 3ac650451d629852236eeb45dfee808acbea616036025676b47310100982d7e8317df647fe8649e7753dd0f57c501dcb3f7401c3d804af52ff2a2f50ace8cc69
@@ -305,12 +263,9 @@ DIST objc_exception-0.1.2.crate 2251 BLAKE2B 6e46ab02269b6c3ef7d67f70bdc3b54ed67
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
 DIST oboe-0.4.6.crate 24067 BLAKE2B a3e1c3ba6534fdc2159ead7a301c6b54718b19ce2e3357ce3bcb58b31c1ee3b86b427f4470564b2e8a3e8b0120b33c25ac069bca922dfdd0a1478ece5b398f40 SHA512 bfd792bb8cf2254030e2750b09a87da70defc4fc65882d94ca70469b175e04175787bd89707cd4dee876dba127b8f3b8ad9c5eee32ef5ff0cad49b046b29a793
 DIST oboe-sys-0.4.5.crate 140656 BLAKE2B 26fdb4ea66dbf2f74ccf38beb280262715642ef22b87076d16f0b8e7f7b8d284714d8c7207567e51cbc421d22224b664f0b1051a0eed3c78c16d825ccc8a1d1e SHA512 b8e31b5cfcba10d43b9e373793427341175b7e84f8805fd18a8be387bae407801a0f196d0910103175c23e41b193c4eded2a4597b958128c29e401a27d9b4474
-DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e
 DIST once_cell-1.16.0.crate 32120 BLAKE2B 59bfc8a44f1fec72442e3d34bf4be3a5af073f854f07b3618b2857c759dca4a0fa6ba358514ae28c25d745b01bb7b390ffe9ed6e296d163fd3dd67e49092b87a SHA512 bc199570ee43bde9245a2c4637ae738e370ce9988635c8342349ceb6fb158f376247b69f9ec4ea0e6d76b934decdc77a524299ebde96c0a2c2d29d9501b9a568
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
-DIST openssl-sys-0.9.76.crate 60561 BLAKE2B eb8926707891a864b11cc1338c316b8d1a97c48985f56cc4bec78a88c3439e6cffb23541d95e50270aac70f9468e9aa876cde08916b9061c963ae01d0dddbe97 SHA512 97be18c56c37484e77f4638454cfb396dc7aaba6c8c710c882dc13b0ae36e44617e6cdddcf8f6a3fca8a5aed28ff9528c59c01f5a48064790491ff985de5e649
 DIST openssl-sys-0.9.77.crate 60799 BLAKE2B 8a2344c7a579c568a420959eb2710a012af0819c054b190cd2de688defa804bbc735efdfec1a537462feaf9cc1d891c4b53be1910713e06786e811e66c6b1488 SHA512 a31256943e739a4ee500a1080d105d8380a65ff43b88ef5bbdcc164cf97a133ab2926b5f4ab3010bca3c14a09edc7570a2edfcb745fc21169408aadc0eef0fff
-DIST os_str_bytes-6.3.0.crate 22928 BLAKE2B 84e8197375742373bc7c7a3b459f8a9f97ffa0b8a2e517bee0d8ebb420a8509056cf56984612f44171c6b5e219b6ea91b14134fa6386b3cf3502b13ab92386c9 SHA512 34f861a15543933c9fcb560a835bd943231ffcef2c68126d8633f8e792d2d59a20765947feddb0c795a15329d74260d6c2bf74a1f10ee88f355f47240acbb42e
 DIST os_str_bytes-6.3.1.crate 22934 BLAKE2B 2b2794218aefb43884d3c4c9c32568734e3f5587145c1d52f34f72bc60fe010f493acabd98ea20965e48197ae493e02c09b8b0b3518b5dcb32074467ce32929b SHA512 39ce351af00046c709b9d279c8d9013f8539ecb046cf1d5992c470547395905755723838b1e7f1b81a54a193e78dd6ae4b09fc799f3b463d016790fa3d8b173e
 DIST ouroboros-0.15.5.crate 11252 BLAKE2B 0a692641892669294642faca8b8aeef91a156627712f375ef31648c505fcf82b9a17da916761f186db12440547eeb5bc568c75236d042856d0d99c0f3c2142a8 SHA512 ba0680b720d0e889afaa5ad0cd30e48e4bf88ab8cb31070fcf22457c8a87c57406bcf4a63b18e2b735de35967c34b1390c35e68e97216f63a5c26071c1d8a9f4
 DIST ouroboros_macro-0.15.5.crate 20731 BLAKE2B 4de7233f7ea20b71974b1a163071b3c9da070af78e1cf39dade2cdd35bdb117b060b08c590a8350f51dda93bc9e536d67c27aec233e20dc2128acddb154eb328 SHA512 117b6cb2b33ddee68d17834926d80d3da360f41a13d552f6d41bb0691e738675afb580b8e26e03861105777c990e2ed92abd1ea9275b367ff11a73af6b7c0fac
@@ -318,7 +273,6 @@ DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d703
 DIST pango-sys-0.15.10.crate 24729 BLAKE2B fde83347113361c5bd5e0b6be729036cbdc396a87bdecc40f7b29f8c7a9c4b14a32edc09bc6f051ffbd0eaa5acc3b3bd4cc374442808ac8107c5fcb8e35171c8 SHA512 9fe2cd809e19640e034416c489d674622447701df4c7d6127ffc04556760c6425d78a9d5dc9e09d477aead1c97fe1cdd81de282a3820536a3defff572a64b047
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
-DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
 DIST parking_lot_core-0.9.4.crate 32359 BLAKE2B 98629cee7346434103d0e9776d89d1c875c023c3fe91d47beae2f3029fe8bdcbe7dedadd262012ad9d1a1e624ffbebe6d3a9165623e40077ab9d0fa4b768cea7 SHA512 6dae00356b759ad1dd08c1edbcc3ffcc86ad412af98a5e4cdf4fc622d0feb79bdb3900c4f72e76cce803c667a6d8581b44264980816ebdc85d59ddaa881a2990
 DIST path-slash-0.2.1.crate 8821 BLAKE2B b3564d0f689ad1b943d132fd95adf2ff654b61f182082bd22f7b8f11dc9024cae8e1b9f3551c4424509db17aef899efd3df96a67e1cd588ffe0fe385c957b361 SHA512 c046707586f25f13d2f9fa452ea340198f6d2e6333ca3af806b9d2d1a61d46b033fffad60d1632ec16062fa79a3710d695b923b831a7db52602b728ed31fc3ab
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
@@ -327,11 +281,8 @@ DIST pin-project-1.0.12.crate 56972 BLAKE2B 1f6b106cd55b9692bb1d671bfd51011d9f89
 DIST pin-project-internal-1.0.12.crate 27956 BLAKE2B ac5cf33b5981e32ecf802a9de1576f696006ffc035b33173b1606a1d12c7b12c53a217f5723e8ebd622a121345f440b200ab3972410a2f161a5ed83fa8769ed6 SHA512 f3f4839c5fa7e3232a323283ad9636cd03e1bab79b439cc2d2ea954d60a3dfd417aa4680b7a34a3baa48d7e02266cf16e56b719a905f04157c708c90c02e45a9
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
-DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST pkg-config-0.3.26.crate 18662 BLAKE2B 2ad92dfdc8ac0414b12a61dd30ea4ac5f142bbb55d0555ecfa3a53e750367e1b11766a693ef11f8cbe5a2ddb978327632458b2bcf75be7aa8f973262033349ee SHA512 509c4d1494cccc20de6a62d9d037c63ff77ebee8d907747c57ba0926d177b08fcac0231ccdda14511b453deb0b76ddd10f8fbdf63ff94257d72a12a889546435
-DIST png-0.17.6.crate 80695 BLAKE2B 2fd956ff04d32a386aec4210939cb9cec5dfca4b72c98dfe49aefa130a229414e6e1692ed55fe9704dd56ef11851b61c3fe0fc50a9207192407432c1332c3f15 SHA512 16a3c657efb1a23b47b2bd51f635ef35338c3b9920b604f216dd6d0ac3a8b21e12e854591739bded2947036f4fc1abde0604d9a8ae5a6639562a46e98d29ee9e
 DIST png-0.17.7.crate 80979 BLAKE2B 37628fa2282c7195f983a95939eda1c73745f89d772904173775d7e1906b71615e45de8f59489d6842450ed6f7c7b809b28881c84d5a3399da38013fc3062c79 SHA512 f8009925a6948d8b9c82007f31eefd18d2173274816c0329673e48ef725aec52ca3aab2b91e8fc4f776c8f7f17475a3e065835e578a632445e1bd70794b18270
-DIST polling-2.3.0.crate 21678 BLAKE2B c30866c2f50c7be9343854ae266f948c10dc2a799182c2b19474ce104d49a5f777e948557647668cf6397711a4f73d19dfaec2b2513c7d992f41ebc7dcc9a319 SHA512 2f3352c0cddd06fb85b2cb5967ced2f3e18ab9dc6b66d08155038b7398443c797bc74a88983bb999a9c87a7c47a1170e34b920b18dc0485901def84c2ac1db35
 DIST polling-2.4.0.crate 21678 BLAKE2B 55d3f39649c3ea370fe6f96a7a3b13b7dfcc38b6ba2bae012b5485bfdcf629c303cbd942b964d2eb575d7a90eacaaaa74c6ea74c07dd0df86edb623140d64843 SHA512 876f9fc145e444df490fd21ce49b3ad175253c845771de32e446809cbcf45e8e44ee735eb26812e0402348263aef1b770c769bcbe7bf1968955de1a837da087e
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST pretty_assertions-1.3.0.crate 79441 BLAKE2B e9d29267ee77532de9432f075daab704e8d80a3d5fd5515a7d3c1c9a58dd98ef0190a592e7fe4d8c22a149beec15fc346a68620a3835c1269f72e563d2a5fb89 SHA512 40a56ae7287552cb66e1066cfb89b26af621f894036b9a0cd49889ec5b25831d52cc07f9e117d905766701fa71786a45955186849d36e00cbdb5f884763efcd3
@@ -339,7 +290,6 @@ DIST primal-check-0.3.3.crate 8720 BLAKE2B 9c7b5273a5df414c57b4104b9bf795b853b43
 DIST proc-macro-crate-1.2.1.crate 9161 BLAKE2B 4c498132d80ee3de239991e2c631ba219accccf093460b2e3f22ab364207336f575692ceecd92be9735713b0c999578f13e9a3a6bcdb26024914450f9bc3711c SHA512 94e39efafb9afd36996b4b03f23398c2b01e3da3f029d868e7cc9c114dee4263628460037f194b3e31580c931ee7842882633fec3f39d344c71f961e4deed0a7
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-1.0.46.crate 41954 BLAKE2B 3bdc274c8ada8bf1a84d4480b25e0348f4ec5bfacebb74da144a36d4dc0efeb341fa24525e7e8408c3589013a048563a46f1e094944afc1726e594534e2455fa SHA512 1c2ae8dc4bebeeaa4af02f8edce18b3d159109a1639d8e9f26be2b7023ade9d09824ee0f2a60ae034967d982158196826fdb989d23a4b3bc81188a9a63e18cb9
 DIST proc-macro2-1.0.47.crate 41955 BLAKE2B dbfc20b61443225130d08b05deeba56e63e76921e56359c9b0531798b18778d6ddcb56c3372fb6ccc68586a6c1dc725054f0e83f93e8623cb5ff6a7a2ed3dc83 SHA512 60c5d0dcbdee7ddab40664882d3cf5a868f7ea5b49ebab3b4419c3f325582b816625e73e0d1737bbd46bd7d765ece6c81c2ff4be894555d4b255f5cb9255e931
 DIST profiling-1.0.7.crate 29551 BLAKE2B f29e0640ddee82245290c4029e6f2b4d2470159f7cab6651bb2f1daf46b19a14aa9958efdf278b807ea4ef908ec62a6d443c162ae39d55da699af49430561ead SHA512 29741582c1a9aeacf180cb7695f15f5e11edac9ed1e6618fbdd226099f319143a05b15c94e291d6c9e8b3d2002e1d91b31f4ad04519fc75545b552622278be19
 DIST quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz 133091 BLAKE2B a6e703f72432fc29bce310307c933698e566ba93ae10048fcdac95abb93ef217002bed452dfcaa64a7ec86396f9eacb4e8650252618abfed0fcb0f11313d5ba7 SHA512 74b4f12120abfc29322faa185ac83f0a7a0cad7b9488978e1f9fcebc3930b0e2dec97dab8b87f9ccef1066908677f20b4a32978edc4bb9c39b3dcd7a92892436
@@ -355,7 +305,6 @@ DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e220
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.6.0.crate 239329 BLAKE2B 646405e681ce572ebe2dc51a3339f0f8204143f9b2b8f8e74a4c80379c43c3581363ad347610a384d5ee831cf1425f74ddd944a658b1da2461e8068c5521af69 SHA512 b4861c9cc13d6fb224f67057fd3522f04576591b3d7ae0d3581dce42ca2b2bff96860cf2a7f4dfab00e46a1d29e6473f6723c4aeb02e34ed6d5f205b66f07876
 DIST regex-1.7.0.crate 239421 BLAKE2B 6e9434bb9835bd8e15c81e817aa64e8443c4188219caf46579078c6b7cbd98ee588af0f526e0fd5a01814762dfaa113ca3d15f7cfa14e969d5acda3a631e9560 SHA512 974c15a593d86c33e0bb34f7a67957fe96dec07b3752f2b6b968d657845f5d2342a5ee9ec1359109c43e4f46c9b2b2b678d59f7b752455a0ab1435c1fa56ca3c
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
@@ -364,7 +313,6 @@ DIST renderdoc-sys-0.7.1.crate 4592 BLAKE2B d5c543119a498bf295bf506b164945a3de6c
 DIST rfd-0.10.0.crate 38170 BLAKE2B 90930add671b87f1af618ba93b809dbb37e4273d1fdf8e3d50c23b9b90e6defbded98fa0e5c3de9356e7dc6e98fef587971d4a100b25848fb544b88f39bd3541 SHA512 1ae6a3b81f590f260211735cbb73930b2c4c7bae0afbed02ce301c68f61615ba0fe8b8b70a394c4ec6cbdf33b7bc8a2618923a46ddbd633aee647933cba9f004
 DIST rle-decode-fast-1.0.3.crate 62086 BLAKE2B 402d56595936734f36597c18e816a798ade6a8636b27e79acdedd4069da38e22e6ded5f2358ef0f0d509ea752e828fa294a4a9ac6d99cf26472fe21a505302c9 SHA512 f647cfd9ae0bbaca4a189cd1f8d1f8531f6dc0ffa1fd296c75cfe405fc9060e25be74581558a9195364ea90e32c7ccd60e066d21704cae836d41606b5799301a
 DIST ron-0.8.0.crate 57013 BLAKE2B c9a74f29ea33a8ee5ecfdee7dc8f56af17c293d4d15ec9be320ab45f75ab6d6b87a7b1f8f44a40e9548c957a2790b157799649c383f1621cbe0957455e000778 SHA512 689aba27920e5d4fd2c9c38e3bf3eb490ea810170bdd6c04ea270a1e57dda0955768a61344a21decb30ab73c460436e90879b4b66de3e62ac7ec27bf4ca8718f
-DIST ruffle-nightly-2022-10-15.tar.gz 12291558 BLAKE2B 6a8cfb7119c4101ff8d2cbb187000ab1407894603ed2b1924420348c0e11c60549efbd99b55d7944a04c5b5ceb351a9b7da9900139201ec765af828d65310f29 SHA512 a79a6495021634be499f1ac8a1331f052eab6145bc3c9085facee2e755d3b16e7c05fcb16e8f80c4c686d875cb6cad36b295e3557bc1d4d3a86cdebc2f02ebc1
 DIST ruffle-nightly-2022-11-12.tar.gz 12374342 BLAKE2B 76e1d179ddcace2ae51bb3f0609aca5e38b96545e57fd0034fa2035148ce7ca4c74409750b54e7da5e7d34b59ff03dbfc8da972d16a54ba83b0350f0addc0c07 SHA512 bb5b48f0cedc3a972fc02f8796e97762f853b9e4e3221f009b503aa5f75e18c168da88597426ce2a47786c46216d9f4d7f51c06128d187395e160f140d4b5d60
 DIST rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz 676612 BLAKE2B 3c2ff3edef1aad8e6276758fd3bac85106fa9a445180c9c7d954d5b4e469751b9a14e1cc8c3bc4736a410f5e1478eb821395b8f0a1acb0e5dca1082155b0690f SHA512 6f668066999d3454d255d227167ef92e8fcf5755017617439fc227d53c5b8169a7c585857bed4879991e8cab0a6efb4ee04eca3e1b7e01bfaaa4cab70af30d3a
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
@@ -378,23 +326,18 @@ DIST safe_arch-0.5.2.crate 75030 BLAKE2B 85ef8824e4dade689009d838e40fe5b87e4e090
 DIST safe_arch-0.6.0.crate 72016 BLAKE2B cf58644922728b0d20ccbd7045d95093013d250dcc7acee28e3f68efca40ecc5598dd5b27d38b8c0db1ecab4211a1f4dcbe4562f096eeb23227d7724219d45f0 SHA512 37af0aa16b671d3bda2b660979f6f047748b7d8b2f11458e45d8dc3127e15cd36e7d5b3afc686839130bfde39af1a0d17348fc3ba3da388f59c22e276d639d09
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
-DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c
 DIST scoped-tls-1.0.1.crate 8202 BLAKE2B 20be49f0546691bcff3f0fc257345e432e200836a60b297ff3fe698699ef6a2fe8a5dc6977902a08f7dc63c578aa27607dae0f1889b849c257c59c48a458e1ed SHA512 342f43d53edd33ea3e2197faf5dce37bfbeb0b20b6f0febad4dc6244c3185df127b2c10488e95561260a0ef968f32707460f2d0d23667cebece19b167c0a0c25
 DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scratch-1.0.2.crate 8152 BLAKE2B d38df70a8067ab6a411798b64e4e9679b554aa66886c824e410d50ed805555716e96c54872186617f2963526119ba81c20ce237d4a0b1ce754d7d28696c9b742 SHA512 c3863dff0c67184605b356d6cc57db2bdf26cad9e0357ce6cbf7d3f23d913fa8917966a8c93b3084a3c9c900e357c6ca4bc2bc5ae5db3bb6feb5ee1ea5c61521
-DIST sctk-adwaita-0.4.2.crate 21047 BLAKE2B 406e4f2681b86f2a0c839638580477e716f3eae4150e0b6da0459e15a2026d337748e03b81265cc09deb538a9e9b18ac220992ccee5018583b5d9f9b37e23411 SHA512 63e2dbceebec13b08fe52f3bfb25e34d68de91912d2fa31cd008db7c52d068506a2008703baa5367f22c7063be8289dbac3d2b9f5109415ed12bfe1d8067f4e0
 DIST sctk-adwaita-0.4.3.crate 21316 BLAKE2B 4f607cdd38eb7ba5b0bf3e0b568629ca98aacbbf9adcc33b84a2a4565ec516327036a8a2da2d9157ceafe5714fb95de9c00e065e5664e1da2cdf8bbfc431e97e SHA512 7ed24fab4f87bdaddde197d871949c0718fa6cd5ca6e0184ad163218e72c6a6587170d35eb10a014601de419775f0a901f9a46246645019cabc80553aa0149a4
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-1.0.14.crate 29813 BLAKE2B a080f0a65127142a90bf033452241ffebfc7098b56a6a6b8bd818528df3b88fb48b3982125b405c1601e1bd55f3a0fdb4ffd9653e398295d8156651a04b2e903 SHA512 04db4c0a30141c2767d24d6d715b66ecd6355c1c88e572d4c473e0fa8c1fdd7197092b8286c973f25d201c5fcdc9105ba3e28c11ba1546a666167afc1fdf6728
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.145.crate 76568 BLAKE2B 2d38e4ced18d204d8c36122ad09fc00f0378c7e9014d3bc67fb7c3e5ab0f923aeabb6a5fefc8699e80e220b12601d01dbe3ae5267a124164bee2e4d9897aa0fd SHA512 8146c39249ad54028717bcfd916fa5abd8b1ddaec54c4d0de485bf10cb6a85676a53068a07b9563e1717fedb4746ef672ae0c285a8998543cf92d7a157f2d442
 DIST serde-1.0.147.crate 76697 BLAKE2B 90fb2df19ad225c96a30cf88dea82a5785bb110f256b882cadef8d1e09f91dd610637a104c2e7629847a14d4a422f89f7ae324c29845788aefb0a6bb51503886 SHA512 d993bd86c61bba602faf7286ff21d36c5d8c83176c5bbb203cb284a3f89dbc8a1ca893a09eb2657f9e98ccb5c5287f44aac06d2e60db96e78d99ee40bd1fe1b0
 DIST serde-wasm-bindgen-0.4.5.crate 17012 BLAKE2B 9f8d4a098a80b25491fb265ce6d776788d22b1587309d3deb5a9d33466e8d6dacff96e6917ff4a7e6616c9ff9c06c28a44706a043c810047e8f39cc52eb3f4dc SHA512 d4f959589b6500e73df9f5b86b633311fe5a8edf3a4cd5880547138f38a4b6dd898812fe4c5d6314c8a5c78b1bf79a79f358663aad732c4abf280cfaa3d7eb85
 DIST serde-xml-rs-0.6.0.crate 20677 BLAKE2B 84e497670bc661b3dff37f081b40679cf1c019e82eb4dc491f78665b46be20b54e826171f51dc03959b1792f4b416b007e9726e41b59074e420bc81416eb47f3 SHA512 a5096bfa71c1e02f3593ef26ee0375ef1bf5d31e42eba76938c51ec9bb507f8f1f20d325a48375b1fd688ee8b79197025ea5d49c537321cdb67ffd16fd53bbd8
-DIST serde_derive-1.0.145.crate 54860 BLAKE2B 0c80f1b8844e044bce28c3fd8e46ac732de21736622fd7b2235c41d9a909d7ad224e8e7ba5fa3e5de2cfba5e48a4116f97e9b7eb31b0201c01bc98d40a78d16d SHA512 267389f8cd6d3a7b7d4a4d3226346999294e2fbef7446ff1cd1183dfb4fd17409f5891f6c2cae113b79cffdaca07f2037fd2f4108f93723e6baa5153bb9a61c6
 DIST serde_derive-1.0.147.crate 54861 BLAKE2B c758a3c854f1474dd3fadd66d60a59408e30d5b658cde4c7ceb10c8d4b4210c8069cc13618f83f1faf36de928feeeb82b2f7011b457e8b9003a15177714f9c0f SHA512 434d65dc0d78c7c1c3f8832221389dc4b0c5d74d605ce1d2d660c2df9a92f5e5d0c6d543763e1462c58d6ea18001c823ca594e3dac92a47d8fe48319a5c52e59
-DIST serde_json-1.0.86.crate 144680 BLAKE2B 666aa0fd8956966aa4bdbfcd88699ae3ab31ec4ad3041c4c3c7b66a86b79829c17d937b0d558a0c34754e10b15cc2100c10e5479302b4af3efda73df73287845 SHA512 86922c40ce32f03c5128e899ce161e186dc35decd3e0672ed347a82f59452f2a3ba0284c342548b17e4b8dba7b13a3d98749ae8981c725ee853537f6e6b40092
 DIST serde_json-1.0.87.crate 144383 BLAKE2B 357ee30245611b15bf98ba719266dedc75211a80a660105756b20d52f50bf4032385b366c3272cfc1c7f34022e818cb6a6af799faf76f8d5969c256a02f9187c SHA512 77b90340aaaa0fb477b33e6628ed2ea0fb53cff1e2b5724a3474e24b2bfc9bff077633d9581e41dd96b2a0e167549e992d238bb09c627fb5680996b39583c4cc
 DIST servo-fontconfig-0.5.1.crate 9738 BLAKE2B 427324bb5c44a5d254000b86e21b2a52ccc41eb40f0492b54cda09c02f4e66da2242d2af662adff1c55098dc46b776d92fd3259aa34cea1d76beb18fe62d2c0a SHA512 7b76733b15e083d2edf2c90b56ada7442898508f992bd91e94f751c21cd42168fc28ad70743e03ea01d99b0f79b2608f126b5241c864c25a21eacb820d9c2de3
 DIST servo-fontconfig-sys-5.1.0.crate 1790708 BLAKE2B 558927804da2698ea6538ace2732912da54216634f4b6f2578d64c4b7da78dd62339a771ed56a57bc66ec48d6f194916057d6753bd25f1d9d93bdf398d365f43 SHA512 7c73c1c3b6fe3bac24d373998e14ac875990434395e543a241f53287297ebcab4b90e0e2a32ddc6a24e1eafcc095cc5cef91f0370959249d08c6994e1c4933c7
@@ -414,7 +357,6 @@ DIST socket2-0.4.7.crate 44619 BLAKE2B 9bf2560812db2c91498d12274e02d17c279efe581
 DIST spin-0.9.4.crate 30180 BLAKE2B 24dfdab3e643abe5cd9ecdc14c07bafe7424ef19979b7e5b856a262ffdeb87e58291061313af2c1396ea33e14d96a728719937790d204398fe271710ddf2f8dd SHA512 156b1c471292e8cb874b59129454b56b5e84a0f10b5d064433e0abfc3384c1a594b12b095acd26da350d7f81e6849da9c07c9a506b4aa0ac4808ce3f70b5511c
 DIST spirv-0.2.0+1.5.4.crate 30491 BLAKE2B adc19c32ceafee6eddde0e92fff3b995fa062877f653efe60bcf4a73b86da4e00f77c5922ee36b239e10e4d942a12724130b726eeacca6a60ddbe2c0a87d204b SHA512 a0725df0ae9ce0ebd0b3037a740ce82c565c21a0ee343408291b30a2aebd3ced236d1df511a73abf5480ab3d23e83a88b237ee172adf5832ea7014355a3733f3
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
-DIST stdweb-0.1.3.crate 90221 BLAKE2B b8072c7be865327b47facaeac68373ce3085474d7a694f2e7f371024b5c4c0c616b8215a75e71b72b0e7aa534c9f8172593c7ec648c32049288ddfac1b0764cc SHA512 d7119427aae5d37336b8cf0002bae9c0d76a87a6865dbc9cc4c1f9abe64efe8d861c149b3975c6b3481a804e20be4fa28619257c233d3ea3d550ebd550ca5fa6
 DIST stdweb-0.4.20.crate 194102 BLAKE2B 68a34d4729ded806846a82f0453cd8a82e7a2bf5e7761725af4fdb70be2c9d9c0022c64c5d11a23c8f449d8da7b707e285a8a994b6f027500c4d11da8458d280 SHA512 d6e608e4124e92c94f22172ad1e985dfd9a8a5182f123abf2d837680ad7f791120774f9a483ae5f8d2066fc6e658045c1ad3ee8791a19caf1884970e5882f7ce
 DIST stdweb-derive-0.5.3.crate 3894 BLAKE2B 922b52eebb5e21f1f3f58866dee0db28506e37a716f8d58924cba568783098fd236954b52f432434c28f0439e9b6153468c5c3e32f4feb3748a56a49162c9b43 SHA512 d47048f9b1a84d3201ff6189873606df678e22216a7b3e26d23b5708b4115564262aa8ab51151e2ea61b4fdb633ccd5e0af73e62548fb653c30545ea4800834c
 DIST stdweb-internal-macros-0.2.9.crate 11828 BLAKE2B 6343aa183e07df93082845b10b564d17af8e65aed6d938054020519a8a96af21838c19a04f6f20d0c1e7ad511d9798f85ab780ffb4dadd049a7bfa19583aa7a3 SHA512 05aee9e19565abd18f781cd6b7e60a5d7fa576ed37724265eb4808b37d9241d89d0eca1aadeed7f3be5237859cd3d905b8e3ce5001a3f1d68ff002bedb7513ea
@@ -425,10 +367,8 @@ DIST symphonia-0.5.1.crate 10348 BLAKE2B bef16d5ac4560b2953ae0b5a91d6aeb14c8db67
 DIST symphonia-bundle-mp3-0.5.1.crate 52668 BLAKE2B a20d6d6b6402a4bc89647f89dfdbf6cea8537a46d4f670d472da12eb12ea608403ff0935ca29be66427b6a4c183476a255d6dcf8ee2914ccf004eaf523b9038d SHA512 1969d10c2984b81917515ff910e2df7e078d1f52d58bebde65e2bb840bc063754656ed975391ba5005fb70f0318f9d532c80116f8beaad002b7b1c6b20b566b0
 DIST symphonia-core-0.5.1.crate 95813 BLAKE2B 01103c863c45d70a86441308b8e6aa011ce1f2838bd918ac7cca149306c9a31add12f613360cb8dafbce0bb8416c511170e0ed524503b4a4068ff4f158c56378 SHA512 12ea4ef40454db3e44ccbc74743f70580785e54c2c204cafece5c41817ba80676f465718379b4f938a0face40a699c9d6484151c21f4d6b317ca0e1f00476e5b
 DIST symphonia-metadata-0.5.1.crate 21087 BLAKE2B 30749e7547ffde2e98419773ee5ef5e7a5272e3723632a814ad6c5b2fc7c3d9f0c716f26bf59384a4b2331fa4708a13114e3fbc8c229627d21ff471b80093f4d SHA512 2f0507e482cfbea869c5a0cd47d1fff36c4b23e3dc1ab45fee138223406d7836fea5a663aa9f4f2da95e8634f460c38465edade9ef41ce52350f4b68dc6f0ef5
-DIST syn-1.0.102.crate 235699 BLAKE2B b29d1b0ab878eda45c486bce03e1b341eb2c69718201e662d81c131ead2bb5c5abffad848d9cd8d2e45a995dbb4d6a185173b5680973971e0c33bdd9fe43dfe8 SHA512 c9a2b2cf216c3d821decd488ebb49743f2f43940a879856e3a15d2352843c405e6f164c11225e904d18b32a5cd2bd7fcdfa74df40ec5567faeedffe5f523989c
 DIST syn-1.0.103.crate 236495 BLAKE2B fd139b1a8b4449e9be6eddf0036c19b93b876182a03f36954f79eaf79abd5e53667a8a9fcb5c872c96639779307fa293f597831ff838a41d90e1ea201f8a4797 SHA512 3dc0f564ac1a4ce85060926c0897158da0baa127a46bb318506f4fdc79e53d9439295e8ed6a2d5ffcf15d9f6651081b7602cc2a091538e8df061b545f7e3bfe7
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
-DIST system-deps-6.0.2.crate 22869 BLAKE2B 0e5412b140cb4c667dd3e98a8b3c9bfae07c1df71abfde009dfe494bd11f3043cc3c7bb2c825b46caa8f47414b7c4076e131c47d3135c60678a2a826cc21899f SHA512 5ab193ff8ef680aafe89e6920b90d07349809018a27d962c6abf0ed6920d8a7541d6af03600c7b5e328425add04305743183e072491eacf973e6e96e6590b33d
 DIST system-deps-6.0.3.crate 22890 BLAKE2B 8d893b58159445fddf285653eae6eefa3f00cfe6834fb95fad3d1a9babd9b1da9dc29d413793d3efdd7d823e54a43cd619e472bc2ecece311c7fa627c7bec344 SHA512 12915d4e43c2c65f1c43c738ecb5f3ecfc817e6eb68989e34b2a8a42c10cc146da9a3b60a4d149215565e77918cc9afd991776da219863536616096ab140bfde
 DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
@@ -436,20 +376,16 @@ DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b918
 DIST thiserror-1.0.37.crate 18752 BLAKE2B b8d792715cfdffccba72af132e414a6ef28f8e4dfc0608bea49bda1bde5b6acb13da24feaabf4467b8aeace9b6d90a97e2202f7d24bfb753cc4019c2243bda25 SHA512 07f0cf9da1bf1029d70c1b6f0c54bc41ed759214683f35cf6b321ec2d69173e3da0abf80a692115a1e4630400b1fbf462878053853fdc6026edb40f7e13be72e
 DIST thiserror-impl-1.0.37.crate 15428 BLAKE2B d91e9f058e1a2b722f604d9a399c0f291c5309299c4bc103427f8927ba41c9937c7e7cd4c0f394dfb9d96799be8a3d5b33f8e869045f58228a43354dead5117b SHA512 37d90875118fe45b51afa89dd0acfbe4d9852b899ad391b419b5181a92bda115cf5569ffef57caf6020964d5d847c2b1f191c99e2c0caf7d4166f531bd19f952
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
-DIST tiff-0.7.3.crate 1417896 BLAKE2B f718ec0bcfb4917d15189c6b4c37df643f43e2d6042639d123c678e11dead387b5823eecd6715f3d3678bf508d8cb53795b9d05e3cdf261badac5cef42738fe5 SHA512 fb5248ae56320ec0ed98c85b545996461924c422b2b1d916b46a2fc04394ee12e111132fea6cda27c53cdf492285797fe46bd4a403a1a598bd8c8dd327814356
 DIST tiff-0.7.4.crate 1418164 BLAKE2B 5d8246d281d66255b5cf44f416c794f84323908f8f881d3beece4ee54c2afe9f2f9b1dfdf462fbba30689192c1f5d277e659d464c5385dc18c7806e904dd805e SHA512 760609a910bb75a10fdee3c68316e8d9ec7185cb55867bbef40449cdb5a283e3d6e084d0a69ddcf9873bf6fe799c0b67cddacabe6b48cbf74d91df3e6d262761
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
-DIST time-0.3.15.crate 93589 BLAKE2B d83c9be58d950631b35ddecf44a28c2708978a922010baa54157b950f1c03c41327258e78701c9bcb93937ffda67303fb1ee0c647afae6597a23a67dc4992623 SHA512 8783fe9cd6aa94cf6588ca1a734d0fa11c9e20e0d99b46b218db95bc185aee8a4324b2ece1a535b4378e87151f9837cd41f663c542f561019be99e3ed5f55325
 DIST time-0.3.16.crate 92945 BLAKE2B 742e49c3fb7f43851cde22ae1c0496061247f59f8c0c80bf39edbd969e04dc4a84719553ac6d03634826d2ea6f46225b9ca2528c433a4352622d8edc99eb507b SHA512 e6117d9ecc9e5bdc6f116f64a881b68ae88077221735282faad843af4238a7a7272a6e95985f38bbb8bdff39a51d2dc371691b487ce09f101b954cba6e92bb61
 DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db
-DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
 DIST time-macros-0.2.5.crate 19015 BLAKE2B 0de97fd1cf467694dfa0fd7db44d161ff6c5eff442cfd816c5f5b2f2af3c7d515a5a63361a8cc4385c7eb1a75f028175cc40e500a59d1e8b245f16abe48b67ee SHA512 f3e28042ca1cff44bc43bec32dbeb92b227d05bcd218cdda5d1145b269f43a6e862254fd3d92ff180fd2146963c94a061b74cec077c37ebcd69f76e525d95b65
 DIST tiny-skia-0.7.0.crate 178703 BLAKE2B 00fe443b5c2eaed33eb1ac1d0915311ddb2c0c2e4eab25fc4dba7991e78d1dfc5e91fed5ba0d1233274ab52b08838632a310cb99cbfcdeb815ab3067de047995 SHA512 5cdebef37b91e0928e9248d95b2acdc47cad931bc9aea89b4f8527984e4d4aef5de86ac674472d630bc47cf3b12fad0c8e41691be10d760cc2d2284c326bd9b5
 DIST tiny-skia-path-0.7.0.crate 47384 BLAKE2B 485defb120103c9d8b88eb4402e210bd8d43d3ccd253ce55051ab6456ccc09cf0acf35fa9dde85157595f11cf8202f45c78a65109489e497e0a78cb0438729ec SHA512 4ade9260fdb1bfee3feef7bd3059c1ff00e80240349d6879669164954b7ecf5539296aa7289436f16ce6cd8e6733e265a5ff375b23c2a286b65d4ad74d924e30
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
-DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
 DIST tracing-attributes-0.1.23.crate 30450 BLAKE2B fa21c4074eefbc1110268cfc79291c909503428b26560cf68cf04640a6387d04c29e22b8f86fd48cc1b8c0fd4bb67fca428c9f8009b3c99879352b9d9f68c5ea SHA512 55e92b4e0410805f8cf9eb8ee50cabcf08d1f6c6b4b38c5a51c70f59d06c82096af1f3b9b7dd4267945cf631fa8d99f78ae9b3d0760f9c7ed4d6da6e5e6ff3cb
 DIST tracing-core-0.1.30.crate 60351 BLAKE2B eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88 SHA512 9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65
@@ -488,15 +424,12 @@ DIST wayland-scanner-0.29.5.crate 17248 BLAKE2B de239ef313e5c4fa4aaebfc4c7aea945
 DIST wayland-sys-0.29.5.crate 7926 BLAKE2B bf09b522dc69b2a49493e769696196e18bfede5681120ceeee94b0cb3393ed8c4d0d3b1acc967d5231735cbc65d71d13394a25845e30a1ce40e6f8461647daca SHA512 ec99802c44e75840e029b771fcdfb57ba4f0e0f143b012f91eaf661ccedf4eb82122950fec25c6692f24c0f7c123e697e7cca890131f04bc8bb4b670485b2191
 DIST weak-table-0.3.2.crate 23989 BLAKE2B f5b12d62704a86f77fabaac918d084a4f7471b52994307da20376d48264b811eaeffe2cae2f28ebeeefa4338c758516bcdba5d138cd7ac12ebfccc697009e167 SHA512 78936f2afca36575d3faa823ef4e621d7dea9e3eb4c8c3e1d66af296951fc25476dc8cbadae184322f6e1e8166410df617fe74794b2d3696d599bb2406499562
 DIST web-sys-0.3.60.crate 700485 BLAKE2B 13942a583dd8462b0591a19759a41f41fb17d2356b3bcd78402e420fdf5726782e5b4ed211c3716a81c1cdf64ce9b8adecaa3fa22756a3ec84eb7c3e12e3018c SHA512 d883363f99300e2d50bc5bf198f0fb8d6c53e5a778217e340573560ac07db26a71c98419fa2ced32820472126d6f97ad5773ad082521be0a1c9a374af9d61df9
-DIST webbrowser-0.8.0.crate 26406 BLAKE2B 6f764de667344b4d578d30cc40fca859fec4b21509b6e654a2dc236f82b0af22d829d4e5b58d5548fe789b1b8f72162206d71dd1b1d65d84a03da22b95a311bf SHA512 a40e98042d81165510e154c60a3124ca0b46b0c2a2e4e6df77738dc282ac62e1d692d281f80858aef7fdce3496c9bc4bb753fccaedecd25924c1b3c2241db249
 DIST webbrowser-0.8.1.crate 26553 BLAKE2B 7af01e67da16050f0c6698dc15ea3fc30330d9e1000a6f09a46dfbc38f49eaad1eb71ac612ef061ef451aa766ac6ddc4ab2e47b468a87120c2babe3084a36534 SHA512 8d2ddf613bd909e6bd58638bb750a5c24a4a8351d2e2d66c005a1b2138b2dad48896bbcda0c3d11fd105e40a0c91f3f3a1b325abfe98abef787dcd8c46e7de31
 DIST weezl-0.1.7.crate 42166 BLAKE2B a3a2a48dbb444b2bd910e1470507209f3d0acc75d88e22bcb42b5ca7ab8edbc41fc9e49cb6a2e18cf5e470d7bd26f4e4d9e30ea01c3eb543f171289a86927fdf SHA512 3fd8cb01dde494371df57001c97be90418b642ba88b0945cd98f973a4498743b83d383bcdfc8884db1da75271aeef4ce3b418e425f23690f12a5cc645c418e90
 DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
 DIST wgpu-0.14.0.crate 141335 BLAKE2B 9f7dff89f6f16260690f997f4a9bc014e4847b01f16ab365114c4aafbefe1244c282c2611a691a514c715b889b698f7b2201b4812bfa0c74c66c8308aeb7f1fe SHA512 89e46b56f8c5c0c6157ba067d12d23868de7016c9c1a5d596a9981039a9da809f4bfa385ac974dbc32ad7715fd5d83d206e487d7642029bdbe00f71d7998d990
 DIST wgpu-core-0.14.0.crate 203248 BLAKE2B 38b081a6f6c2f2943ed469d97e626817c4cac7bbb02e04e75d62ee47f3dd8e95c6729d095978b51095459fc01bf7164c3f4ddda54cd2b8d852c4880645927bb8 SHA512 04e0fd9d0b6fd4a22a30be0e41106462f20f1870a1f091143204cc705152fe7e69c7d21c3438a02481bf71cc516d99715594193b3195e09771f8257140865a24
-DIST wgpu-hal-0.14.0.crate 222732 BLAKE2B 58365d7ac79097ca5c0c03bb53193ab0f6adf448bef1cbbb35f1d7ba10bf94a5501b2f69fbaf9d63094774f44c514eaf43d457a68e642cf6f1836bfd3c3758c9 SHA512 34d67142a052ce71ee4234aa0295e386fe30dc678772cb5849a6918eaa4eb18de9deca55e7f4064da4b7af63d4e3eafcafe70ff992bdc98b8cdf42b27f079997
 DIST wgpu-hal-0.14.1.crate 220634 BLAKE2B 3fd79e4dfe1d8332283c8217733ca1a8d01deed1f7a0caeb23f2db85d014843be6445bc0789545150950bc07d117c07e0d919d0b83648d1c83567545c40b6a75 SHA512 4ef7d50dcf8b9e48ea7c8bf4292e86649920505c0925da0f8a356185581bfff51c4ea32f78d832af36be2bac235a1ef41ef7f95c9ae2714046908878eeb809c1
-DIST wgpu-types-0.14.0.crate 43156 BLAKE2B 180b2a7fe44faa0be1d5cc74f17d296de649dadbbf20e86096d26921f013eaf19bb29e72198083b793824b5b4c1bd45b7126ca18080411a400330e585fe60779 SHA512 f9107ccaf4d6d42d9a5dd7771aba818ad5fb806d909fbe2bd976d0b39336475212ce3033dea4d2ebd2184ca1dbc6b1a5a02896a1742fb0b6255b4d5daf93e587
 DIST wgpu-types-0.14.1.crate 39502 BLAKE2B d65d932df63cf0fc647f600e9a0979e8659d45d0f45f4d1010233d7f9a3cf861c154369713457d7c03a6fc358861b153c82e29f1bd297a8d55f996e6cdd93676 SHA512 4c670c0dd5b94b123083aaf8037f5f72c160e9a3370a2c6017a724b76e0c0b94cc1bcdabe587c13051a2d968ac39bd4fc39be43bb0dde379fbe154561bc67aae
 DIST wide-0.7.5.crate 70547 BLAKE2B 2733b50ff16b87bd2b232bacb4722a188dcfc703615da23dd0c884b7b70e9876fa705493bfdf04d868d761d9f10e211bc9378d14cc67b3cd3994614e90d0db8d SHA512 8f83aef8ad2c6539e4ed1478ef818ef9b4d83fc2417037fe633749f75e23a5b4b373fa6527ddd9cc1eb1fc864f5eeda960dc6e9b5310204d08c2140530a48d4a
 DIST widestring-1.0.2.crate 79706 BLAKE2B 64423d0c485d1596015e9fcee691222a2a69b85a1b13a91651c50c1e3c5ec61c5105232904c6239bb442a2b3f2e808379d802856b93bb62ec8779cbf3db77655 SHA512 cbebac37d87808e791d7839ad69e0b86af49b0e8a354a22e11797915c719937ed5b0cb638e5afc9d710cd1e073eaa9f7db76cd3ca1ec35a71b565f0b8f55407b
@@ -524,7 +457,6 @@ DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST windows_x86_64_msvc-0.37.0.crate 661993 BLAKE2B ec6509a2e07ae8f94c5cb0cd6eb507b504782702698c93ec86af66c9bf3587d2dcc7b7f5a5da95ce92df42091633378374f101d64685cbdc8ef55d49523c41bc SHA512 ccfb98753311f32a591b94391dc4a8d9ffb5bdbb09e83f082b8dde6077e5ec710dc380a2a6cad90a00da5570eacd74dae810108943801a0615abf53c35ff7da6
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
-DIST winit-0.27.4.crate 370023 BLAKE2B de04a0be0e9641b9132039a29b2452af8e9b10bc8811c3095844ed8ab31d949626238d6fd1d399d28152bf7387df59564c391bc667277f8f730dee5bb256bf18 SHA512 e5c17a80ebfd140c48715b42b4ef1345e216614321ff31cd2cb9595d07f7a817dbbd81b66d6d1b5c0196ccaa9f477b7e031043a75d07a7034e24ed46bf9121d2
 DIST winit-0.27.5.crate 370578 BLAKE2B 7e8c52606d18fb04fa301a08d8cdb4d32b62bba66be13545e7eb4a94f47726cf0e48688625702f5b9c50f05aa57ce813c3af027da404dea48304c85d76dfe8ca SHA512 1fba987f18e1437285e19b9fce4d060fbf0b92339bbe3f8c0107222103b35654bc1a3be8654d0aa6cedd6ec339e62a430b1655e6c6933e057b122785432f1e63
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST wio-0.2.2.crate 11214 BLAKE2B 7356229f90aa50d6ac8a7651637967de3e06755a7a45eab2a144e13c876058553c22129abffb07717b1715233f6cfc1efe90ff60c1877f4291fabaa4b5ea283d SHA512 13838de6e01b20de8996c7aa9efbaca5bcd9e4551614cfc10bee45ecca4bcc70b953b2c59fe460d1a054b3ecac13445b020aa244ea70686fd19be8d65c539b0e
@@ -536,7 +468,6 @@ DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f49
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
-EBUILD ruffle-0_p20221015.ebuild 11589 BLAKE2B 6fb69693a65cb828bc21b80254baa9190c979939bd4bc568ae220c775109bb2c1df46ac83f1f31384343ee7a6ff6f7c1addace644dcb762af33b571f62dc7eb9 SHA512 d0a2bfd096cbc82057c7ac84cc6c35ba2a381a7a6815739f91d95df7baa894a6f3a6b3c58325245eda9398bb0a426d8f1e4cca3ea07ec7f4cabda794d127d448
 EBUILD ruffle-0_p20221112.ebuild 12147 BLAKE2B 677f59ccc9738c7552a82b13fa2970b62d788f99ce62bb9364d62f187016d664ed6689389faf35e30008151ccbefc38444d5775e26c790e498e7c477ea34538b SHA512 4ca457f3dd8222ec6738e7bf9245bd1624551406c863842f3b9d113dec91cbfc6afd9c6511f411b99f063cfb3a3e205acd08df47bb82771899fdd64d29b7d485
 EBUILD ruffle-9999.ebuild 1452 BLAKE2B abd4cc978b403a2a3ce822bdab0d677bf1ad9bad1930631040eab02f315184182ec581c0b01cb100b01a06926b8c5158153c3bf97fef789b6b898889ad9216ce SHA512 777abded8310d1b745f78a140860b420ece95b72f776a75d00ec015075d2890fad0defb2dbf79f5dc19ccde211c63ebcff6e8045f1d795b44455ef828c728867
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20221015.ebuild b/app-emulation/ruffle/ruffle-0_p20221015.ebuild
deleted file mode 100644
index 1f87beb6bb19..000000000000
--- a/app-emulation/ruffle/ruffle-0_p20221015.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	Inflector-0.11.4
-	adler-1.0.2
-	adler32-1.2.0
-	ahash-0.7.6
-	aho-corasick-0.7.19
-	aliasable-0.1.3
-	alsa-0.6.0
-	alsa-sys-0.3.1
-	android_system_properties-0.1.5
-	anyhow-1.0.65
-	approx-0.5.1
-	arrayref-0.3.6
-	arrayvec-0.5.2
-	arrayvec-0.7.2
-	ash-0.37.0+1.3.209
-	async-channel-1.7.1
-	atk-sys-0.15.1
-	atty-0.2.14
-	autocfg-1.1.0
-	base64-0.13.0
-	bindgen-0.59.2
-	bit-set-0.5.3
-	bit-vec-0.6.3
-	bit_field-0.10.1
-	bitflags-1.3.2
-	bitflags_serde_shim-0.2.2
-	bitstream-io-1.5.0
-	bitvec-0.19.6
-	block-0.1.6
-	block-buffer-0.10.3
-	bstr-0.2.17
-	build_const-0.2.2
-	bumpalo-3.11.0
-	bytemuck-1.12.1
-	bytemuck_derive-1.2.1
-	byteorder-1.4.3
-	bytes-1.2.1
-	cache-padded-1.2.0
-	cairo-sys-rs-0.15.1
-	calloop-0.10.1
-	castaway-0.1.2
-	cc-1.0.73
-	cesu8-1.1.0
-	cexpr-0.6.0
-	cfg-expr-0.10.3
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	cfg_aliases-0.1.1
-	chrono-0.4.22
-	clang-sys-1.4.0
-	clap-4.0.15
-	clap_derive-4.0.13
-	clap_lex-0.3.0
-	clipboard-0.5.0
-	clipboard-win-2.2.0
-	cmake-0.1.48
-	cocoa-0.24.0
-	cocoa-foundation-0.1.0
-	codespan-reporting-0.11.1
-	color_quant-1.1.0
-	colored-2.0.0
-	combine-4.6.6
-	concurrent-queue-1.2.4
-	console-0.15.2
-	console_error_panic_hook-0.1.7
-	console_log-0.2.0
-	convert_case-0.6.0
-	cookie-factory-0.3.2
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	core-graphics-0.22.3
-	core-graphics-types-0.1.1
-	core-text-19.2.0
-	coreaudio-rs-0.10.0
-	coreaudio-sys-0.2.10
-	cpal-0.14.0
-	cpufeatures-0.2.5
-	crc-1.8.1
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.11
-	crossbeam-utils-0.8.12
-	crossfont-0.5.0
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	csv-1.1.6
-	csv-core-0.1.10
-	ctor-0.1.23
-	cty-0.2.2
-	curl-0.4.44
-	curl-sys-0.4.56+curl-7.83.1
-	cxx-1.0.78
-	cxx-build-1.0.78
-	cxxbridge-flags-1.0.78
-	cxxbridge-macro-1.0.78
-	d3d12-0.5.0
-	darling-0.13.4
-	darling-0.14.1
-	darling_core-0.13.4
-	darling_core-0.14.1
-	darling_macro-0.13.4
-	darling_macro-0.14.1
-	derive-try-from-primitive-1.0.0
-	diff-0.1.13
-	digest-0.10.5
-	dirs-4.0.0
-	dirs-sys-0.3.7
-	dispatch-0.2.0
-	dlib-0.5.0
-	downcast-rs-1.2.0
-	dwrote-0.11.0
-	either-1.8.0
-	embed-resource-1.7.2
-	encode_unicode-0.3.6
-	encoding_rs-0.8.31
-	enum-map-2.4.1
-	enum-map-derive-0.10.0
-	enumset-1.0.12
-	enumset_derive-0.6.1
-	env_logger-0.9.1
-	euclid-0.22.7
-	event-listener-2.5.3
-	expat-sys-2.1.6
-	exr-1.5.2
-	fastrand-1.8.0
-	flate2-1.0.24
-	float_next_after-0.1.5
-	flume-0.10.14
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-0.5.0
-	foreign-types-macros-0.2.2
-	foreign-types-shared-0.1.1
-	foreign-types-shared-0.3.1
-	form_urlencoded-1.1.0
-	freetype-rs-0.26.0
-	freetype-sys-0.13.1
-	funty-1.1.0
-	futures-0.3.24
-	futures-channel-0.3.24
-	futures-core-0.3.24
-	futures-executor-0.3.24
-	futures-io-0.3.24
-	futures-lite-1.12.0
-	futures-macro-0.3.24
-	futures-sink-0.3.24
-	futures-task-0.3.24
-	futures-util-0.3.24
-	fxhash-0.2.1
-	gdk-pixbuf-sys-0.15.10
-	gdk-sys-0.15.1
-	generational-arena-0.2.8
-	generic-array-0.14.6
-	getrandom-0.2.7
-	gif-0.11.4
-	gio-sys-0.15.10
-	glib-sys-0.15.10
-	glob-0.3.0
-	glow-0.11.2
-	gobject-sys-0.15.10
-	gpu-alloc-0.5.3
-	gpu-alloc-types-0.2.0
-	gpu-descriptor-0.2.3
-	gpu-descriptor-types-0.1.1
-	gtk-sys-0.15.3
-	half-2.1.0
-	hashbrown-0.12.3
-	heck-0.4.0
-	hermit-abi-0.1.19
-	hexf-parse-0.2.1
-	http-0.2.8
-	humantime-2.1.0
-	iana-time-zone-0.1.51
-	iana-time-zone-haiku-0.1.0
-	ident_case-1.0.1
-	idna-0.3.0
-	image-0.24.4
-	indexmap-1.9.1
-	indicatif-0.17.1
-	instant-0.1.12
-	isahc-1.7.2
-	itoa-0.4.8
-	itoa-1.0.4
-	jni-0.19.0
-	jni-sys-0.3.0
-	jobserver-0.1.25
-	jpeg-decoder-0.2.6
-	js-sys-0.3.60
-	khronos-egl-4.1.0
-	lazy_static-1.4.0
-	lazycell-1.3.0
-	lebe-0.5.2
-	lexical-core-0.7.6
-	libc-0.2.135
-	libflate-1.2.0
-	libflate_lz77-1.1.0
-	libloading-0.7.3
-	libnghttp2-sys-0.1.7+1.45.0
-	libz-sys-1.1.8
-	link-cplusplus-1.0.7
-	lock_api-0.4.9
-	log-0.4.17
-	lyon-1.0.0
-	lyon_algorithms-1.0.1
-	lyon_geom-1.0.1
-	lyon_path-1.0.1
-	lyon_tessellation-1.0.4
-	lzma-rs-0.2.0
-	mach-0.3.2
-	malloc_buf-0.0.6
-	memchr-2.5.0
-	memmap2-0.5.7
-	memoffset-0.6.5
-	metal-0.24.0
-	mime-0.3.16
-	minimal-lexical-0.2.1
-	minimp3-0.5.1
-	minimp3-sys-0.3.2
-	miniz_oxide-0.5.4
-	miniz_oxide-0.6.2
-	mio-0.8.4
-	naga-0.10.0
-	nanorand-0.7.0
-	ndk-0.6.0
-	ndk-0.7.0
-	ndk-context-0.1.1
-	ndk-glue-0.7.0
-	ndk-macro-0.3.0
-	ndk-sys-0.3.0
-	ndk-sys-0.4.0
-	nix-0.23.1
-	nix-0.24.2
-	nom-6.1.2
-	nom-7.1.1
-	num-bigint-0.4.3
-	num-complex-0.4.2
-	num-derive-0.3.3
-	num-integer-0.1.45
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.13.1
-	num_enum-0.5.7
-	num_enum_derive-0.5.7
-	num_threads-0.1.6
-	number_prefix-0.4.0
-	objc-0.2.7
-	objc-foundation-0.1.1
-	objc_exception-0.1.2
-	objc_id-0.1.1
-	oboe-0.4.6
-	oboe-sys-0.4.5
-	once_cell-1.15.0
-	openssl-probe-0.1.5
-	openssl-sys-0.9.76
-	os_str_bytes-6.3.0
-	ouroboros-0.15.5
-	ouroboros_macro-0.15.5
-	output_vt100-0.1.3
-	pango-sys-0.15.10
-	parking-2.0.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	path-slash-0.2.1
-	peeking_take_while-0.1.2
-	percent-encoding-2.2.0
-	pin-project-1.0.12
-	pin-project-internal-1.0.12
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.25
-	png-0.17.6
-	polling-2.3.0
-	ppv-lite86-0.2.16
-	pretty_assertions-1.3.0
-	primal-check-0.3.3
-	proc-macro-crate-1.2.1
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro2-1.0.46
-	profiling-1.0.7
-	quote-1.0.21
-	radium-0.5.3
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	range-alloc-0.1.2
-	raw-window-handle-0.4.3
-	raw-window-handle-0.5.0
-	rayon-1.5.3
-	rayon-core-1.9.3
-	redox_syscall-0.2.16
-	redox_users-0.4.3
-	regex-1.6.0
-	regex-automata-0.1.10
-	regex-syntax-0.6.27
-	regress-0.4.1
-	renderdoc-sys-0.7.1
-	rfd-0.10.0
-	rle-decode-fast-1.0.3
-	ron-0.8.0
-	rustc-hash-1.1.0
-	rustc_version-0.4.0
-	rustdct-0.7.0
-	rustfft-6.0.1
-	rustversion-1.0.9
-	ryu-1.0.11
-	safe_arch-0.5.2
-	safe_arch-0.6.0
-	same-file-1.0.6
-	schannel-0.1.20
-	scoped-tls-1.0.0
-	scoped_threadpool-0.1.9
-	scopeguard-1.1.0
-	scratch-1.0.2
-	sctk-adwaita-0.4.2
-	semver-1.0.14
-	serde-1.0.145
-	serde-wasm-bindgen-0.4.5
-	serde-xml-rs-0.6.0
-	serde_derive-1.0.145
-	serde_json-1.0.86
-	servo-fontconfig-0.5.1
-	servo-fontconfig-sys-5.1.0
-	sha2-0.10.6
-	shlex-1.1.0
-	simple_asn1-0.6.2
-	slab-0.4.7
-	slice-deque-0.3.0
-	slotmap-1.0.6
-	sluice-0.5.5
-	smallvec-1.10.0
-	smithay-client-toolkit-0.16.0
-	socket2-0.4.7
-	spin-0.9.4
-	spirv-0.2.0+1.5.4
-	static_assertions-1.1.0
-	stdweb-0.1.3
-	strength_reduce-0.2.3
-	strsim-0.10.0
-	symphonia-0.5.1
-	symphonia-bundle-mp3-0.5.1
-	symphonia-core-0.5.1
-	symphonia-metadata-0.5.1
-	syn-1.0.102
-	synstructure-0.12.6
-	system-deps-6.0.2
-	tap-1.0.1
-	termcolor-1.1.3
-	terminal_size-0.1.17
-	thiserror-1.0.37
-	thiserror-impl-1.0.37
-	threadpool-1.8.1
-	tiff-0.7.3
-	time-0.1.44
-	time-0.3.15
-	time-macros-0.2.4
-	tiny-skia-0.7.0
-	tiny-skia-path-0.7.0
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	toml-0.5.9
-	tracing-0.1.37
-	tracing-attributes-0.1.23
-	tracing-core-0.1.30
-	tracing-futures-0.2.5
-	transpose-0.2.1
-	typed-arena-2.0.1
-	typenum-1.15.0
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.5
-	unicode-normalization-0.1.22
-	unicode-segmentation-1.10.0
-	unicode-width-0.1.10
-	unicode-xid-0.2.4
-	url-2.3.1
-	vcpkg-0.2.15
-	vec_map-0.8.2
-	version-compare-0.1.0
-	version_check-0.9.4
-	vswhom-0.1.0
-	vswhom-sys-0.1.1
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	wasi-0.10.0+wasi-snapshot-preview1
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-futures-0.4.33
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	wayland-client-0.29.5
-	wayland-commons-0.29.5
-	wayland-cursor-0.29.5
-	wayland-protocols-0.29.5
-	wayland-scanner-0.29.5
-	wayland-sys-0.29.5
-	weak-table-0.3.2
-	web-sys-0.3.60
-	webbrowser-0.8.0
-	weezl-0.1.7
-	wepoll-ffi-0.1.2
-	wgpu-0.14.0
-	wgpu-core-0.14.0
-	wgpu-hal-0.14.0
-	wgpu-types-0.14.0
-	wide-0.7.5
-	widestring-1.0.2
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-0.37.0
-	windows-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_aarch64_msvc-0.37.0
-	windows_i686_gnu-0.36.1
-	windows_i686_gnu-0.37.0
-	windows_i686_msvc-0.36.1
-	windows_i686_msvc-0.37.0
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_gnu-0.37.0
-	windows_x86_64_msvc-0.36.1
-	windows_x86_64_msvc-0.37.0
-	winit-0.27.4
-	winreg-0.10.1
-	wio-0.2.2
-	wyz-0.2.0
-	x11-clipboard-0.3.3
-	x11-dl-2.20.0
-	xcb-0.8.2
-	xcursor-0.3.4
-	xml-rs-0.8.4
-	yansi-0.5.1"
-# python is needed by xcb-0.8.2 until update to >=0.10
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit cargo desktop flag-o-matic python-any-r1 xdg
-
-# 0(github) 1(repo) 2(commit hash) 3(crate:workspace,...) [see core/Cargo.toml]
-RUFFLE_GIT=(
-	"RustAudio dasp f05a703d247bb504d7e812b51e95f3765d9c5e94 dasp"
-	"ruffle-rs gc-arena 081b6883a522b38030b13744c80c84efbfcbae1f gc-arena:src/gc-arena"
-	"ruffle-rs h263-rs 023e14c73e565c4c778d41f66cfbac5ece6419b2 h263-rs:h263,h263-rs-yuv:yuv"
-	"ruffle-rs nellymoser 4a33521c29a918950df8ae9fe07e527ac65553f5 nellymoser-rs:."
-	"ruffle-rs nihav-vp6 9416fcc9fc8aab8f4681aa9093b42922214abbd3 nihav_codec_support:nihav-codec-support,nihav_core:nihav-core,nihav_duck:nihav-duck"
-	"ruffle-rs quick-xml 8496365ec1412eb5ba5de350937b6bce352fa0ba quick-xml:."
-	"ruffle-rs rust-flash-lso 19fecd07b9888c4bdaa66771c468095783b52bed flash-lso"
-)
-ruffle_uris() {
-	cargo_crate_uris
-
-	local g
-	for g in "${RUFFLE_GIT[@]}"; do
-		g=(${g})
-		echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
-	done
-}
-
-# using _pYYYYMMDD over YYYY.MM.DD given ruffle has an underlaying version
-# (0.1.0) which could get a non-nightly release eventually (YYYY. > 0.1.0)
-MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Flash Player emulator written in Rust"
-HOMEPAGE="https://ruffle.rs/"
-SRC_URI="
-	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-	$(ruffle_uris)"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB curl"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/openssl:=
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib:=
-	x11-libs/gtk+:3
-	x11-libs/libxcb:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/jre:*
-	virtual/pkgconfig
-	>=virtual/rust-1.64"
-
-QA_FLAGS_IGNORED="
-	usr/bin/${PN}
-	usr/bin/${PN}_exporter
-	usr/bin/${PN}_scanner"
-
-src_prepare() {
-	default
-
-	# use [patch] directive to register git snapshots of needed crates
-	local crate g
-	for g in "${RUFFLE_GIT[@]}"; do
-		g=(${g})
-		echo "[patch.\"https://github.com/${g[0]}/${g[1]}\"]"
-		for crate in ${g[3]//,/ }; do
-			echo "${crate%:*} = { path = \"../${g[1]}-${g[2]}/${crate#*:}\" }"
-		done
-	done >> Cargo.toml || die
-}
-
-src_compile() {
-	filter-lto # does not play well with C code in crates
-
-	cargo_src_compile --bins # note: configure --bins would skip tests
-}
-
-src_install() {
-	dodoc README.md
-
-	newicon web/packages/extension/assets/images/icon180.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
-		"MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
-
-	cd target/$(usex debug{,} release) || die
-
-	newbin ${PN}_desktop ${PN}
-	newbin exporter ${PN}_exporter
-	dobin ${PN}_scanner
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "${PN} is experimental software that is still under heavy development"
-		elog "and only receiving nightly releases. Plans in Gentoo is to update"
-		elog "roughly every months if no known major regressions (feel free to"
-		elog "report if you feel a newer nightly is needed ahead of time)."
-		elog
-		elog "There is currently no plans to support wasm builds / browser"
-		elog "extensions, this provides the desktop viewer and other tools."
-	fi
-}
diff --git a/app-emulation/vkd3d-proton/Manifest b/app-emulation/vkd3d-proton/Manifest
index 8533fa5684bf..2e1a8f5a894b 100644
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@@ -6,7 +6,7 @@ DIST vkd3d-proton-spirv-headers-87d5b782be.tar.gz 439180 BLAKE2B 9c64a1b7aa40817
 DIST vkd3d-proton-spirv-headers-ae217c1780.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b9c69757d7c2257ce2fe1bc6be308341f3189766f120994e4920bc738b737d9eefc299359dab568fb8809782e3663dd589c0e4d13aecb8873a SHA512 02cf1d63b29e48ef0efe489eb32237ba2f9f4bf58a182b00dc96aab18faba94de79283398e9e945cd81130f83fff228c59b04e496716ea9ccc148a5f4465282c
 DIST vkd3d-proton-vulkan-headers-5177b119bb.tar.gz 1588963 BLAKE2B 3e973c9fc1fd8c8f725fbe8dbd67ca451aa7ffbb202d2395f3b26bbad9cb4e9e39514c7c78825be7ca122ccd5b434adb0b3fcce25cb7fff7c831dcc5909bbdc3 SHA512 3848e5b14f73dda60f133d396742a9a2aa2fc3914b8cbd8bde90e392437398321865ade63e81ec99a83af20a42424cf2c6d06e4dda0d7323486d59fbc4504a3b
 DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
-EBUILD vkd3d-proton-2.6.ebuild 6053 BLAKE2B 50d2d2fea9801e9a84546a3d3fc3ab4c982ad61ccc56ad2f0e99865bf6e4214032a8f6514a0e7981bb8f9ed55de71db33e6bec832f825d7b08c7f81513dcd30c SHA512 f3a6606f9fb3abfbf474039e6b6dbaa900d0142b0e5dff9d43c60066f3ce7be97bc0d3b4e4b4b248d3b8f99c7358cad53ccccf1e17dcead99b9a797fe8bd30ee
-EBUILD vkd3d-proton-2.7.ebuild 6384 BLAKE2B 269ec641805d0b4933f31b44a82011b5bbb09399991687299c76bb0b6d687684b68362388600808ca47f128e52c9ef69e436007dd6a2f29932f5cfe31a12e466 SHA512 b99b1f2a819641b477be633a55c6c7f92afc03f1357a8b1d150abb6b8a32c58ba179d433e2d18cfcc34c4c0fce4487b11bc053b0362a625cf6f3c59c8ad4b4ea
-EBUILD vkd3d-proton-9999.ebuild 6392 BLAKE2B 1b1ce6d4bb4173722850fd6a365f6e14ebb5c4bfe3d12b6a5246b931e3b7510df324289af733c4d4a5ffecc2db5b335fc745c84e77d43a40b837ba8bf153978e SHA512 458451234d899ab68ec18f05ad0547638f0948a721edc5074587c2a80b839f856cbe4a759df05678f435c11944811f19987b56e5881653de0e27cfae345d530d
+EBUILD vkd3d-proton-2.6.ebuild 6063 BLAKE2B 4ad68420c36546605e2a9d74bba75fa170b55c6f931aafbc541e50e26d0f9f94a2e55ea24786c2685163115c7ea6f815ea3f046654ed1770136ab4592b630b3c SHA512 3993f21573c32747f5a253ed0cd1bb97bef7f9c73c7f7781ddd63dcbdaee18b5987dc035703b3315a6a61b5a5679b339b6ff6ce07847ba9585ec9b0cd13a2c87
+EBUILD vkd3d-proton-2.7.ebuild 6668 BLAKE2B 6f5ac985f8ed120930b4eddc646799d1f22dfc0ff2165af44437a0ef75c6458544395420dd0ecb6f163f43a99d4cccf54a3c2ec30fdd74ff9b44dc67c6e94b4f SHA512 89fa2bb4cf2ddc1877e007fff3cdc06ce06476723b7373adaa75c939d93764497f09feb71bf61c8d7315388b03d26bce0092eee880702f6608b1f627fb708b76
+EBUILD vkd3d-proton-9999.ebuild 6663 BLAKE2B bb56548c08e6632f095851dc403b2b610819798babf3a66f36f709018fe3d469eac320e4f8c27488bb0d040e301ab776d46139a97cc538eb09257077a9902ca9 SHA512 e396296b59aea3a220b6d9cdc1e2445632470bc6a3337b77058f517c2bef9b5b3992d4b95c5f0a03f3dc4cdd1836921330e51e68557b345f64249600d15a6d2d
 MISC metadata.xml 618 BLAKE2B 4382557118c0ea56972d05a10c9cc1f94a4fbcc58a414f1cd5e4354ce6ed1de15c95377f167ed5627231c2887ecce3c00756908720458fedddea5ed6732771ff SHA512 b5cc86b412c30ee5d54868a87c9f4892337c83988b738806532cd9e2cc295a2326e776030c19cae9a2e9dd4f5f615b1d962ec48a4b310fd8a94ec4024dde99ab
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
index fad3b13cc6c6..168166ea70aa 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
@@ -22,11 +22,15 @@ else
 	HASH_SPIRV=ae217c17809fadb232ec94b29304b4afcd417bb4
 	HASH_VULKAN=83e1a9ed8ce289cebb1c02c8167d663dc1befb24
 	SRC_URI="
-		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz -> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
+		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
+			-> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-2.7.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-2.7.ebuild
index 5a33b6e7850c..7e1f9bfd1240 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-2.7.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-2.7.ebuild
@@ -23,12 +23,17 @@ else
 	HASH_SPIRV_DXIL=87d5b782bec60822aa878941e6b13c0a9a954c9b
 	HASH_VULKAN=5177b119bbdf463b7b909855a83230253c2d8b68
 	SRC_URI="
-		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz -> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
+		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
+			-> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
+			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
+			-> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
@@ -162,4 +167,12 @@ pkg_postinst() {
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
 	fi
+
+	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
+		ver_test ${REPLACING_VERSIONS##* } -lt 2.7
+	then
+		elog
+		elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
+		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
+	fi
 }
diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
index 6c6b0e82479d..55490ce310fc 100644
--- a/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
@@ -167,4 +167,12 @@ pkg_postinst() {
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
 	fi
+
+	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
+		ver_test ${REPLACING_VERSIONS##* } -lt 2.7
+	then
+		elog
+		elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
+		elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
+	fi
 }
diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest
index c239010c7a85..54bfa6a2fd3c 100644
--- a/app-emulation/wine-gecko/Manifest
+++ b/app-emulation/wine-gecko/Manifest
@@ -6,6 +6,6 @@ DIST wine-gecko-2.47.3-x86.msi 55686144 BLAKE2B ce428b35ce70968c12141832aab6044a
 DIST wine-gecko-2.47.3-x86.tar.xz 43291212 BLAKE2B 441659dd002c14b7774b0c2dc4bbc8d29f16bda7b9d1b5ff7d75dca53a6b01366c62270fa617f8bcd7ac07871de72c016d66e557b4d4f734227c0c4ec0b74013 SHA512 c1530c4aec4743b5acb14cecac909ece6e140eec2171ad4b154513de9aead7a323789251e27f4f1c3ff0d6af9cd2590193db99380e2c91a1640dcff49f78b84e
 DIST wine-gecko-2.47.3-x86_64.msi 54623744 BLAKE2B 2783e060e2277925ca4b1193f4c13d7af88c7605d48d4bdd118826340e293547edc83fa185e2c64fddb629c632480062bedf995b6f65b07360cf9496bbd21f9a SHA512 c8d617695426c19bdb8a415fb0f00dc3ff9aa6c023599d24313f1c6ac50bbf36bc42dc0cdd58dee93c5ad4998468000d123080cbea09efe1bca3d8f7bfa2bd1d
 DIST wine-gecko-2.47.3-x86_64.tar.xz 42325312 BLAKE2B dd7b8516ce38c2baa5fc6c73d7292a78c03136a9bffe50ceb4bd32df0754e7f8d6adbc7689e2d00e0a5fb9806d6da736b5d15acc2fca3f2210015ac55892ed6b SHA512 3d4ff51e0dede5b52929b3babc91b16c06fdd89e75f0d6911e2262142c7422405676238d0d6cb90b6705a18b975de21dd58036a78f856523bab28c5bf52879f9
-EBUILD wine-gecko-2.47.2.ebuild 1027 BLAKE2B f9148675665fa0e6d0f4f8e00a58b282ad489ee4bbd8ca9ee6aad69d2dbd7b096f3bb39e16acbd3254bac1b2775f68d00b4a2e66c0725707d62c63824e906c85 SHA512 ea1371d7805c0ffa6c68f5030549ce051cc4cd2f000eebf193f371f8bc5174d76b09c10ec9fc59f50b0cd032c51d0f3ae8464e8df4cca385b498d6f0127c059d
-EBUILD wine-gecko-2.47.3.ebuild 1029 BLAKE2B a64f968eb0a9b25376b683355699639fce47598352110a626cfe5365eb02b90e9963e060e71ea5319dd91f536a47dccfd139302c9eef1593b66508dfbceeee81 SHA512 8ade14076e070a40184679d0d9e20fc7ea17164a059d077cbc5c6c31ebcadca070428ea31fdb3f5e47faacaabd81c52b00e2f1a66b8135993c0a47419172b7ba
-MISC metadata.xml 434 BLAKE2B a825bbdeb70a3e8b86a167a2902a5b5a7dbe7d7268bab4452e4d61699dc3449bf2441cba42baa321d4e86d83f16ffffa7597acf82664da4d822b6f14a407a55b SHA512 56b110d425e78e375897bf4adafbe785fe9fe7181181e3e74a317365afb43e391df36e75a673e994c4ad5eae990c8f8f7045302be5e7cecc8a35bf87a569c872
+EBUILD wine-gecko-2.47.2.ebuild 1047 BLAKE2B c651d13e8c8cc713f9eb12d1b345bc8f76f9fd0d675789105390feed3376c2db8f388f8b826ffdf59692bf5e8f8f498fd9306a6b3f808726d40bc89d04f4303c SHA512 ee618b17ed645e654ed8bcf000293f7a633719e05b9af1efd04e83736dd778e21d431b1475bc35791f8b6d4394c592ea6f6529119cf14b54ca888e7150738cc5
+EBUILD wine-gecko-2.47.3.ebuild 1047 BLAKE2B c651d13e8c8cc713f9eb12d1b345bc8f76f9fd0d675789105390feed3376c2db8f388f8b826ffdf59692bf5e8f8f498fd9306a6b3f808726d40bc89d04f4303c SHA512 ee618b17ed645e654ed8bcf000293f7a633719e05b9af1efd04e83736dd778e21d431b1475bc35791f8b6d4394c592ea6f6529119cf14b54ca888e7150738cc5
+MISC metadata.xml 360 BLAKE2B 0ba4f28c9fb2b313f332b56122c9293d60094c1d7c8bc76928818003bc7e3e07385b370759a676ecd5714dc74bf1bba66680c9ceb4655bc4d10767e9483d947e SHA512 feb28080c619be3fa965d7ebdcdb01587ba9dac001737a485d5746b97951638aff49493e9b5ae22ddc29b37a1b09a9f1b1703b979d3531d8e10ea331d0e12085
diff --git a/app-emulation/wine-gecko/metadata.xml b/app-emulation/wine-gecko/metadata.xml
index e1932b4ddc74..8b46426a7860 100644
--- a/app-emulation/wine-gecko/metadata.xml
+++ b/app-emulation/wine-gecko/metadata.xml
@@ -5,9 +5,6 @@
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wine</remote-id>
-	</upstream>
 	<use>
 		<flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag>
 	</use>
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
index e5a5a8df49a9..fd2e621718a3 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild
@@ -1,37 +1,37 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine"
-HOMEPAGE="https://winehq.org"
+DESCRIPTION="Mozilla Gecko based version of Internet Explorer for Wine"
+HOMEPAGE="
+	https://wiki.winehq.org/Gecko
+	https://gitlab.winehq.org/wine/wine-gecko/"
 SRC_URI="
-	!shared? (
-		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi )
-		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi )
-	)
 	shared? (
-		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.tar.xz )
-		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.tar.xz )
+		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
+		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.tar.xz )
 	)
-"
+	!shared? (
+		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
+		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.msi )
+	)"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
 KEYWORDS="amd64 x86"
-IUSE="abi_x86_32 abi_x86_64 +shared"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
+IUSE="+abi_x86_32 abi_x86_64 +shared"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 
 src_install() {
 	insinto /usr/share/wine/gecko
+
 	if use shared; then
-		use abi_x86_32 && doins -r "${P}-x86"
-		use abi_x86_64 && doins -r "${P}-x86_64"
+		use abi_x86_32 && doins -r ${P}-x86
+		use abi_x86_64 && doins -r ${P}-x86_64
 	else
-		use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi"
-		use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi"
+		use abi_x86_32 && doins "${DISTDIR}"/${P}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/${P}-x86_64.msi
 	fi
 }
diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild
index 08acbaed7440..fd2e621718a3 100644
--- a/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild
+++ b/app-emulation/wine-gecko/wine-gecko-2.47.3.ebuild
@@ -1,37 +1,37 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="A Mozilla Gecko based version of Internet Explorer for Wine"
-HOMEPAGE="https://winehq.org"
+DESCRIPTION="Mozilla Gecko based version of Internet Explorer for Wine"
+HOMEPAGE="
+	https://wiki.winehq.org/Gecko
+	https://gitlab.winehq.org/wine/wine-gecko/"
 SRC_URI="
-	!shared? (
-		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.msi )
-		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.msi )
-	)
 	shared? (
-		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86.tar.xz )
-		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${PN}-${PV}-x86_64.tar.xz )
+		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
+		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.tar.xz )
 	)
-"
+	!shared? (
+		abi_x86_32? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
+		abi_x86_64? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86_64.msi )
+	)"
+S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 +shared"
-
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
+KEYWORDS="amd64 x86"
+IUSE="+abi_x86_32 abi_x86_64 +shared"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 
 src_install() {
 	insinto /usr/share/wine/gecko
+
 	if use shared; then
-		use abi_x86_32 && doins -r "${P}-x86"
-		use abi_x86_64 && doins -r "${P}-x86_64"
+		use abi_x86_32 && doins -r ${P}-x86
+		use abi_x86_64 && doins -r ${P}-x86_64
 	else
-		use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi"
-		use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi"
+		use abi_x86_32 && doins "${DISTDIR}"/${P}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/${P}-x86_64.msi
 	fi
 }
diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest
index ee89199b4503..33ca032af254 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -6,8 +6,8 @@ DIST wine-mono-7.3.1-x86.msi 86930432 BLAKE2B f43b605ab7b07a7b4d8d4675297af6e827
 DIST wine-mono-7.3.1-x86.tar.xz 43216532 BLAKE2B bc00f41d2e9e88c0a687fad6bdd48e9a836f3d7369747602665691ca3e430c895655e9c5e9ef955a5cf45a96818b6858bc3cc93d90c3d7a49f8d8f4ff824d45a SHA512 a2c8d10d9b34fd7775eeddb6494b84f2f04e6a2f21d93940dc902434b189d43bdfdcd198baf8133cda8b17c2bc25ee84538e12a32027cdd66da9ab029eed6777
 DIST wine-mono-7.4.0-x86.msi 87334912 BLAKE2B c0b778f9db59d1a2917631f1d6ca1a1798972a6a42e27975da78f3a35b77018a99228d7d95e5640c57618533a6b01bf2252859e3e978e2aa8dbdc8cd62afcc28 SHA512 cf35513b368324487c387d4339e5b05a90c4825b25ea603140524b79e69786ccc20dfb898213a9548c0313c0b0e4b160acb88364e4b280dd6712d185d9e5ae57
 DIST wine-mono-7.4.0-x86.tar.xz 45404344 BLAKE2B 3a74106b9b3f21a88c2435f7988d66a54e08beea931a0ce0df6431c21add4ee2685bf9c9cb2404ee1a685736d61b1aee3cdd507130e5c5dddba7e506a2ff18bb SHA512 108cb5d969e84deeda3d2b11dba7cd73853fc3b088ecf2bcdb9bc5c5bbaaff03e72cd4f485d1935eda43cdd95b927886441be1d2204edeaee1ff1fea75735d22
-EBUILD wine-mono-7.0.0.ebuild 658 BLAKE2B 736288bbb65baa8757a7855e435bc10e18aab234793b78576df51e36bf63a417fbf428f1c5017a9a3a23954ce7cb49f05c3642354cd06fdcddc5066f29ce243c SHA512 e8579034f418b3f89013639607533e5af315003259649e6916649a4314e28f3db733aa77d0dd7b0ad58a4e7e1013e3cb8413203cdb58d81b88c5b7ae944724ce
-EBUILD wine-mono-7.3.0.ebuild 660 BLAKE2B 717e0716e608ef4ccbfcaa2ce6fb2d7575803be75929cfd7d48f096321a92842a589e554d304f3de3a2d0777ec27eb3ef6bac42d7f8d404c30d31731e6f182e5 SHA512 044b057599fadfe22a0f7aa3263bb4daabab629963061abd4dc703ffc34fecbf9568e68e42925975015a981ec39c88a587d2bf2f6ac0fa72fcd64fb625495152
-EBUILD wine-mono-7.3.1.ebuild 659 BLAKE2B 4f8e48d165f71e886b0736c42d6ce0e3be50806a9dfa5a70783b45d30eb5baa8e64732ddc1290186366963e3394134667d780cef3dc5a647a8439f3cb7803ee5 SHA512 684ecf95867c998b7d51d7e393775d3c49fb362ab519621d8ce0df26619602915b05d3199a7359781f9ea327ed20b06d905675fe461f8023ee0e2224e95c349a
-EBUILD wine-mono-7.4.0.ebuild 659 BLAKE2B 4f8e48d165f71e886b0736c42d6ce0e3be50806a9dfa5a70783b45d30eb5baa8e64732ddc1290186366963e3394134667d780cef3dc5a647a8439f3cb7803ee5 SHA512 684ecf95867c998b7d51d7e393775d3c49fb362ab519621d8ce0df26619602915b05d3199a7359781f9ea327ed20b06d905675fe461f8023ee0e2224e95c349a
-MISC metadata.xml 738 BLAKE2B 45cec53a33f954fa8e3d06e75f8d1cf7fdc01b46ba5df2b6de61fa966574e85e32d7b5db5bd424ceefc88099c98a8b3967d3ef1bbb45f3087899c174f4cfa6d8 SHA512 6537c87136e2188f3f5d2e03a055e5231ee13cf483fab052ee538b93e167d0d8d947d9237684acc44d504bf2480aeed3ff293ae31c5b57db251e81fc52278e24
+EBUILD wine-mono-7.0.0.ebuild 612 BLAKE2B 39b9a3190973e810ad32da319b29e8448de94e7289b264579900c9261d32fe3bf101dd1b46e2fd71ba61d2fa4b073aceb59526e0fdb59b8e15abb55bd0eadb4b SHA512 eded1db18604b14f9a634d8364ed5013ec84821f32a31ee459f5aa38172f2f8f1b3e3d38e1527d87208e69d604dec49f01d8b9dc30ca70530aacc7e1f9039039
+EBUILD wine-mono-7.3.0.ebuild 614 BLAKE2B 3714993f823335c75e1d770d92a16452b9651a3856469d8e06ddcfa5d2c69822fee0b23aa76aa7c378eefb9603014787c27d5141eb0e5d0fc2eb177b7f46b6cb SHA512 89dfe1f004c48631259b5a81c30b0935b049c340e3a6320a6850ab711b8431a754d50d0cffd9aede4b8353fea6e4ad1ed10f179a8540574cbba430039c2009c3
+EBUILD wine-mono-7.3.1.ebuild 662 BLAKE2B f2f93392f9b755e268615f55ca56bb17e4f6016a6cf5b429db3a6bee6f919bf007dc6decaf1b89173cf1ba93271958abdd0d034730a1c92e815a31f27e08544e SHA512 0f7f8305547cc3a502991df847c393180da67ca74be5bef604536bd1c22c23e2d56e0807b6c9b252073d93a5ae1c9d5938089011d79e4080ae85e8f9272461b8
+EBUILD wine-mono-7.4.0.ebuild 664 BLAKE2B 777787b0ad9586a62e670420bebd27f0c78d4a56571e98f42e1fe51d8c2a9e12bc36d2f3e19e85491702cf3be339d03ce494727b0e41241f06e4fdeb393017ae SHA512 a60f544517b6488089828807437ff1acce795a7067f38d440c24609d1dab08ae803caab15c6382d6164e26cd65188be89ec8274fd1278d0cad437b2bdae9e8ce
+MISC metadata.xml 746 BLAKE2B f9afe281dd6e667a39d5c42dc0580f7bd6581edf5271a0c54e7436e6398a69ea415e09425fd5df56342cbcd128cf24ad4c94f43d64d1d42bcdc528073c72e3b7 SHA512 83016f049bca7f127af165425648857df8e44c3d6cbcb33d849501ff1ddefbec590c38e8a59d3c69e4ab583c89ac4dabc9cba5d7fe8ada66eaffe5b4d55dd13b
diff --git a/app-emulation/wine-mono/metadata.xml b/app-emulation/wine-mono/metadata.xml
index 35b0a5fbed1f..83c506abfee8 100644
--- a/app-emulation/wine-mono/metadata.xml
+++ b/app-emulation/wine-mono/metadata.xml
@@ -6,12 +6,16 @@
 		<name>Wine</name>
 	</maintainer>
 	<longdescription>
-		Wine Mono is a package containing Mono and other projects, intended as a replacement for the .NET runtime and class libraries in Wine. It works in conjunction with Wine's builtin mscoree.dll, and it is not intended to be useful for any other purpose.
+		Wine Mono is a package containing Mono and other projects,
+		intended as a replacement for the .NET runtime and class
+		libraries in Wine. It works in conjunction with Wine's builtin
+		mscoree.dll, and it is not intended to be useful for any other
+		purpose.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">madewokherd/wine-mono</remote-id>
-	</upstream>
 	<use>
 		<flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">madewokherd/wine-mono</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
index cbd75a5c9f9d..f943df20d059 100644
--- a/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.0.0.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
+DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://wiki.winehq.org/Mono"
 SRC_URI="
-	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
 	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
-"
+	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )"
+S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
 KEYWORDS="amd64 x86"
 IUSE="+shared"
 
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
 src_install() {
 	insinto /usr/share/wine/mono
+
 	if use shared; then
-		doins -r "${P}"
+		doins -r ${P}
 	else
-		doins "${DISTDIR}/${P}-x86.msi"
+		doins "${DISTDIR}"/${P}-x86.msi
 	fi
 }
diff --git a/app-emulation/wine-mono/wine-mono-7.3.0.ebuild b/app-emulation/wine-mono/wine-mono-7.3.0.ebuild
index 0836b039a90f..4dc409c643f3 100644
--- a/app-emulation/wine-mono/wine-mono-7.3.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.3.0.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
+DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
+HOMEPAGE="https://wiki.winehq.org/Mono"
 SRC_URI="
-	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )
 	shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.tar.xz )
-"
+	!shared? ( https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi )"
+S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+shared"
 
-DEPEND="!!app-emulation/wine:0"
-
-S="${WORKDIR}"
-
 src_install() {
 	insinto /usr/share/wine/mono
+
 	if use shared; then
-		doins -r "${P}"
+		doins -r ${P}
 	else
-		doins "${DISTDIR}/${P}-x86.msi"
+		doins "${DISTDIR}"/${P}-x86.msi
 	fi
 }
diff --git a/app-emulation/wine-mono/wine-mono-7.3.1.ebuild b/app-emulation/wine-mono/wine-mono-7.3.1.ebuild
index f32c9e9a3a3f..186acdfb04d6 100644
--- a/app-emulation/wine-mono/wine-mono-7.3.1.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="https://wiki.winehq.org/Mono"
 SRC_URI="
 	shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz )
 	!shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )"
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared"
 
 src_install() {
diff --git a/app-emulation/wine-mono/wine-mono-7.4.0.ebuild b/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
index f32c9e9a3a3f..c09e03eec8e8 100644
--- a/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
+++ b/app-emulation/wine-mono/wine-mono-7.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DESCRIPTION="Replacement for the .NET runtime and class libraries in Wine"
-HOMEPAGE="https://www.winehq.org/"
+HOMEPAGE="https://wiki.winehq.org/Mono"
 SRC_URI="
 	shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.tar.xz )
 	!shared? ( https://github.com/madewokherd/wine-mono/releases/download/${P}/${P}-x86.msi )"
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index aa482d16e6c5..2df15e3e4c9c 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -6,6 +6,6 @@ AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf
 DIST proton-wine-7.0-4.tar.gz 45561670 BLAKE2B 0bc3432e5aa9ca1655e76b31dcbef08febe263e07d3635d005fbc7798b3a08fa50e2e736f33b18700f187dc755f012d7e8ae3edae6a63fb433cd9b8861b747b0 SHA512 dccdf4115e2a7c92981163783f5705e78fbfa042f06123e4802251bd2c558e8b4de7e3d2e114a5d942f9493eb64fb7fdedff2e6e8b3f21ea1de1156456930d8c
 DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b
 EBUILD wine-proton-7.0.4.ebuild 10309 BLAKE2B 084ee116c5ba5fbefd89b022fed3b1863b8700a15c40bb9dcdbf5775476286474d66bd3ba25deecfa2156ee23d844962983cc8261ad30820cfc41127c456eaa8 SHA512 d5accffbc3618c9dfd7bcae20b169db43dd633bd5d83d723ccb88eb43a9d01033ba213d278d8efe08210df989aefa7713035b6d53df183e436549da53fe377bd
-EBUILD wine-proton-7.0.5.ebuild 10316 BLAKE2B 5ffae0a8f9f947af159b7f7203076b3acb00cf65173d68f6ff10bf9977628e51d5e090e2ac850a91c66ad584447bfc95d88e62a644e3300354ae85108eb53f38 SHA512 de6c2d546c2c2c50eb483b11661a150acf88278dd05498ec9ec6bf91f585794a24ed3a582d3e57c3b92ebc8990486be13eb000688ba562599b0e93e31c787017
+EBUILD wine-proton-7.0.5.ebuild 10315 BLAKE2B 609db3ca1eaa5041fef6c874ffaee4b1b0913ec904bcb02da822f915bc71e3a8da41cfc4b7ebf36e89db7bda1923614df4e0d5e8080d860a92319f796d305697 SHA512 148cbbee8e077abcd1663958e79086643419e105c1b20cb17b613bb1fcdf1c853b58dbea8ff183d2c1db6ef46a642df5d5f4cd7282931bf4ed12440881525353
 EBUILD wine-proton-7.0.9999.ebuild 10316 BLAKE2B 4a64c83297a590b8cd0c31faaebea248e14cd3d339ed8c8ce45bda954ea7d28a21d5a098312c8840a5b9d115ffb7f30fe91c630a85b986bebb284b68c0659013 SHA512 c0926234e267566ae3099f1c43a3dc5ef30690dd7191c9f5f31c72eb2acf96fbf22d551f672934debb9526ca3d5e20e3b4760e5db0595427329d3736438781ee
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
index 46cd54a51bd3..82c405523947 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.5.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
 	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index fcebe058aa63..fd44a66245c4 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -10,7 +10,7 @@ DIST wine-7.20.tar.xz 28534920 BLAKE2B 2e0cd49a7820f0c885a2a6dbcded6ebbdb5e1ea55
 DIST wine-7.21.tar.xz 28703308 BLAKE2B 8902ded32b9e635f8ccf659ca4055e9ad45d3659f3ad48d0c218dc5a7a334df456ea0e9441dcaff58e8cac0bbd65140b20e61180acaa06230bc70e28a8382c7e SHA512 15c0c9efda972b84890886fd4b1fb18dd462373ba490f5e607004a5436caba9823f643369ceb5abbc2d2d0e26d7ce002e00136299d9984c0a27f729f3ac129c1
 DIST wine-7.22.tar.xz 28974052 BLAKE2B c86466964817b916ee8f7b687f193eda8bdd3fb17152ab1565971e36f43b12b540033ac1c5fa5d15576041febd32cf1ea2955732c5386debcbda46fb3acca0f1 SHA512 bf58a5b98bef5b291aff1eca3f94c28da95990e4c8da9af5e9e28b9480d57163d088b501b0c1bca5b568bf586dd9933cdc1ea1f371b78d95c94e2d25d0a65efc
 EBUILD wine-vanilla-7.0-r3.ebuild 10596 BLAKE2B 9e62fe7db88a8e8e8232b4cd2cea88bdbaffcf3c95d023b280f50094f32fbbb95cf118be16470054e0560cef7db6a21ae780ac3dcdf205bce2e4e91059651f8d SHA512 ac951ccd3c00b52ad174c52f5b82b3295e5a1fe025865148d9b6a286f3af3181c43a6f8f2d37e211c45ef94b21b286ad2aed64f4c7faedfec7c78ceb6c284e90
-EBUILD wine-vanilla-7.0.1.ebuild 10272 BLAKE2B ae3917c6d7900e0a211384a600c29b825ab686da4ad79e89a7c479a997b2bdea65862feed77a94d134532b1ac437524004523da9343de8b61d7790f46c567b1b SHA512 ee9cebb5af001838f9659f576b7f54a06e12994c4e35bca445c521f6031367915ef2e898f9776482209c201e2653735322767b9000c9d8534d167e64c6273cdb
+EBUILD wine-vanilla-7.0.1.ebuild 10270 BLAKE2B c4f0e913e525149e043e14597ef78ea26fb060cb5eafaa6d6678f6e493e50594134780bd472c8c66152c472461891380f776301cb067d552edd8c5737c5ccd35 SHA512 edfd32b54ec5ac60e6a8edf1d6c1a002fc270dd24d21775819ec325757de7892b098d0a463c6f98bf6fd44092798d2cf2335b0d4303adaf57eee0dc275b79b62
 EBUILD wine-vanilla-7.19.ebuild 10187 BLAKE2B 9008395c2c412674f26b5273ae83cdaad211eadfa70de7d75a7a336b0c3ed189ae0d2c60cd957c8c10f1bcdb22fe9c59a48f034b9e597ccf36c55540a374301c SHA512 9d0ae015c3a171768d01d769df742f66741e2d5fa14cfcbcd458e7ccabb7f7b98cabdcf1eff55b88a8b927c85e14aea7319e0edeac1ca57e60335144768f752e
 EBUILD wine-vanilla-7.20.ebuild 10188 BLAKE2B 77c7365ec9c58166b07a13e4204bb0a0e2251816c502dbea050877cc19b7864b16e7c4513cac8ad2225137f70137808d58eec17469af09f1278263a87f5aba10 SHA512 db487e83f4bfded1b71a0d4b3ba1608cc46a9f5a767a78d2efb9bbd545038fba041c92234f851156fee5e637c13b3e76286a88139d250131320b45af4106fc8f
 EBUILD wine-vanilla-7.21-r1.ebuild 10318 BLAKE2B 0b6c50edab0c79d522c20d2f59e062f9b01b51fe3aafd21f2adc4150156ba060029020c09f7d6a1c59b1ea0d22725beab85bdb908b447f9630d8951a3ef39025 SHA512 16fc2e67425af712f00bb8b952a03a717bff142461c29c6fde4df79e6ff97e9b6cf44a81521568e666638382efdaac53e0067b8fde8b867d92f69a256e0dcc83
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
index da66b3163208..c0992e01230c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.1.ebuild
@@ -16,7 +16,7 @@ else
 	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
 	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
 	S="${WORKDIR}/wine-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index da525e3414df..220afd07d2e5 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index bb3c0dfa90ad..034cb01ac119 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,8 +1,6 @@
 AUX eselect-wine-1.2.2-proton.patch 160 BLAKE2B 6385b15daf83e1ee1cd8fa3a16fcf075d009f260845333dc16c31022a2f2cb2c529d298ccfd2d258232800586f8855433ee40116bf1af07935c53c7ee32f6521 SHA512 be0a0b3a7da99443a7e7f2ee8f93d90001a45321aaec66ab44eac58fa226eaf9abfd7e250919a48674e3d04f5917c2461f4d94bd53de8f2dd569bb6e25aefdd5
 DIST eselect-wine-1.2.2.tar.gz 4712 BLAKE2B 6ce92654cf2a5197c18bc84f8db52a11f198f81f0a8116f1986e74a1795ad475d22ff5a7cb9e9e31ce8ca813059b33cfbc52763110238cb378b15bebeb4b4271 SHA512 39f4d91461f72aeb07292dc7479c5cb7fc080b843bac57dec85c43d8751227e6953d32d52d4a14387d398b73120a32b79370d686c823f230dfd1d8b32ac8113a
-DIST eselect-wine-2.0.0.tar.bz2 7336 BLAKE2B facbad9bb4a937a310b1f81c5eb9fd1e29ce1a04cf524f7fd1f6322715d15e639fa27e99220cfc5b3659932d5ee57864a4615523e2dc5142da8ad7e9b49290fc SHA512 ec89b4b2fb3bf60e00983f7dd2c2aaa4c797005516f03573000482c5efa1f62e73d0bc149bb9203c5186a7a0a259d7461e95f077deadfd6791ea8d5bc5cb3c00
 DIST eselect-wine-2.0.1.tar.bz2 7391 BLAKE2B 646b4f07988448c70d2bdb0057b4b5e4a36fbd8f6dd1475cb131c26b4d10afb1a274c53aba0f705497f840f45b53fda4307882c588b69bcf5e8754ad153ea4de SHA512 a90da162bfd80a9f2f9a688e765152e1b03f5d27742f67a8485546cb663547f2f6eea302e857454e3cf00632967b8d83e9578f6be36171178f7e78aa3adf3838
 EBUILD eselect-wine-1.2.2-r1.ebuild 1282 BLAKE2B 3eeba89fe219b352d6b0ce155910aaa4aa36a831e0cb40650c8ffe5b5f26e1cacd3a9661f8c91be7c751e9e76554180eb69d0fd0a176f0a7b251998ecb2f3880 SHA512 13e7d32212515398ac9d00488a10d2b51568135dbb5bcae18c52706a373c08ce5c11196d8703d28ef94e4b74aa1a50d5d758ffb177950de29e5d4a0c59906479
-EBUILD eselect-wine-2.0.0.ebuild 3074 BLAKE2B 1c7d24298d6eb8d87940237ae6c9a459cb659c38307c99bd8cd89e2463cd91aa5c7e4f7c189e9e8a2215b9794093886b698bd21fd8c2387f0c05fe1c7fc877c7 SHA512 35c08260c377a5e976e0c8cff9e3255643b9cbd2b406f22b0fb1e3851e7bc49034b6de9a1ace05a66a9cffac1a72eb3c8ca52a64ea41529c70a1fe16e407fb76
-EBUILD eselect-wine-2.0.1.ebuild 3074 BLAKE2B 1c7d24298d6eb8d87940237ae6c9a459cb659c38307c99bd8cd89e2463cd91aa5c7e4f7c189e9e8a2215b9794093886b698bd21fd8c2387f0c05fe1c7fc877c7 SHA512 35c08260c377a5e976e0c8cff9e3255643b9cbd2b406f22b0fb1e3851e7bc49034b6de9a1ace05a66a9cffac1a72eb3c8ca52a64ea41529c70a1fe16e407fb76
+EBUILD eselect-wine-2.0.1.ebuild 3072 BLAKE2B 23025fd7aba36ffdbc57966f00c095d0d3d4c73a69945ab6a961d7b83dc46b49f87df9de720afa5f0901d71f5aaa9fde0b36193458600b48dd20942746e0b32a SHA512 14a5ad5ec2d612a98da8b7dbe93e3f8121d3451ec9532283489f498d6d8a773e0ea07f69d97130a00e4f0aad4281c2eb53dbbc432b1d7fed39595cde87661ad1
 MISC metadata.xml 343 BLAKE2B bc82c6a6549e8fa152586c247467e3f107920426b0be2758ad20ea1da273afd894aa4a9581f7520942092399c62d877117ceefd67b26b8e5778d832241e8a20f SHA512 9c9905ce98e2c43a285b8995d1e16016151416fc622a3f927751207c6820d661ea73a55c812fee6fbf7cd4e474f382f7a3ab277b4f06bb3f2e519bc3b9f876e1
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
deleted file mode 100644
index 92c25353de07..000000000000
--- a/app-eselect/eselect-wine/eselect-wine-2.0.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manage active Wine slots and variants"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Wine"
-SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-admin/eselect"
-
-pkg_pretend() {
-	# /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's unset,
-	# but portage currently checks collisions and errors out /before/ preinst
-	if has_version '<app-eselect/eselect-wine-2' &&
-		has collision-protect ${FEATURES}
-	then
-		eerror
-		eerror "!Warning! will likely need to either disable FEATURES=collision-protect or"
-		eerror "delete ${EROOT}/usr/bin/wine and ${EROOT}/usr/include/wine to merge ${P}"
-		eerror "(these files should be orphaned, so default FEATURES=protect-owned is fine)"
-		eerror
-	fi
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins wine.eselect
-
-	keepdir /etc/eselect/wine
-
-	newenvd - 60${PN} <<-EOF
-		PATH="${EPREFIX}/etc/eselect/wine/bin"
-		MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
-		XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
-	EOF
-
-	# links for building, e.g. wineasio (bug #657748)
-	dosym -r /etc/eselect/wine/wine /usr/lib/wine
-	dosym -r /etc/eselect/wine/include /usr/include/wine
-
-	# not required, but useful for e.g. binfmt that's not looking in PATH
-	# (not doing this for everything as it gets troublesome to track)
-	dosym -r /etc/eselect/wine/bin/wine /usr/bin/wine
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	if has_version '<app-eselect/eselect-wine-2'; then
-		# keep copy of still-set 'active' to auto-select same slots
-		[[ ! -e ${EROOT}/etc/eselect/wine/active ]] ||
-			cp "${EROOT}"/etc/eselect/wine/{active,eselect-wine-migration} || die
-
-		# managed differently, need cleanup
-		eselect wine unset --all || die
-		rm -f "${EROOT}"/etc/eselect/wine/{active,installed,links/{any,vanilla,staging,proton,wine}} || die
-		rmdir "${EROOT}"/etc/eselect/wine/links 2>/dev/null
-
-		# some rare man dirs were created by old eselect, cleanup if now empty
-		rmdir "${EROOT}"/usr/share/man/{de,fr,pl}.UTF-8{/man1,} 2>/dev/null
-	fi
-
-	# lacking QA_BROKEN_SYMLINK, and rather avoid live /usr changes wrt
-	# bug #632576, nor create "owned" placeholders that will be clobbered
-	[[ -e ${EROOT}/etc/eselect/wine/bin/wine ]] ||
-		eqawarn "QA Note: broken symlinks QA is normal on first merge, targets created after"
-}
-
-pkg_postinst() {
-	eselect wine update --if-unset || die
-
-	rm -f "${EROOT}"/etc/eselect/wine/eselect-wine-migration || die # see preinst
-
-	if [[ ! ${REPLACING_VERSIONS##* } ]] ||
-		ver_test ${REPLACING_VERSIONS##* } -lt 2; then
-		elog
-		if [[ ${REPLACING_VERSIONS} ]]; then
-			elog "${PN} changed a bit, suggest reviewing 'eselect wine help' (and list)."
-			elog "Note: if seen bin/wine or include/wine merge collisions, they are harmless."
-		fi
-		elog "Please run '. ${EROOT}/etc/profile' to update PATH in current shells."
-	fi
-}
-
-pkg_prerm() {
-	[[ ${REPLACED_BY_VERSION} ]] || eselect wine update --reset # no die
-}
diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
index 92c25353de07..8a665f8d91e8 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 4e520c3ac2df..c6186bc8d53c 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index 2c1674c8a1d1..c1611832a0b6 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1,5 +1,5 @@
 AUX ibus-chewing-test.patch 2777 BLAKE2B cb7f3c8246ff80a6b7781a72aa27f0a5804d7dcfedd51001888c7833d6eb6790b5a931412d3bfad28c1711578799b48b5c39ce4760ebf96b03282bee2b233312 SHA512 245f907e51ffd4c7efd291055322e976eebf948f3f86b1e23a9f187f97ae91e20a41c6faf1a0396ebc097f09ba71e123940878c5211d2bf7f49ecce770a7a2cf
 DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6
 DIST ibus-chewing-gob2.patch.xz 11760 BLAKE2B 929c6f09ddc22efa47eb53fd9bd5833a5a5105e9e8c6251009699548b4b3a1bf124f335f9d963c42efe00a9f9276f4df303a087632d894237ee3f69f5c08b74e SHA512 4317f5e807d6114f9d1057421db9c032670578ca83898c7495a27bf76aaa0fee88649a5df9f16df74e7961129cfe2029eda66dcea9407263344add7670de088c
-EBUILD ibus-chewing-1.6.1_p20210117.ebuild 1577 BLAKE2B 7c6fde9cf845f13fd5391f96e61ff7517def1c52ecfe6bffc5eb702dbe7af3478cb3fa4239dd813fe526dd993c569f4a0175a3a05080dc798a4cfebc152ad6ad SHA512 ba5f4c24b13d9bcfb32f389d6aec842b6210fb61c9a94cd23c4fafc77bcf45888345628f743d809eeac955d4685e1fce0d468b84b94aa7b52fe7c1db4f9cdfd3
-MISC metadata.xml 411 BLAKE2B 39bf10c1dbb59f5213f9250b3780bb1a91bc7a13f6681eb996a64344779775247859b38d4a55c42b030ed15fa7d408ea387cd28c200740a76fd70383814cb016 SHA512 57eca3e6c4d055f23021ace5573124be9a826de6227391d024701faeea31c2e280633523ee509565c2c2223faa7d0a92c12f92b70b83bdfbc444b604066db481
+EBUILD ibus-chewing-1.6.1_p20210117-r1.ebuild 1519 BLAKE2B e7d0a3128729526103c374d5fddfc54e5ca0837357a91b2104404b826686c5d3fb11ee3c52f0b2d929526742b3dded15b5154b11c5a3a09196dc793b201102c6 SHA512 d3b8b2c4591880ac52455ce5c5f6cfd3204c98c9fc5ad8a1767e2c52f1bbf3eed26038525dc9cbd129effa9f0fdb6e72fbdeb30c8c9db2570040642e398af1ed
+MISC metadata.xml 321 BLAKE2B 637e05444c3aa3a159332fbdda2070a0ae62c47e126c4e524eee8c1f1bbae14da4009bca3b5bdc809b41d9ca95de492e47fa3f9eccddf77da0bbf7a9b713191e SHA512 c6f417a968f62193ca43c4ea3360ebe2f4cba63b3490c0af42e2e1d8365d558d21d8a186f7c0fa9048636b398a3b25d06630c7b0b1ab72602e9c78db6d42f628
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
index 85e9e8c0e864..08958e1c6e49 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
@@ -16,14 +16,13 @@ SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gconf nls"
+IUSE="nls"
 
 RDEPEND="app-i18n/ibus
 	app-i18n/libchewing
 	dev-libs/glib:2
 	x11-libs/gtk+:3
 	x11-libs/libX11
-	gconf? ( gnome-base/gconf )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-util/cmake-fedora
@@ -38,6 +37,8 @@ DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
 
 src_configure() {
 	local mycmakeargs=(
+		-DGCONF2_SUPPORT=OFF
+		-DGSETTINGS_SUPPORT=ON
 		-DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
 		-DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
 	)
@@ -54,12 +55,10 @@ src_test() {
 }
 
 pkg_preinst() {
-	use gconf && gnome2_gconf_savelist
 	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
-	use gconf && gnome2_gconf_install
 	gnome2_schemas_update
 }
 
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index cf7f054fe39e..2fc61b76269f 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -5,9 +5,6 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
-	<use>
-		<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">definite/ibus-chewing</remote-id>
 	</upstream>
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 1c93050d2a1f..a07d11e9e00c 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -2,5 +2,5 @@ AUX ibus-1.5.26-src-Fix-refcounting-issues.patch 9275 BLAKE2B c9035aa6877848cd8f
 DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714
 DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4
 EBUILD ibus-1.5.26-r1.ebuild 5533 BLAKE2B bc4beaf62fb033ba9be3fbd8aa42dbe7652295b0c2b60f39041a23635990a6cc2b8bd2baa816c2d60eaed4839700f0df34717d10210e92faf6b5daf810660050 SHA512 d57d3f1cf45bfbce371f02c64f04ec556450d512c25b069ed7448ae51a736eec5355ece75e897712f7b7e50228bed7ba693e9be66025b255fe1d444794d32d8d
-EBUILD ibus-1.5.27.ebuild 5730 BLAKE2B fe688668f0de32cd0f90fe4850badfd32c022ebe136b75522ba86f40a2ae2154d9f8307f4e4aac3fe52340c46b1fbcbe74e5a129922c39a9d27a06d50136abc9 SHA512 822612564e98cb1b13d1bd4bf567dbd6efa5342f1c62bfea37c6e2982d2a80bbb0ec7e349cc1cfc2db6de0ef867947e855f1e6931ef089f9e0638916e9f97eb4
+EBUILD ibus-1.5.27.ebuild 5724 BLAKE2B 2c788151a6a1d2297a913ea055b640d03241ffc6430d40c650dd59598705edda019605413cff013a093456fceb622f4c6abb2a6dd74ecc86f14827ea298f80d6 SHA512 aabc8a89eafa77df5531b67ccf797d04584faa81b715b7dd016f91be52d9a5dd2f40c0630855b6455f7bd3ecf14e3d7134c431c542353cbbaa80451db43e4765
 MISC metadata.xml 989 BLAKE2B 9103c61af6f3766fa483864877a674455d0a47a2e7fc1e7ef0f62d835e1f57d6c71816737c64938babd5f29a7228d67f64c1d7aaaae0e9b10cc793ed373a698c SHA512 1552ed06ec527f6c9868b2b006b1d5d7bdc7101d34d4c4438eba6de74f398744a2720e31f73dc203f034631aa900db0a2ad8d429a67e577b69005cda1440f1ef
diff --git a/app-i18n/ibus/ibus-1.5.27.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild
index 2118ad5f14ca..3a949739bc2d 100644
--- a/app-i18n/ibus/ibus-1.5.27.ebuild
+++ b/app-i18n/ibus/ibus-1.5.27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index d8878aaa93a4..d825f9e71269 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1,4 +1,4 @@
 AUX imsettings-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69
 DIST imsettings-1.8.2.tar.bz2 705391 BLAKE2B 3b7f3e2ca2c08bc149be95fb97889ab58fc22be828b9801f4c342c1514a7be35644548d6a920fe657e1d85a9d35d8c2a40766f25d6420bb3da8a8f4e7a7ba739 SHA512 600315a20fd61eaa77a0add1e587861ad3ce70175d87639e43105d804cec59bfbc0219f2177c4d9e07d337231eb85514cbfd8af614a113b688ead372075b9ff4
-EBUILD imsettings-1.8.2.ebuild 1643 BLAKE2B 52375b27b45d44e2ab866e211abc6a3f4e23297ce9e1d231b88a64a3a0d5ebad6c072fde8ba064866b938aa46ac5791d1950b2c60bf113987f48ac889479d7e0 SHA512 3c3fcdfad95b7c60107c90fe2ec43c81741d9bdbcfa2c1a83743b20bf2810056fb71cc250c93db0a5acd5280604b0ad583dfd8507159521a28aafb91fbf53650
-MISC metadata.xml 485 BLAKE2B d88d782384ac82e2fdd3c73821019b2293e27c6883036daa3c4e9477e81b7f82ec7dc47ee779c376ac8462d032a445dd6682a53330ac4acaebb3ec9f94affe6e SHA512 c9d7943e08fded57aa9d13538bd2daca3afe393831f113cf56a7cfda9f4b16324553f029f483cf3c6f1b54827423cd5171bea94d9638046a90f15a2170ab058f
+EBUILD imsettings-1.8.2-r1.ebuild 1589 BLAKE2B fbe5b384b97b5a941ce1cccf7a44de78500c39015f2e4ed22e3d23765d3a76dbc49c8383a9b3b4325225b715e8fff1949a80e6c1641f53e4dc27f7f005e246da SHA512 19a9117f022f96821a77c30cfce9fb94b681c9200c1e6274a0b76fd55a7c2e6a6cd0546a63a2a0d7f2ae29627e7adae40121af489f346b374fee56e6065562cf
+MISC metadata.xml 410 BLAKE2B 9b893f3f660a74046f8142042e752f1cce43c232f302da93ed61c2dc9a81b9e705b5fc2ab42227060d82ac1a49f905255c2c217eb902f49bf11ba46d63e06b7b SHA512 77fd0aeef04c23bfabf828efdf08914814177fc02cb4df7379aae85cee24f79f413e582a88df215a4f32fc09b5e3612d389da7dfe53664d7f0bc76514b4def46
diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
index 9fad1e854c63..ed1257e0f018 100644
--- a/app-i18n/imsettings/imsettings-1.8.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="gconf qt5 +introspection xfconf"
+IUSE="qt5 +introspection xfconf"
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:2
@@ -22,7 +22,6 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libX11
 	x11-libs/libgxim
 	x11-libs/libnotify
-	gconf? ( gnome-base/gconf )
 	introspection? ( dev-libs/gobject-introspection )
 	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}"
@@ -37,7 +36,7 @@ MY_XINPUTSH="90-xinput"
 
 src_prepare() {
 	sed -i \
-		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 25862f59a7ee..7593ee8f578e 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Cjk</name>
 	</maintainer>
 	<use>
-		<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
 		<flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
 	</use>
 	<upstream>
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 0789f6280255..cf0553d5a26d 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,4 +1,4 @@
 DIST skk-jisyo-202005.tar.xz 6836292 BLAKE2B 6d73e6d2e38de178c6683ae447b0ea79054036739b7a01fe386d677cc99556d37f47adf4156e1d571681195b85a2134cac710b12fa08df87e4fe5e5098289119 SHA512 7cc639b307d56d4cb5d04280a003ffa2cfb326f7821d70dddb619e117c1b8358417e44f8137de1b8027ec7f97df8bff8fba845019c015cf8c48ed5d91753155c
-EBUILD skk-jisyo-202005.ebuild 1375 BLAKE2B 5f36ab36e2c0c17d85dc73a180bcc3845f327cc4f888170c8e8c601e669799dae1fb4f25f023dd2e3e197893bba8589d1195a88024a1e3b51a0746dc021c9850 SHA512 b7f855e2642ff7c13a81fce6579ac341a6168ddee02446dbfc40d3abd4b59e3713f2bceb12dc5440901c6081a7aaa16c0e812d13af9f7c870477310e202be7ac
-EBUILD skk-jisyo-999999.ebuild 1693 BLAKE2B bda980c91b9bfaabd869630e1a57395714a242b4d47622928e34207ac5db6b5bd5dd381d6d2b36d5e4d5ef767b809dd7d6887fa31e740f2fb254c7fd6a003e6d SHA512 ddd348d3908d049248919cf3ca8f4e8079d70e90693cfbf2b76510d360f347a46e16273eec2c249e8cddb24e1d2e6d8b9860f7bad79cf642233f2bf3eae5f46c
+EBUILD skk-jisyo-202005.ebuild 1384 BLAKE2B 63f1158ba754e48433fb8f3b37a5e503c0484d1031740cbabfece65bf88aaa6087b5d9a8beeed1d5bbea4b95ac41ad3695db1767b10be8d40d7d4b49b8358d67 SHA512 5e8aec34121fa4dccecf471fd48278deeed5aaf29d89b971ef993a40112400de4e92f391dbe5e59b763a0f9061b363f62ae0625b7fcf45440b35de3dca1bb7c3
+EBUILD skk-jisyo-999999.ebuild 1702 BLAKE2B d39afcaa431c0c4f16257a62d5021cf37a8b4dd2364bdc4bf2bafe6837ee2c3a78b6131e4fce5103c5d84f5c1e22e54fee237fea0333c220b2639fe7a0a377a6 SHA512 b5a1699c2859e17159a52164afa93b3a5de445369ea34ecc6367ebfc8463a33d96c42efc40258600f1ce54bed506621e1d162310df0741f1c92b394f66be2673
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
index 5656df1d6f58..3a8cd33b75b4 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="cdb"
 
-DEPEND="virtual/awk
+DEPEND="app-alternatives/awk
 	cdb? (
 		|| (
 			dev-db/tinycdb
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index 4afa4781d97e..f680501ee5c9 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -19,7 +19,7 @@ IUSE="cdb ${USE_RUBY//ruby/ruby_targets_ruby}"
 
 DEPEND="${RUBY_DEPS}
 	app-i18n/skktools
-	virtual/awk
+	app-alternatives/awk
 	cdb? (
 		|| (
 			dev-db/tinycdb
diff --git a/app-i18n/skkfep/Manifest b/app-i18n/skkfep/Manifest
index 531873feb8fe..8943c05af871 100644
--- a/app-i18n/skkfep/Manifest
+++ b/app-i18n/skkfep/Manifest
@@ -2,5 +2,5 @@ AUX skkfep-annotation.patch 540 BLAKE2B af0332372b17175124477c494a2f09d0bb688a63
 AUX skkfep-gentoo.patch 1836 BLAKE2B f8430c997bbdd192446e952ebbbb141b7de2b12b10ce6f6e63c7ede577719033b7969e6fde4a685717ea78a6f5e02be3c1f51a3ad058a6f31b6cb60e590822ee SHA512 7af2a73f36277fd99d9ab42e928183be4db00de665d3d4b51b6735ca7cdb9259aa1ecb6572b87732b6af865c7f04122fa3341543d9feea89081a1b53b3e58298
 AUX skkfep-system-dic.patch 325 BLAKE2B 2b13ae10b3be26a5674d69ec558351aed6ee4c56a22141d1220f9840e384b22c65583439e913ac9fddd128cd88fc1695eeb202b495558d0e89b283f1253d000a SHA512 af149e67e9b8fc727404bc67e50eeaf3ba37effccd73cd9416279631bd1c000685c129ddcdbd909ef1d1dbd4e84ac4efb0d3236b988c9c9b9416342edb005254
 DIST skkfep-0.87.tar.gz 45711 BLAKE2B ed2d9a7f779ba09fe71b023de395a37a84be81a7e70de7dcd0b04494c44319f067d19182e762b9a48395c08587b353457ffa8bdb84b5e0526880d6c735ffef53 SHA512 3dc842559640b56b967679042c31bfa889e66cd6b7d0347ec17ddc606b85f2a4bb49dc995b3b38c30e71f500031714e2083bfc028ad4ff76ac4f07476a3f2469
-EBUILD skkfep-0.87-r1.ebuild 1101 BLAKE2B 6999f3d8d99f39cf4c64143b699bbaa9ec8e001d84bc201567e04197048eca0fdc03fbd28ce283b5776bb890970e398741122bf8fe36c714fddb8d2331154236 SHA512 377fc37e4a66c38bd8ec3dc9d92a87ccb658e46c2e923b47136f2e80812fa2f5a1cf54fa31f2b6569216dd2fa0fe449711335c51e60afea71ace28c05518f514
+EBUILD skkfep-0.87-r1.ebuild 1110 BLAKE2B 87ac1801e5b33eda88f28c607939299b6d38d0310db4c97b757106b04b1d99ad7bfafa926afadbb90af457edae61c637225894cfeb051b084787dd6d5bb4ee3c SHA512 aca8b03c5e695be1dd8c92671e829e76d7109153d42f83d0b3cd4b4a43ba57f7fa3bcdbf04b780694576f94dc2e980833ddd025b94683177b936e2ebef11e049
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index dd9870453969..af01b4a3251f 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}
 	app-i18n/skk-jisyo"
 BDEPEND="sys-apps/sed
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig"
 
 PATCHES=(
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 125539a2d28e..74a68c7b308a 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/fmawk/Manifest b/app-misc/fmawk/Manifest
index 76f223d64276..c8fa7adb1599 100644
--- a/app-misc/fmawk/Manifest
+++ b/app-misc/fmawk/Manifest
@@ -1,6 +1,6 @@
 DIST fmawk-1.2.tar.gz 23399 BLAKE2B f4c20c8f1569a6715710a5cef02a767152694ef7e216c9fe707c7ac57c20dd012189db14777d47a980008255c7f51b5c165cdf086c41835a7ce550b758a8f350 SHA512 86d56e1cc893c385a0bb338957a9ef698c0edef4587e6d3a21aa316fd996fa3b1416220e5c235d613876a3d19650e8e7a20bf991a4ce67ce9759a362d2aaac30
 DIST fmawk-1.3.tar.gz 25628 BLAKE2B e9b591941c5dbfa96414cc494b91eebfc19e9153cad7066afe216a6e1a177de5c3f3e04f09fec62bbd0adf0b3330bfc9471fcecc23b568e966e8185b7a298c39 SHA512 b1ca40c71b219cd59009c96692e1297cec75d2a61b28c330e4b80b55bde6dc6dfb071fec9dc4ae4f3e8aa7be7bbb51d444687f9500c82dba440388d41369e157
-EBUILD fmawk-1.2.ebuild 850 BLAKE2B 935055d95cf1d50f4de12b90694c1a7feee03dd50ac7750f1176a19544853d3b15063d96e71b5e759dac89b0359f79173bb28037cf87185fe85d0cf957d74d01 SHA512 e252e456465b9b9de87d1279c7e8694df049fb64df1716775d24df3cd66883b8fcd6a4fd9165eaae799b5c5b946af730ad135128d50afb730e2013673e4af3ca
-EBUILD fmawk-1.3.ebuild 802 BLAKE2B 960a8bf0a581b67b13d90de1c38ee9696993f05ff686561cde41a1107482b6ec16a33b6232eb607485af5ef29acceb8ed6ed4d52d8eeaa2e24fedd12d4e2374a SHA512 99aaaf6307c049e9f13743c44db2b31c71186399e28d1fbc3d5b7a04d3d88eda3d28a1b03497012f3125c477d5f60b1eb649223eb45ea98fe8e06d219089ad18
-EBUILD fmawk-9999.ebuild 802 BLAKE2B 960a8bf0a581b67b13d90de1c38ee9696993f05ff686561cde41a1107482b6ec16a33b6232eb607485af5ef29acceb8ed6ed4d52d8eeaa2e24fedd12d4e2374a SHA512 99aaaf6307c049e9f13743c44db2b31c71186399e28d1fbc3d5b7a04d3d88eda3d28a1b03497012f3125c477d5f60b1eb649223eb45ea98fe8e06d219089ad18
+EBUILD fmawk-1.2.ebuild 859 BLAKE2B 21dd1a6218cdad096406fc570964fa750a22b9c95eb88b8efa9572ffdf767f0d63813eacf8fafe27ecf18023c4a2857dc6cec2b41f8678de4f1ea212c96bb084 SHA512 080d7263e53b27f9c682364683041dc7afd49feefdd9b2650e0a1d1858245d7ae5a8a54e9824bd16e0066ac95083bc5e1a61790bedb1d3f05544736c2ef140da
+EBUILD fmawk-1.3.ebuild 811 BLAKE2B 283eb7d72c1cba50664983d350a887cbfd0b9984a612a6bf435421aef0d5dd37a604bc290c57ffbd5dfbe383cb26337ea7a0cb5f9868640cd7094761bb8fe510 SHA512 f9548cf1e2e489b3be45de7accd9f18a97c4fbd2f116631682613fa809eceb8ca1901dbda9851cae801c102e464ac6d7341281dc5cd441207419fb1033b51c91
+EBUILD fmawk-9999.ebuild 811 BLAKE2B 283eb7d72c1cba50664983d350a887cbfd0b9984a612a6bf435421aef0d5dd37a604bc290c57ffbd5dfbe383cb26337ea7a0cb5f9868640cd7094761bb8fe510 SHA512 f9548cf1e2e489b3be45de7accd9f18a97c4fbd2f116631682613fa809eceb8ca1901dbda9851cae801c102e464ac6d7341281dc5cd441207419fb1033b51c91
 MISC metadata.xml 758 BLAKE2B dbf30b8f5a4ad49d804ff86a0738c0822c59e277e23ea030fc8d214491bf6a094d1ab0965501649aa5c566751b19eb79a8b087446c83af833c93d61de9b75e6f SHA512 73212972218ea85709cf9de7e2707ae8b7a9676da5cb2dfa0c54c6c9ff528834c45631119306c93bdf3f1b7ff6f74dfeadc6a21277234e6665f4a1f325c50f9c
diff --git a/app-misc/fmawk/fmawk-1.2.ebuild b/app-misc/fmawk/fmawk-1.2.ebuild
index dac7c8432767..3a0ee6e1fbd6 100644
--- a/app-misc/fmawk/fmawk-1.2.ebuild
+++ b/app-misc/fmawk/fmawk-1.2.ebuild
@@ -20,7 +20,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 
-RDEPEND="virtual/awk"
+RDEPEND="app-alternatives/awk"
 
 src_compile() {
 	:
diff --git a/app-misc/fmawk/fmawk-1.3.ebuild b/app-misc/fmawk/fmawk-1.3.ebuild
index 188ad7e91e82..57d3dbc7f79e 100644
--- a/app-misc/fmawk/fmawk-1.3.ebuild
+++ b/app-misc/fmawk/fmawk-1.3.ebuild
@@ -20,7 +20,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 
-RDEPEND="virtual/awk"
+RDEPEND="app-alternatives/awk"
 
 src_compile() {
 	:
diff --git a/app-misc/fmawk/fmawk-9999.ebuild b/app-misc/fmawk/fmawk-9999.ebuild
index 188ad7e91e82..57d3dbc7f79e 100644
--- a/app-misc/fmawk/fmawk-9999.ebuild
+++ b/app-misc/fmawk/fmawk-9999.ebuild
@@ -20,7 +20,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 
-RDEPEND="virtual/awk"
+RDEPEND="app-alternatives/awk"
 
 src_compile() {
 	:
diff --git a/app-misc/ktoblzcheck/Manifest b/app-misc/ktoblzcheck/Manifest
index 203be35d705b..cb5361233947 100644
--- a/app-misc/ktoblzcheck/Manifest
+++ b/app-misc/ktoblzcheck/Manifest
@@ -1,3 +1,3 @@
 DIST ktoblzcheck-1.49.tar.gz 561501 BLAKE2B 209d88fac131f58413c27a2df1bb2a380a7517ae20050c8151c368c1a2e7675ce4d563d20e481fa7d843991a95d5edecd393dfbf601446d2657c72302fb5d7ff SHA512 da2321112a78b11ccaa938ec295275cb27a4830de0de62e7b9335f2991b9ca335f0ad10e422d9dcbd32a16effc2fc59f3cdde0fd732a639d3e6a39e141081aaa
-EBUILD ktoblzcheck-1.49-r2.ebuild 693 BLAKE2B db07d9f52c7fbb797c0c1f6138ea7a72ed509bbbd306207828b1d1c0bedea534c7b0f372e5cb6bd997fe28a6e7293f6ddb72508307083733a7adcfec4f63f05c SHA512 bc6c46c26ca7ffd61eb407db5a61dd35f8bbd85dad0b239d792fec528767f5a0d3a909e7a365d6170b200f42089aff6abb4482ba1d5841afbe3c9461d291c5ef
+EBUILD ktoblzcheck-1.49-r2.ebuild 702 BLAKE2B baedee47e2ffe793c942961efa073e6e8d8240c347a792c1c5b508798f1c620a79f79f7fe85461906f448e00f37389e713372966752647295b3307afd445e23f SHA512 00e9e0a6fcf29548d9cecc512e013c9fbeb05c3aa58049fddc015aac87991ff5722118e0c0e44380fde2943d5393fb582c8ffe477fe248b9cdb0f1e61cd34ada
 MISC metadata.xml 249 BLAKE2B b698582d5092ea2c1d71be79cbc681baeb82d21c48fca633d3037a35188f1beac8f6e5668af0cfc9ff5c0848d11e75863e531311bab90651a62aea47f45956d9 SHA512 f5ec21ce74f4748342a9277a82ce7e6eb613d90594ed1e70990b472a132db02bfc7e2b1e03ee446b87406b53f0769f89537314b02fcf07e1586f77822a887b15
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
index a929f45f05f7..7a75b1bf3b1d 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
 	app-text/recode:0=
 	sys-apps/grep
 	sys-apps/sed
-	virtual/awk
+	app-alternatives/awk
 	|| ( net-misc/wget www-client/lynx )
 "
 DEPEND="${RDEPEND}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 276a1b7e6539..0038408f6dae 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -4,6 +4,6 @@ DIST tmuxp-1.13.0.tar.gz 833657 BLAKE2B 5938121b2951b735e52eb7361a83dace4327b120
 DIST tmuxp-1.15.0.tar.gz 842727 BLAKE2B 7e0e68ae848fdefab46a936511f57a9927b28a220e1dadb8b2531cd26a2cb6cbb7f1fd3a3a279f624a3ac8cebfeb434582cf48803d3c8bbf14b1c6960b5f2ef7 SHA512 4c9c72ddeea283ee4d0595d099dfdc178b3fdd96691ae1b02e9867096f770b4339e1f60abea985a05b974d3d620addd8b571c05db7d2914e8736322e5cf19fb6
 DIST tmuxp-1.18.2.tar.gz 853145 BLAKE2B 4fc3e825474bccce9f78072e1c3545b7c8eeb40e0d23265901062a00f7434506a84db0414637d18c57e84f4e3b37978c890e01a786d6f1edda87af806c2b298d SHA512 c599dac5b54627342424b2ef7721f47c57c2d271698b007ffb7de972a3a7683c0bd7ea76d2a7e4c168e8a412a03171dd5f53422a3e2d858f7dfc746fa7946be8
 EBUILD tmuxp-1.13.0.ebuild 1004 BLAKE2B 117193b813735527156d70a0047b08fc5e41bfc8acc8782fbd7bc0932a2194c084e8b00cff233c8cdf0df7755aa3ee5451c236d04c0e357fb1b741580bd5f793 SHA512 058dce47281254ecbd769e2ff18587622c47286d81e75ad299e12c62f301d6c4cf94d2952dda0640be17c3ac9989eb7800af8d225073de792b7778da95d26783
-EBUILD tmuxp-1.15.0.ebuild 920 BLAKE2B fe1a327e618e2298f9d4b84a6480143161adfc5063883c79cd98f49ce14982e802701859c48bef0eb37a20d6e6b3a4605d8d379da9a230bf4845f0215e51e82a SHA512 99f396fb98ca803bb51da39dbb844f492b30d76e690ad689688888cb31d444183f1bba53d0c1ee70b13aec925b12949edf811e4a213154711c3b6190a3f34ff3
+EBUILD tmuxp-1.15.0.ebuild 919 BLAKE2B 3e3b9703c4907aef498f5981eb906d0bf0e4a52ae6a8ff0050babb84e22afbb6e60bedb8cf89b2a3ec1813ba215d11c87546aa4a08e7215eaf4d75e0ac930e2c SHA512 152e1ca7405ab953223881a77529e6d811b0a4442da9b0fa73d7ebf0fcb6c096048c173a6feeb672b4be3f453587e5337f3c086ed191fa213d4b29066976273b
 EBUILD tmuxp-1.18.2.ebuild 928 BLAKE2B 4988926342091828cd81ea9a9a4f2b09a12362ec3edf2a83038e6f7fbbec9f7c9da9a759d03377a524613e350f5c5e6d452cb15ada2c7c41e91509115f1b49fc SHA512 6ea3027ed76d8a6c38922aeb5233bbad573614753fbb2a8728f66eb08d8f0c2665ac5b1922b0c96d05f53c836de35daf9485036d63f9835b9cc36bf24aab2055
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/app-misc/tmuxp/tmuxp-1.15.0.ebuild b/app-misc/tmuxp/tmuxp-1.15.0.ebuild
index 0291bacf80a1..3b1433e864e6 100644
--- a/app-misc/tmuxp/tmuxp-1.15.0.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/app-misc/wayland-utils/Manifest b/app-misc/wayland-utils/Manifest
index a63e300baa14..735b96ded0d8 100644
--- a/app-misc/wayland-utils/Manifest
+++ b/app-misc/wayland-utils/Manifest
@@ -1,5 +1,5 @@
 DIST wayland-utils-1.1.0.tar.bz2 14071 BLAKE2B b2726205c8d123a4543aa316928fe2909917f70bbde4318376581c1ec97f658f0d5743a7df091799ef2adce4c962e83aefdc805e25cf1af5429520eddff2918c SHA512 5cd842c286c1960c1f604287826625c23c87306e9e31daba23a65402d4ae0abd0cec4a701c8fb65af2aea6adbcb018660e646939062c51628a65dde41ebd64bf
 DIST wayland-utils-wayland-utils-1.0.0.tar.gz 13188 BLAKE2B b05917c611a54e157e31c6e83b026c0960189c36d71361e12ec6dbc33872184fb2ea30cf04a0c57ba6a9b776e5aa51baf286f092eb8780fdd6f0462c8e36ae87 SHA512 0e5886fc74bf84396facb79bfc2fcc4fa7ababc39f861fc62d198656c65dec31150bc7fd27773dfa8add421f08ad0dd43a7d72c9e8f6f5733ac34fb8212658cc
 EBUILD wayland-utils-1.0.0.ebuild 588 BLAKE2B dd9eb30959b6d87b21153093669f97e8b123fba85909701b541280a38601612f675f9b0d98b7eb30c9a605287564707a3a65e06c2c4dbe4e548752659d6d2f7b SHA512 877c480d53e85f9fa97a3ef5519df4792a7cc3c9729a7af6cc8b5867d4eae8999b977402bb182fe1c8719fa33301ec634afb126418f55a7eaa4dc8362b0e946b
-EBUILD wayland-utils-1.1.0.ebuild 661 BLAKE2B a40e9ff4787e81de17395a571bfeb024eed46c86544652525151a371e1f90fafbd073eeecf2d4a56da429dd779a130e8d26e35df58306e45d6926f92236aeb69 SHA512 c2330202084fd2f662a3f4461ce39980a8dbf56d0f83983ff289d5a35d8902debc21b766988b560ca97cdbe6ad1b2b846f49500433a83819d82572af9517cb41
+EBUILD wayland-utils-1.1.0.ebuild 660 BLAKE2B 53de061a465023be4dae05444163ce8dd26b8331803171c9b03f760a3b3b893015302ffff6f9d5575f9bb1cefbc98b2bfa5d78c6ed65fc5366d323130d5f7fae SHA512 bcb0c20e89113c00c16b93d6dccd06ed3f51e802f245f67a882586f4852cd14deb1eba7205300ebded2ede1b2045c77e3304c5a95cba2a7123dc66c77ef75b32
 MISC metadata.xml 343 BLAKE2B 1245da4d0eed93c9bc6822719c23140406b752f84b3cd55c7787511164f9bffffafaf359b86e9fd14a52dc119d8e77a21cbaff3c4420348fef8a9a7c92430abe SHA512 12684765e5e7d6f51a0b77180e9c7dd354f29515026fd61621d10b65451d2cc007138b14aa3f5adb4a408f8805b866bfca331ca8083d8d1fe11a2d9f6fb1abc6
diff --git a/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild b/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
index 653302d4f879..a8a631373d6a 100644
--- a/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
+++ b/app-misc/wayland-utils/wayland-utils-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/wayland-1.20.0
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 6c6e6b6a7377..f343cce740ca 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index eb4824d6651f..62162b6b8379 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -7,6 +7,6 @@ DIST gentoolkit-0.5.1.tar.gz 3203805 BLAKE2B de2cd69aec9be79f498b1180a90afb54e77
 DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d
 EBUILD gentoolkit-0.5.0-r3.ebuild 2398 BLAKE2B 9ff7c63bbe1781290051b6a3479f23ee3fa8a81a1e5bb9fc696b0a8899dcf740470b8c4d31ede30084fc54fa99d93a64bd65123e5793862b68a420d26f4c1a12 SHA512 bc9fb3941d26b3c68641c72342af463a45b89be8de0ff0530422b5dffd5d3409f5ff4e62da307d14d9a6946806900368f24dd68825c7ffacaddd8567d7e80a08
 EBUILD gentoolkit-0.5.1-r1.ebuild 1934 BLAKE2B c510353ec768dcc7848475cd2f353c466cb93e59a52c2743e5236995a1bf6761dfa1f32fb0ec4de75bc14db3a17404b152cebe7121dece062350744e08bdd0d7 SHA512 763f276f1dca5148efd9ba93c9008296b7ecbdd9119fe818e868e7996306d5b8ccf7a42ac540908b8edcd271e64cd680be9b3c5d39af72037ed8eafd587bbf84
-EBUILD gentoolkit-0.6.1-r3.ebuild 2104 BLAKE2B d22f2791fc46f600522b7d360c8cc6075ae92dbca8ee42dd42af9d9643fd2cb68e5144f437fb980c34c509123c1aca77a3647e3ddce30ac3df5d73c85bcd2967 SHA512 1f50b5bbf6f40aedc4b4575b885a3897974d3babfc4a0f4ad019b9ae7a2b42caa2983e471c8efb267fc9e91988c729b9348f3682ed027fc953ac0cafa3fe1dab
-EBUILD gentoolkit-9999.ebuild 1949 BLAKE2B 38ce3fa24d29285072cc202b89cce7c17fbaea4252e4d5cb13ec42d63490a58cbbdaf5c984fa0d93b54b42996ca7e8b586acb87b23e4320ce6c8a5554625c72c SHA512 681ff7aaab607dcc47836e6426a3710220e40cf8f5ba934ad99ae19fca03a2a3f05265c36a19331dfb415028ebf11a2462bfede94b7202998a15772b7a914bcf
+EBUILD gentoolkit-0.6.1-r3.ebuild 2113 BLAKE2B f304f93970a938ad7ff84b3c68f674aba8837cc7047ba5afc1dbf55fd736674206687076eecfb578bf4e79cf0cd90148cdd4cae318226aba8ef74d774f46c6fa SHA512 c5c705ded7ca6d2e584017477aab9417e8d72707e17781aabf8352bd66c1c0d9afa14984af8c88d88431d93bb991abc7ba2a39fe7ed7b7d1c4d6a5051551f36a
+EBUILD gentoolkit-9999.ebuild 1958 BLAKE2B 7bf84bb857ebffae0ca5b3c08740ef680c850be2a6b6cf98e7a88c1abd362f4987525af92b8aaf283683a1c05eb174c76d0b745e1b2869b4144190e0d6f6088c SHA512 e3368e7f712e723cec4cb89d8b5a6ee0dbab7c506a4546dbd24dc63ed434450809f1d4702950795e37c5fc8b9a12a97cde41070e1844da30232621e61f2f5b60
 MISC metadata.xml 569 BLAKE2B 952f63a005765c32e676350461cb14b3ea5818e1ec7df082c3fbe0c12df5721f387168b389abc32ab5fcb83794f712725d7d859433f3603f68fb047165cf121a SHA512 7fdf52442396aae7a2d0029a6d42c3a3227faa7e088222bbd8e8cfc3a91323707dac4fbce455996254c82796e73f480543211fe214cb383a9dacb52c584e7318
diff --git a/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
index 496a5a4076ef..a42f4f4243a5 100644
--- a/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 DEPEND="
 	>=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions"
 
 PATCHES=(
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index c864a6922d64..c8ce2d30696c 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 DEPEND="
 	>=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions"
 
 distutils_enable_tests setup.py
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index c135c511715d..5feb554c048a 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +1,6 @@
 DIST iwdevtools-0.12.0.tar.gz 88411 BLAKE2B 9220d59ee9ec7305925798d8beafec49ef35d8e39a428b62df3b3ed3832da1e42aff5e94ab8c5cfd85272d21cbb13c856408cf665523f8b1de85818ba08aebc4 SHA512 b69face29355df2443e75101b81c477dfdb1f54aad14f0d6275c399bd97cd654c4819f5621177d7ef75ecc4540e923ee5cd42f806240ed346ab469959f6a38d9
 DIST iwdevtools-0.12.1.tar.gz 88857 BLAKE2B 885909b20729279f5d711c65e915078995d0b2d26170f12e6669e499ee42f8a6bd8b5d59930215a3f39f60a1a0b5970f31548d33e059ae314fa1520971bb990a SHA512 3046a661718afbec305dda20990be258a4df981b3a72d49b77384f7a23d8c22e295bb99717c69a4569b6ab3a4195c6dbca0c07b3675bbb78a98aa0a198994988
 EBUILD iwdevtools-0.12.0.ebuild 1907 BLAKE2B 5cce7273be85fbd5ff5b3aa468086c23612e40e54ff7acf456311e07aa4ab39e597424f23b94c6b56912c9b1252e72cd7c12e8d14f654f91eb636bb63909177a SHA512 698c0530e9dcdac227d14000ebf845f9c1919a0801aee12818ea5588e30276ad57fb8480a920976c91b020cbd80cefcb143ff8446454f18222dfeed46bd5b6f4
-EBUILD iwdevtools-0.12.1.ebuild 1915 BLAKE2B a98ac7ead6f494052f08e6dbd20f34866bfe2481d252c43cc94d31f75fb0b4bf24c6f6f1d73a2b5dcc4c76e2fb1e1b5d14b0b58af4162c1f27183b73ba8daa66 SHA512 6da66aa4d2ea4d6e040636a8b189f8d3fc83662a4a042472a8bbad9202fb8849595cae99a41a55a924c8a094e1bdc0392050d40f294b398a4139fd149c33c5e4
+EBUILD iwdevtools-0.12.1.ebuild 1907 BLAKE2B 5cce7273be85fbd5ff5b3aa468086c23612e40e54ff7acf456311e07aa4ab39e597424f23b94c6b56912c9b1252e72cd7c12e8d14f654f91eb636bb63909177a SHA512 698c0530e9dcdac227d14000ebf845f9c1919a0801aee12818ea5588e30276ad57fb8480a920976c91b020cbd80cefcb143ff8446454f18222dfeed46bd5b6f4
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/iwdevtools-0.12.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.1.ebuild
index f618116f15e0..25527bd89228 100644
--- a/app-portage/iwdevtools/iwdevtools-0.12.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d12041880b9b..8fb7e360c8ea 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 6fca73b0b48d..aefab4367567 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2140 BLAKE2B 181f2405c7d762242314a96df3674360f9f98edf168dee983332b58be81db967d6fbee6e1e8c5a622d13dcfdd86f4bba7757c192ef2cd2a0575e16f31eaa12a5 SHA512 384e2d0571621402b9e3cfa0cc666d244e93e42e6520c1d88651c26d3fed1cd3d7b443e7d0e87d7eb4518798a779ee075ff51390d3835b043f4e82ce4e2ad9b8
 DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r3.ebuild 2039 BLAKE2B 1187c4476fceb492869dde37ba7fcd84ca0348f0366b8be20073a66099ab2e6c68e52f00a3c7f925b34c35735e346ccdf0bc7f3a0456461e0a7691de7ba8e19f SHA512 1dedea65fd173f3b7009a299d01c361eeaf57aebc4ebcf5ff4ae5f4730487bbfbd45f801f40003ee5bc085933b069d70f986e6f2e7fa7fdee9e8eec3e6136138
+EBUILD gnome-doc-utils-0.20.10-r3.ebuild 2048 BLAKE2B d214981233d84c2b40a2c918094d7636611378b579dccf9e48daabd3ab4f3f1a905d5dd187346611ef0997e245ec2a732b81566a01e809e3c62260c891ba74ad SHA512 a5e436059d831e0a6e768b3c77f6de0878a4764ee708a7e3fe5daeefe75c351b248013db3c81d85ae5143b2f4b693c6e1df5a536fd40242b53661eaacc6bb5cc
 MISC metadata.xml 358 BLAKE2B 2eea9f0df67157d1f3fb590f9b48dfd4ec8e5c04daadd2cb540787cbd3eaafe8fda16dfe1f5c871bb90d6d9346e6519f0f9c351664a762845f1500fd35ae57a6 SHA512 791f779816b0edcadecef7e96b767ff3867fe3e296b9fb2c84442bb27562906920f593971f2b733aebfc95e522a2ed275ecfcdc31e06737be835a1316e24deb8
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
index 3c536ca4e4ca..184df8131725 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 "
 # dev-libs/glib needed for eautofoo, bug #255114.
diff --git a/app-text/idnits/Manifest b/app-text/idnits/Manifest
index d7752f0145b4..0e97dfd8c0f5 100644
--- a/app-text/idnits/Manifest
+++ b/app-text/idnits/Manifest
@@ -1,3 +1,3 @@
 DIST idnits-2.17.1.tar.gz 60480 BLAKE2B b2248236590bf025f9e06a4d804ac9d0cd207406809f17a2393dfbce2d0712c60aef58c8a4d7388c61495956ce0d2b0c5c491e290b178b7c46dcbc711615a847 SHA512 deed0c73e95e292443ec3e2ca447d2e6ceb9cbafd0775163e247185c158e74b7a4cd1e906474ca45ab40d92eac6e881e417df4c6e84a15277c71c711c590f55a
-EBUILD idnits-2.17.1.ebuild 496 BLAKE2B 4afb192ebaa1618f148121ffafaa08e592f25839dce5d0fa01d9e309e112394478be214bed0fcf9491d7e8b02fe0551f4e25cfc10b0918c280316c58258cfbf6 SHA512 035af6199a9f520eadee86b70e44f326c38bde72bdd8cc09cf8a5cdcaa1c892c683b98f5f80bd33e7fcca903094d9b33212f723c363c299b97689df42d5b8d60
+EBUILD idnits-2.17.1.ebuild 505 BLAKE2B 81a2baacc9e13673740de6f8df094f92ad3ed97f0a65da111d6408dd044fe6b52f1cbfc4041842850b39e65c0f7e1d0e804f174c2e5dd061c97a93d3745223b4 SHA512 9da926e55df156c8ea243f8d03ffd2149ab9f983fe78de259ef5386e5d80d93527578e50b6670365f7909fa9d497469ca6737c71a370dc0f1c67e53a76f7572d
 MISC metadata.xml 328 BLAKE2B 95be330bd0f0b2ce18f8a58e6a3d15a7a8b34643a6c72139866ec3a0f32f6403479d417b5ceb1019d0b7fee5151e21708e129b19a473576e7d2656a5589fa4b3 SHA512 4aa1d18ffa5223ef93ab981c033dad607ecdf4c7fbd39ac45f201b5f6a6d2d06733f57efc3c856370a7b4d6d87b79c041fe36ff7d55c0028eadd1a695c73772e
diff --git a/app-text/idnits/idnits-2.17.1.ebuild b/app-text/idnits/idnits-2.17.1.ebuild
index 5a0345d2fdc0..87ff6c1483d2 100644
--- a/app-text/idnits/idnits-2.17.1.ebuild
+++ b/app-text/idnits/idnits-2.17.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 RDEPEND="
 	app-shells/bash
 	sys-apps/coreutils
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_install() {
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 30da84f3be8e..51e46372d282 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,3 +1,3 @@
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
-EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1947 BLAKE2B f22cfc520248a1f82d8ba0af600a71d5822e1add1fe2d7d526d6f2b8f6aa9202f1fed646cf49337a3391f986c92569e3801a8f30d5b3a11b86100483252b691b SHA512 5899fe18b31eaadefca317298c4c0727824a677c3ca16293acde4ea13dba96e84a864843c01c81af7176e93da0ca306e3ca2751008337baefafed797d0eaa777
+EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1956 BLAKE2B 6434070af0621f3da002e10a83bc38bc3907ef0ba69fcbc9438dbe2320aed950227bb15a5436ba7727aa89519c80ac73ac01610e95707b9c0194442fbbea521b SHA512 a7dc53a87a5f8b1e2ff4d55f1dbfacc84da78fc62e5b11a5bb1d0f2839e351c931204df88debb276587c9c0622f298a421da40f5c61bbfbec5d837a8dd949758
 MISC metadata.xml 713 BLAKE2B 5bb40701020a2a88bccfc3293098732f464066af3317724cdff560819de1db44e33a6ef20ef3b09edce61580a50184e8cc5112d60d415ee42cabe6409e94d384 SHA512 10311f69090d7dbe3ccdf8047daf15ad6b86ae3cc58028b11629c581708c5de543c7fa1ab1bdbd173dbf5037e1dd23d68267de8e11d1a9da9e56659034f1316d
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
index afa70d83839c..7c6cbf38b441 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	sys-devel/flex
-	virtual/awk
+	app-alternatives/awk
 	doc? (
 		dev-texlive/texlive-fontsrecommended
 		virtual/latex-base
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 02826c71bded..1fb8d9ca193d 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest
index 6c2ea921370c..a1554033af19 100644
--- a/dev-ada/gprconfig_kb/Manifest
+++ b/dev-ada/gprconfig_kb/Manifest
@@ -1,4 +1,4 @@
-AUX gprconfig_kb-22.0.0-gentoo.patch 10025 BLAKE2B 50e25068df717bee13ba59d76c4f92b722d0cb449340cafc4d00bc45bb5211123b0e2ac97462ce02d9c45eb5966d58e7656f79cf84f3b59febfa529a8103fe71 SHA512 af6fb8c72b8fadeef19ef505270349156c75d602bd6b6035b97ef569b5daffb65b70a3d05570a5d609abfa5b201ee8e58c270b6c15784697ffb66c60d29e50e6
+AUX gprconfig_kb-22.0.0-gentoo.patch 6246 BLAKE2B c5e4d4135548ac45094c5886f997d7e28a0e5501bd52db488ed9d01f4638d69c47be85389282e5b26a9be61a368da3cbb551c9142852d32f116ce37be03a5487 SHA512 0d9c80767c22aee445b255a023488942f121933327ee749685304c54942da51730c5fec2482d6bd7706b14e62c1c6c55dfc11ee6dbffeb5ca958270b5db35a53
 DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4
-EBUILD gprconfig_kb-22.0.0.ebuild 786 BLAKE2B 2450822f707a94a23130b2ce02ef5aade2eb38282f2b4cf159523670f0547a6e8563c7480db1aacef260413604045a797c1518720bd0423fb986efced5e82c98 SHA512 874277de320443dd4a1100b2a2e2b01a93c4a802f397ab26da4cf586b3762c5566e31b2633ad85f7e03599c4aa1f0ba0fad8a17fda483c82eaa489f75b20ebcc
+EBUILD gprconfig_kb-22.0.0-r1.ebuild 786 BLAKE2B 2450822f707a94a23130b2ce02ef5aade2eb38282f2b4cf159523670f0547a6e8563c7480db1aacef260413604045a797c1518720bd0423fb986efced5e82c98 SHA512 874277de320443dd4a1100b2a2e2b01a93c4a802f397ab26da4cf586b3762c5566e31b2633ad85f7e03599c4aa1f0ba0fad8a17fda483c82eaa489f75b20ebcc
 MISC metadata.xml 892 BLAKE2B 0c323b949a393a634485d849b25e56ba6a9f9922538c0c09690671810c6ce97842a52021bd2448408747d18210bc8363c94b03697884ad29090f7d7a2ca92a30 SHA512 a1a9312eb03f1e5d0194c21d365650348b2fff626875e075a94dece326a3a6c589133f75998d58d1e2f7053b39fa3fa9ae31074cc0484352024ed336843e819c
diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch
index 7dfa8e0e9cd4..ab3d0f9367f7 100644
--- a/dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch
+++ b/dev-ada/gprconfig_kb/files/gprconfig_kb-22.0.0-gentoo.patch
@@ -5,17 +5,17 @@
    <compiler_description>
      <name>GCC</name>
 -    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*pc-linux-gnu-)?gcc-@VER@</executable>
      <version>
 -      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
++      <external>${EXEC} -v</external>
        <nogrep regexp="for GNAT Pro"></nogrep>
        <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
      </version>
      <languages>C</languages>
      <target>
 -      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
++      <external>${EXEC} -dumpmachine</external>
        <grep regexp="[^\r\n]+"></grep>
      </target>
    </compiler_description>
@@ -24,10 +24,10 @@
    <compiler_description>
      <name>GNAT</name>
 -    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*|.*-rtems.*)?gnatls</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*|.*-rtems.*)?gnatls-@VER@</executable>
++    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*|.*-rtems.*|.*pc-linux-gnu-)?gnatls-@VER@</executable>
      <version>
 -      <external>${PREFIX}gnatls -v --version</external>
-+      <external>${PREFIX}gnatls-@VER@ -v --version</external>
++      <external>${EXEC} -v --version</external>
        <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
      </version>
      <languages>Ada</languages>
@@ -37,7 +37,7 @@
        <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
      </variable>
      <runtimes default="default,kernel,native">
-@@ -202,68 +202,11 @@
+@@ -202,7 +202,7 @@
         <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
      </runtimes>
      <target>
@@ -46,142 +46,24 @@
        <grep regexp="[^\r\n]+"></grep>
      </target>
    </compiler_description>
- 
--  <!--  CodePeer -->
--
--  <compiler_description>
--    <name>GNAT_CODEPEER</name>
--    <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada,C,C++</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,native">
--       <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--       <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>codepeer</target>
--  </compiler_description>
--
--  <!--  Generic GNAT LLVM Target -->
--
--  <compiler_description>
--    <name>GNAT_LLVM</name>
--    <executable prefix="1">(llvm-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,native">
--       <directory group="default" >\.\./lib/rts-native/adalib/</directory>
--       <directory group="1" >\.\./lib/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>llvm</target>
--  </compiler_description>
--
--  <!--  Generic C compiler for LLVM  -->
--  <compiler_description>
--    <name>C_LLVM</name>
--    <executable>clang</executable>
--    <version>
--      <external>clang --version</external>
--
--      <!--  '...clang version 6.0.0...'  -->
--      <grep regexp="clang version (\S+)" group="1"></grep>
--    </version>
--    <languages>C</languages>
--    <target>llvm</target>
--  </compiler_description>
--
-   <!--  Generic C++ compiler for LLVM  -->
-   <compiler_description>
-     <name>C++_LLVM</name>
-@@ -221,28 +221,6 @@
-     <target>llvm</target>
-   </compiler_description>
- 
--  <!--  C Target -->
--
--  <compiler_description>
--    <name>GNAT_C</name>
--    <executable prefix="1">(c-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,ccg">
--       <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--    </runtimes>
--    <target>c</target>
--  </compiler_description>
--
-   <!--  CCG Target (C generation via LLVM) -->
- 
+@@ -254,7 +254,7 @@
+   <!--  Generic C compiler for LLVM  -->
    <compiler_description>
-@@ -286,23 +264,6 @@
-   </compiler_description>
- 
- 
--  <!--  GNAT_DOTNET -->
--
--  <compiler_description>
--    <name>GNAT_DOTNET</name>
--    <executable prefix="1">(.*dotnet-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <runtimes default="default,kernel">
--       <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
--       <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>dotnet</target>
--  </compiler_description>
--
-   <!--  JGNAT -->
+     <name>C_LLVM</name>
+-    <executable>clang</executable>
++    <executable>fake-clang</executable>
+     <version>
+       <external>clang --version</external>
  
+@@ -424,7 +424,7 @@
+   <!-- LLVM Compiler -->
    <compiler_description>
-@@ -421,21 +326,6 @@
-     </target>
-   </compiler_description>
- 
--  <!-- LLVM Compiler -->
--  <compiler_description>
--    <name>LLVM</name>
+     <name>LLVM</name>
 -    <executable>clang</executable>
--    <version>
--      <external>clang -v</external>
--      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
--    </version>
--    <languages>C,C++</languages>
--    <target>
--      <external>clang -dumpmachine</external>
--      <grep regexp="[^\r\n]+"></grep>
--    </target>
--  </compiler_description>
--
-   <!--  Windres compiler -->
-   <compiler_description>
-     <name>WINDRES</name>
++    <executable>fake-clang</executable>
+     <version>
+       <external>clang -v</external>
+       <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
 --- a/db/gnat.xml	2019-06-01 21:53:53.383281607 +0200
 +++ b/db/gnat.xml	2019-06-01 21:57:08.414196529 +0200
 @@ -60,7 +60,7 @@
@@ -197,7 +79,7 @@
        for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
        for Driver         ("Ada") use
            "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-+      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
++      for Switches ("Ada") use ("--gnatbind_path=${PREFIX(ada)}gnatbind-@VER@");
 +      for Required_Switches ("Ada") use
 +        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
     end Binder;
diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild
index 8dde8339ac1e..8dde8339ac1e 100644
--- a/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0.ebuild
+++ b/dev-ada/gprconfig_kb/gprconfig_kb-22.0.0-r1.ebuild
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c3950b5ab167..dda3cf54f87a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index f2bf286e9cd9..842bbfe0dce2 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -6,6 +6,6 @@ DIST Catch2-3.0.1.tar.gz 1020413 BLAKE2B 91c207bb67b9d97191fcd5b3f50df66c7d671aa
 EBUILD catch-1.12.2-r1.ebuild 896 BLAKE2B 185ad88f37e5fc1b66d865be02c20989fd215c5ff50a63c6e91ea3fdc1af497b1f499693e24e66b980c367d387aaa328feffb3e11a37513e0191a43236e6c0d8 SHA512 b076e9b7b233dd067b55592382798d7ad7a85666e46a287ba5de688cbbedc9c6226b39a5c448821bb2fb6ba90c654cb33d111aded9e4a38d82d8d3f402bae1f2
 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e
 EBUILD catch-2.13.8.ebuild 1013 BLAKE2B d1d2c9587ed514cc8400d70061ed29b3f0e68d7ec6d8c7efd0a59b73b47f2fa8f3c7c2a789e5646e122eaa94e5145f43a0acfd44fa68bcf1394cefd5c342e332 SHA512 ee469d1ed858557b9486b2d6d3884045daae4e529171a5d93e34bfa304d6035656a8dd5ded4f7675df70ba6e8f8e42f29c2d147b87552fc413c8b7a6c4a5b22b
-EBUILD catch-3.0.1.ebuild 1001 BLAKE2B 1b889c57cfbffa4b0afb68c8945bc682ac857a3201a0a2870a8fb8412dd386e2af5a6f4cabcaeab9baeffb18f869033d4c22468b5e9b68c6005de1e1f5ac1757 SHA512 885f95f3d4d569e754e7c9579e432c8a2e78998d9ff1121dbbbdd5d2d9755778fd210f0337421c382c4125ddb42284c763993c78fef86ee1e919c56c5e56f6bb
+EBUILD catch-3.0.1.ebuild 1000 BLAKE2B 88c8596b8b354cbef4df9ceb6fe694f70c227b4bcf847700234008af362d60eccab8798a5ef393687ca123382e68951c9213e2a2ab8cd6df1122a798ac459366 SHA512 c14b0368beee30e0dd0d3020290868ed9d02fa6f390cfac33c8474028d3d637179d2a089a034f907fb4861773f79e7b8848b1e596f61a6b940a7428973467220
 EBUILD catch-9999.ebuild 1001 BLAKE2B 1b889c57cfbffa4b0afb68c8945bc682ac857a3201a0a2870a8fb8412dd386e2af5a6f4cabcaeab9baeffb18f869033d4c22468b5e9b68c6005de1e1f5ac1757 SHA512 885f95f3d4d569e754e7c9579e432c8a2e78998d9ff1121dbbbdd5d2d9755778fd210f0337421c382c4125ddb42284c763993c78fef86ee1e919c56c5e56f6bb
 MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4
diff --git a/dev-cpp/catch/catch-3.0.1.ebuild b/dev-cpp/catch/catch-3.0.1.ebuild
index 7802f6595ece..7b6e5cc3685f 100644
--- a/dev-cpp/catch/catch-3.0.1.ebuild
+++ b/dev-cpp/catch/catch-3.0.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index a021edc5c8f2..46cf463deec6 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest
index 120751148496..7546429d9cf3 100644
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@@ -1,5 +1,7 @@
 DIST barman-2.12.tar.gz 1370978 BLAKE2B 2b44e153addab3fca7dbf572b03b2e22fe18f0960d98048aa145c64552a0de4cea977c423c268bfb9b822e44aaead3572ee350053049ab5459cc022d976eb4d0 SHA512 b4b479a03e5b770ba783af1d5645f6be2a19e2427cb58c6d9dfc6389240d4eeeec85401caa59c0d837a70f1cf67c0edbdb1539ecbd2f3de86285a122fc184320
 DIST barman-2.19.tar.gz 1423229 BLAKE2B db316bad10774ff5825af7409ecc69cd502fe447dd91efc52c04ae23d8e5c21e682fcde351b23dea437817d6207765a6cba355399aea0c5799b0f34be55ee524 SHA512 042912aac1e02994fbbe270f9bf6f4340b9b7ba5b1fdb5d588bdf95098a970ed398e002d1d56731f9b96c8bd0c7e0b71463ab6c08517ce3c1f2c77d1a92618ff
+DIST barman-3.2.0.tar.gz 1463937 BLAKE2B 9daff4dc1374aef5dfd8eff48438464265189223c7b5e7b39045cdf39362c0d266e437f8ff98aac3c045ab94f09ecc59cd34dd7847b783649cf5e18ab3e85280 SHA512 73b86ce55a034bc1bb4f130ef06f2e05c4a7b5c221b49c9ff1cf2f3693e42a5b30613232e823c5b4a87d201bdc8c3b2137de3b189268354145cc3866526095ab
 EBUILD barman-2.12-r1.ebuild 1071 BLAKE2B c1aeb0559545350da1c2afc671280c5a04571980d1c7019b6b0d6a64e926e15395609840c793b05d896727ea48dd9e120ba9594edebfa869a0ca88d91d72deb0 SHA512 80c2c19a626e010bdb24d2ffe2aff41e7041d506e04438c1797af2227e153b158d8ff75f46548e2d8c57739ee22fca94787779668653fe6c84ffef714fcc68ef
 EBUILD barman-2.19.ebuild 1072 BLAKE2B c6b5bd7c1feedf5763aa088a9d4b72f48b8b1cd8eeea8c04698d4a273fef19e84dc70afaff6b1e185a4ecfe15660564ec9bcfb9e2fa13e5a1e958975deb3bd5f SHA512 65e10fb4b81593de8c2c5a09f8dcb98f99367b9577e89bcf07faa03e5dad754e75e036815faaed750ad0c1aef4d1a2498985fe75d273a110e5c8c3e86abeef30
+EBUILD barman-3.2.0.ebuild 1181 BLAKE2B 7637713d3f0bb3ecb216113730f0ed5700189f59e296d7a8f55a52c95d0a9e6c46fcfb15c0d13ace6133302962a3c8c3e5d27c4123b17e9ef8c582dd8da94ace SHA512 9a5e6a58ca62f5638e7390c1481ed6e67ea0f59cca18d9053d345520a85bc3c7fa164d9b4e95aa298f5561100bccc4f66f86d3a219d45ce4303c1b675db516e6
 MISC metadata.xml 452 BLAKE2B 21fa365e3d6c53cca2a4f18f46801ddefb86f1f5c0f257d4090ad4209dfda27e041506055c5e102ef193ea61b8ddb4e0887d9387acd4cb4986eb017e44138d7c SHA512 630b4513af924c08574beabcad91e91dc6db5713b32558fed35c45a384439c3db54e5c97bf080224321a606a250ef780b88b7667d0227b72acced29325d0091f
diff --git a/dev-db/barman/barman-3.2.0.ebuild b/dev-db/barman/barman-3.2.0.ebuild
new file mode 100644
index 000000000000..08998d1bf9e6
--- /dev/null
+++ b/dev-db/barman/barman-3.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{8..11} )
+
+RESTRICT="test" # missing azure sdk
+
+inherit distutils-r1
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+HOMEPAGE="https://www.pgbarman.org https://sourceforge.net/projects/pgbarman/"
+SRC_URI="https://github.com/2ndquadrant-it/barman/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/argh[${PYTHON_USEDEP}]
+	dev-python/psycopg:2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/argcomplete[${PYTHON_USEDEP}]
+	net-misc/rsync
+	dev-db/postgresql[server]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/snappy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	sed -i -e \
+		"s/^    def test_xlog_segment_mask(.*:/    @pytest.mark.xfail(reason='Test fails on Gentoo')\n\0/" \
+		tests/test_xlog.py || die
+}
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index ba850320cbcf..cc952f2c4522 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,3 +1,3 @@
 DIST freetds-dev.1.2.18.tar.gz 3406990 BLAKE2B f0134ee0a322cb9e7a7fefbf9e85c60b826318b546febde78e53d5ec22dc2c8e269b7e830da6d84267d16a2dc2cf367a54354765017a40e07af2c3c6be54676e SHA512 315f40ba0d97281f852ec99fac457ec4b2a30879a2384bfa2d7c680aad6c056b6ae23fc192c18db4fba75caff552ef86de7bbfc5d7b608ea5a12531bf9eadc4c
-EBUILD freetds-1.2.18.ebuild 1639 BLAKE2B 19c2071c0002d79a4d6c56af37bb236261a3274bcce9e87f2bcac6880140b587ff559eb848236b3559921a529290a8b3581055d35dbb9e49ff04cf4ead67f8ce SHA512 baa09beeef502fb8f69becc8ead7246dcc80cc3159b9a7b01b23a013b9090124b3841ff8ca75fb036f0f10b449f1c53f24d18c387a2486f0a65459419b30a618
+EBUILD freetds-1.2.18.ebuild 1648 BLAKE2B 5b9142c1fa91a03f4a51bfd34bf28c0d6dd28b8efaa1e54587a4b09c30f4530854f081bbae722f65d2e897e5f4fbf9ed1574224188a96dc49de7fae0a2c7d138 SHA512 239cc3551db9c9b264e6f34cd915e16cfa0d4f8672f47cd2f711f58b81943b61b1b7ac2b4778d115a6a26f7cf1adbf49bba23ef79b2a58f3707b4e04931d9199
 MISC metadata.xml 307 BLAKE2B ef2023a0b7e091f47fa6e6e8c225a905e7456cbcccedaab86c3c9aa237eeaf87e5cafed83650a6ca569b3cc70bcd14ad0badabd0e4bd1739b619dbd3c3877de4 SHA512 e5489d7a456f904586f31a9c1e4b51a83d6db0ad27a7964df0ddf5a2cf75d3ba1e22fd2765d25540987e35932005968aa321dee761b64550dab27620ab9be3d7
diff --git a/dev-db/freetds/freetds-1.2.18.ebuild b/dev-db/freetds/freetds-1.2.18.ebuild
index 6ec7c9983374..d76511a638fe 100644
--- a/dev-db/freetds/freetds-1.2.18.ebuild
+++ b/dev-db/freetds/freetds-1.2.18.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="?? ( iodbc odbc )"
 
 RESTRICT="test"
 
-COMMON_DEPEND="virtual/awk
+COMMON_DEPEND="app-alternatives/awk
 	gnutls? ( net-libs/gnutls:= )
 	iconv? ( virtual/libiconv )
 	iodbc? ( dev-db/libiodbc )
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 2fc8d123bfd4..b49597853cca 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -8,5 +8,5 @@ DIST mysql-connector-c++-8.0.31-src.tar.gz 4201904 BLAKE2B 48385db732572ccf2ba91
 EBUILD mysql-connector-c++-1.1.12-r2.ebuild 1305 BLAKE2B 62cf36d8a5c5fe823ddfa7897cacef3d082d8a247ffaa8292f7599d0637bdad37e751fba3018b27746f6ce9077906507e947aefed932a89eacefaa3a0e76ecc5 SHA512 c4f7defd6e3fbcb891bd9e4a8529d081b05376329ef8556d206bc33c13f4d718be35d93158900d86c116cde96027c14500d36e92ba3714e7cccc469591281940
 EBUILD mysql-connector-c++-8.0.27-r1.ebuild 1025 BLAKE2B 1de09343d48984a042bd9f141e72fd568603022b2d221d9d737720f4e4e002a488ae104cc92fc1a667dce0772ed38822a40557e56900085e1ec3696601c2550a SHA512 570c4deb40fe652f328c0f33f8fb34f80ca000f1a6988e1092aafc27bad15a05a86632608bc4b65b2b808f86d2a84e9bbd938073714639ce78b3457f570ec00d
 EBUILD mysql-connector-c++-8.0.27.ebuild 973 BLAKE2B 956082e0b535dd644bbf81dd2392785f7bc53c07bfc2e4c4136b0adb249b3d199a151a8a40551379e039d6d2b18e2b1fe3dcef9c594f03677dcee3abdebfc560 SHA512 07d72d46a68a61368bd923fb2ac1664e3660af9bd7f049f00a36f78775cccdc123ea28b52a5ccee2389b65fbfb28b1af130555671819eadbac5c006e4ccbe693
-EBUILD mysql-connector-c++-8.0.31.ebuild 1177 BLAKE2B 4e0e416363593f0cf4dc06f8e9bece87caa60a7bdca49723ed40010b637d3f83e6102911cacb7db21fb94df0e64ad5d5f34a771d86c833ca1fa17dafa0defd43 SHA512 d84e2bed434b8cf8fae770a8f6c272ae6b4a7ac67c43dd96f16b396b8a27efdf20ddb76f1f61c89d118e14cef949727f2a33d8ec850f57eeb90feaff3619cd7a
+EBUILD mysql-connector-c++-8.0.31.ebuild 1176 BLAKE2B 0354d385e2e676021c6a483b268393bfc5e160795b16f3bdba7e11741738bef6e5144ea068a5bad4214c943226445d13214809ed52ab682dae503a4871c24587 SHA512 3f05860b415317de5f66b56e9d2032a52ebb7d8c6598a1b896678160b02cf7a2058bc6254a9d3b3adc8d0e9ea95d4d58df64e5ed11ce4fab06f83d9691674568
 MISC metadata.xml 477 BLAKE2B c2f18ac95fc5dc00aa030ea5282340551481c1474a728dc94473f1e18d03475d2c014f4acb496de4cdf027ede3c0c94cec6b1d1faad0ba0f902fbf4d6fb71789 SHA512 54f2daaabb2450c2feb3004f7754df52b7eaab1bb1cdca69a8b3e2155536841420118314635de877eb532b0dabc5d6ff1c67c939265fc478d660743bc8e9bbb3
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.31.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.31.ebuild
index 87c9e7f9ce8e..1dabae524fe4 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.31.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.31.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}-src"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 # -ppc, -sparc for bug #711940
-KEYWORDS="~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86"
 IUSE="+legacy"
 
 RDEPEND="
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 99eea8669646..21522be7d57a 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -5,5 +5,5 @@ AUX mysql-connector-c-8.0.27-res_n.patch 1635 BLAKE2B f75811958a6415bf45aa571a8d
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
 DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102 SHA512 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
 EBUILD mysql-connector-c-8.0.27-r1.ebuild 3243 BLAKE2B e0cd9a95e8b9760309df66c35e3c22f21bed920288e91ec466cba438cbdddd9721fd37068720fc1b6155f820aa0c759cff7a06cb27aa90f97e4d6eda82d2294b SHA512 29d9d9a14042f9c18ce6bdb4e30c0bf31932f734965b001cc7dadc6d55d9fb06b78be61f5c29c5dce0242102d4c1bbd375a7c030d081c9c983b68185caf8bf7b
-EBUILD mysql-connector-c-8.0.31.ebuild 3190 BLAKE2B 37e676b49e36b64362616afa6d7fea875b193e60fc10f0b6fac63febf29c467e60855cc82428e698da8457ea7cb888f863f4e97b853aafa81864350ac64b6322 SHA512 a4fa8442592ab5a0b7835cce7bf188272dc3465dcb5d384452a1751932af5177ca594e2539a6dbc45a406d196e62072ad71a5743f377cfcd9b7ae92076227260
+EBUILD mysql-connector-c-8.0.31.ebuild 3188 BLAKE2B 1ab752a9987f919d1059bcd6d976c24249698cd557f56ecccc9509ee189108d291996dea0e97134a65cc34ba9e3ccb222bd45b62680e75238c7614ca834248d8 SHA512 eea1112def0de172b3c10071c9de3dac1517f6c834e8569cd9ae0e53e319238d5b957b45151827c58748b7f5d328d22106094e2875667b246dfad5e34f0e85c1
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
index fd1796f00878..3db67ccfac3c 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.31.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 0355bd4ae227..ad9d732ebf86 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -8,5 +8,5 @@ DIST mysql-workbench-community-8.0.31-src.tar.gz 19350289 BLAKE2B eac2024763f112
 EBUILD mysql-workbench-8.0.28-r1.ebuild 2768 BLAKE2B e60559e2a7ea25723a6b15af251d28a44373242a6439ba02c5366e51e6398d528dd531d87fbff566fc5976820b35b2e34a86412d25f543e7881be21d533855fa SHA512 607eed04308f2200655334cf0b39e3aa9c1e141571ebbf23f5ec5573196667351782bb223ecd740e73c676017efba88d94d46a5a4318b2eb67540bddcab96962
 EBUILD mysql-workbench-8.0.29-r1.ebuild 2768 BLAKE2B e60559e2a7ea25723a6b15af251d28a44373242a6439ba02c5366e51e6398d528dd531d87fbff566fc5976820b35b2e34a86412d25f543e7881be21d533855fa SHA512 607eed04308f2200655334cf0b39e3aa9c1e141571ebbf23f5ec5573196667351782bb223ecd740e73c676017efba88d94d46a5a4318b2eb67540bddcab96962
 EBUILD mysql-workbench-8.0.30-r1.ebuild 2769 BLAKE2B cdce565076e933ad3375b41bb4418af2cd671df13f1118f415ca0c01a0cafca01a829c854b63a0b873844b6147aeb85a485d5c275d3965bd0a684676507c255c SHA512 b58406e66629992e4ce5ed98e4a1a074180c4b553461b4e6d138dc7267859452ca39e75e9456af70ff628b6ee16ed3b2d624c7b0c3d2efa37490f185839ce463
-EBUILD mysql-workbench-8.0.31.ebuild 2716 BLAKE2B b4a6873ce88290c471f957e00e51206fa72d54b62227ee3e4b293add1a2dd03c8ddb9cf230c9ebaf500b9791bb577cb7ed58138f577bfed8ba8fcb40fee1955f SHA512 54a0124b23bf879f228d6deadeb27ef533425b461bb97a1328d7a932efd0275166d44a0a5c3407049c76998e5c6e9affdd4e61fe554f9eda9bcfb5ebe17a2c48
+EBUILD mysql-workbench-8.0.31.ebuild 2715 BLAKE2B bf012b7d2ba2648287c08111de4768f2e1d8592a3805275d834a3cc6b0fe8f561bba03f7792edca289e92241b0869cb8660caa46f5d78dec903eb9caa37078ba SHA512 cc1aca3a18e1bccc2ba2264da80b0ac6d3e023df3ad6b268bbb004f0a98057cc88e90eac7ff9f0b43b829ce7b67d0864a10be62e05a0055cddbba749840615d3
 MISC metadata.xml 312 BLAKE2B 8c491f0d45e24b9e367ef63f8822daf6925a17f8d44ff822b8faf7485f729524de02309b91e18411421b4533aa086853914c4a0b2a93d3fd5573a289fa1e3715 SHA512 01f2f645d167290bdb313e6c1c386b0426b41edd0ee9b50acf538a7353855c84321111ffd11c213c71424c7df73aa48b8fb9f3f2af914b595fb2961cc6b3186c
diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
index 8fceb5a83513..628991e78d22 100644
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.31.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://cdn.mysql.com/Downloads/MySQLGUITools/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index aa048e66c8e3..89228e865c0d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -16,5 +16,5 @@ EBUILD mysql-5.7.36-r1.ebuild 38643 BLAKE2B 8bb0254c476cfd7a8f6b247476a57c7979a3
 EBUILD mysql-5.7.40.ebuild 38640 BLAKE2B ec43562024204e938d9c959c02c641ccb2d8e9a7296b9b0e434a8431dec02ef561e0a700bdb4ef147579c8548b57f980dbee2a1bb079e57016b8d795fe977304 SHA512 04cc73d74f452dc9c79c7e3ea8f4e1e274ccbe1ab17d113916dc26c27d8032cc45003d82e495c30307b99cd7902e52a893f7efabb763201b58c36ebf092ece9e
 EBUILD mysql-8.0.27.ebuild 40673 BLAKE2B 7d4186450e56ab73f5d8b7844a80f00b3e978eeae80dced0342c021913d8e4999acce91a68167570d956cafa2f2c634f122bd5a88383fd3880024cc726d6291c SHA512 08fb21ecc87a040ef7ddf0af5b5e24e7180c162c03c745a52b2cdd81a331c2876fb12cde11b0392d7ff62a0fc2a3b8cc78ca271a80f5961088b9f6e9439a52b9
 EBUILD mysql-8.0.31-r1.ebuild 40730 BLAKE2B 8b99cdfa58be89d93b352db2ff7a2478a957d1484275a672b147f00314accf5bd99163f3ff8fddf9b45723e3ad5aeefecee93f59255411c9c80ea1b6bb7dc023 SHA512 1a4eecd0f63159c788ad2376ddb4b550f7bc54af025a34a55ca5ee814f54838e9fd0aa814fd148e6c9d36979977874f8f53efad9128064fa52e175a810b01fa8
-EBUILD mysql-8.0.31.ebuild 40673 BLAKE2B 24344f74c4f79906bd078b09aa3e406eac03e2b96d39e5667fab917701cf61861dea7db23a3da8c1a33aaf53c16729c321f6eed8ea99b83ca654eaf3d980ae40 SHA512 c0b3a21aef0d3f44482b0b221273886c25c5e293bcc51d3590a29f993461703be5a3ad0f0d4c60a86ce4fce82463755a03a12dde517843d69ad9e386fea1e020
+EBUILD mysql-8.0.31.ebuild 40672 BLAKE2B fc9af84191b1e9f656b93dd092f2b779ca2275b48569d58b8de8f738416e162fac83fe2096ced8711abe29930b810596cc503da147f800a4d6d5c6848683af8c SHA512 f732f6eb13c1a5c955c1f830868de182e66e2ef9b36d38c89eb5bd05797d221fad4345bae16c0b101b0a50043a78b58fbac8431975d05c46a9b20b863b0472dd
 MISC metadata.xml 1352 BLAKE2B 81b263eaa05ac8a0bd2cf0e84bf51ff4a07d8ca74e6febf8cbfea7b85f78a3d682549b1471c9d5a96ee21cdcfffcd4376246b5c9f964e73d7ebc68a4e026f5d6 SHA512 f9566f7d6c4892eda73587ac70eab66b98437d3a9512a7a036590a2347ef2a98946bf33bf22f6270b50a54966db31b079cf217dc6bcfe9087bb72ad95c9bb327
diff --git a/dev-db/mysql/mysql-8.0.31.ebuild b/dev-db/mysql/mysql-8.0.31.ebuild
index 2afca38d6e20..f34f46ee8443 100644
--- a/dev-db/mysql/mysql-8.0.31.ebuild
+++ b/dev-db/mysql/mysql-8.0.31.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/mysql"
 LICENSE="GPL-2"
 SLOT="8.0"
 # -ppc, -riscv for bug #761715
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="?? ( tcmalloc jemalloc )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 7fc927d40bc8..75ff5853b3da 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index a0efc49a38eb..2420c1e52bf5 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -4,9 +4,9 @@ AUX godot-4.0-musl.patch 345 BLAKE2B 05057241c1e29ff886a38b815f68fcfe2b8c5e23fce
 AUX godot-4.0_alpha14-scons.patch 972 BLAKE2B e67f2350fdd18f66e3416320dac4d7fa0b9b44dc7c033f4970e7bb66d195515cf8fabed250225a661f8743d180fd60bf6410bb56a542fe582af277acaeb7461a SHA512 1a34bc6d1bc01de8eac127b71e1796263774b9059532755e990ff4ef6ad9f7ae0785bfeb8c2788e226189362d67354852aeaa33172127367c0a7cb0b2302745c
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
-DIST godot-4.0-beta5.tar.xz 31384400 BLAKE2B 69ef95cdf6b48b4cf2992c893efd919b109cebddc11386409642d32bb70c3ee25256c9e863f388d04458414a582426b894423bafaa27366431ba5c8fc29fb7ab SHA512 ca6d5be97a11f6313c160a34c8456521d2489233ea99c3236b5a94c03db256487a1518d936c85a1d072115a1b5a62a6a1f211c18aad9f280ac6e60db30ff323e
 DIST godot-4.0-beta6.tar.xz 31397808 BLAKE2B bd67aa9e1447a9caf6c914545262df3f04c181a729dd62cf02c8caaf9e96592a56a9387e15ba3d0050fc57911ba31f5782e609bedd00e3da39cc199d214d7353 SHA512 921aa694380458763cda552791b2bd9976913444dd24b8be8038f37d94a666ba18f72bee2365222d7e7130acd916766833c69a810693725d525bca1c986b6055
+DIST godot-4.0-beta7.tar.xz 31508396 BLAKE2B e6f65bd345dda8360ce7ab4234ba045f301b66b0e7b1cda31652e78d96ab023c368ded982fd33d583cf55ec481fda05bcc734abe094e7b18707a73973533c22b SHA512 72e6b52a35d2f077a21339d5c07a36529d10aa05d6d1d1d975b91b42ce6a08f7804cd88b7760ebaa0165a65bc318d2ef971458ecfb7743e579d1b040086b7fd4
 EBUILD godot-3.5.1.ebuild 6747 BLAKE2B b19789b1ea9890973b16c2c6e7bc015f033fc218587e529a715ff2813e21c3fa8c89476c8f16cca707b2b93d35e2bd53ac7e6521af5c0aa088edd4e4a93b4fad SHA512 f6858b117eadca56a3539bf19d6ce1e8e04ade2e3b82a7abd49a30f89184681982d889eb82a5f9832107d8d5ad62326729eb286aaef4602e257391c0924e0e68
-EBUILD godot-4.0_beta5.ebuild 7984 BLAKE2B 0e52f54e88fec735ed856e4dec68481729c2aad8f0618ddf78fb576e822475457446f2909caa0b8d4d2fc4e7b590e946ac557b0e94a0ab6c9f4c3985133d7bc8 SHA512 2384f804a529d0ed2acf2d01df0a4adec81c6fab77072b43a962eb02ce0c746cd9bc56c1f0b6313817d1f48e100607e7ddbe6821f4a5279bfed55b7d9d8840c4
 EBUILD godot-4.0_beta6.ebuild 7984 BLAKE2B 0e52f54e88fec735ed856e4dec68481729c2aad8f0618ddf78fb576e822475457446f2909caa0b8d4d2fc4e7b590e946ac557b0e94a0ab6c9f4c3985133d7bc8 SHA512 2384f804a529d0ed2acf2d01df0a4adec81c6fab77072b43a962eb02ce0c746cd9bc56c1f0b6313817d1f48e100607e7ddbe6821f4a5279bfed55b7d9d8840c4
+EBUILD godot-4.0_beta7.ebuild 8214 BLAKE2B fdfe10682b1d3e87d543f105f524497fcc4225e7c2c0de8aa7d3bafd0df7dfc2cd79c47bf2fec098d45e5806f70f22b1dd62df7e1d01990fdb42142594a6eb22 SHA512 553af82ceaad5ba3b58849b62d764adcdad65270fbb3c5dc7619b4b106e0ee3f5e85f847febc18b72978087a2c1fe3049d57f6736d9d05df831fcffc3b7c678e
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/godot-4.0_beta5.ebuild b/dev-games/godot/godot-4.0_beta7.ebuild
index 918839a123bf..0c1902be556e 100644
--- a/dev-games/godot/godot-4.0_beta5.ebuild
+++ b/dev-games/godot/godot-4.0_beta7.ebuild
@@ -27,6 +27,9 @@ IUSE="
 # disable tests until out of beta, tests themselves are new and can be volatile
 RESTRICT="test"
 
+# libX11 range is temporary while this is being looked into:
+# - https://github.com/godotengine/godot/issues/69352
+# - https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/170
 # dlopen: alsa-lib,dbus,fontconfig,pulseaudio,speech-dispatcher,udev
 RDEPEND="
 	app-arch/zstd:=
@@ -46,7 +49,10 @@ RDEPEND="
 		media-libs/alsa-lib
 		media-libs/libglvnd[X]
 		media-libs/vulkan-loader[X]
-		x11-libs/libX11
+		|| (
+			>x11-libs/libX11-1.8.2-r1
+			<x11-libs/libX11-1.8.2-r1
+		)
 		x11-libs/libXcursor
 		x11-libs/libXext
 		x11-libs/libXi
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7042c65e6686..ea0e31b941a4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byaccj/Manifest b/dev-java/byaccj/Manifest
index e209e0b7c43f..7575826c854e 100644
--- a/dev-java/byaccj/Manifest
+++ b/dev-java/byaccj/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile 2003 BLAKE2B e57447ec26975954239e92509fa1491fb31235a150d56db7fdefbd4fb61bd53e13df5d0b6157843c094ff8b691de00515e92fdf4c95c9ea6e71fc122c4d27efb SHA512 d48f81fcf89ca5f6524572b75dcde4866cea5f434059233c234a664f56e80c0daadc8f314711cb9c55430a947cc9dbf48f4a0bead0433da5b333f5fd73fcbc68
 AUX byaccj-1.15-implicit-function-declaration.patch 451 BLAKE2B e6f601d34a94c62c9a673857eac1b6fbf375a2154102e5ae9cb312133da41b693a77a8c3fdbea2e2d222385f2575eaa78a3923f79f32b1a3958c6a52e7dccbda SHA512 fcb1743c65341e81a3fcaa970eeca3313daf8eb5547b6f9852d87278e8e4a5c16add33b88bb593379068002f2b498cdb88506bc6fb97ccf6b9f37e26c347857d
 DIST byaccj1.15_src.tar.gz 53646 BLAKE2B a57cdb85253f2ea8485c05687222cf99912494841cdfb6deb13d80d49f87a3dd8f1eb3350bf2501c7c86b70a198415e339019930301bd8d2a770e10ca9bb850f SHA512 6423ecca70d21dd0c1dd8366361f6c4420536e099090b18738013fbb6e8e0710ee739e51dfd7f603a64f8761f48cdd1d8dc7844d1b5ec6b792535254d290addc
-EBUILD byaccj-1.15-r3.ebuild 741 BLAKE2B 8711649e0ea1c58c0b2d7847d9cecc8cfb8560a3e7c0258f7efe6a026dd23adfd1db541e6f051f66a3b614caac235da1cc45c1e5b925ad574ad21483c2ff082c SHA512 9e87f18f4c1d972783773bedbc2c5cbe595ca3cbaa772e65840fb69d07ce41dd3c906848700e2999597b721e544803d3314a236880c039be8890c9b05e101da0
+EBUILD byaccj-1.15-r3.ebuild 742 BLAKE2B 965c56e9283e2a62788c98924b7e23a3b16638bb548f64c88d6225385519d6280a20a2620800edc664e20d26301ae331fe6ea6d0f83317a48fdf783c9e2e50c4 SHA512 7c40c74261c4295a31a4d469e104213a08ffd673379bf287c20e8d5a157063bab4318fc3308a4de46a5c3bcd6c9800b5e59de818731da1574cb4abc1e5292be9
 MISC metadata.xml 313 BLAKE2B c5964ac48d194d9f970a09e692c7d1460eeed214ec359c1393116bac2f6b9112233f7e5f6d3f1152704e553760b203cbd355e50c34318fe89019b13548b8a20b SHA512 0e243b8c5993cb0ae9de0b5efe268ab1587c722b4de9d915d250fb63814f5169754b467a9db3e8b9cd6256e67418fe5e3d15da7e07c984fd400dad43e5b65796
diff --git a/dev-java/byaccj/byaccj-1.15-r3.ebuild b/dev-java/byaccj/byaccj-1.15-r3.ebuild
index 9feb822145a5..70d92d0ce0ef 100644
--- a/dev-java/byaccj/byaccj-1.15-r3.ebuild
+++ b/dev-java/byaccj/byaccj-1.15-r3.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="A java extension of BSD YACC-compatible parser generator"
-HOMEPAGE="http://byaccj.sourceforge.net/"
+DESCRIPTION="A Java extension of BSD YACC-compatible parser generator"
+HOMEPAGE="https://byaccj.sourceforge.net/"
 MY_P="${PN}${PV}_src"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index 3cdc4fc1c519..7513687a6812 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -1,6 +1,6 @@
 AUX commons-compress-1.21-asm7+.patch 7037 BLAKE2B 49270e040492c413fb9f26ce81dde2e7594a02b48d4dfd68bfe977eefc9d41e21e585d1a0d2e56803d08d1af617f8c2d0e3f3d3b0cffa893bfc8d2d3c50b6d9d SHA512 6722a9fb119d72c7061d12b94452fac40eef63be7610eee81ddc115c346610e5e4caca0cbf659ec9e7ff1a58f9def4ebfef26476b915bc74299a1f984d2eb29c
 DIST commons-compress-1.21-sources.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
 DIST commons-compress-1.21-src.tar.gz 15165800 BLAKE2B 3fed32af039860c6b434c485f0c78939ed810a224a12680ddf1d9d6ed540f4e74530edd0e0077fd41af31404c296a607db912465cfd725c31446bc6fa7b8df8a SHA512 8041371b491057435ca62390e70b30031e4d21e80c37d9cb922fdffa794b56aee3b5d60d8241e4db0cecc28c82dfdaafbe52b2175e26062da169fec8efbb17e1
-EBUILD commons-compress-1.21-r1.ebuild 4334 BLAKE2B c6bd9fa17ff783451f88f5f0069bd4e9f516c723d96ecee0ddcf2d67117bce57af4a6db6c1aced087643e3c8fc752428075975b65a339ea7d9ae85fa45235b6f SHA512 4f20b34db0bfab349faa906785048b4216e5a17aefc4291fe8ae76c263de91cee902967824428d25ae1a51f5db5a85907ba0161534b89658ce290da073509a9b
+EBUILD commons-compress-1.21-r1.ebuild 4333 BLAKE2B bb10a0e4e639e9cd64097228b7eb649ecfc45c8cc1111f4b19c97b3067e7c5dcbbb16f1fadc3b0d48137ffa60bc3a04cd8ef660b4fcc449c9ca8666fcc527c21 SHA512 e4b5d82bb81738de75604b757b546962ec235b7ed1bbe70c9d33e08b2d560de91dec2276e852e59f2ac8fb671215b58ec91babe6cc84b4f6b91801312a24b4a3
 EBUILD commons-compress-1.21.ebuild 2369 BLAKE2B 64f03ba92636ab8f747552423d4745232649e7a13486c98737b80d330c8bf3e7473794262b50deca2c182ac09241a60c9ba1418fd1c1dbfdfd20f1eb413e8dd7 SHA512 650f15362bfcc8ff7376d39264d54c5bee8a16faa4052f06323faff97e4df5c3464af9f69c95bc8f172613cd75e2c0a733858f69a6963d7698e72fb39af3bd47
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
index 6b0b692be230..aa3811672d98 100644
--- a/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.21-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/compress/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index a17b181b5b8f..425fcd1849c1 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -3,6 +3,6 @@ AUX easymock-2.5.5-nameClash.patch 7264 BLAKE2B 9f94d1f3d87fbe5ee90695370140ab59
 AUX easymock-2.5.5-tests2nameClash.patch 16138 BLAKE2B 8d93149e3415c315a98a82cab7d1d212ea39090b9558bd8b92d55b5e8f3e2777908a53a0f61c9db54ecfa5a683cb38f59bc1bd30045a128c3ae88c57f7c9d4d5 SHA512 fe58f8373757b539ef7be9f5907a448b5e8fb21546215ec3c978a658f283c5aa4f06ebc15c5d6518a37beb480ea12620654023bfa8614c2f797418dbfad8d1d0
 DIST easymock-2.5.2.tar.gz 100112 BLAKE2B 2952aad1a88b169413152e8fa63eaba85767d93ccd8535e309cb647b90ad86695da59c394d1199abfb6f1c624913b2546f326ae5a68092261968d734d2018c5c SHA512 0343815f74258739ac60e1ef2fe72a0e9ce0e1b6ecd4f14d657d7da2a10523e24df5160533b0d75e87ffa0322a3477ec6823b257fe5968929d55dee9dfa68267
 DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
-EBUILD easymock-2.5.2.ebuild 1856 BLAKE2B f09bdebea901453fe03ac4a867dadc4a098dbb56bd9214844732d914ce33fdb938a9395811e02964039efd0489e5bad145d34764d1325c52340ebed23f2a1408 SHA512 8a063450215eeeec1d87f472a07d3bcd6faab1911d0a1bb8a3fe3391492e8f2cec8fabe583eaf6069d5742d5fad826f2900b1f023f4267c9aff36e30b169a60f
+EBUILD easymock-2.5.2.ebuild 1855 BLAKE2B 3c7c1a6ffcda30c01ffa1d6cd9f2d7317f113242c0fbec6935d02541215d68b84800f421134e70c4a611e310858d6674b33293fabd1d043ce6d7d75067530eb2 SHA512 42b22e29fb70965b2b4f875fa97316c89085d4f29676dd9c1baa887e05d975bef68a480396a4116b8dbbe06377be7bca0e40e9ee6f46e9b6a833c9ac132e8da7
 EBUILD easymock-3.3.1-r1.ebuild 1979 BLAKE2B c7a45a9824b47b5de1eccfcee1f9c1e7b44a0383a48d31358381b22084348b23005d88f040624b378d445fc37932cf4ab44f0be72202ded34d246dcc7939c8e3 SHA512 fe6d6076f6cd4957274cccf802cc2f67cd47d5b2e46e2a6defd17d18cb39a9f0d7b344571ca0173e222cba0a08f5ae74fa165bd91e53a39d404f2988eff56f31
 MISC metadata.xml 487 BLAKE2B a24b4adf994d9fe7aa7db824ee499c476d971c7d4265a6a502644d0dd498e87bbecf1b50fa3a0b53a27e1b7d9e91a1c67bafaa783d173435228f0c36a740df12 SHA512 dba708a8b66d470df4378efc4e0ceba8bd896132f3d086f7751ca9409a47e04a24fc5f98255264b44711efd960810bf491c657975acec72bfb863ba603bc64ee
diff --git a/dev-java/easymock/easymock-2.5.2.ebuild b/dev-java/easymock/easymock-2.5.2.ebuild
index db85a81b0e5a..cbc09bfd69ea 100644
--- a/dev-java/easymock/easymock-2.5.2.ebuild
+++ b/dev-java/easymock/easymock-2.5.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/easymock/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.5"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest
index 9216b186ec26..f1e1188ebe44 100644
--- a/dev-java/felix-framework/Manifest
+++ b/dev-java/felix-framework/Manifest
@@ -1,3 +1,3 @@
 DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
-EBUILD felix-framework-7.0.5.ebuild 3580 BLAKE2B 42de60016c69ffd792983f2900463cdd4f148eb56f9032b90ce3f8954f2ab6463ca625ac976778afa445ef1b97365005b04b0017f2f56f3fad327a0adfad26c0 SHA512 fc5ea3507d6689aff13297e2630c983548efca764c904bf69c5048fd1683dbb91df399ad9d082c4e5d27ebb6c918f576a0a280fe2850f033c92de7ad69d83f7f
+EBUILD felix-framework-7.0.5.ebuild 3579 BLAKE2B 25496898b10b14ccc3fd6a6aa2c64d79c452cdd5ba03af8235eebbf7e3cba1a104df67e05002febe4c56758e92541f393a9d93d47f1fa5f19c63a5c50dbe1367 SHA512 318975d8785d8c5809e247337a20ccd9af75a1a9880a958d662879f73cfdb3a30913bffb905418d71bcdb5438fa62c9c94bd14a4c2d9087c358d4f689fcb13d0
 MISC metadata.xml 455 BLAKE2B 69e2d92cd05dd44530363b6920e0673ac8f6d87cebf7ca931d4699378062348b83391fdfeaa4dc95d470a718d363fa7e6578f949b6f8f3510317f6d63bc7c514 SHA512 585dc4c8a3fb5c6c01940c887207346065ca9c7499abdb79ab6f6554a05fe6b27734e48101cb0dab61b8e0e32417bf28e722947864bd0ea3d48296198a3f3264
diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index 6e6fa63d3b52..f0ae43bbeb99 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/felix-resolver/Manifest b/dev-java/felix-resolver/Manifest
index c992485dee4b..8ad4b82689ca 100644
--- a/dev-java/felix-resolver/Manifest
+++ b/dev-java/felix-resolver/Manifest
@@ -1,3 +1,3 @@
 DIST felix-resolver-2.0.4.tar.gz 164538 BLAKE2B 38d979557e484692bc6e47ce069bac5ca3c19f4b01b2d6222760708da571ca79166f4821c0b79c181a40c4228095dbe28f051e7d84d696cfddeef63f5a006ddd SHA512 bf4da4550b208dbe9e74cb4f66e9456fb0a3da66f6e60c08ebea88b68cc6f71200dcf324d22d85e6f5558e7f67335f8899e932de3b813a7fc7e9325eb8a31b61
-EBUILD felix-resolver-2.0.4.ebuild 2130 BLAKE2B a0eadef833fa180745d09c652e8776ebf230d1a6fb85b8a446430ec5add70b5ccb7f33fc2da5cb85d9ce1fc35ea967d61bd0121e3406b4687a77426b4b135e7b SHA512 8af165a9d87de045d832f2a5eca022d4a3512413b3a1973c9995d8ed6de95d2a52064a832cdafa3588204e9357b22270cd633e2359bd97909e4cc24d56083922
+EBUILD felix-resolver-2.0.4.ebuild 2129 BLAKE2B c53705fee375f00891c19e9b959d51f374e53a230b6cc4dd4869fdc5b53c3eedbca1275c22f9978595d6c3090b013f5c680ceaede1c8ae49febe2b7aa57a80df SHA512 a5d89616f3d1dde81b5e94218b2299e75eee9e5d0136e5e051fa65d15379e5f2ce42e8fd5b19592929474c940c5a43c02957a242a13cbe563999727695030bf0
 MISC metadata.xml 369 BLAKE2B 9cd4712616cc7fbb8010c253c0f6edf4855e190f79eac831794cf53e966f2963945f5432ae3a9f12534cbb5611986247e00b7c2981c0604e7fa0c3fffa42ec4c SHA512 1b18db4dd45409a4296c24c198e5aeaad34fd8901c041f490a2c1ecaf4f692e3140c304fd76faa18644ad0f359b551443bba096445efb819503434e35636e791
diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
index 67b44b029672..ef879a1a1645 100644
--- a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
+++ b/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest
index 52eb8322eea3..b9c536f115eb 100644
--- a/dev-java/felix-utils/Manifest
+++ b/dev-java/felix-utils/Manifest
@@ -1,4 +1,4 @@
 AUX felix-utils-1.11.8-Port-to-osgi-cmpn.patch 4717 BLAKE2B 012aa489c1f063bfa5d3f8e9504bc72176493d4bd345e1aa9027d73d560c6852589a448cd96927410220286a247e2d14f4ab0a08a2ed70f9dba34b86e6be7e0d SHA512 267b3bd025fe71992b3cc3872cabbd0d13407e1aec013c671754d3ed94bd104ffb52bb22255acb0bfc4be6428f16073e37d3e79fa4b7a45bca34f3e4a1d82637
 DIST felix-utils-1.11.8.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd
-EBUILD felix-utils-1.11.8.ebuild 1636 BLAKE2B 93030bcdfa55cbc0a39f7d0b6bb11ad44521a28d329f085ab4cbb5fd779967ac2009961360d73af8f15edda87ad0192229e0187546cb2d6dd4e9f1116c20edfb SHA512 b8ed1e841fd7e4f329dfd384b52411faf2f847247522a0197ff1f5f5c63d5d087768e9f00574fc660d7212491749ef14a0d52cbbf8c9973e35c2dbf52672c3b7
+EBUILD felix-utils-1.11.8.ebuild 1635 BLAKE2B 14e1548a94d561d543fbd1ce5a9f85c1c3a559dabb5f8ee691e449ec614ac4757530f4be2fd0de2ba64784b6a8ccc1038eb8f01ef8f2eaa8e3545629616cf503 SHA512 84077246c145b8e0c8f6269509f732e663d09c59765b79be8b230025d10bb922e076d8100cff93be476db15efd271d0a5a9009a0ce18348bad96ce2ec8376305
 MISC metadata.xml 369 BLAKE2B 9cd4712616cc7fbb8010c253c0f6edf4855e190f79eac831794cf53e966f2963945f5432ae3a9f12534cbb5611986247e00b7c2981c0604e7fa0c3fffa42ec4c SHA512 1b18db4dd45409a4296c24c198e5aeaad34fd8901c041f490a2c1ecaf4f692e3140c304fd76faa18644ad0f359b551443bba096445efb819503434e35636e791
diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
index a71d531d58b9..6dae3adfc641 100644
--- a/dev-java/felix-utils/felix-utils-1.11.8.ebuild
+++ b/dev-java/felix-utils/felix-utils-1.11.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 87fec6751dd4..ea8bfa51b1b3 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 62a080b43a31..ca22e047d4ac 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -21,11 +21,11 @@ DIST python-gentoo-patches-3.12.0a1_p2-r1.tar.xz 9168 BLAKE2B c2f1018c7890518c66
 DIST python-gentoo-patches-3.12.0a2.tar.xz 6164 BLAKE2B 734068ed87dae1bb30b61f42436664936f27c2507e89fde6da0ce10f791d444b54e8298810717e461b60b7fe572a8fbf2cc9c787e59f01aa0eb5fd1360b212bd SHA512 96e060dc6f2cf412cb1a1be251a6cdd2c30cd2706bfc669dfb920815bcc768b712ed53cc43ee6a1606504a19fdcd9492e7d88bf7e334e1dde2769aa7f1e6ed2d
 DIST python-gentoo-patches-3.8.15_p3-r1.tar.xz 30604 BLAKE2B 68ddeff291a70dfe22e8a0276b30db5a37d7e53dfc5d52c311573136f6fc322cddc65478684ed6339cd8156170588fe8ea3a454a5ec18e0bb91a898dc7c99f1e SHA512 ce9c73cd2b53c5c7f8bb27c65d5ea02bb7c38bfc1b25c972203fcea52bd1ffe4afcb65eedc8556b026a2faf0fc402f566c38b91ee54d6580bc958c0322e90e0a
 DIST python-gentoo-patches-3.9.15_p3-r1.tar.xz 26400 BLAKE2B 27198acf3e9087b96ef15328b9da6d80837a459c62b21c9785fde77dc6f4a5c8c4ccbc3cb48e5af684a253a978c5562fb1a342e6a554d2247aa968fd5890d6f5 SHA512 d658dc89ca29070de2a39d643cc9585ae7f66232dececfd7007cb57a6c6ededd30ae030dbe9226686b8517c48fdb5ed7e681decb64b207e41173a0993f461aea
-EBUILD python-2.7.18_p16.ebuild 8389 BLAKE2B b0188ed0f9d5e09c8b23ed6e8da7960d3ab1e5cfbc67451e5d5fdd3ab6dc416755f10a351e51a3b7512710c1cea080f13508f894de6dea97e0b5426c6fc88e3f SHA512 e3db6ec32828fa89ba77bfe0a2ac466991069985698cb029971141eb3eb528fcfec588a4c5e9f5281f210aacfe96b9c6a3d417d14cdec76ee26ac1fe93f2c484
-EBUILD python-3.10.8_p3.ebuild 12969 BLAKE2B 9cacda2586dd20690cc69be9f82f7f74e053f682e289a0ce0f2dcb03766be3baa85502cf6d008ad9b8582de174fa627ca36a4ed8f42c41c51eaae7b09d59b649 SHA512 52d4dac4e28c15933df38f47f366f0ad9b85ba87aaf30fb5117b39996e3ab869b8c62eddf29d9744f4cfab205af255d6a3760f75669a992ef75157ee57bfebd8
-EBUILD python-3.11.0_p2.ebuild 13868 BLAKE2B 3284ab0242a7d1a06401222c209b985c54d445fb684065fa31eb76fdda253ae2452bff9ebb50ab08dd0b9e05120d0264e56258b9677fd7f7bb41451e148e0896 SHA512 f6254890368b33f5983b6795326c7d5d7ce203aa9b168f3e19be910d3d4d7c2338e043d3d0320143ead3716f67c4556a9aed85e4c97b8773fc7721ed235a69e7
-EBUILD python-3.12.0_alpha1_p2.ebuild 13697 BLAKE2B 40bf6c2ab7a475b8d430dc63989c50b8ea9a75813329f06efe4835a45ab90bb6358e22846eedc8794a791ab15004a90fd3314859ce186093d8c692eef66b58ce SHA512 5eec79eb25429604b17f3ceabcf5e9bc123168d050f1c368308ccc1306fcb29952edc6aeba9782930b75feed3676fac9514438bce380b1cb5588ed03030285e7
-EBUILD python-3.12.0_alpha2.ebuild 13635 BLAKE2B a24c6a835abba75791a04f05a69d89cba3fb51072f075c1f4e2f979623bd6c7939d014b572c4b3c8f2e22c1d42d21b5160cc42dbf046a504008fb3761764966e SHA512 9c5baa017defbcaf5ea3394c029f341296d90564b6bcee64bd71e205d2affa7b63f1e9bdf99af3d4f44a39c3a4106f27072c3f97ab93746325bef31992286096
-EBUILD python-3.8.15_p3.ebuild 11508 BLAKE2B 126cc766eb701bb3d142aaf79ea77e9793a556aee3850ab792764dd7eb780e2459759dc6107b0ba657e79b9d1014b4167c81589f5262ec4d0b2e60e0434c30fa SHA512 9047dcc24bb1f83539a6237333e423f20950d9afa6d3552d346a03408f22cbc3e8533b62d6a026b886930b0a330b4f64aa15bd67d66cab51580bf581a34d167b
-EBUILD python-3.9.15_p3.ebuild 12767 BLAKE2B 85e426cd40df49e92c9de0545354c29959c53c060723fdb1fbf8f5bcaaf0c7a23b73cf8209598b9d38edbcbb34055864f9bddc8b89f2e83af81b6003ce266eb1 SHA512 0e7273348db533359b329913a11b2612a5f618fa411e24444af7a2c61f95c8e3630f142577d44e16f9e621f9df6696c55a9032c5ec50fc774a559d0c4a65af40
+EBUILD python-2.7.18_p16.ebuild 8398 BLAKE2B f136256fc59c3d6808f964e647a50bf5107e9e9154ec3420de1ab8602421bc96541951ee607b4ef2c106982b2f7c280b9bb9eb86a324492c780bde5f26f0f60e SHA512 a36f0ae948b4cae1d86c3f8080cb41ba98b507ebb3a79142f79e1db25f5056b872862c2d76291a22e9eeba32cb6929aac54de5422d24b7e81f15c855012316d3
+EBUILD python-3.10.8_p3.ebuild 12978 BLAKE2B 9e40d2fdfb4ddcbf245324cfa1675c3b0ed3899db7f4c40194fd2a1420204877295aedc031fcc4f014133cc337f27499a8d7d46e2a2d6d2a7a675bc45cb6538f SHA512 8296d770efa6134320705c6200b84904738556b0a29bde6d9ca878a685e4b66191d6c61dbed511a42f66a3c9f342b6b99669eba495d7253705c7cc9c2cb6f7cf
+EBUILD python-3.11.0_p2.ebuild 13877 BLAKE2B c647db023362cc5bbc23725e1e0d7de9c2893567a21aa13be5500fe8347298b3d4270a88134dedc51e55b737550c2baea047748eb1bcd73a889157725fd6e528 SHA512 7fdc89a25c86bdee50ddf411e2bc60a6996a14bf36f2940db74e75c758542a339f0ed60e58cb792768604cbd7759dfa3e949c7ae9bfdfaa72e6d877e3d1aac35
+EBUILD python-3.12.0_alpha1_p2.ebuild 13706 BLAKE2B 9da066781527c5e03fd85a2968b40f4b249f378e283a5475843ff8b90714a826ba788375fd17d5571d8003e31cff2dee15966539344c27801fed36a0acdf8728 SHA512 c5ff9fd0f33729eb19aeeba94b3e67c03833855e261ed1a1ad4e6584de2d0a08e63aafab71c315060db6512337abc8552ae95973b452b367ec5324cb033724cc
+EBUILD python-3.12.0_alpha2.ebuild 13644 BLAKE2B ae285742f8af9471e3dea2f25fea2d76cd72f7c7a6311ee92c440d6ba1894ebb8ee8d62f1e6c722ac77e8238f5d065692f43593b8bd71017c4c46e4077bd450f SHA512 c1247454ae5c16c88d7ec0cc60a62961385bb0ce56d7a0776890da145d81a075ee3246fda88f9d727fad912da15f87d2dcdcedfa7ecd0869e903907075ab39d3
+EBUILD python-3.8.15_p3.ebuild 11517 BLAKE2B 5a7a6960f2fda4a5804b6651a30427dd97cd863f96741e5d01ca1fb86598da4cbf060084480a0000468f2167fc2366a92ac7c81c1ba4b80b2c8b8c4ccbac3c41 SHA512 390f8e2d694926458f7b20d62e00808c8bc9af927db998a361a3b7bb6a55c741d19cd99da24f1c9089825721e3dc641281e2f12b124e18b96531af06935af971
+EBUILD python-3.9.15_p3.ebuild 12776 BLAKE2B c2ff085146850d7b3762016c38dbc6442e634b0df55426f7dba7f027ad809f7ac5481341631910f635b9f3e137ba7fffc89a400c3cc5a21065998a44cfc05d0f SHA512 e111128bf44ec80fd2bfa390223428e26c8f6ecac1854cdfdc9bb82bd06d700f216b21301fd370880afa8126841896c6aa273af5fe3d57bcb845d8dc49e39720
 MISC metadata.xml 1315 BLAKE2B eb468cc22ed763d197ee9292e5531bfad6d05123a68466fb9a1f3c3f790d3ee7e16e2fb74ce652a1dde33ed38d089fc442b629395f711f056dcda34d3058feaa SHA512 9c38f152b3ee3bb9d9f0d5640ccbb28032c9e770d0aaad266fb2758218259c28ca3f6c76542a5b79f6c20ca09ad284772ecc6c7e484d77e995ad51f418f616ec
diff --git a/dev-lang/python/python-2.7.18_p16.ebuild b/dev-lang/python/python-2.7.18_p16.ebuild
index ee49cd0dfcda..19033636cd65 100644
--- a/dev-lang/python/python-2.7.18_p16.ebuild
+++ b/dev-lang/python/python-2.7.18_p16.ebuild
@@ -69,7 +69,7 @@ DEPEND="
 	valgrind? ( dev-util/valgrind )
 "
 BDEPEND="
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-python )
 "
diff --git a/dev-lang/python/python-3.10.8_p3.ebuild b/dev-lang/python/python-3.10.8_p3.ebuild
index ca2055bc531c..e7125a5118a9 100644
--- a/dev-lang/python/python-3.10.8_p3.ebuild
+++ b/dev-lang/python/python-3.10.8_p3.ebuild
@@ -77,7 +77,7 @@ DEPEND="
 # autoconf-archive needed to eautoreconf
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-python )
 "
diff --git a/dev-lang/python/python-3.11.0_p2.ebuild b/dev-lang/python/python-3.11.0_p2.ebuild
index eedf9c768a85..6888041b8060 100644
--- a/dev-lang/python/python-3.11.0_p2.ebuild
+++ b/dev-lang/python/python-3.11.0_p2.ebuild
@@ -77,7 +77,7 @@ DEPEND="
 # autoconf-archive needed to eautoreconf
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-python )
 "
diff --git a/dev-lang/python/python-3.12.0_alpha1_p2.ebuild b/dev-lang/python/python-3.12.0_alpha1_p2.ebuild
index ed2942996282..9c5e7029b37f 100644
--- a/dev-lang/python/python-3.12.0_alpha1_p2.ebuild
+++ b/dev-lang/python/python-3.12.0_alpha1_p2.ebuild
@@ -76,7 +76,7 @@ DEPEND="
 # autoconf-archive needed to eautoreconf
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
 "
diff --git a/dev-lang/python/python-3.12.0_alpha2.ebuild b/dev-lang/python/python-3.12.0_alpha2.ebuild
index 9d0d10adab0b..ec1c57a29503 100644
--- a/dev-lang/python/python-3.12.0_alpha2.ebuild
+++ b/dev-lang/python/python-3.12.0_alpha2.ebuild
@@ -77,7 +77,7 @@ DEPEND="
 # autoconf-archive needed to eautoreconf
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
 "
diff --git a/dev-lang/python/python-3.8.15_p3.ebuild b/dev-lang/python/python-3.8.15_p3.ebuild
index 1c522eb3b332..5f5bccbf6686 100644
--- a/dev-lang/python/python-3.8.15_p3.ebuild
+++ b/dev-lang/python/python-3.8.15_p3.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 # autoconf-archive needed to eautoreconf
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-python )
 "
diff --git a/dev-lang/python/python-3.9.15_p3.ebuild b/dev-lang/python/python-3.9.15_p3.ebuild
index 65e32a706fd5..4ab4f51b7faf 100644
--- a/dev-lang/python/python-3.9.15_p3.ebuild
+++ b/dev-lang/python/python-3.9.15_p3.ebuild
@@ -73,7 +73,7 @@ DEPEND="
 # autoconf-archive needed to eautoreconf
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-python )
 "
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fb501879f3e3..c8567727b917 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1e02819cd81a..86195f6fbf24 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,10 +2,8 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 AUX glib-2.74.1-gnome-keyring-cpu.patch 3930 BLAKE2B 3da62efaa538e4685475b730626b9d76777874908340a55244e83cd70eaf6b731b5c363155b12db20c6fcf3a7692db047ca6cba65ac03f6c7f2b894af7da2ee8 SHA512 662d12afab80fb3d4af854d0ad1b477cfd27194ea86cbf5ad254a2997381d4eb327554a25d8a397b948c38011aa85d026d8ee477ce959553d292330fa01dd318
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
-DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
 EBUILD glib-2.72.3.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
 EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6
-EBUILD glib-2.74.2.ebuild 10204 BLAKE2B 99dc7514e59c7e7241ba5ca9eff5a77165bbfffaec685be34693287692562d6ad3decd8c0c98ee9458b951b55d98f4f3e16d30e72565377f6e1cb257dd8557d4 SHA512 4eca5a10d7a04028ca059b833b5d2941d8ceae13a5a92278aa699a5d751c33e7038a08b7b7e3085bf1509a9d9e3b9553f91e463ef4e28d66e4f75d764ce73530
-EBUILD glib-2.74.3.ebuild 10204 BLAKE2B 99dc7514e59c7e7241ba5ca9eff5a77165bbfffaec685be34693287692562d6ad3decd8c0c98ee9458b951b55d98f4f3e16d30e72565377f6e1cb257dd8557d4 SHA512 4eca5a10d7a04028ca059b833b5d2941d8ceae13a5a92278aa699a5d751c33e7038a08b7b7e3085bf1509a9d9e3b9553f91e463ef4e28d66e4f75d764ce73530
+EBUILD glib-2.74.3-r1.ebuild 10215 BLAKE2B b1ec264b5e77c633dc44348a27df0e5fcb6dc7d2fd01f2f37245f3033de46b176d7a1cc8992c17d39e91a497d7e3126d9e2231cfae1424544b64a2b26adde9fa SHA512 49b67bd553b6aecc82545a191add65276dff5aebf06915b5ad43baccd287d97ab3aa68f2cb280a0fc5f3079d70e9c2181d38ac725e4f1114c75f79048e07d637
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/glib-2.74.2.ebuild b/dev-libs/glib/glib-2.74.3-r1.ebuild
index c62ece284c75..7585636eb1ea 100644
--- a/dev-libs/glib/glib-2.74.2.ebuild
+++ b/dev-libs/glib/glib-2.74.3-r1.ebuild
@@ -30,7 +30,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
 	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
diff --git a/dev-libs/glib/glib-2.74.3.ebuild b/dev-libs/glib/glib-2.74.3.ebuild
deleted file mode 100644
index c62ece284c75..000000000000
--- a/dev-libs/glib/glib-2.74.3.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-		-Dmultiarch=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	export TZ=UTC
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/libchdr/Manifest b/dev-libs/libchdr/Manifest
index eb97894fcda2..ee3fddc0b020 100644
--- a/dev-libs/libchdr/Manifest
+++ b/dev-libs/libchdr/Manifest
@@ -1,3 +1,5 @@
 DIST libchdr-0_p20220917.tar.gz 1748223 BLAKE2B edb42f85d402955a82b79d62e3d47e614b01719ae641c7ed993ba479fb9762a7c66267212bb52d41a5fb175d11482ea7814dc120b0100e5c9210012274184d7f SHA512 acde5dd87b9e61862fa6da81cee715a14c2f350ce5167f85ccdeecc259aaa93ae500e403962b60a332f6a4dee3dc71031d23e2778650ac2702e02c8cc24f1431
+DIST libchdr-0_p20221129.tar.gz 1748187 BLAKE2B bc2f03d558e0f208ae3c51a53b2bbf630fb4cc502c18d83b31f184cf2c2f59e06dbb88c5399e01fb5f2436643a5095256bd31501a1531a043537a05c45c27be3 SHA512 4a72dcb376c451b74389650e121de06daae7cf0b293d7d66a8f7acf1b4f83355a2467a2d77e0953331ee5fffa243f713efb0878bb509384715e9c42a567a9b90
 EBUILD libchdr-0_p20220917.ebuild 601 BLAKE2B fd00f055d1a29a818e85dfdea86e180d26efdb8bf58da719ba1a18d9bdf51d93027041175673a3b7bb1691d1785a2df2056d54ac0d6935348bf3511ad43ce530 SHA512 6bd6b97b311a6e1231ca4e863128fabc0dd20f0ac54fcc500d3e05dd0433188780e161de2ad509e300b37e006ac2c41df1a9b4dccf8f80a6556b4ef3818470a4
+EBUILD libchdr-0_p20221129.ebuild 601 BLAKE2B 001f0c6be7d3a791170039f596fee04db2fea5d6e70e9688890ec5ed096affb1e7bcb1dd10e14a1689b3595441773696ba1aa024106f6ea3106e2df9a279ee77 SHA512 3aa39756cc6cfa74f739b4d7c5f5b5ea71c2ddedde8d69bc737ef25612459256ee02182da3067e31b58a27a0d3d5195d5918c864664933d846552854819cf58b
 MISC metadata.xml 327 BLAKE2B 20c6d3bc61e288afbfd5b0d7d6bb641dc2214d9221b1c2b69a69de676042994bca2878c855b92fea7b5aca60e6dc687c55f0e79f4db13d579332a3d15991e211 SHA512 31e8175f36df91d1bc81a2351a99deba53cb57cb08e6e0e5ad65e17c53cd1cb1b1565b943f2c881bd3e11df45c6ea518f3eaf86335e10d816078161bb23d284b
diff --git a/dev-libs/libchdr/libchdr-0_p20221129.ebuild b/dev-libs/libchdr/libchdr-0_p20221129.ebuild
new file mode 100644
index 000000000000..243e27033a4e
--- /dev/null
+++ b/dev-libs/libchdr/libchdr-0_p20221129.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+HASH_CHDR=a20e04c12c0c20048bf771da6df7aa2e51f5e0cb
+
+DESCRIPTION="Standalone library for reading MAME's CHDv1-v5 formats"
+HOMEPAGE="https://github.com/rtissera/libchdr/"
+SRC_URI="https://github.com/rtissera/libchdr/archive/${HASH_CHDR}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${HASH_CHDR}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SYSTEM_ZLIB=yes
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index d7fa70df430c..baa58efcbb92 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -10,7 +10,7 @@ DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAK
 DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B eb984d3f19f3b147d3974722c11218117240cad75033c12eb6664ef7d492e9ed77fd3c3dfef2fe59bb0c23716072b7ff3b10840b19b213fa96121d5aa7faa335 SHA512 66b74a3cb2ee6c54e6d348d64fe239f2ea72a43f28d1ab0cf22a4757cf87cadde427516d8aa74b4c95a947f38d01571f23e69388a04694527e2be9b0fd1bf94e
 EBUILD libclc-15.0.3.ebuild 1411 BLAKE2B 22c88236e222cf2e547b25bb19e971fc7df4416cb686dbcff6086a60c023c4b11ea44242bd1f65ce68fc760199ffb985c3635022c74d05df5ef8e25f07f28e2a SHA512 20d96c75fb7916cfd6ab2c9480d0833da81036c4104bfd922eac93e76ef44225b0e27c9fc20aa6bb10c2f7e609a52e8d752b447e41ad1a9ed51715d6e8c9d8eb
-EBUILD libclc-15.0.5.ebuild 1669 BLAKE2B 8ab5c9ad7381e2aeafe2a41efcaea056bf8d3c73b17f12cb72a305b2f9bc914d0098d5fe49146b91c342d90efa57d99b17d509d2b3a00bf5ee6f27b304ac8e5f SHA512 6a3012c9ac885802c1d2ca5fd962890ab919f5715ea68442303ad8c7af9213af8dd0006b97e902cccc5fcc06ffb67d19033473715e4467243c1dcaaa55f2071f
+EBUILD libclc-15.0.5.ebuild 1667 BLAKE2B 0c2b3a2a781f1a177214e1da430f2180188ab1d9cbe0001009016fd7cf4aa72391de4bba2c4a9f4c8b275462818a24c4a29861fecb6a235d6c0fac10220144d5 SHA512 a06a0ee32ff783980d6b93e52a4c0b9e92315d05b03443f24121a3170edad5a5a63508617942e5890913d09c90e5fbbc7371c4f0b32c9ab18057a0a8b5d20e3b
 EBUILD libclc-15.0.6.9999.ebuild 1658 BLAKE2B 3874dd2500b10a36ce6dd24bbce66bcba8b1835859e3a07debc3f4d17081b4b8f34d7adba7666b8c106b455a68b1ad41604d44d36b9ffc63ed40e1d5b99b0f8e SHA512 cf3d643b19823e6c0ec33122ea33b21da8300ac8b7476e906002ed7ef3e0501db2874d97c58e32ec71a524fc1278b29098f521cc0d6ca8076211305ab61a981a
 EBUILD libclc-15.0.6.ebuild 1669 BLAKE2B 8ab5c9ad7381e2aeafe2a41efcaea056bf8d3c73b17f12cb72a305b2f9bc914d0098d5fe49146b91c342d90efa57d99b17d509d2b3a00bf5ee6f27b304ac8e5f SHA512 6a3012c9ac885802c1d2ca5fd962890ab919f5715ea68442303ad8c7af9213af8dd0006b97e902cccc5fcc06ffb67d19033473715e4467243c1dcaaa55f2071f
 EBUILD libclc-16.0.0.9999.ebuild 1647 BLAKE2B cd2b48d8a71c6c28f4b1ed65bc3ed87b3b491cd331b6e693c8482b83620c66c407f0cd3317ab168548108cf563b8415b763e11de5a7111db1f2d47283e36d5d5 SHA512 081c408b46360129f4d0632a261708ec9c538050090c9246254c74e930fd86cc0fcb6a0e39e58ec5ca3bede453337ec0b20b11c8fe646f2582ebaa8ece5cbe69
diff --git a/dev-libs/libclc/libclc-15.0.5.ebuild b/dev-libs/libclc/libclc-15.0.5.ebuild
index 3a0f83d5a902..5ab51a5e86cf 100644
--- a/dev-libs/libclc/libclc-15.0.5.ebuild
+++ b/dev-libs/libclc/libclc-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 
 LLVM_MAX_SLOT=15
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index ec0fb354cb45..f409b9ccccf9 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.12.1.tar.xz 446476 BLAKE2B 3b73c50b5e0bdf6dac001c7e34338ece2ba796af711d8f6f9c2928f93a8f41ee484e067c3cb02878de49d631de87229d4b1a377123e385af5997e11f7c556510 SHA512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4
 DIST libevdev-1.13.0.tar.xz 451328 BLAKE2B 07b15bf46ca3b01d9a93da8d93fd60b2f1eb95961f0f202a321030e145528453375f1e4fa3458adac3f3346cc26642538251b35002f18f9802799e4732d39f3e SHA512 f30f14c44ef4d4829625aa4c28f10555f333905486f9d39c18cd3ca35e87128a0c24c1bc18ca37b6bf98bc8f7fad27e1bc68678a58e6e6fff3b8d99502ac6905
 EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B b39700425b4711359fb8e0f05f5473420ce3ad87eacd8cbeaf40c605c2c8a5853df8b60f137dbed41db5f9c401b2336835bf78af074676891c97f2461434e563 SHA512 f86f50f39388d35606ead66f16594f2bcf3c4de27649cc956b11f59bb61636b593f44aede81c4cda16b854c9d128874071df69e4afa573e87679c7bd450e9ab9
-EBUILD libevdev-1.13.0.ebuild 1126 BLAKE2B 17109657108aafe69b7860011b190ae4e96929cc099407492d8b6715c0906d29a4c0dd9b1f6665de1be67989070485688818aade691d3edcc84aa378c85cc7cf SHA512 9422f785b5f4d812e3aed29858d324b3d9ce81bd552d85738f2fad8752fe83c91b9912d07e4e1b35d2c48885ff285a3d6a48c90bf3145d23327753e9f9a9faa1
+EBUILD libevdev-1.13.0.ebuild 1125 BLAKE2B 88dc6ad19cdbc1a1d4fce09da2194c471fe7885d5de845f5a6203af76c9ee95be5f0b5a970ea23a9c56ac48e177c94546d0b40254049c030c36d8dbfee30c401 SHA512 616d80172f3bbc681680fd5b42f909390e3b680d4d39ff3090e40e57f178bf5da808416fd94ecb0eef8025affd99427d0294768ccaaea6aff503134b157fe5c0
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B dde6bf4c9c7fd7ff688237ec8a793d9d2303a0e78178cb79839ec0332e7a1ad3a3e139ca285b92bf55e7aef054953d58e4c8b360b99adf7af04cf36783019281 SHA512 26c9e626570a80ba6e0ba5b59932830fd4cc7817f0f2dc0f7bd6c8635c71dd1fd9f923623b4bf9d39e3f64d882187fceb4fbe4be46468589c2f85e80b857bf8c
 MISC metadata.xml 339 BLAKE2B 17485a5a6202c366cf975f0c34aeb9521d5190f2ada003bdcae8c3e561740b3b43809b177baa2cab87de46e2f234b48df5bfa6c8df5dc2674f95e6206f0e4398 SHA512 26ff955c224a24cd58bf4eed14d99a0b7cf1b078e0d93bbd115a9193656180f112cb0f27bc6d35b2ff2e062a58775fc4b4310d6ffeee322b39963143f079b3b8
diff --git a/dev-libs/libevdev/libevdev-1.13.0.ebuild b/dev-libs/libevdev/libevdev-1.13.0.ebuild
index 3ea94b0d8b89..a905f916ece4 100644
--- a/dev-libs/libevdev/libevdev-1.13.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.13.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index ce482b460097..aa65e8f9e7d3 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -3,6 +3,6 @@ DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b
 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0
 DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
 DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
-EBUILD libintl-0.21.1.ebuild 2771 BLAKE2B 7225cb200a9cd4c4ac0940cc56e411e2c3a6ed35c09b3a660a8f139a4c653041165911aac2647cb196124f04b6a7ec61f3e882837a7eff0a494971d219fcb167 SHA512 aa13e37e6c844861939c238c38c99cf79f9cc9280c900da67a127961905ab9c578177d8b09c4f73a821cebe90fbe9b355a5807833c1c1269560478a6f2348d13
+EBUILD libintl-0.21.1.ebuild 2769 BLAKE2B 186e5c51991920dfed079ee3be3ab0d975c6706d33d10198b20afbcc41e5e02c74c8266e35ada082062e059e81a6856d519a9381c05ef49573b38b6748eb24f1 SHA512 08d3510710471ccc8d32a3236ba9e688bd691d6faac64a496c4acaf64a07185a29562f7dd123242eb1ca17eb63ccfc2c1fc8b2599c52cea7f991d98969db5e35
 EBUILD libintl-0.21.ebuild 2306 BLAKE2B 60a9ddab1a16c75d69c68469a519bb15a2da78915584b034e619765f9b8dfd9d566702dff32b9f796860ce69feb58252ed53ee96c44af4740ae5f04d4d36075d SHA512 3e3135769c793b7077c188f1122e15a19cbb1f8d92ab734549dae85e2cb5c52b3457db814674a802f85a9c885aed9fcdc8ee00cb7143bcd3f8d3e09078835be5
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.21.1.ebuild b/dev-libs/libintl/libintl-0.21.1.ebuild
index 398827d1353d..c96124d7a3b9 100644
--- a/dev-libs/libintl/libintl-0.21.1.ebuild
+++ b/dev-libs/libintl/libintl-0.21.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/modsecurity/Manifest b/dev-libs/modsecurity/Manifest
index ebb36667f6da..4fd9d09d5c98 100644
--- a/dev-libs/modsecurity/Manifest
+++ b/dev-libs/modsecurity/Manifest
@@ -1,5 +1,5 @@
 DIST modsecurity-v3.0.7.tar.gz 3333372 BLAKE2B f391e2057b95a26a16efaa5f9d86acdd030b2f32d3da3ebac4e5eccdae7c9c6453bdb6b4e2d7f49ce189760d5c5de7d656aa5796fe2723e2e6f5493c93420913 SHA512 d8caf5946b598b16c4481938f22c1116595286811cfdb01d95db95ab061f7045751f2aa98e515df239bceb3f1a6dce2ecd5b24c954bddc27997fa64e9e429730
 DIST modsecurity-v3.0.8.tar.gz 3336288 BLAKE2B de15124362f23c86a6dcee15dd847fcf703a378a57ebd4826a6304fed33b34f4791c7aa80abd42cbe5932063c1ca59f755345e3810dcbc296e2b6a758e0c580b SHA512 8113358548aea19a18de183922e979fd7ce9daad289c6894bda458176f17da63fb45160a2a86d97730c90191c881b232b1c9c6ab9209c3988b4390e49e086117
 EBUILD modsecurity-3.0.7.ebuild 1940 BLAKE2B 0e1b1b024e4e1be46d22f1515834cb6f764c55ed2f26f4fcb17bd35d8427092a82606603994dac978382f99f9d898578c77efa86f0f7c7076cde312be35f96f0 SHA512 f31dac3be38f46f8bff64dc4413283bd9577b9354d5fa528b80b197e03efe369bb6d8a93288a54a97da170ca5e14fbd199ad055de926a56e40f39ec3a581a039
-EBUILD modsecurity-3.0.8.ebuild 1475 BLAKE2B 0e35aa739a333b8f21e545ca22583acfe2d4145bf72faf8ceedd1b71b0b4029367e26cebf481490fbd62fbb363f42b82d16355a4f4ae97f780b8fc47da6b8bb7 SHA512 e17fdb14a0f33ff7ec1fb3d8c40c5835245415fbd9ce391cdb7621c14b67cabbb85ab645f9e7d112704519a9c33a60463c54af9612752ea960605f9e93299f5f
+EBUILD modsecurity-3.0.8.ebuild 1471 BLAKE2B 319d98a2631dfd4ac9870db77033bfb8c6b8b8320cc062c1632aebf6f085aa47974dc5f31a4eaef923b0aa6623b8fb64314147d2a69bd3dbb07e1fd15f03ec1e SHA512 50b3e66c5160689d20b52223a45cbebaaa2820474ada5b0c4bfef3348f352f7b1bd15b1c903d8cc2202bdd1f447fed9cf67a1c6159967e3c65292e08c2703994
 MISC metadata.xml 1019 BLAKE2B 0873fbb1c328dea3378abbe280dc7adacf389a9f1085614057e328ca7258afb4553c2a37bb527eb80b995d69e428ac7fcb3306e65a84c0e3d17acb6ace270b0b SHA512 549b1dc80684fff950148598807b866ab9400c619d2ecb32f2e7f90f8f298dd47daadd4c33f76af40983ed22ffbbb017c110253d810bab931344dd6f80d8f2ce
diff --git a/dev-libs/modsecurity/modsecurity-3.0.8.ebuild b/dev-libs/modsecurity/modsecurity-3.0.8.ebuild
index b7405d95da91..fcfe19f0dd73 100644
--- a/dev-libs/modsecurity/modsecurity-3.0.8.ebuild
+++ b/dev-libs/modsecurity/modsecurity-3.0.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="doc fuzzyhash geoip geoip2 json lmdb lua pcre2"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 88f2cbbb1ce8..3eee20438d8a 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -3,7 +3,7 @@ DIST wayland-protocols-1.27.tar.xz 82604 BLAKE2B ae1c19dffcf255c88e6d646f321ec19
 DIST wayland-protocols-1.28.tar.xz 84116 BLAKE2B 2b911b471ea61e34da5f0c8eb1bc67e0786261411123bffb02bfcea4e0c5e85b2ca1e8cf3f8f55fc92aae0365c30caed42e3c6037df46ce581f27952f6e38a24 SHA512 092454c6a7e5cc47729de49e9061fb91dfdc5610859e17c495642806ca14dcfb3850a5d3a7459ddb70b2adb08d2590d4b0f92c3a97600e48598682d59adb102f
 DIST wayland-protocols-1.30.tar.xz 84776 BLAKE2B 059a40c839c5775851fb31f3f4637e11dce091b1758a5eb0c375ae40c3b745321cdc549d26456edc1bf66cd7d013d370c3df8c0de64f867b899571a73e2a4233 SHA512 e1e5648387e821c190058b390d7120c06c2767b644caf2644f05a280e0fe300b677545fbb9537839d8bc569a0cc7fb51190963421281e2557d1680767899b743
 EBUILD wayland-protocols-1.26.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
-EBUILD wayland-protocols-1.27.ebuild 788 BLAKE2B 7df6163dad4264aab0d511bb0dcf541032cbbf7993d5338041c9dfb71cd364ee03eeb423ddc7d1ae8695b493b6dcc1837816b387bdd60818056e037b9069d403 SHA512 5733455c98725d2f2b41097fddc0445da544b8d11e2d7475cc84345fcf9aa3645ab29eff33ff4037bb416297364ab435dd39c7f632c739956242ca20d66dc9e6
+EBUILD wayland-protocols-1.27.ebuild 787 BLAKE2B 1d063b98a704a967d3244ed2d961a961a6d5a9cba4bef6ee72726ffa191436184508b7170ad3b2c58b0cb506c725c56120f6fcc09110a92b1f1923ba8a1fdb34 SHA512 70b75ce3f5bf94590f8e731a1a4358134cf7a934e0327fb475fae590a1c889a60d1c37f1480e1f1c36d6d8b3399309d7a4de1825be978c3797c4d8f237a9dc1d
 EBUILD wayland-protocols-1.28.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-1.30.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 EBUILD wayland-protocols-9999.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
index 30ccbe230c18..a4add7336933 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.27.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="MIT"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 69f4e43edc50..6e6ae0975bdd 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index 58ddf07ec1ce..12f427b59008 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
 DIST mcrypt-1.0.5.tgz 27056 BLAKE2B 0ed78eed5d5e1c848f554bf16bb5d94fd445081ab389b4a44f3b0ad0fdb11b25bd79eea77ed87a35120fb89b8409705b01d725923d7b2777dd32276f3a39238f SHA512 fe9afd0987ddbcbb0a9fc5e8313c08c65ac6afd606cce586fe30600ab149b4f4add917bb0319f803942833a88f520f65e2e94bbcc6c58e2075e829509e7dfac5
 EBUILD pecl-mcrypt-1.0.4.ebuild 528 BLAKE2B fc56eb2a581e1ba1edf7adb4b952b8305245ecc67eb2e3449fd83d57029dd224be26d77e34bfa8d135ae53b6daeff6301d45356042735108d091519a9bb782f3 SHA512 da4dd33965d8e855dd2543d82dba4de557e48a53db648c236d42d3ce59dfe5365bf54f6b02ba564dee62aca83291f37cfc10234b575771b5d032b8dfbba86776
-EBUILD pecl-mcrypt-1.0.5.ebuild 547 BLAKE2B 614843b8404a94acb432284e012bb4841b8c8d89b5c82e294ce7e5a58e0763cb5245a6623b91a55cd03d0eaf33ce9cf3bbde123c32552985a63125db64d7ceb0 SHA512 add9e2c84f68f604173c2f686f3b72ababa39679b4321250d4ab12243b90ff8b74546dbacf19bd69b72083783d141659f5fbbdbd4f6a1ed3e52f021f4d8fc33e
+EBUILD pecl-mcrypt-1.0.5.ebuild 546 BLAKE2B 0c6ae7311b814e4c1b9c1131175796df8ed0a6e12ab2c3692c5bd96730d1a1c2f7129b4ac6528d1fc5fbdfc58d81be928861ac0796f5f2811e314ecce6ecb82a SHA512 1b1a106f54337b5c8f49b492976f193b5828c88bec6488d2dccd02beafe28d0ccd741c5654e3a7a819e8213b6c53f6d2e931c804e8aca22211ce54a965826339
 MISC metadata.xml 410 BLAKE2B f833751f407d57c96e4e2f2dd05520c55037ba7874e753750df8a22d4c18a5edaf0925982b2b04c4e7e541bd691c6d7798bef0079fe980b35a9f71f5e2405793 SHA512 cf4f51a91d42ff06b0d628c44ee66463a1903de18e749d690a722e2fe77d95d83ba709595adc20e27976de502c5a5e232065d394eb41c03f9d39a8291a874841
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
index 364bbc894e73..94e2afb39170 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Bindings for the libmcrypt library"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="dev-libs/libltdl
 	dev-libs/libmcrypt"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6a4769329b6b..350de8df87d7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index dcc13b9b52e6..ff56bae30d27 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -2,5 +2,5 @@ AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8
 DIST cairocffi-1.3.0.tar.gz 88784 BLAKE2B 022634825febd3d70a0115f0632e9b146719a2ab802583e0f57ebbd36c65c9e73f4547dbc5ea3651b8b38a043d519f000e908c34b77f3bf49e2ed5ded1a0ca02 SHA512 be459a5f4c1986cf339b7b15fdb7d3ac52476c8c31ff663b4708917ce8abd6fc66860d1966744b69aebf7aebca4415b32166df79505ad42f315ffd76d7163d7e
 DIST cairocffi-1.4.0.tar.gz 69851 BLAKE2B 8037d9bc619d2e96e655dc4682bb95a1e920d0b2188963088c1be21f2e157f7e791f3994f0ae7ecd338547baf2a65d03b175398bc1b3c92145ae6ea148420b5a SHA512 7ffdaf365c1251b202e2680a2f689ec6ea04c19eb75df38137624ffeb429ab61c6f54af450aec019b2570a4e91d2d701328109e4e0f5662a3b3b655ab53705ff
 EBUILD cairocffi-1.3.0.ebuild 931 BLAKE2B 2979d0c07db59eea86e753e79480b1a9550c2502c49435e24c609b20c22a4f84c409541d13f9d78e65ce76677b0cba33bf5b44667f8547dbd833a48459973730 SHA512 c993f3b94bd1481cbc0302bc04e90081870e1639921f4c713eaae4c22905beab8d2a73ed5a433439f2593fac4602021e55232d75d5dc8dbb8cbc1f9bf3474acc
-EBUILD cairocffi-1.4.0.ebuild 967 BLAKE2B 79cd937bc1da13e88c4125f498c2f9f2788252ce84733f8020e9e7b8ea85391b782dbb9c03e0d112e613e073d9446d18deccdedfebc366d895f952baedb2034b SHA512 2c2e0bb8a6c2862bdfc613028bf28b4848f713e2b386cba3e8da9ae48fa243fed2a88ea4ca0e267ea92291904575310ead932078b0ff4c8b5077ab4956f6c126
+EBUILD cairocffi-1.4.0.ebuild 966 BLAKE2B 0978fbd82da14b3e394cae600ac12a5d8becc71b339d2b56ee61f23be62e78c82f79fecac9ccc306f03eb90f826a93ee9b1dc1b1bd86388185b4f8271dc57288 SHA512 ad2b2f36e7f03ae1402857cc049c14c406bb99e55499bce121716b10962b4d8078ca1e9d1f1d04a8524fa4218bcab899553bff4342f57f4b9160522098e56faa
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.4.0.ebuild b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
index 01a8da41e874..73adbc34f5c1 100644
--- a/dev-python/cairocffi/cairocffi-1.4.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 4f37e626645f..99759c807208 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
 EBUILD clang-python-15.0.3.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c314018fa23a5ec58cef95098f70f979fe0ba7c6f0880bec50905f084a0d9a7091428ae930683aeac4204c9999a4b3f690 SHA512 7ad0811bedb1938316a95528bae46f20c9e00051a41ed545173de4f36975247ce1a5b1f648655acd0bf3474377a8a32f8c1d573e036afc503cc6a30e24dbd0e1
-EBUILD clang-python-15.0.5.ebuild 1167 BLAKE2B 5a32b05a4e7c8b41511a2652be3d1a3832d8ebeba2ecc138566e8ac0ed7c78eb7edba431af20ef475d2a52b3219a9880c65c7df001410173d4d305e1bd823b44 SHA512 173ee4a9f597c2b09219086a6cf5a4e9034f5c9509e313f01947c2936525eb335aecb124dceb75ff0c09a84ffd6274e4b595457c4b35f94a96f5b4bae248c227
+EBUILD clang-python-15.0.5.ebuild 1166 BLAKE2B ed1aedc9342d2011eca73510f651e1c314018fa23a5ec58cef95098f70f979fe0ba7c6f0880bec50905f084a0d9a7091428ae930683aeac4204c9999a4b3f690 SHA512 7ad0811bedb1938316a95528bae46f20c9e00051a41ed545173de4f36975247ce1a5b1f648655acd0bf3474377a8a32f8c1d573e036afc503cc6a30e24dbd0e1
 EBUILD clang-python-15.0.6.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-15.0.6.ebuild 1168 BLAKE2B b393d5cbb5e01f46da90232e0dd5b265e01643a33085108fe6ada27b6407742814d6c61d37d23cbb93ed1cbe47bd2b4301d37d8e03ae5243e13fe0b92df4b492 SHA512 1337fb232189df580021eaa06c732bf5f2e5f59a506cc28e674913c048e81053d440eff05332510ecb4ab3596fb88ffae6d6eb9fecf9732424d83865b853c6c4
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
diff --git a/dev-python/clang-python/clang-python-15.0.5.ebuild b/dev-python/clang-python/clang-python-15.0.5.ebuild
index 20e711a06f41..4e6410cd2385 100644
--- a/dev-python/clang-python/clang-python-15.0.5.ebuild
+++ b/dev-python/clang-python/clang-python-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index a46c77bb7917..c36f0fa16fa0 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
 EBUILD lit-15.0.3.ebuild 914 BLAKE2B 8425acc2d890bf889570c4d76703acfb3aab774d3db0b13cf0dfeb43db1bd5807f47554a11b986bb133fd160a92761e86cf691ac6d8c5504ed6e7a3727b390c1 SHA512 a8c990856614b3e8a175a39cbcaf43b43bc038f7945ee3391b2f0fd90d53e2ec48a1797d11b25b24198182d3c2aa2e9373779b1e8ce34942bb16a505db06c820
-EBUILD lit-15.0.5.ebuild 916 BLAKE2B 04954bbc482685893e8e4fd8a496eaebd9f607592fc46fd4b586f5a30368a6b7654700f6357425118070b6c11c8b38def5cb7f7ba1fcce2b978fd36cb2adaa46 SHA512 a54351463f4b8e73f489b8c53471aa6c7ebf166a2f38b5fd6ed74be422de5b3f2632d342262216141b02e06b35ace5a2cdd3a5c38bd3a21a66d1e9883055d980
+EBUILD lit-15.0.5.ebuild 914 BLAKE2B 8425acc2d890bf889570c4d76703acfb3aab774d3db0b13cf0dfeb43db1bd5807f47554a11b986bb133fd160a92761e86cf691ac6d8c5504ed6e7a3727b390c1 SHA512 a8c990856614b3e8a175a39cbcaf43b43bc038f7945ee3391b2f0fd90d53e2ec48a1797d11b25b24198182d3c2aa2e9373779b1e8ce34942bb16a505db06c820
 EBUILD lit-15.0.6.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-15.0.6.ebuild 920 BLAKE2B 44ddfc3adf60ca1c1a328ecda0d28b7fcbc416a0d472cdf31f978fa25beebec533686b71292a7b36be1654633026e029f04e2b496c06845e088bd9b416b1b6c0 SHA512 d4a2442ead255c0664f4a4946034632658d39dd36ccf3d88b5aaad7f7ebe25b0969dbfb368ad6a487c277f845c47a54f8f548df79db2da84bf3714883ec0fbea
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
diff --git a/dev-python/lit/lit-15.0.5.ebuild b/dev-python/lit/lit-15.0.5.ebuild
index 31dae6fc2eb7..2a7472695496 100644
--- a/dev-python/lit/lit-15.0.5.ebuild
+++ b/dev-python/lit/lit-15.0.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 9f2b2e80c000..f8c6483b6568 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -5,5 +5,5 @@ DIST pikepdf-6.2.4.gh.tar.gz 2906023 BLAKE2B 4ca9e6d56260c6e5fcf4e88aae899576d1a
 EBUILD pikepdf-6.2.1.ebuild 1642 BLAKE2B dfa04b38399c091e5b5224062289f8cef0247dc0a45f7dc58357593d3c35e7ad248f4928aff2b961c4c86abe388045ea1eb4fbedb17d2de6ed088a150ec6db43 SHA512 9f37438ce5ed61d1be568b86c4542e19cc6a8490c10b912526cd5d394801e1fabe142acf244b13b78b4d7af907f6de028933a155f958e18d27985e8fb914efe6
 EBUILD pikepdf-6.2.2.ebuild 1643 BLAKE2B 7d8a84e436eb7458e9860065af8f197f6ba9ff53f204ee1dd5ee569f51afe9bd3f10c459012eca73345c8fac74839e73e55a3f198bb0779a50eaab8116382fa2 SHA512 a63271907712049a08ed70b82ac9d64078e17faea2c514a81e848a35991c81dd144d5ff63fc489f9b97cddad8ede595a3474c4b71320068eef0ec589325bc67a
 EBUILD pikepdf-6.2.3.ebuild 1643 BLAKE2B 7d8a84e436eb7458e9860065af8f197f6ba9ff53f204ee1dd5ee569f51afe9bd3f10c459012eca73345c8fac74839e73e55a3f198bb0779a50eaab8116382fa2 SHA512 a63271907712049a08ed70b82ac9d64078e17faea2c514a81e848a35991c81dd144d5ff63fc489f9b97cddad8ede595a3474c4b71320068eef0ec589325bc67a
-EBUILD pikepdf-6.2.4.ebuild 1661 BLAKE2B e7d0e980a9b119906ccd79424badc589074c024fd0b259a757c355a82da4d9338f7efcab6b97c301dd52665f18a0d16810cd3182c738d713d45077eba04d04c5 SHA512 ef02c628cc6873f502c904fb84b49f8b971db7bf14614e78746630bda1bd9faaa112bb54d47d99f454d242b02680ab762860ba37ef154650bdb43dc10c05138e
+EBUILD pikepdf-6.2.4.ebuild 1660 BLAKE2B 842878a67a4cf6129efaeb3a6be17284becb72f2ddec27ddc4679d4fc1420e027bcf32cd6867ec642d6a0a1acfb41656a4fb72148e315002fec8f25a7ef6c9dd SHA512 72814fa935e0f8191529c9e5fd969c7857039880fe9ca334b5915951af2622fbbe210ba663ff22ede890da4b6fb2e09dbfce0303882cdc57193afb6524695df4
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-6.2.4.ebuild b/dev-python/pikepdf/pikepdf-6.2.4.ebuild
index 8b33e4d735ed..4701dbdb08cc 100644
--- a/dev-python/pikepdf/pikepdf-6.2.4.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.4.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DEPEND="
 	>=app-text/qpdf-11.1.1:0=
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 4e4c82e1599e..b78c1bb71062 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -2,6 +2,6 @@ DIST pybind11-2.10.0.gh.tar.gz 716362 BLAKE2B d9d3a8a108a303721766b822d43b631396
 DIST pybind11-2.10.1.gh.tar.gz 727880 BLAKE2B d051220f33ce44ea6d174d64a2ecfad4f7452b0f5152035cfd36950875dc451e11e8352eb80c9c01b200176c0b09fa5274504ece524e699590deac64c44d57c6 SHA512 040f109ec870516acdaebc5133ccbba9e3ed7ff93214a66997cf4b8366c209322f3c902c283040826c7e585c3ea2259caf62d90d0b475bfa33d21e459dd54df1
 DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
 EBUILD pybind11-2.10.0.ebuild 1226 BLAKE2B ce22b4d19a78fd2a6aea3abb0f1c25d1f8c2365e019e545c8f9756d4ad148a28b2017cf80aebade83326182de542bc554030ef570f51b5daf4dd9d0e0dc547e7 SHA512 9e23a42ab85645cde613a09ee013540dfab8e73181fe9bdc2a7ec86433c77252c32c76c7bbcbaca65a629f2f05306dc749f53bbcb5f0807d5b6663430f2e32f3
-EBUILD pybind11-2.10.1.ebuild 1232 BLAKE2B a7095f0c72f98dd061dd0936453a05b2f0e92ba5da97f896315cf18f746d94befc45db3ff945e10c661466201bb0efe40479ea1e1aef385b27433bf08244faa9 SHA512 dd02d25faba581686b0d76f209b52d39ef4ed5a9d048a8310c7c4536773303c31801c13f5d4ad49d6ead36097084f8248dcb8a4d5698f7b051627d874f53bfcc
+EBUILD pybind11-2.10.1.ebuild 1231 BLAKE2B 47bd76cfbccba765fa9bb9f5b2545570fa52294966fc14057e41a97ce27493ac1f1aa8a6a1184113edd8deb56319837b8ee438752c2cebf756c7504afe02f98e SHA512 87c351b46dd714d3713038d085b2de2dfe4c7398972b7f73e43f7f829431d903053e774d2fa165260e9e0fc863e947889e93db0c401a0491b0284cbb07b7eb29
 EBUILD pybind11-2.9.2-r1.ebuild 1223 BLAKE2B e9199c4817a2e5fdfa82deb9a9533c4eb583b06c12f5d1e67d79f3d7db062ad133001002ce47c183cd29740445e42afd446d715517eee270b0def1fe514ff47c SHA512 cc9ce91713484c07c6e417319b6a02d32bff1c5dee34042458537c4540e4a0bdf61524285dc43d2b63446d19bdee660304f4b689e8c0a48dfcaba7e2d04d2a62
 MISC metadata.xml 420 BLAKE2B 8a3480ac275b7e2893d696bf4fd0d70f41ea941fab9e24b19d8561c0efeee81024ba6fea0ab26333346f3c176d1a87b35229e31ecefc74de2e7614600a64013e SHA512 8140e933878a75968420deab189bab1decd030b5209baada2857a7659dc32980bbc46678c6612ef56e4b4f6b598579bb8227e6c7fd00fbde63a40eb13bccf86c
diff --git a/dev-python/pybind11/pybind11-2.10.1.ebuild b/dev-python/pybind11/pybind11-2.10.1.ebuild
index 391705a55c76..5fa28b785e40 100644
--- a/dev-python/pybind11/pybind11-2.10.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.10.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 633fad692e9d..f346bea74f46 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -2,6 +2,6 @@ DIST pyglet-1.5.26.tar.gz 6534434 BLAKE2B a4366390f4ed92ed9e6c2d362fd8a009adf0e8
 DIST pyglet-1.5.27.gh.tar.gz 6532179 BLAKE2B f1dc668530a69e275860befe11f4c86003c5de2dadede706df7abac9eb6fb1729ea030c7053f0149926f3ffdd12985d9abea4afac65de3b6b7541fe871eda369 SHA512 98896dab06873cbf3cdd0d4015cb0b9e062cffb1110908bd422ecdc4f0e16943adc8a4986e7dbfdae4392e82ac115bad6f937896e166989ad2c4d73a0f45c8be
 DIST pyglet-2.0.0.gh.tar.gz 6201132 BLAKE2B e72436804688e9022f0efc7da7fac5eb31ed2d35632612149b52431167db98f1d2e8bc3824ef6bd69851a8bf609d5098ea5f5c77aa7bcf5a527457c62ed47586 SHA512 2dde724f0b5f284d0094109a7077464ac4ec76ea905c91ddc096032ac849ee9720ee36926e9f11969169906c7e45580789001dfc657edc2e737ad116c48c588a
 EBUILD pyglet-1.5.26.ebuild 1574 BLAKE2B a701c65476ff75e74611efe43d8401929e10ab4d73aee621664ed0c1772cc153d02799578a08f9f07fab8fde8033abca3b367ad705f71956c7242f9eb441e8ad SHA512 9c6cfd4b55ffb1f876dfa3b268f27a812b263ca92a428aec34885a9288c1aaee9a8cab15c073536da01fb54fa8db8710469c6bddbe543c4e54376b930055a610
-EBUILD pyglet-1.5.27.ebuild 1636 BLAKE2B 587f69117a3651b62f60786ac911157936dd18b2cb778601df366df16d6da2112b9c3710fd9a19ff72f2acbcdadad4f1df9c30c3a5708a490a20d3825a4669ee SHA512 cb674226375ebfcc668b86d28b6077b3f554d05285ffbe0141c85e78c263ba875e6081e58521d62d3ccdcbbbf490a9600f14981185dfa34ebb396a7700fc1135
+EBUILD pyglet-1.5.27.ebuild 1635 BLAKE2B b107e1081670aac52989972b8bcc617d29c2d1a4e31470a57c4041ff28c55cea616fed0b5ab834fbc37e38605dfcb2aadde623585e41889f96a1a11916a9202a SHA512 4123a85c09af260a37751085b67966c0316330509613e2a529ef13e522e3f91283a433f0da6bc68667e429791376b88144efcf14b6d322e58c429091655cbaff
 EBUILD pyglet-2.0.0.ebuild 1853 BLAKE2B c9c149fac929b6f5fbd429e2fdc9a7b6bdea0ec6fe27f236743a68306a6ec9bc5d302771c72ce57d9c841487a8b548db2abd33109b46ac6c8e2a53ff6483e33f SHA512 4de24b2a762f846fa201fcd57c41f2a82c1e740da096b2b93fb58b169d23f5f6e482a63663cbffce62c96d54f65d091851ac232efae1f359fa4f395da3b664af
 MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/pyglet-1.5.27.ebuild b/dev-python/pyglet/pyglet-1.5.27.ebuild
index 1808ce4c5d33..70c2856c0c2f 100644
--- a/dev-python/pyglet/pyglet-1.5.27.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.27.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index cc16de07c9eb..26d3a0fa40f7 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-gcrypt/Manifest b/dev-scheme/guile-gcrypt/Manifest
index 2d53d73b37f5..59a7143d59e5 100644
--- a/dev-scheme/guile-gcrypt/Manifest
+++ b/dev-scheme/guile-gcrypt/Manifest
@@ -1,3 +1,5 @@
 DIST guile-gcrypt-0.3.0.tar.gz 55022 BLAKE2B 20d0948df250637c38a9e583ed9b8e0f4fd6d6142a60b4cceddab9a6a5c3062ffc7a0c8bc61187a1e942a137186ccc6e3cbc44b86d3c64f8cea91c67ae46cb08 SHA512 036017bbf10247bf474f41bb23fa0e824ed17241f169d0b36da5b20753502050bf6b14fa3a584076521e8f076732b75fe3f5e0ec9fb9ffeaf142319a98d36ae9
+DIST guile-gcrypt-0.4.0.tar.gz 56915 BLAKE2B 0b1ca0b23531f1dd28422798f235d15898ec67dd77fa08b52f9ccbfc9b9c1ed55abd1ec7cd15c9a129444e9d7411e24ef5b73ebc8547ca9e0408e7e5a552a200 SHA512 5dbb5ca9f00a607200c600d438f5d96db271a5e889f4e92d361793073ef618b1f731c3bc31dc39c7b939c2e9111da7905ed68845f55fe7fd24b064496e9d2677
 EBUILD guile-gcrypt-0.3.0.ebuild 838 BLAKE2B a332d61c6925c55aa64b0b3b68ebef2d0afe329584790fe6d3ed415c4d1490b3b708829b8d58e350357e524029dff19f0fa907e29afef0773c67ea52a54d14d4 SHA512 b631bba26efe511cb388ca877fb04ce01b570cab5f80d7ea29c62351889291045904f078e6a918de448bd1252c1e45c7df706c8bf63097485560c85f423d06b1
+EBUILD guile-gcrypt-0.4.0.ebuild 838 BLAKE2B a03f2e8426ce16754c8bd677d6824f93abb0229be2315e3c1e2a1c8314c5c8f42e1745c482be2ac62b0ee5e0365f01af87ea090ee18c3fa6eb1bb48bf3037e93 SHA512 96fd7e9a81064968e6d854637c1a44dd1f04b7d8b983a16272b67b567c9f760876cc75e9f41067e2e8ba2dec07ed78c8a783d40624086148208ddefee8b0e714
 MISC metadata.xml 354 BLAKE2B bfe98c34fd1d916fab0de0b611ffe99c1c12acbd27549ec4fbe2dda90ef1e66b970e4df253c3c1ae878472c20fff522f23771eb2bfbd115e51130b1b4e9a8c14 SHA512 a1f5eccd97377c4e1c44f435322d786335c9eadb1d8e2cd7fe39bb695aa62b40879634c9dc0e3968cf51eeec50f596472f882fdc5daf81eb9a4715f8a7ca24da
diff --git a/dev-scheme/guile-gcrypt/guile-gcrypt-0.4.0.ebuild b/dev-scheme/guile-gcrypt/guile-gcrypt-0.4.0.ebuild
new file mode 100644
index 000000000000..7c88a2ac40d5
--- /dev/null
+++ b/dev-scheme/guile-gcrypt/guile-gcrypt-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Guile bindings of libgcrypt"
+HOMEPAGE="https://notabug.org/cwebber/guile-gcrypt"
+SRC_URI="https://notabug.org/cwebber/guile-gcrypt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.11:=
+	dev-libs/libgcrypt:0=
+"
+DEPEND="${RDEPEND}"
+
+# guile generates ELF files without use of C or machine code
+# It's a portage's false positive. bug #677600
+QA_PREBUILT='*[.]go'
+
+src_prepare() {
+	default
+
+	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+	find "${S}" -name "*.scm" -exec touch {} + || die
+
+	# upstream tag on top of source tree. has no autogenerated files
+	eautoreconf
+}
diff --git a/dev-util/FlameGraph/FlameGraph-1.0.ebuild b/dev-util/FlameGraph/FlameGraph-1.0.ebuild
index d9461f2bb009..13949c99653c 100644
--- a/dev-util/FlameGraph/FlameGraph-1.0.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-1.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild b/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
index 3fb4cd530480..877d6bde3fd9 100644
--- a/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
index 88f035e99fd0..2cc9d511e112 100644
--- a/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/FlameGraph-9999.ebuild b/dev-util/FlameGraph/FlameGraph-9999.ebuild
index 63b0925c8c09..f92d7b48e0a5 100644
--- a/dev-util/FlameGraph/FlameGraph-9999.ebuild
+++ b/dev-util/FlameGraph/FlameGraph-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 
 RDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_test() {
diff --git a/dev-util/FlameGraph/Manifest b/dev-util/FlameGraph/Manifest
index 79280a7d7d8d..5f085a6d4f3d 100644
--- a/dev-util/FlameGraph/Manifest
+++ b/dev-util/FlameGraph/Manifest
@@ -1,8 +1,8 @@
 DIST FlameGraph-1.0.tar.gz 1049627 BLAKE2B 4ac6669de754d5c17cd783a2f4aca956f48ef5f2d02740ee63c10629b940df70ea4ea66b8ea5ebbe3c1da5ca74987383ffd700409ce469ad43eedcb72d2e8a3c SHA512 0ae27fd14f76f0db7873a50079efb2bc4fd77ee6550700746b51eeee6813fbebb233d35d744e1b397734da9f89b25c4c0de3567f283cf1218ee7baee46e1b8e8
 DIST FlameGraph-1.0_p20210830.tar.gz 1057405 BLAKE2B 75669be86ace6e6ccb30bd3883c77aef9a3b6e9c1d5d62e4d22f4090d9934a37fa083fe7783e4514f5439448c7d39d3f1c3b839170ac523e44a3bca71597463b SHA512 16769c1e3e907f0b53fd544a55eb3f580a2f1af55dd22b594d6aac9f4ffa881a2cdc6ddfc3599a6479eb127c1d3aefe0052dff1932553a2bdc377aa6f995f26c
 DIST FlameGraph-1.0_p20220918.tar.gz 1061640 BLAKE2B 6d4b96a21eec5c5706e108f3e4314d75a38df8bf64e96d84caaf90c7021cff58384a42df65d6def555c1a242f44d347cd82ab2f3eea5c2cebb5f42f86e6e38cc SHA512 97d57a33f4759c122ec09fe421288b31cbd227c1d81b771c76379f33cd62e1e44f5ebbd1510483df18cf355cd3ddcfc44a7a47f9ae54f30ecdae34e776dc87f1
-EBUILD FlameGraph-1.0.ebuild 678 BLAKE2B fbf4e06ab5a18717f1e9a7492e087ed9de0a0ea8e62a96d0fa837adb7ae8b43725f71f026b916d3064d2fe0d8a05114589ea1dffcbf095e6867e94927b878387 SHA512 2e5e95daf3e80279a200a51cd4c30cb507c773413a8a857ebab1993c2a6cab3338c0963537810e56eb9dd12d31a72868e5df169ad3261482eb0e7cf8aee099a5
-EBUILD FlameGraph-1.0_p20210830.ebuild 660 BLAKE2B 884e8d1affb02003ecf0ef8f62848e269f1a1d9abc7487296f719f06846ef6681dd0384ec36d17eb350815de71bafdef60d519d92d8b7c66969132e07ca24366 SHA512 7e764f4c94195f8018a3ad8821c48f5d694e497822570e4dffec8ab65e74f9b68af21bc42739287a062eaab6f8f3f3bd7e1f0c139a283c32d37d353f2f00fdc8
-EBUILD FlameGraph-1.0_p20220918.ebuild 780 BLAKE2B 24bb716e9237b957d8758c52bdf6f207a39e5f4b95659f98f7b735d3810800cc8e35429395fca4c7a55c95bc921c3d7b1cc9da5eb0d452fcf52b59377ac439a5 SHA512 274b86454a0674af1f0c82c816456961522bb4de535f2093e9a1a47db94bc4b1ae02661d16acbf26f62ae7db712cd1e5604c76bd20c58454c2fb3a50e16301c3
-EBUILD FlameGraph-9999.ebuild 680 BLAKE2B e85386a2e7ca303e2216745b209a4b891b02b9a639492e495d1f326144bb722a2e8b61ff1c178156019e100611f25503a77b3f44c9fb7d0c31ab94523e5f26ca SHA512 408b8e67b97b73781783dd40a12ba4c1c2fd5a2414d12112d0b89fb3a6b967ecdf39dd2e53ad9fdb7d24658b98c7803d6a58a351af43d5aba47a2b1a47f64fea
+EBUILD FlameGraph-1.0.ebuild 687 BLAKE2B 8aae4b0d229f258c02be636a5f85e95bb21e7e1f8bed73b954ba843e59b1f5171848464819373339a107de2ac979eebc6f937708ed4f81b2397a6dfed03ce46b SHA512 a648faad2eaa9a0ba461debe379de968cd4eefdad6a4a77e317637c40a4b0bfec1daea5408fb171a8c947baad4ea62611da0327b767ce0af126f29b0b068ed92
+EBUILD FlameGraph-1.0_p20210830.ebuild 669 BLAKE2B bbb39895a9c0858f2c47048d9eeca2b65203edfb963093dac0395a4912e4f48ff6e46f3f8c55b866d38174e43d3170918c58ce2a4990c17d77677a714e1e4b6b SHA512 88360c97066f542ca2bef5e7d66b8c5ac38f6121d476659818cd17947b60bae42aa0070b5ec2e20e62b4b0cfb40af751e2a2bc3346b487ddb90aad987ba4a5be
+EBUILD FlameGraph-1.0_p20220918.ebuild 789 BLAKE2B dd3187092d6cf3a724eeef6987e4f7cd9098f092da9ab1cf2bbf5356f18879f60a87fe0086f6f92184133d42863d8fcedf10f4886309c465981f526558ab2075 SHA512 9ab72f598d8a35385f1f8a390df50467767c306a4bf9c44f61ba61ca81778e51e9a472ab1e7067e16afc1a7c3fa4ce22ca1a94539b29e7070dabffaf4d83c65c
+EBUILD FlameGraph-9999.ebuild 689 BLAKE2B 59642850636557277bd26347753fb0365f6e367c50acffb22e71d345fac3d6e32531f3b45470c09b1bdabcf4007d5e6d6bb082d6e160cd674c2b2a6bf44c557e SHA512 c1cf5a14edc17c1d00c4eb40f774b8a22e5b4a45d76d0fec4fa73baf528c1d88d6fc84ab72c99d5c6bd99f6449d58f0e3bb4ead54ade74091916b3c91aa37891
 MISC metadata.xml 335 BLAKE2B 763810bfc87b644b5559da3ebc79826e27b26f58c6be072da6c399e8f799d8a5f97cefa44b4b6d42af33dee63e53ef52660bd924619e90857290fa30071d9a25 SHA512 0acbd73fa02f69ff43015f2ad7b34a9d93e5423235111f2f93348889cb34f81a1a7980a507ab5628a18c6ab14895666391b1d3c555518df013b1eb245a18abe4
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d9594d2e0d97..e1beb6b5b5dd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 41a3b66ff23a..95ae9a33767b 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,26 +11,16 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
 DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
-DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425021735d5dc8613a1fd7a68887f6707b6030c1e4476af5e4bdb4830cc4ff3d8708f4bdf557ba94508086e0447030 SHA512 f7500d8c9a500c9ad2679a68d6343cbbbae1483014ab2cd48a056e1e9591b6edd0d712e9ff5441e19c05284696e6c52ebdc3cf1efc61432f2764da7703816b49
-DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
-DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
-DIST cmake-3.24.2.tar.gz 10396126 BLAKE2B fcfdbbce94ce6cdb3fa478afe591bc63ba25104a32edc3dd9395d7b6bd16e222f41428ef4f9982061d6d1e69b10efbc2a33cc9df4573400612b4b756b80ec348 SHA512 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
 DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6933414a4a2054a582b9cf53a12c2b1a37d2189077cbcd138b8cc2828ef1819ab0fc74ded926ef0df7c7ea8c79e1 SHA512 b670acc21b98d1da22b31743f83ba10d6dbfda60341457a02639ee6f15d50462ddcd90b5992eff275d77e7cce6f074aff72abd95c539d18f191682ad87d7884e
 DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b
 DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132
 DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764
-DIST cmake-3.25.0-SHA-256.txt 1646 BLAKE2B 0408c43f36777473c0df229059d6508990a01535f5b3b8d3ae3b1cda221abab5cc2d37dc655de44a581a4b18b3ef73e920c20921d649a9149b7307b9d548ba6a SHA512 8b73a55837e86fa2e166a12041558cc45d1910514c9a1d63398758a99d76687f13f0c8b5244b89297bd890776a5c286a20e278361eefa0bf8db136744ba76515
-DIST cmake-3.25.0-SHA-256.txt.asc 833 BLAKE2B 1424ff89c7ae68352daddbdb810e818020bdd0979fac32de98839cea510ffb8d30a517327f1853d59bf83f846ccde528d07ed624e55c1b1f185551e4f7bc47d6 SHA512 354f7fbb3597eed8f0d94a496cac13b8d9301576b23bf85fcd5d14b84f2848d96534e2c827f7311a00043da789b4160adad805717f110cfc4677d585691e7e55
-DIST cmake-3.25.0-docs.tar.xz 499744 BLAKE2B d6bfb6f58bab66e0b444206c93a03c10e084f7326c9ecdc7a1a2c5ccd79e4d6403eff92989e05883e5985782dd93e9daea19e773a7fefdfb3808deda0546288b SHA512 7c382bd837f808fbfe3c665c2294ba935f20f62acf24c46c760d79f252b3e26f7ff70c75cdd802bfe9fc65ef73a560ce686caa53a4516c1071800f1ce2285285
-DIST cmake-3.25.0.tar.gz 10560389 BLAKE2B 182983a7fc2eedcbd369fef1b1cd118044abcd1679870ca301f3aa8c0ddebd7cb509ae843d0f7a9847b2b54f79235c3407efd47b6a4684c010b6a3b030e1db4b SHA512 f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c
 DIST cmake-3.25.1-SHA-256.txt 1646 BLAKE2B b5ebf93e481b2bf63c5448875983f0b4d13f4e588eb226577969738f3b56c0ca14d9ab99ffc4dbcf8a2ab74a159de00368ce6ebf9667b90ef657083f351c4c01 SHA512 5e7618b27b0cdb674ee0ea7e1e6641ba31da6f4414ae1a08ed11691e105ebd89a39a307b53e04e2386785bcd2917e1b8d65755ef7c07a1d9f4f400dcb5385b44
 DIST cmake-3.25.1-SHA-256.txt.asc 833 BLAKE2B 3dce05d9ad5852165418726fc16de4fcc6c66aa379ce926a68c10515dcd87ed40b60ce345952fc2c83f342b5ebb0f02134af6c07b58e9dcf7e1757ad6294d8b5 SHA512 70ec7f1cef52d76ab6732556b663509de780648a2009608632a7df0de86c1d8b91fab874233413216a486fa97648d95de1556f89f48cea936408b609380c5aa4
 DIST cmake-3.25.1-docs.tar.xz 499680 BLAKE2B 0baac457fbde68046080a906093be96c6fe3d7a4b592125237258768eeb0f9c80d3e1e867e2850fe3ebd27a1284d2f47245ca73b8f5b6eb4c046f2afdab78e56 SHA512 02e1bf84be15a7c796a9a7535ee286ca3cddc478707daa1be076be44285f762a0c5eb620b34815e6713b7262a534d7c7fb48e53896c4706645792397f8da83e3
 DIST cmake-3.25.1.tar.gz 10561054 BLAKE2B 3aaf546ebc935caaaf6d15c61f99184964902a50004222ba29e17714488b219f8d8754008f2b2d701dd7befe8c0f4cd0edad92fcabb8ad37b981f31b2d1e37a2 SHA512 ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57
 EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
-EBUILD cmake-3.24.2.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
 EBUILD cmake-3.24.3.ebuild 8809 BLAKE2B ead6e18dc3b681108680c13cde096e898cb0cfb0afddb85c52596dc8df0b5e2b7553889d6de59e53eec0fc76e27d4240355c6e9af7eeb2780af7e2f72d394896 SHA512 9131ae15daeffc6570fe433ce18de40237a7663fc9a45dc8fd91801f442b2a0eb91b55ab611e00c6db2c15726c7b7c484615d002b65ab22cc7f987e00767e148
-EBUILD cmake-3.25.0.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-3.25.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.24.2.ebuild b/dev-util/cmake/cmake-3.24.2.ebuild
deleted file mode 100644
index 835f3a198d1d..000000000000
--- a/dev-util/cmake/cmake-3.24.2.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${CMAKE_DOCS_PREBUILT:=1}
-
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		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"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# Handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# Respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.25.0.ebuild b/dev-util/cmake/cmake-3.25.0.ebuild
deleted file mode 100644
index 9491df325a39..000000000000
--- a/dev-util/cmake/cmake-3.25.0.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${CMAKE_DOCS_PREBUILT:=1}
-
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
-		)"
-
-		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"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/libarchive-3.3.3:=
-	app-crypt/rhash
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# Handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# Respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 83631bea2bc4..8df796085990 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,5 @@
-DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
 DIST cucumber-7.1.0.tar.gz 410595 BLAKE2B ee1fbca606479f1f07d64a5434051d8466d7056a326424a0235a6e4f860ed3cdc7862495156874b38631e6a0a1b70bda40deb6f5310f7bd6bdafe72c5faa8f2b SHA512 7c124110634259e83ba1986efacf85a73e9a6f36a7c262ba9842e85e73e359a50b5090489f656e5b503cac68e3db9905dd1834db1bfae9ee55e3a4d1b31a4adb
 DIST cucumber-8.0.0.tar.gz 412254 BLAKE2B 8e86ca726a85afeb6d80799c3b2cf633e4949bacb9ad65b41d3baf37f642b9032d57b4e66cca15cbababcdbe5541ce2cd0d23b113897dedbd7cbfb5c85283a00 SHA512 33e9abeb33c7924c3eedfcf477019a782cd813a004e35dcdeb0878b6dea920ba870023b6c8a60c8de810ff231378fa67969208611ce8e9199ae2611d3f6f1f99
-EBUILD cucumber-3.2.0.ebuild 2837 BLAKE2B 8d76d4476b2e1c8d7bdd16c4c89f8d45eb04af571d7438a057ffb28f3b818388cc346b30b53606e8e96ce75b65fb59e9333433c343817e9a57c805128267cd24 SHA512 f0a0a344b0190d7751f9de8aebb8c5d2c93dec6ba41f6df288c67b1629649c2a0f510394b65e9d53074c8f9ce27dafaa6a469b97b03b69309fbcf17f0ac2b689
 EBUILD cucumber-7.1.0.ebuild 2536 BLAKE2B 87c54cd1ecd24e957c322f3994728417bca331b432ae19df61eb08d2d728a93d02199d541c60f407691e695b44684b3d166eaa0d9990d7584a27ad70520860f7 SHA512 0577e95e76824c679f1ff86f84aa357ed0f004fa07c8f780ce184d076423a3a050384e387f231bcd1ab36bb0448c1f46d4f2e9b6c30485cf7ed140bf0bfbdcec
 EBUILD cucumber-8.0.0.ebuild 2570 BLAKE2B f87aa63a8aff4ebd89ead22d5e47fc90873beaaea842cc5f9715b9d6f9d54f13c0039f07949159dce19828e9fc02f6b3885194b505f51ab3fc63a041d25bf386 SHA512 20b771f17a3b44867f492cc70f3de4e6453e73d605503a0be17259fb42d69254940cfc79bbca10861c94acfdbe5742f1e8df6da59af35528a16eba5a683f7003
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
deleted file mode 100644
index b5af4c5497d0..000000000000
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://cucumber.io/"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		dev-ruby/json
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.2
-	>=dev-util/cucumber-expressions-6.0.1:6.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	>=dev-ruby/gherkin-5.1.0:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' \
-		-e '/nokogiri/ s/1.8.1/1.8/' \
-		-e "/json/ s/, '~> 1.8.6'//" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged packages
-	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-
-	case ${RUBY} in
-		*ruby24|*ruby25)
-			rm -f spec/cucumber/formatter/http_io_spec.rb || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index e81ab851663b..6263ca75a4e2 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4
 EBUILD dejagnu-1.6.2.ebuild 520 BLAKE2B 5d35364056aa60b443fef9785257ed648c3493e599c680cfc210e95153cf12282764d97e391d3e115bd5ecffea9f4c618baf90a1847eb2488be94ba8d69d61ef SHA512 d0d23efa9a108005965090718a4102c47c07c6186200d642cbafce55d0982a9e2f5bb1842aa383bf18a5d52a4ee34e87adaaa96a4e37daae061f1df25dd020cb
-EBUILD dejagnu-1.6.3.ebuild 586 BLAKE2B c7d802d3e1beb9c58c537a94750cb158058e9598985245cad7619f2bc45687f1976b41ddf4ee765dae0f3a3974cc9b5c4c0165604fab61a2c45363ef8812975e SHA512 18ade392af0889737cf07e45874a8696baf12e62c973efc72b4552907627564f511703a4bb82d3b2853b8e873859a1c55d3cfe989408a10f307e2fd6919f9432
+EBUILD dejagnu-1.6.3.ebuild 595 BLAKE2B ed7f69ec64cd0e83064330ce228844a0ed42f9ab9877626933e261c5f9df6b7ec9a956ea44ca6b9659485e16e2ed2f12f88f07c5445ff6dd21d385e7fe5a31a1 SHA512 acfc28fc9cd72edabd16b7d8986e5ca3b51849feb05afdab03f893ed2c52955bb72074ca408260331d4f20f1b6b43a781ef98e50180858906da30b31cb5303e6
 MISC metadata.xml 346 BLAKE2B bcd7b010b14ca00937b7241ff66ef048fc645e1724c33e18d12c3a91d6a117889535fdeba947d2c7071ee5b75b85c3354955014ed8b943685df39a3376fa764e SHA512 cc7e8b6ebd769fdf5fabe1009b7ab1fbd5884e6df686121df1e6fc58d1ebea51e3c15b1be7d6f455ddf3142a2e6ac57780d26a34b4421259df5745689ebbe1a8
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index 039228517fed..4d4a2813baa1 100644
--- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -17,4 +17,4 @@ RESTRICT="test" # needs fixing
 
 RDEPEND="dev-tcltk/expect"
 #DEPEND="test? ( dev-tcltk/expect )"
-BDEPEND="virtual/awk"
+BDEPEND="app-alternatives/awk"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index aa233c12e817..f9a55e99cf71 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,5 @@
 DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c
-DIST diffoscope-224.tar.gz 3145263 BLAKE2B 918de272781a7829ad4a16f5db3f8d98e05fd1c7e342e18028bf448bf94ede09d5c475a3c1cadf255fa35f46bc8912374cb6cedf2cea878dcaf59380188b084f SHA512 2efbf2ea45e3a43a86eb6a3432852e0eb5a299d3745d8acb3f8857638cb4775d4322d844f2020ed718e4d28419c8a5ca8ab26f66b9bedeea15da57f33a008909
-DIST diffoscope-226.tar.gz 3164328 BLAKE2B 96fbafcd00c695fd3391122b8468abb0bb27936c45d97d01b2e0bb44bb1f18dc46b7ed2c7cf365993d6303c96a6cc8aeaa780808f23c6dfee5066e0cb377456b SHA512 59e8fd73fcf6e94a603c7e5fa8793f4746e770b0ff84d13379e155d3b4eb91defed79b688109785b62ae5cca1faf9b536454b3107ea93aa361eb511916601615
+DIST diffoscope-227.tar.gz 3163754 BLAKE2B 8a93b168e8ac404b6cfb08ebf9de5adf0288ae6e741653f8194a2d3d45e30b5826ca3d21a37b5db3867c73816e862f1d4593fe7a77487736f8a6e5f2b15057f2 SHA512 1e8a143006c4e734cf30d4110241ed164c3ee893801efa2a7b81a917146a0643dd8b38af0cac937847506a4338d59f4bb03211179742bb076fc4d4dd5f7cb585
 EBUILD diffoscope-223.ebuild 3444 BLAKE2B ace11e44d106488caa6e2e2014236e1d5889667c48348ef29b6b34b719f5b95392cc0f2aaf73ecf0a01085263e4dea21c3ba4280802abca4fe95ac2c2c018c17 SHA512 e9cb6a0ec3fe55146081dd3336409c49112b55dda2e7edb97c9c0b6269ca29f9706dbf9b1cc5061d4d0869f980824ea8ebe447e191d015510af58a50014f659b
-EBUILD diffoscope-224.ebuild 3446 BLAKE2B 24aa2e6955914e21505310a6c935ad141627be46c1a22505fe371e4c3e6623866a6984090967eaddbab9905391b299ea2fe1cc7714b2b7d2a9d068e105a45275 SHA512 562d8964cd5d939e7280ef1d69d7b034b76cf27072391b262536fb3502c9d915562cee2464dda4c5a3e67b210aa3cc8897aaa0616e50b6a04b9c433c93718b32
-EBUILD diffoscope-226.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
+EBUILD diffoscope-227.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-224.ebuild b/dev-util/diffoscope/diffoscope-224.ebuild
deleted file mode 100644
index c76f883a24b8..000000000000
--- a/dev-util/diffoscope/diffoscope-224.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-226.ebuild b/dev-util/diffoscope/diffoscope-227.ebuild
index e7f6e7cb72c0..e7f6e7cb72c0 100644
--- a/dev-util/diffoscope/diffoscope-226.ebuild
+++ b/dev-util/diffoscope/diffoscope-227.ebuild
diff --git a/dev-util/directx-headers/Manifest b/dev-util/directx-headers/Manifest
index f39d9cac3624..b20aad847683 100644
--- a/dev-util/directx-headers/Manifest
+++ b/dev-util/directx-headers/Manifest
@@ -1,4 +1,4 @@
 DIST directx-headers-1.606.4.tar.gz 352341 BLAKE2B 5b79e5fb0f807c7766708ac3467f0f8bbf82aa68e3aa71abc84c6791742ffe625a5fed4c36dceded9b372af5349e41e431266cadf21b173e4a659b39f840b41c SHA512 3fb4142f8ceedd8484f5f7dae5804a7a0012951de344936fbf22991d6ae659d4e5093e1627bfe51c3cb0859340b13171c4f6aa68377ec26ac05038acaad8c540
-EBUILD directx-headers-1.606.4.ebuild 650 BLAKE2B 9ba540c786a2d37cb6077cdd8ace5483c4cf042706afc262c09f6088946e4cf1186d6da31fd937d3d75f7953005cb54b274cf77335cb5818ed415f9e1987f104 SHA512 9cc4b43fc783d90679c17693afe5dfe51beeed88180c9a285f898bf608ede80164603333be6afb324116724131ca832c46382475154df5d2e6f16a59488cc5dc
+EBUILD directx-headers-1.606.4.ebuild 649 BLAKE2B dc2a1270d835f85959742cf81ffcec6f3ce2e9570b8bbd825c3920ddec9f838c806e6ec8d1c3b0fa9a015869bb060e5a1fbc619edce20d2f37f819487f98a997 SHA512 2ebb0da2c0b4475979a372a0bf0ee7d4812d4658b1285f5c04ca97fbae702c818031853aafe08e5543e5b80a504f202673ae139dcf69d5d8440b090e9dbb7c9d
 EBUILD directx-headers-9999.ebuild 650 BLAKE2B 9ba540c786a2d37cb6077cdd8ace5483c4cf042706afc262c09f6088946e4cf1186d6da31fd937d3d75f7953005cb54b274cf77335cb5818ed415f9e1987f104 SHA512 9cc4b43fc783d90679c17693afe5dfe51beeed88180c9a285f898bf608ede80164603333be6afb324116724131ca832c46382475154df5d2e6f16a59488cc5dc
 MISC metadata.xml 325 BLAKE2B 5f99ebc7e34bc34ed7ce7de68b4856195b45a4b482fa198972f3f054a4b945bb548a046b71e07ed2e89d3486b7259291bc1b5d09cfae739d0daa091d366a82e7 SHA512 f8ff1d6fafe3c2ed1837ab3db04a52351ccf851098046e0240c5619745682c2669aaa0791a792647d0af533cfc4f83b68171cc2afd05a30c532b918d42111216
diff --git a/dev-util/directx-headers/directx-headers-1.606.4.ebuild b/dev-util/directx-headers/directx-headers-1.606.4.ebuild
index e0d36de615c0..4314233e9802 100644
--- a/dev-util/directx-headers/directx-headers-1.606.4.ebuild
+++ b/dev-util/directx-headers/directx-headers-1.606.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/microsoft/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 6fe53c89df22..7ad0aa9f9b5e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 272053742b016bf234e75bb6b05e4b113b1f8b34249e8a601842412216665cf00df1b93bf590815d1dd1a709ce5006671bddb92cda7d42a5d099f3cfc3968368 SHA512 91a303661ae706bde45a7d12da928735690fdbb48901a31d6477c2d8595a42a59d4e07dc0ffe4eeb64e0775c61c329b05c0f12ccdece7bed1d5a9093db690f34
 EBUILD lldb-15.0.3.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0b1e3119204662d262c4e76d08fc4e330ba5e1ff20bda3b684d78396a23d097869361776903c418942546437 SHA512 b6d0d29a828b38508f5814851bfc17914dbf668bf0207e8c6653b6df5fef631e9f25e38641e4786e34fe89b29138fabfa59bfe89a1267a95c310076a4b207de2
-EBUILD lldb-15.0.5.ebuild 2718 BLAKE2B 99e4f1154fd04f50199aa6510be2ce8b42c855a5fa37acbaf746e0689324fa0c0eadae85ff9ca6c00b31979665cbb31327a7372d61d3e0e3b006fcd24ca01356 SHA512 9c8a1ddbe6f22fab2f0f0f23b04475a73d3c88c21704de55997612b7b7455e47be5f5b16cb380e99e9313b92d90de464569fba9a5493452331b85fb4d2a98357
+EBUILD lldb-15.0.5.ebuild 2716 BLAKE2B b4b4386fa20bb713bcefba2716a3a0c76a156c5d0b1e3119204662d262c4e76d08fc4e330ba5e1ff20bda3b684d78396a23d097869361776903c418942546437 SHA512 b6d0d29a828b38508f5814851bfc17914dbf668bf0207e8c6653b6df5fef631e9f25e38641e4786e34fe89b29138fabfa59bfe89a1267a95c310076a4b207de2
 EBUILD lldb-15.0.6.9999.ebuild 2697 BLAKE2B d713c22a59e74b93d059ca32c71555d89dc5e414994a07fee5a77440753385de23e59d09d4e7424f205adb9d06b639d4ff2ceadf6a074113b7c31c00c293e892 SHA512 d9ab075e295b873b1aad46f495d6e40d36114b7402df3fbb4360897d9d9c946fb6580cd4034fbea48e74ca3b27de925e4ecfdf1c3ef6bc024ecaaabe26ce1965
 EBUILD lldb-15.0.6.ebuild 2720 BLAKE2B d2efa1b35e353a9824ddd2126a2219c01087b8946349315ed1c4a390b6950e3fdc8bd2035d202044e88148fa789f25940064e7ead5d9a8c5574e56bc7c70183b SHA512 0d526d2549dc50da21c203657188bf378cd3b2beaf6d105abe9e073cb789749445d21806d820d84205cccdccfac20534d3a1a778ad4712cf302087f41646da49
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 6515a2671f5b221a3d6491a24d3a2ef566b1a62c8dbda9c613b39b217eda748d431d54282029a22414620bfe22d403d4095c0ecd37acd4ba770b1babffe8613c SHA512 ee5089adce88c519026a79b47014b4776946db997e459bdafd9d101ccf9bee2348e6be998e0f60a2bd4807d86df763301dc24c217392ab0ed257fd733a04542c
diff --git a/dev-util/lldb/lldb-15.0.5.ebuild b/dev-util/lldb/lldb-15.0.5.ebuild
index bfee209b5ab8..09d417102b7d 100644
--- a/dev-util/lldb/lldb-15.0.5.ebuild
+++ b/dev-util/lldb/lldb-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index fa08ec37e54b..3133b6b9e9cc 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -52,7 +52,6 @@ DIST cargo_metadata-0.15.2.crate 18528 BLAKE2B cb80318d0cf7316fa57badcaa05027372
 DIST cbindgen-0.24.3.crate 195698 BLAKE2B f5c65e9c77a7c2f98a44382a6e4b852071b70bd832a3da3220bb8a7c4729a44b5964e651cd63577f555c5bf4e6594b1148a5afd96dc1d3f599b2fd1d523b54d4 SHA512 3a39be67a87aa7a4dd9baaf6b803215f4587bd7925c4315c5ec93954e021471919fa977ad2084f099c606daa392350de3557bba56cef77806def99c40318ef05
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cc-1.0.74.crate 59410 BLAKE2B e53e0992395e6ae54a732ece8af7a7713afeec3488a303c545b4ec50459d049609cebe8652ed595bf86d4f3c23a16d7a19c7f73e6f6f42b13b1567cb34ea6078 SHA512 0cea38466818473b0c3b3c304eda797b018dbf644c084cdf07539c63557be4c38346fd10afc20fa65a099aa83fdb423972c987a080c68205abd9ef04166a8d3b
-DIST cc-1.0.76.crate 60132 BLAKE2B 9e8dabe8cb64a8ef7bb4a91d4e601a9175712da00644125e0e625b0a10a4815ed1a3c93f32eb773d0c2215c74b8f0d73a35831291195dff65d1ae79b8e423d8a SHA512 9a31f5a78859f7272cba9289d0c1b7fe01cbbe5ccd20a729141a751df7f5a576726e2b7e038cb7142e63c59a5ce7cdb83b93c32d5b5f3f45bb297ecdc1b9e983
 DIST cc-1.0.77.crate 60723 BLAKE2B 93720cee6c5721ec43b3f502b0879043afc44049e2ce528addebd8b6cf182a8e370143d67e32a965f1ef4fc07e55c87aaf95c0b1b5f9b85eb4e743a95b17bdf5 SHA512 38a421818bbb22fa6a6bd871a7d69add88932db68683ec91d1b4ce1ba68ea2b9272c42c35f437030614cb522f43db964e3a8f1223dcdef9158090b00d17afe2b
 DIST cfb-0.7.3.crate 63277 BLAKE2B 5d0d4124421d26c1e3dbfabaf741c407f346d62147b12bbf889ef5b4c25350c02d09919e332e1ca18ade34a4e6d2895fc835161f7062c0c0bb56f104f94811a6 SHA512 a5c8d5da5ac009dd7d19320237ea516a65c9b1780bec3403fdbfb6ffa13bf7d05a896baeac5760c3e9aead9f4bd66cf969ab12bbd2938cbe479b1d2266e80b8f
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -199,7 +198,6 @@ DIST lzxd-0.1.4.crate 21891 BLAKE2B 8271b79bdf6c65a17b5fe77a4d8b7d3a96ccf1752d21
 DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b5494ba582c333e09de6263769869b5a4903ec2d62cab7a032635fa5d28f00f3f80337b968221e386e252f842cf36 SHA512 c7557f741c170c421d5ccef8cb771fce544b3f3da0475b170f82116c00cdd7522fe29fc8bb4dfa20735345b2c72e12af0bcc4317d9ada412b59f9ff4266e14ac
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST maturin-0.13.7.gh.tar.gz 335508 BLAKE2B fef8ad495208109b867d1ca9700cef149b799bdb372d5110480a035ee5ed52b569f5cb3ca7dffa7d69db3fd4a593d3b894027eb1538e25deddd68146640cdde7 SHA512 509564719aa7b25c1464036b6830518129b24a285075ef551fbb65c42aa2e3c2cfb1bfcefa55cd9b99c7dcec07795ea08fef0a33a55c14030f49afb392face7d
-DIST maturin-0.14.1.gh.tar.gz 373011 BLAKE2B bfbc99aa15cd0109dc3ac0855f144d1150385e8a0f6055f963ce295bf0c852398948af28fb024757837b4f660b4d6d923307424502f4e99ae7018a5d1385e2b0 SHA512 b4f929bb857cc27362a21e0f714d3870ce9d764062613ecf47468160c01af3c1546c1728d4ebf8b1f0d028e0a3272ddc79d23bd51bc92fbb6985cfda92a58ff3
 DIST maturin-0.14.2.gh.tar.gz 373223 BLAKE2B 3b4916430fde07ded175e564d3ce445a35412a840eaf1a030d715af6c7911d6eac10d9fbdbb9073440dbf5ff1f0c852f9f36b361b017e56049f65b6d62d3302e SHA512 fe621bcf077be5ba374cd2910cacb38457a2f6225162ff9c95251b38dd1394670e5209a901daeaa86d9d7ee315e5d945d7536b3fa385d9eec546188b750dbfa5
 DIST maturin-0.14.3.gh.tar.gz 384759 BLAKE2B c787ad0311c4a497f53615bd19e6ec9f37c5acd20ac0dedc5c18a12011ae7191e5ca3b9c0fa2f94c405260ea2805c7c1c32e0453f1c21beaa719d66079083539 SHA512 6a2d8cf0284e0cd4a118be0ec3c7e02baf9852881b12558f78a3c91a88e8fdd2a873ad69449254d3ce5166f6033871d214c08b5f3e6edbd632a6fa2c2501ecb4
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
@@ -358,7 +356,6 @@ DIST serde-1.0.148.crate 76637 BLAKE2B 41a88a684e96df8e7eec41602a5eb1e97b54799ed
 DIST serde_derive-1.0.147.crate 54861 BLAKE2B c758a3c854f1474dd3fadd66d60a59408e30d5b658cde4c7ceb10c8d4b4210c8069cc13618f83f1faf36de928feeeb82b2f7011b457e8b9003a15177714f9c0f SHA512 434d65dc0d78c7c1c3f8832221389dc4b0c5d74d605ce1d2d660c2df9a92f5e5d0c6d543763e1462c58d6ea18001c823ca594e3dac92a47d8fe48319a5c52e59
 DIST serde_derive-1.0.148.crate 55562 BLAKE2B bfde4fb3eaa7d4fb0a96f744612d7cb249325281902d3fc03aaab2bdf55aea22fea2f63b14d00ebeccdb402ecf79cae6060065068af06be427df5cb1204ebdbb SHA512 c011e252ed1fa7578a51241a6147ddfdd462f3e1171666c193895691a295f72766cc48e325f14d389a128a8c146ef16454a7f257a52abae45e83fe5f23dffa12
 DIST serde_json-1.0.87.crate 144383 BLAKE2B 357ee30245611b15bf98ba719266dedc75211a80a660105756b20d52f50bf4032385b366c3272cfc1c7f34022e818cb6a6af799faf76f8d5969c256a02f9187c SHA512 77b90340aaaa0fb477b33e6628ed2ea0fb53cff1e2b5724a3474e24b2bfc9bff077633d9581e41dd96b2a0e167549e992d238bb09c627fb5680996b39583c4cc
-DIST serde_json-1.0.88.crate 144528 BLAKE2B ba14e2634a9bf718a08e0dd525e1bbdaf98a5c1d5c99129e4904c886285f40e6fce08699efcda34766860f2899f0db011ef2032298ad647072d73a1c8bfd248b SHA512 a09e4a26c5177d0faeb9190e668b72813ec1f6a318459480419c8471c1e0ef65310a6879d9b26f11cb8c161d84ff911f5d81e7a4aeb683757620c2e5c6541eb0
 DIST serde_json-1.0.89.crate 144638 BLAKE2B e296fd2fd3054b81349f246d207de4f7f8072e480a34f1c39afc2d46cdb6b861d1514a8bb64f2f68920e8db43b642814f7f4e989dab95cee62485ca2f8db2e8d SHA512 4bafa5693977e129f5787f2ff10f914e2a7740bf7e631bcdf51b27d0d9e5517873184b56649914371e1881107e7ed0a8fedf487617db334d4a7a4bf95c6c16a3
 DIST serde_repr-0.1.9.crate 9695 BLAKE2B ae28d645e12998ce971bface40e7bac688d0f6347149e7be7e7ea40e46b1bee5b6f28b592f981138ac1ddef02c6c62856b98f9aa2f126848307b57e5a2ae8977 SHA512 987d197c4e8326853281f4f8e3f1831c4591d0687429fc08191a1d39edf88261668047100156fe08b2beddc3b01fdcaba5a2a4e45eddffd19fe5cf3e6052f2bc
 DIST sha2-0.10.6.crate 20558 BLAKE2B ceae6f1e28606371f93f5e4fd617b2cb057ed9aa4aa2d81bf4c6af4ca47d639a51f50d0fe4fa77667022c770056d6d711beb4835b2341ae0a8d667f11a4a51a3 SHA512 38dea4c300ea8dee22587ab0af6d66dbde824e1cb071e02e7790bf978efff6bdb6d4076d61c5acb38e86e69261a65811a7bd0182299d53ef053202ee54d2b05c
@@ -491,7 +488,6 @@ DIST zip-0.6.3.crate 61785 BLAKE2B aa59cfa836cdac9cda7e5423cf7146a8fa2be74a4a2f7
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.13.7.ebuild 9173 BLAKE2B d1c7190275e939df29e9879e60cccfd08a3fe03a96aa1e7770109fd4fb14f0545d5906ba6622a9626a389c6b94734ac7222aeb13663ca03cfa3b83286180c543 SHA512 4ff95ab86d1dfcd50c70cc8f8f31c58342cf010e38f004f8d714970e7f884e74cd45fe47f04c8da1b6a19c0113d624ed47906b497bc91d65497858be74022c8d
-EBUILD maturin-0.14.1.ebuild 9938 BLAKE2B a6d6a5f613e89df7899e2b23459bd9e26081a3c62a0f14225f0e2242b6f239b174b1320592b8f397ae242cd86e0ec57a488d14ebf8392c31ae1399d70109db87 SHA512 a6521a64dabdc14391ad8bb7110b09931bdf4164f69c4100411a106419a76c0a410b51cd8643f996ad633872a9fd7efb5ee1fa2e2c925e54d0be6044c3019083
 EBUILD maturin-0.14.2.ebuild 9988 BLAKE2B 7f9be6233f8604d9d4148b66019b362fcacf2ff42f59f3bb4249335f80280b31ae42509b05b1bf743cbf53dab356d56663d5616f7aad1c13bdd157b799ecaab6 SHA512 5537b337ccaa134e56a9cad8f2a1959fe39d73ee68ed59410cd53f23487a91a6a78cc80dac920fdd989045e61e7ab2e22ace5131a14e61132a8da7e24065d222
 EBUILD maturin-0.14.3.ebuild 9994 BLAKE2B 65f8cb2a7f132c7a662080bc7e2cacbdbcd329ac8486b6e28fe14195a3673a5bcd7eb69cd817f6fc4c8f7703c22463897b22345d9f026302f9a92fd905138d85 SHA512 291465733b58abe1e52207e11379742b64cfc3d965e477d971e19ff81f968f1ded11931a6c78711040d41b9d26697b1d5242e818b3ce18ba592c9307dc09ec12
 MISC metadata.xml 581 BLAKE2B 9fd4c9b9ef68199ef36af2d3799e3c16f819e89a2858bbfefbedb35575f5018c44ccf6b851f1bd367adefec1e8e6dc4a817bd431037b2ee8d1c01e3638d81541 SHA512 93e477343b707475d8b5bd043575a047e7247998e62daaed232216a9a3bfaa9dcae0ac02ec8489e847018495b31f9ef1811d528498e0e129dde99b06712ef7f7
diff --git a/dev-util/maturin/maturin-0.14.1.ebuild b/dev-util/maturin/maturin-0.14.1.ebuild
deleted file mode 100644
index d0484742c7ce..000000000000
--- a/dev-util/maturin/maturin-0.14.1.ebuild
+++ /dev/null
@@ -1,478 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	addr2line-0.17.0
-	adler-1.0.2
-	aes-0.7.5
-	ahash-0.3.8
-	ahash-0.7.6
-	aho-corasick-0.7.19
-	anyhow-1.0.66
-	askama-0.11.1
-	askama_derive-0.11.2
-	askama_escape-0.10.3
-	askama_shared-0.12.2
-	async-io-1.10.0
-	async-lock-2.6.0
-	atty-0.2.14
-	autocfg-1.1.0
-	backtrace-0.3.66
-	base64-0.13.1
-	bincode-1.3.3
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	block-buffer-0.9.0
-	block-modes-0.8.1
-	block-padding-0.2.1
-	bstr-0.2.17
-	bumpalo-3.11.1
-	byteorder-1.4.3
-	bytes-1.2.1
-	bytesize-1.1.0
-	bzip2-0.4.3
-	bzip2-sys-0.1.11+1.0.8
-	cab-0.4.1
-	cache-padded-1.2.0
-	camino-1.1.1
-	cargo-options-0.5.2
-	cargo-platform-0.1.2
-	cargo-xwin-0.12.2
-	cargo-zigbuild-0.14.1
-	cargo_metadata-0.15.0
-	cbindgen-0.24.3
-	cc-1.0.76
-	cfb-0.7.3
-	cfg-if-1.0.0
-	charset-0.1.3
-	chumsky-0.8.0
-	chunked_transfer-1.4.0
-	cipher-0.3.0
-	clap-3.2.23
-	clap-4.0.26
-	clap_complete-4.0.5
-	clap_complete_fig-4.0.1
-	clap_derive-3.2.18
-	clap_derive-4.0.21
-	clap_lex-0.2.4
-	clap_lex-0.3.0
-	cli-table-0.4.7
-	combine-4.6.6
-	concolor-0.0.9
-	concolor-query-0.1.0
-	concurrent-queue-1.2.4
-	configparser-3.0.2
-	console-0.15.2
-	const-random-0.1.15
-	const-random-macro-0.1.15
-	content_inspector-0.2.4
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.2
-	crossbeam-epoch-0.9.11
-	crossbeam-utils-0.8.12
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	crypto-mac-0.11.1
-	ctor-0.1.26
-	data-encoding-2.3.2
-	derivative-2.2.0
-	dialoguer-0.10.2
-	diff-0.1.13
-	digest-0.10.6
-	digest-0.9.0
-	dirs-4.0.0
-	dirs-sys-0.3.7
-	dunce-1.0.3
-	either-1.8.0
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding-index-tradchinese-1.20141219.5
-	encoding_index_tests-0.1.4
-	encoding_rs-0.8.31
-	enumflags2-0.6.4
-	enumflags2_derive-0.6.4
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	event-listener-2.5.3
-	fastrand-1.8.0
-	fat-macho-0.4.6
-	filetime-0.2.18
-	flate2-1.0.24
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	form_urlencoded-1.1.0
-	fs-err-2.9.0
-	futures-0.3.25
-	futures-channel-0.3.25
-	futures-core-0.3.25
-	futures-executor-0.3.25
-	futures-io-0.3.25
-	futures-lite-1.12.0
-	futures-macro-0.3.25
-	futures-sink-0.3.25
-	futures-task-0.3.25
-	futures-util-0.3.25
-	generic-array-0.14.6
-	getrandom-0.2.8
-	gimli-0.26.2
-	glob-0.3.0
-	globset-0.4.9
-	goblin-0.5.4
-	goblin-0.6.0
-	hashbrown-0.12.3
-	heck-0.4.0
-	hermit-abi-0.1.19
-	hkdf-0.11.0
-	hmac-0.11.0
-	human-panic-1.0.3
-	humantime-2.1.0
-	humantime-serde-1.1.1
-	idna-0.3.0
-	ignore-0.4.18
-	indexmap-1.9.2
-	indicatif-0.17.2
-	indoc-1.0.7
-	instant-0.1.12
-	io-lifetimes-0.7.5
-	itertools-0.10.5
-	itoa-1.0.4
-	js-sys-0.3.60
-	keyring-1.2.0
-	lazy_static-1.4.0
-	lddtree-0.3.2
-	libc-0.2.137
-	linux-raw-sys-0.0.46
-	lock_api-0.4.9
-	log-0.4.17
-	lzxd-0.1.4
-	mailparse-0.13.8
-	matchers-0.1.0
-	memchr-2.5.0
-	memoffset-0.6.5
-	mime-0.3.16
-	mime_guess-2.0.4
-	minijinja-0.26.0
-	minimal-lexical-0.2.1
-	miniz_oxide-0.5.4
-	msi-0.5.0
-	multipart-0.18.0
-	native-tls-0.2.11
-	nb-connect-1.2.0
-	nix-0.22.3
-	nom-7.1.1
-	normalize-line-endings-0.3.0
-	normpath-0.3.2
-	nu-ansi-term-0.46.0
-	num-0.4.0
-	num-bigint-0.4.3
-	num-complex-0.4.2
-	num-integer-0.1.45
-	num-iter-0.1.43
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.14.0
-	number_prefix-0.4.0
-	object-0.29.0
-	once_cell-1.16.0
-	opaque-debug-0.3.0
-	openssl-0.10.42
-	openssl-macros-0.1.0
-	openssl-probe-0.1.5
-	openssl-src-111.24.0+1.1.1s
-	openssl-sys-0.9.77
-	os_pipe-1.1.1
-	os_str_bytes-6.4.0
-	os_type-2.6.0
-	output_vt100-0.1.3
-	overload-0.1.1
-	parking-2.0.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.4
-	paste-1.0.9
-	path-slash-0.2.1
-	pep440-0.2.0
-	percent-encoding-2.2.0
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.26
-	plain-0.2.3
-	platform-info-1.0.1
-	polling-2.4.0
-	portable-atomic-0.3.15
-	ppv-lite86-0.2.17
-	pretty_assertions-1.3.0
-	proc-macro-crate-0.1.5
-	proc-macro-crate-1.2.1
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.47
-	pyproject-toml-0.3.1
-	python-pkginfo-0.5.5
-	quote-1.0.21
-	quoted_printable-0.4.5
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rayon-1.6.0
-	rayon-core-1.10.1
-	redox_syscall-0.2.16
-	redox_users-0.4.3
-	regex-1.7.0
-	regex-automata-0.1.10
-	regex-syntax-0.6.28
-	remove_dir_all-0.5.3
-	rfc2047-decoder-0.2.0
-	ring-0.16.20
-	rpassword-7.1.0
-	rustc-demangle-0.1.21
-	rustc_version-0.4.0
-	rustix-0.35.13
-	rustls-0.20.7
-	rustversion-1.0.9
-	ryu-1.0.11
-	same-file-1.0.6
-	schannel-0.1.20
-	scoped-tls-1.0.1
-	scopeguard-1.1.0
-	scroll-0.11.0
-	scroll_derive-0.11.0
-	sct-0.7.0
-	secret-service-2.0.2
-	security-framework-2.7.0
-	security-framework-sys-2.6.1
-	semver-1.0.14
-	serde-1.0.147
-	serde_derive-1.0.147
-	serde_json-1.0.88
-	serde_repr-0.1.9
-	sha2-0.10.6
-	sha2-0.9.9
-	sharded-slab-0.1.4
-	shlex-1.1.0
-	similar-2.2.1
-	slab-0.4.7
-	smallvec-1.10.0
-	smawk-0.3.1
-	snapbox-0.4.1
-	snapbox-macros-0.3.1
-	socket2-0.4.7
-	socks-0.3.4
-	spin-0.5.2
-	static_assertions-1.1.0
-	strsim-0.10.0
-	subtle-2.4.1
-	syn-1.0.103
-	tar-0.4.38
-	target-lexicon-0.12.5
-	tempfile-3.3.0
-	termcolor-1.1.3
-	terminal_size-0.1.17
-	terminal_size-0.2.2
-	textwrap-0.16.0
-	thiserror-1.0.37
-	thiserror-impl-1.0.37
-	thread_local-1.1.4
-	time-0.3.17
-	time-core-0.1.0
-	time-macros-0.2.6
-	tiny-keccak-2.0.2
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	toml-0.5.9
-	toml_datetime-0.5.0
-	toml_edit-0.15.0
-	tracing-0.1.37
-	tracing-attributes-0.1.23
-	tracing-core-0.1.30
-	tracing-log-0.1.3
-	tracing-serde-0.1.3
-	tracing-subscriber-0.3.16
-	trycmd-0.14.4
-	twox-hash-1.6.3
-	typenum-1.15.0
-	unicase-2.6.0
-	unicode-bidi-0.3.8
-	unicode-ident-1.0.5
-	unicode-linebreak-0.1.4
-	unicode-normalization-0.1.22
-	unicode-width-0.1.10
-	uniffi_bindgen-0.21.0
-	uniffi_meta-0.21.0
-	untrusted-0.7.1
-	ureq-2.5.0
-	url-2.3.1
-	uuid-0.8.2
-	uuid-1.2.2
-	valuable-0.1.0
-	vcpkg-0.2.15
-	version_check-0.9.4
-	wait-timeout-0.2.0
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	web-sys-0.3.60
-	webpki-0.22.0
-	webpki-roots-0.22.5
-	weedle2-4.0.0
-	wepoll-ffi-0.1.2
-	which-4.3.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.36.1
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.36.1
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.36.1
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.36.1
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.36.1
-	windows_x86_64_msvc-0.42.0
-	xattr-0.2.3
-	xwin-0.2.8
-	yansi-0.5.1
-	zbus-1.9.3
-	zbus_macros-1.9.3
-	zip-0.6.3
-	zvariant-2.10.0
-	zvariant_derive-2.10.0"
-# additional crates used by test-crates/* test packages,
-# `grep test-crates tests/run.rs` to see which are needed
-CRATES_TEST="
-	cargo_metadata-0.14.2
-	cc-1.0.73
-	cc-1.0.74
-	indexmap-1.9.1
-	libc-0.2.134
-	once_cell-1.15.0
-	parking_lot_core-0.9.3
-	proc-macro2-1.0.46
-	pyo3-0.17.3
-	pyo3-build-config-0.17.3
-	pyo3-ffi-0.17.3
-	pyo3-macros-0.17.3
-	pyo3-macros-backend-0.17.3
-	python3-dll-a-0.2.6
-	serde_json-1.0.87
-	syn-1.0.102
-	target-lexicon-0.12.4
-	uniffi-0.21.0
-	uniffi_build-0.21.0
-	uniffi_macros-0.21.0
-	unindent-0.1.10"
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-inherit cargo distutils-r1 flag-o-matic
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD
-	CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 openssl
-	doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10} pypy3)"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	doc? ( app-text/mdbook )
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# used to prevent use of network during tests
-	cat > "${T}"/pip.conf <<-EOF || die
-		[install]
-		no-index = yes
-		no-dependencies = yes
-	EOF
-
-	# TODO: package-agnostic way to handle IUSE=debug with setuptools-rust?
-	use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die
-
-	# setup.py handles most for non-tests, but ensure rustls is disabled except
-	# on arches where ring crate should work (keep in sync below, bug #859577)
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		sed -i '/^if platform.machine/s/^if/if True or/' setup.py || die
-	fi
-}
-
-src_configure() {
-	filter-lto # undefined references with ring crate
-
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		local myfeatures=( upload log human-panic )
-		cargo_src_configure --no-default-features
-	fi
-}
-
-python_compile_all() {
-	use !doc || mdbook build -d html guide || die
-}
-
-python_test() {
-	local -x MATURIN_TEST_PYTHON=${EPYTHON}
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	local skip=(
-		--skip locked_doesnt_build_without_cargo_lock
-		# relies on 80-chars terminal output but ignores exported COLUMNS=80
-		--skip cli_tests
-		# avoid need for wasm over a single hello world test
-		--skip integration_wasm_hello_world
-		# fragile depending on rust version, also wants libpypy*-c.so for pypy
-		--skip pyo3_no_extension_module
-	)
-
-	cargo_src_test -- "${skip[@]}"
-}
-
-python_install_all() {
-	dodoc Changelog.md README.md
-	use doc && dodoc -r guide/html
-}
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index 41acb31951a5..cb60ada4fdd0 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -2,5 +2,5 @@ AUX statifier-1.7.4-clang.patch 344 BLAKE2B 6e5d2f48fa20c34c999cf898f943e9e61133
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 AUX statifier-1.7.4-musl.patch 673 BLAKE2B 1b1d46c44ae7675dd757219a40d0f255455308c27a0515c32ebdc629cbb6e1777e4a7d673c51cba42b7b82b4608ed1e69ab3d2aa7bda93b4171c0e9670e608db SHA512 285ed4d06080188b45a10c3e5da83c7e28e198cbe2f20dc84befa4d4b83850278c4f8e444898f6c419b8e13e41140875eb1e7960d9633a03b396a716c53bd03e
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4-r2.ebuild 1232 BLAKE2B 671eec9b49075f7c655c0a97635985a1c71cca4272fcf68c57b84d03c9cb348a36ad136ff1155ab7badfe27233f29ac6675a892695d43ee545151aba00116656 SHA512 c80e913de1bb3f3c4dd6a7693cfaf9feba50f449920677f77e182f4596b5a6ee46e2e1e08f1adc86700bed98173655d12f9e3f34a2f803b3867a8f15b37f6e5d
+EBUILD statifier-1.7.4-r2.ebuild 1241 BLAKE2B 04afc0f30405b28b5c83f8de6dbd5104367217fa26ce12450e4234ddca43078ca93a52d0400bb30d6d67f143f1b75c782e2e7e9acaafb7c4c767c365957b6787 SHA512 6554f5d160054ad7527efaf971b1b79ced93c7b8347885560bd0f1bc37e40c23d5a9750fd14c62747db6fc0fadb0e52c50bb827296e302052a238ec35bf1b686
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-util/statifier/statifier-1.7.4-r2.ebuild b/dev-util/statifier/statifier-1.7.4-r2.ebuild
index 0c00e2573e74..4207ebc917d0 100644
--- a/dev-util/statifier/statifier-1.7.4-r2.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 RDEPEND="
 	app-shells/bash
 	sys-apps/coreutils
-	virtual/awk
+	app-alternatives/awk
 "
 
 PATCHES=(
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 8781af0960b1..02c29a2ee74a 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -108,5 +108,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
-EBUILD tree-sitter-cli-0.20.7.ebuild 2934 BLAKE2B 193c8aa33aae24287eeb81210fff705f22b419e76cdcabb562ea06bbd38a52c9be30107e0b69e3ebc546e416e518e3d7bebc218fe75726dd7f228222804a792a SHA512 af376217826657f1e5f7d99d14ddda481e0cfa75ff213c67fa694325d191acc87f984e0217d0ab857c586f4f042b295bf7f09e8ff60334a0a52abaccf9fd5441
+EBUILD tree-sitter-cli-0.20.7.ebuild 2940 BLAKE2B 425847106b3ca58b17dc9e4fe915c72f8b17990f0ff08aee70e01cc79ffdb68f4672fd0ac80cf02b536646361c9b968600c2d2b1f74357f1fae23d4591b1b571 SHA512 74a4717f1c5bff7f82a7d6269992af5deec4375898d1945f6090270cc526bfacbd5aaa4ea227c367967fe2f03531a03247c8fceee628dacd37af8deb18b8ad57
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
index a0f1b334cf70..a6ee59daa11e 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
@@ -124,7 +124,7 @@ S="${WORKDIR}"/${MY_P}/cli
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 174e6baa2c96..c5bf1041e6fb 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -2,6 +2,6 @@ AUX wiggle-1.0-cflags.patch 561 BLAKE2B b2daf7fe766800733dd8b22f8e56dd97d9ffabec
 AUX wiggle-1.2-cflags.patch 1104 BLAKE2B 6ce9fbf3a78516b0302dc19d281a8c295867954302c50d011def60568791c7507d35ad3502d8782a2e37fc4e1e99785f0f0c6e705f78699c862a414ad85457ce SHA512 a314dff5ce1610103366a5ad243df29a73f7a4efaaa1eba654ca6d6b2df7ec55d667350bca56c088efb24e5fc4d6bae35fced5d26dfcdf23dabbee72d6a4a0cb
 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
 DIST wiggle-1.2.tar.gz 847391 BLAKE2B 5e2e3d76e8d5a0ee25cb0957fed1faf0f41bf14a7e7ced9a4547c300154a835df3ade2a94c1d28eb7878e608bf0f48fcd827387d87fe614a95bfea4261b3df01 SHA512 655525a05c0ebc08cb2e4dc33c0b40f893814976e493ea4bcf87cf703738310af2e71c43a15a6e56c948472bf0bd981a5b95f6d9a91a3a377d580928a86bcd58
-EBUILD wiggle-1.0.ebuild 1528 BLAKE2B 84da92153a66c06105451c5d46261d0dc5dd52633506b8ab26ebed2ad8b25337c350c3a60ff2136f9e650028b71ce74322238ae02e24e8ac138af0dc70f0f91a SHA512 7c1286f62a60d97033defab7aa6e19a0cc07134c7d9a757774a12ef077684d3e83d6a8b28a29dc120d354258075bfc599e6e24f57795e2c39b18a70ed23b1b74
-EBUILD wiggle-1.2.ebuild 1529 BLAKE2B f6da44432392b049812905f67051baf80b00c23d7f951957532f066c09d9e626bcc25fba6b3b158586c80f5a1ea4e25af8878b1774a212f76bbab365385186c3 SHA512 582217676c539d6f008bd7ec33cdde11e0d4f0dd4e9d8f34cffdecfd2f2d4e14c4f23c2310ce33808ea018657108bf95ad5235c611013f060a72c34aae5e41c9
+EBUILD wiggle-1.0.ebuild 1537 BLAKE2B 8e2a1f5601f5b3762425a60edac904cad1240055c6e73824b6efb1880bd8132630128f770130c8da055ae4dbbfaea92d7ce5f6fc236edc78a20edbd9208ce906 SHA512 c79fd1555ae5b4a96bd3e5c4742224a2ecf985256d9ed98694a373f7b7853b66645b532e2491db683e05cb81bb9e6fb09a1dee92bf22c4fdefc317ff46654f83
+EBUILD wiggle-1.2.ebuild 1538 BLAKE2B 9c0fc9536844c6d63e5eb4b5e2e0e2386057df42b7884ceb579443afae08bf79ca6196f6fec9dd1686f4b0eec8a3c70f339a5ff2a0754fb0ba8ed96d42edf894 SHA512 605a10bc1b09c8e61d88ec0e81f69560187f28569d8e8d1e048b7aaa726f56872b87f9f796f280b1a9941b27721b503e5253988919e1b5620eb0c844b62a76c4
 MISC metadata.xml 342 BLAKE2B b388fcafbff2724b63fb8d68f6a5862c2b776beb4cbc36c214806b3461cfce8e3f365b6daa60c98458087f5e3ad322f7cbee49c0e499582980ae20b2eca02f53 SHA512 1a2b8f28bcb95a4e30b4e3ebefcd29e6ab085935c2e25425797c1320d6f8ca93183dbf8cab8e15d1969effdd1f644f74f598937c53a2219cad7a9056ac6ccd58
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 2a259f966e52..0f3c7e80a92b 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-util/patchutils
 	sys-apps/diffutils
 	sys-apps/findutils
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/grep
 	sys-apps/less
 	sys-apps/sed
diff --git a/dev-util/wiggle/wiggle-1.2.ebuild b/dev-util/wiggle/wiggle-1.2.ebuild
index 0f7322c3e7de..900ebe3deb12 100644
--- a/dev-util/wiggle/wiggle-1.2.ebuild
+++ b/dev-util/wiggle/wiggle-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-util/patchutils
 	sys-apps/diffutils
 	sys-apps/findutils
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/grep
 	sys-apps/less
 	sys-apps/sed
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 18f68feff8fc..8945e1e01bd7 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index 44658f921c66..cda7f3ea15a5 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,3 +1,3 @@
 DIST topgit-0.19.13.tar.gz 355721 BLAKE2B 0f70d7720d0ca2f7724fe5fa3bb100c7f812c0bb18fd9acb4897487d90f31da957bc0b4e47e9dcdd08594366fb31c4f46447cf78989f828f337edd8f8f231bf3 SHA512 8e477504c5f873651854c9412864c9dcb0ee35d0349b65e7c5d618a0add0fad3f749381edbe17195981bae3ff9f0e7323286abf7a5c6b744721ba2cc2a5d40d4
-EBUILD topgit-0.19.13.ebuild 875 BLAKE2B 8eef3583510fa9f8cc56945cbf83b8f29fa5be802519907e4d23478b3e1a63abe3661a40341c78d03459830fd41fee0956e2c546864f452b5ab9b2a40afa5db1 SHA512 be763c350c58c3d01f76b603819891b3d147f5c76118e7960e85c909c83b3af15ff5c8d5c5231af374c87a202debfa2cd48a49664d9f145775108b5cf32fdefc
+EBUILD topgit-0.19.13.ebuild 884 BLAKE2B 58f4d740f022549c2ba4f68629fa059df9fdd2011551db13515244b8b93dede39fbe4824cbc10131f2946463102340e1a60d7ef63388bbed631ed73c40f9acbc SHA512 c5ec8084b12ee631c96a56d37282d2d64359516848037d3196711d29c55663af4345582538a293571dcf73ecbd3b4f7c415a815d37bd9260b8b0b5c48869a294
 MISC metadata.xml 486 BLAKE2B 44790d7afe48d2d2f36bd2b2c946d842a71ea76fcfa5297541f036531e82059e8d1f0e712402cbab4c45fdeaebfe7841e418da3a6655e4fefb2d994cf439ca62 SHA512 0336f1e67faf3a7d3645e72cec0329ea3fdcd293a44b1808abffaf87b381d80509988a7fa26e29d3c50510d110bd01373e279547fac400782d3c1b9eba20dbdb
diff --git a/dev-vcs/topgit/topgit-0.19.13.ebuild b/dev-vcs/topgit/topgit-0.19.13.ebuild
index 22d15a089a9b..dfade4f8c109 100644
--- a/dev-vcs/topgit/topgit-0.19.13.ebuild
+++ b/dev-vcs/topgit/topgit-0.19.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 
 BDEPEND="dev-lang/perl
 	sys-apps/sed
-	virtual/awk"
+	app-alternatives/awk"
 RDEPEND=">=dev-vcs/git-2.10.0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4a0a0354b0c8..f83cd65be8f6 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index 392a59481bd7..de4debaf8c56 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,6 +1,4 @@
 AUX cdogs-sdl-1.1.1-cmake.patch 410 BLAKE2B b2a36bf3644e885dcf05147f63c4c72e5936acc7727fc37daf9f1732ab3edd699d7a990f63f1977e9e2e9e775b8102429fbba6ffdaf77834a9e7acd3e1933023 SHA512 dd2ffe17f21640d50dec2021fa133baed11f93eba53686792116f15d21d37aed144cc03708baf633d0e0b1c74999202fe58a92eae9f15b81f61bb1b215d39ac4
-DIST cdogs-sdl-1.3.1.tar.gz 35202950 BLAKE2B 0f1da8a8475fec784042dc31d329361cc11266816a03e64a156362064e19a057908abf6d97cc5c7903307dae039713eeab27b87bba0764cf770cf49eaae806a1 SHA512 504736eddb6aa314072059ca76b65dcbc56c622dc217f78ca12a55a0fdf5e05b5c4cf49408d6af52d00d9cf8b7d3c2e246d7f44c98486520f31e94879e855e3e
 DIST cdogs-sdl-1.4.0.tar.gz 35203975 BLAKE2B 4966b6beacd8b0b83f6a59865a6347bea2ecabbc508317dd41bab286a25d06fe26de0e9cee0591f31c259a56c666734609ea4ce7710d820fcf446b280d6db42f SHA512 31a2802248cb4a16331181fa7c0cbc5b1cd5f85244554f5eccfeb1003a813452d08c6249521b7e9e800e48d636b0e7f8f8d592e54706bfcdf3dab88105ee0f28
-EBUILD cdogs-sdl-1.3.1.ebuild 1055 BLAKE2B 1748878a94567b6f723c39749b30ec0501b48e39a51be759536e965089176f3334ba0d05de8b0c874d2084d546c52e0cc5e6d935dc0ac55ad4a9e6bae4204659 SHA512 237f6c276c9fe225204cdde80a14dd153b595f97f25ab69866f0a054ce0466e2451c6155c863bfb3a4e7dd7c501e58c82f646a0cb08e0685069661174f90b785
 EBUILD cdogs-sdl-1.4.0.ebuild 1055 BLAKE2B 1748878a94567b6f723c39749b30ec0501b48e39a51be759536e965089176f3334ba0d05de8b0c874d2084d546c52e0cc5e6d935dc0ac55ad4a9e6bae4204659 SHA512 237f6c276c9fe225204cdde80a14dd153b595f97f25ab69866f0a054ce0466e2451c6155c863bfb3a4e7dd7c501e58c82f646a0cb08e0685069661174f90b785
 MISC metadata.xml 738 BLAKE2B d88ddca3d0f022c5dc03aa79cd3e64bc11e3328c53e75ec0ce719edb389ee4d119e044ded0c1c3fa7de058c62a6614459f2d3927d745cb3cb3a3e55e32ddac39 SHA512 49e02eb89ad38a8b2e8375940a9e30e2368d970c01a88095dd679e828ba91a6054c9db264a0af038648cf42f8da99800f682a6394db77c0278d98a87dc6648cb
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild
deleted file mode 100644
index 3abc29134e7f..000000000000
--- a/games-arcade/cdogs-sdl/cdogs-sdl-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="Classic overhead run-and-gun game"
-HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
-SRC_URI="https://github.com/cxong/cdogs-sdl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	media-libs/libsdl2[haptic,opengl]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer[mp3,vorbis,wav]
-	net-libs/enet:1.3="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-cmake.patch
-)
-
-src_configure() {
-	# LTO warnings, bug #858527
-	filter-lto
-
-	local mycmakeargs=(
-		-DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/
-		-DBUILD_EDITOR=OFF
-		-DUSE_SHARED_ENET=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc doc/{AUTHORS,original_readme.txt}
-
-	# CREDITS is used at runtime, rest is licenses or duplicates
-	find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0f72f96e265b..74080ba46d6e 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 199b4b1c77a6..4b8db6d1956b 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,5 @@
 AUX mgba-0.10.0-optional-updater.patch 206 BLAKE2B 199a4305212e1974aa79ee728ab7b685b4b52602fe6447dd1b29513b526e101a306558b9a912bbb3c1438ea6a70df1c9e6368e2ca2ba5b50e6a59200b2a11daf SHA512 3227908dca7a2973ae5c7ec311b683362adf16ae5d5c801943322962d181ad046f43383bdf86441d81284f4f567a8d8ae387f4c15bf25b3d4189882fecd79d6b
-AUX mgba-0.9.3-ffmpeg5.patch 4576 BLAKE2B ffce6592f2ff469a97831dd9ed8ede27bbe070ba0434545b4ff477f0f8652a15d320b205d227d3b21043127e60a4f7f326ea6c062d8bc04645b87d9af71cebdd SHA512 cce9ddd1d5bed70f1b996948afb31b5c827ccb0e2878fb032a65543551925e4a6d6a7f72a0380156b1f8a6e3720d3479d5e5e45026f7860c29fba022fd4df3d5
 DIST mgba-0.10.0.tar.gz 14302653 BLAKE2B 0ebfa8a3de5db61452f070116fcf2d6312ce96f5d08b1b1e70ba8f7e50235fecff2a0f6a5a32860b7e95e55a6ab5bbf2227d483bad7eb25d6c7e471424bcf0dd SHA512 05939f94bc00906d999b955091e8e8059cc13a5b822048f6e002062c2e74069337d947d2cde2f8c1be96e3353a361743d752811c214fa9da31ed6a4893b4d7e8
-DIST mgba-0.9.3.tar.gz 12763090 BLAKE2B 7d9ff6fc7bdff5d734540b74893a888d400b4bb6e1ce5b3b2a856239db8798ac76b8535dc770330d0451e2568a6d402558eeef27d643c0d5d3454441f45cf09b SHA512 da65b3c7ec32d732163f129c4fd38949ae2da2980beb3257bf6def5e35534a27b6d30309bb3c9a8d651642f99e1a45db7a8577c8dbf5472153d4551167471b3a
 EBUILD mgba-0.10.0.ebuild 2616 BLAKE2B 057e0e72f7bbacc6d9f4e37dbd5b60aef55527ab8bd0e44f1a16f117093f3657640be6139fa042a1f15cfbf9cfa991a6de02a4320d1cfb6d2ca409598a5c7e98 SHA512 514108085ecdf38a0ef5e9199d68a1db72b5e9f7137093249580b1e3cc492332271509d91150c6f855ccce1937120aa957ec6b452baecda7c49da8bf864394d8
-EBUILD mgba-0.9.3-r2.ebuild 2198 BLAKE2B 34575ef09aa8e06018aceb19670be2a18fe7a38ec64d52c86125e87ffc47473d47d21cc9fcf7e1cedc9fb7bdebb23a343096ffb13afb7c83be4d4930dfce57d0 SHA512 4988e0a060421a4f201a90ffc877c02252f45220ed9d8ba166bef8439cb6e10aa438ac1850bfe3927dc2b16ec9a5468e860206d7f6234dc4c08bc9518bb846c9
 EBUILD mgba-9999.ebuild 2618 BLAKE2B 2a3cd7d8f3627e9bbc55d2b9cbb2311ff1110a0ec65a56b1d205577cf17fae84d494a8e8670fc58a2f6a6ef1a9485338a027c3427d34b94c6416e0790929f4c9 SHA512 1ae1336a426f6a3158143a1e73d143320fb3ec7873e9874819da697b7594b3fc17b67c8c1d43bd6a25660ade451cebc8035342aefdfa5558fdabcef322af72fb
 MISC metadata.xml 686 BLAKE2B 14edb52fcb9e889ba151f05141d2f0b866a27ddb87943ee99a71223c747ae72423cbda0a8646b32ea175c13a67305bbba01c5062e3f73efba636f2d4a744de55 SHA512 3d671e43a9c0991131cce93bcc4b3c4da32fd67ebdbc57b404eafc4f235b3ad7af1417801bd84578d76553829b3ebfeb29d5a7f9871d11812e681759a2232698
diff --git a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
deleted file mode 100644
index 6b8d55c377ea..000000000000
--- a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-https://bugs.gentoo.org/834374
-
-https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
-From: Ryan Tandy <ryan@nardis.ca>
-Date: Thu, 3 Feb 2022 19:02:52 -0800
-Subject: [PATCH] FFmpeg: Support FFmpeg 5.0
---- a/src/feature/ffmpeg/ffmpeg-decoder.c
-+++ b/src/feature/ffmpeg/ffmpeg-decoder.c
-@@ -5,6 +5,7 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- #include "ffmpeg-decoder.h"
- 
-+#include <libavcodec/avcodec.h>
- #include <libswscale/swscale.h>
- 
- void FFmpegDecoderInit(struct FFmpegDecoder* decoder) {
-@@ -38,7 +39,7 @@ bool FFmpegDecoderOpen(struct FFmpegDecoder* decoder, const char* infile) {
- #else
- 		enum AVMediaType type = decoder->context->streams[i]->codec->codec_type;
- #endif
--		struct AVCodec* codec;
-+		const struct AVCodec* codec;
- 		struct AVCodecContext* context = NULL;
- 		if (type == AVMEDIA_TYPE_VIDEO && decoder->videoStream < 0) {
- 			decoder->video = avcodec_alloc_context3(NULL);
---- a/src/feature/ffmpeg/ffmpeg-encoder.c
-+++ b/src/feature/ffmpeg/ffmpeg-encoder.c
-@@ -12,6 +12,9 @@
- 
- #include <libavcodec/version.h>
- #include <libavcodec/avcodec.h>
-+#if LIBAVCODEC_VERSION_MAJOR >= 58
-+#include <libavcodec/bsf.h>
-+#endif
- 
- #include <libavfilter/buffersink.h>
- #include <libavfilter/buffersrc.h>
-@@ -121,7 +124,7 @@ bool FFmpegEncoderSetAudio(struct FFmpegEncoder* encoder, const char* acodec, un
- 		return true;
- 	}
- 
--	AVCodec* codec = avcodec_find_encoder_by_name(acodec);
-+	const AVCodec* codec = avcodec_find_encoder_by_name(acodec);
- 	if (!codec) {
- 		return false;
- 	}
-@@ -193,7 +196,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
- 		return true;
- 	}
- 
--	AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
-+	const AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
- 	if (!codec) {
- 		return false;
- 	}
-@@ -213,7 +216,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
- 	if (encoder->pixFormat == AV_PIX_FMT_NONE) {
- 		return false;
- 	}
--	if (vbr < 0 && !av_opt_find(&codec->priv_class, "crf", NULL, 0, 0)) {
-+	if (vbr < 0 && !av_opt_find((void*) &codec->priv_class, "crf", NULL, 0, 0)) {
- 		return false;
- 	}
- 	encoder->videoCodec = vcodec;
-@@ -223,7 +226,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
- }
- 
- bool FFmpegEncoderSetContainer(struct FFmpegEncoder* encoder, const char* container) {
--	AVOutputFormat* oformat = av_guess_format(container, 0, 0);
-+	const AVOutputFormat* oformat = av_guess_format(container, 0, 0);
- 	if (!oformat) {
- 		return false;
- 	}
-@@ -241,9 +244,9 @@ void FFmpegEncoderSetLooping(struct FFmpegEncoder* encoder, bool loop) {
- }
- 
- bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
--	AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
--	AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
--	AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
-+	const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
-+	const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
-+	const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
- 	if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !oformat || (!acodec && !vcodec)) {
- 		return false;
- 	}
-@@ -257,8 +260,8 @@ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
- }
- 
- bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
--	AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
--	AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
-+	const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
-+	const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
- 	if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !FFmpegEncoderVerifyContainer(encoder)) {
- 		return false;
- 	}
-@@ -272,9 +275,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
- 	encoder->currentVideoFrame = 0;
- 	encoder->skipResidue = 0;
- 
--	AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
-+	const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
- #ifndef USE_LIBAV
--	avformat_alloc_output_context2(&encoder->context, oformat, 0, outfile);
-+	avformat_alloc_output_context2(&encoder->context, (AVOutputFormat*) oformat, 0, outfile);
- #else
- 	encoder->context = avformat_alloc_context();
- 	strncpy(encoder->context->filename, outfile, sizeof(encoder->context->filename) - 1);
diff --git a/games-emulation/mgba/mgba-0.9.3-r2.ebuild b/games-emulation/mgba/mgba-0.9.3-r2.ebuild
deleted file mode 100644
index 82caf353a7fa..000000000000
--- a/games-emulation/mgba/mgba-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
-	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Game Boy Advance Emulator"
-HOMEPAGE="https://mgba.io/"
-
-LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
-SLOT="0/9"
-IUSE="debug discord elf ffmpeg gles2 gles3 gui libretro opengl +sdl sqlite test"
-# gles2/gles3 opengl require can be lifted in next version (bug #835039)
-REQUIRED_USE="
-	|| ( gui sdl )
-	gles2? ( opengl )
-	gles3? ( opengl )
-	gui? ( || ( gles2 opengl ) )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/libpng:=
-	sys-libs/zlib:=[minizip]
-	debug? ( dev-libs/libedit )
-	elf? ( dev-libs/elfutils )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gles2? ( media-libs/libglvnd )
-	gles3? ( media-libs/libglvnd )
-	opengl? ( media-libs/libglvnd )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[sound,joystick,opengl?,video] )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ffmpeg5.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CINEMA=$(usex test)
-		-DBUILD_GL=$(usex opengl)
-		-DBUILD_GLES2=$(usex gles2)
-		-DBUILD_GLES3=$(usex gles3)
-		-DBUILD_LIBRETRO=$(usex libretro)
-		-DBUILD_QT=$(usex gui)
-		-DBUILD_SDL=$(usex sdl)
-		-DBUILD_SUITE=$(usex test)
-		-DMARKDOWN=OFF #752048
-		-DUSE_DEBUGGERS=$(usex debug)
-		-DUSE_DISCORD_RPC=$(usex discord)
-		-DUSE_EDITLINE=$(usex debug)
-		-DUSE_ELF=$(usex elf)
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GDB_STUB=$(usex debug)
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=ON
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_ZLIB=ON
-		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	use !test || rm "${ED}"/usr/bin/mgba-cinema || die
-
-	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
-}
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index df8d363f6617..8f66d688a349 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -7,14 +7,12 @@ AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fb
 AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332
 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646
 DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea SHA512 cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
-EBUILD pcsx2-1.7.3468.ebuild 7180 BLAKE2B f8ea7f06b934f87f2ee869ae08167078e7eaca8b9601e34d7ed586aec4ab0ce10790db81b3c6d2620be7c9606f25eefed6505c51b9d8a5621639347c73d83d00 SHA512 2cf088951ea0f2f542c0ce158bccf462f2cdd7d2f8150e4135fffa8ecfaf1ee7895eb739cb6e283b058bded6de605b89bc9aabd8112965c0b73b1357e5c2e81a
 EBUILD pcsx2-1.7.3602.ebuild 7200 BLAKE2B 5edd27101b1c0f5fec9e2363b1d9aea136686242a5bed068380ea12bbf3c5ea9a3b64853ca68c39b3b7f4e8707ac6f632d855eb73ebff941b1a32594fe54d891 SHA512 a81bb85f9ea75ee86d332ce1fa765a7b2689d822382ad1b45d518e1a2c5e6114a2d932ed4b5f1f70758b753bdcb079e8d2e9fac4dd659bb33585f7ab3b81c173
 EBUILD pcsx2-9999.ebuild 7200 BLAKE2B 5edd27101b1c0f5fec9e2363b1d9aea136686242a5bed068380ea12bbf3c5ea9a3b64853ca68c39b3b7f4e8707ac6f632d855eb73ebff941b1a32594fe54d891 SHA512 a81bb85f9ea75ee86d332ce1fa765a7b2689d822382ad1b45d518e1a2c5e6114a2d932ed4b5f1f70758b753bdcb079e8d2e9fac4dd659bb33585f7ab3b81c173
 MISC metadata.xml 805 BLAKE2B eb7ce944f7dc5b1889cc2b59f389eafabe9d5e44c4a730fa1352b0a00aec0f97d607204c440a9ce014e02f5b1a73c6ccd294074e7ce41f563c6c3643614ac9f6 SHA512 e8d939f76830204283557319961b4e3aab557e1c3e36fbfc98d4605b0728adb42d0731a05da998eb099f6b0df837eef7616cddb1e62b006979fb9262c172d961
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild
deleted file mode 100644
index 25b97c43ac32..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic wxwidgets
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
-	HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
-	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
-	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
-	SRC_URI="
-		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
-		https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
-		vulkan? (
-			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		)"
-	KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/"
-
-LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
-	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
-	dev-libs/libaio
-	dev-libs/libchdr
-	>=dev-libs/libfmt-7.1.3:=
-	dev-libs/libzip:=[zstd]
-	media-libs/harfbuzz
-	media-libs/libglvnd
-	media-libs/libpng:=
-	>=media-libs/libsdl2-2.0.22[haptic,joystick]
-	media-libs/libsoundtouch:=
-	net-libs/libpcap
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-		net-misc/curl
-	)
-	!qt6? (
-		dev-libs/glib:2
-		media-libs/libsamplerate
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[wayland?]
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-	)
-	sndio? ( media-sound/sndio:= )
-	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	test? ( dev-cpp/gtest )"
-BDEPEND="
-	dev-lang/perl
-	qt6? ( dev-qt/qttools[linguist] )
-	!qt6? ( sys-devel/gettext )"
-
-FILECAPS=(
-	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
-	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
-	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
-	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
-	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
-	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		local EGIT_SUBMODULES=(
-			# has no build system and is not really setup for unbundling
-			3rdparty/rcheevos/rcheevos
-
-			# system rapidyaml is still used, but this uses another part
-			# of the source directly (fast_float) and so allow the submodule
-			# https://github.com/PCSX2/pcsx2/commit/af646e449
-			3rdparty/rapidyaml/rapidyaml
-			3rdparty/rapidyaml/rapidyaml/extern/c4core
-			3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
-
-			# uses glslang's StandAlone/ResourceLimits.h unavailable with
-			# system's (also keep bundled vulkan-headers to be in sync)
-			$(usev vulkan '
-				3rdparty/glslang/glslang
-				3rdparty/vulkan-headers')
-		)
-
-		git-r3_src_unpack
-	else
-		default
-
-		mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
-		mv fast_float-${HASH_FASTFLOAT} \
-			"${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
-
-		rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
-		mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
-
-		if use vulkan; then
-			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
-			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
-			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
-	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
-		-i pcsx2/Frontend/CommonHost.cpp || die
-
-	# non-cubeb pulseaudio is only used for usb-mic without qt6, not output
-	use pulseaudio || :> cmake/FindPulseAudio.cmake || die
-
-	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-			-i cmake/Pcsx2Utils.cmake || die
-
-		# delete all 3rdparty/* except known-used ones in non-live
-		local keep=(
-			# TODO?: rapidjson and xbyak are packaged and could be unbundlable
-			# w/ patch, and discord-rpc be optional w/ dependency on rapidjson
-			cpuinfo cubeb discord-rpc glad imgui include jpgd lzma
-			rapidjson rapidyaml rcheevos simpleini xbyak
-			$(usev vulkan 'glslang vulkan-headers')
-		)
-		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
-			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
-	fi
-}
-
-src_configure() {
-	use qt6 || setup-wxwidgets
-
-	# for bundled glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_BUILD_DATE=yes
-		-DDISABLE_PCSX2_WRAPPER=yes
-		-DDISABLE_SETCAP=yes
-		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=yes
-		-DQT_BUILD=$(usex qt6)
-		-DUSE_SYSTEM_LIBS=yes
-		-DUSE_VTUNE=no
-		-DUSE_VULKAN=$(usex vulkan)
-		-DWAYLAND_API=$(usex wayland)
-		-DXDG_STD=yes
-
-		# sse4.1 is the bare minimum required, -m is required at build time
-		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
-		# https://github.com/PCSX2/pcsx2/pull/4329
-		-DARCH_FLAG=-msse4.1
-
-		# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
-		-DCHECK_ALSA=$(usex alsa)
-		-DCHECK_JACK=$(usex jack)
-		-DCHECK_PULSE=$(usex pulseaudio)
-		-DCHECK_SNDIO=$(usex sndio)
-		-DLAZY_LOAD_LIBS=no
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	local replacing_old
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
-	then
-		replacing_old=
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
-		elog "it is recommended to backup your save states and memory cards before use."
-		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
-	fi
-
-	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
-		[[ -v replacing_old ]] && elog
-		elog "${PN}-1.7.x is a development branch using a nightly release model"
-		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
-		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
-		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
-		elog "roughly every months."
-		elog
-		elog "Please report an issue if feel a picked nightly release needs to be"
-		elog "updated ahead of time or masked (notably for handling regressions)."
-	fi
-}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 950efe8a5846..a2c4a62447f9 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 619725ece8ca..329874bbb8d6 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,3 +1,3 @@
 DIST freedroidRPG-1.0rc3.tar.gz 237674000 BLAKE2B 44031686ccd9af3bb082ec9cd2bf233792d2b1019a35b0fc2585df39a05b678ef784f9ff5861fbbcfe7ea624a338f6ab28f855158b7c1d18d52fa9e410410d7d SHA512 51125619fb57f8cb16746b3ff100175ab7917c567c8b1efcbc1aebc80a4774501a934b2fd544d65f1420212f9043015c2b88f08d785e765a30ce478157d887fd
-EBUILD freedroidrpg-1.0_rc3.ebuild 1569 BLAKE2B 4a8a468f8d415944a10b1f03519095f795b5a9e20041750b635f84ac7d19a7347f809a627e89e80588b8b1e4cc8caee1927ed598f615d20647c4732a31efaa58 SHA512 83fd558973acb96f480774de27848a753a7970b920b47066fbcd4db0c385291ca2d7362bc60b3032a5df1b16d70ef752e7a1e2430b3a4d1905b24e1f686f9920
+EBUILD freedroidrpg-1.0_rc3.ebuild 1578 BLAKE2B 7df854345a29e4ead87afa23749fcf27f71b2d758de1a820d515d8ff16e868549ca3c7584d231660d1040c85861149536d58adf8ef338490a673fb22c928b472 SHA512 8eb27734bdc299f58742b4b0aead970ae9147052d1acd97e102cb504220c2f4b09b55e1637732055ba9959b91a15dc1879f0a323c8773ce02a58c4ee1562c6fd
 MISC metadata.xml 1841 BLAKE2B 35e1181f9a732aa02c9fd3c354aca984cd0084b373bd62da49f270d03b580d2613775bcd273d0a2cdd9e2cd48c4c0e2fb7f2c81d0e6e6af17a38f29ab251d8d1 SHA512 39c950f196b3cfb24ac213fe919f891f969c35993d1e225961a9f4375dbda2d2bad87c9161b161d0997c1e0102b7a4cef356796b209771ccb062692787d0d43c
diff --git a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc3.ebuild b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc3.ebuild
index 680b0d7e6349..bea68dfb1fe7 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc3.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc3.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
 	sys-devel/gettext
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig"
 
 pkg_setup() {
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index bffd913d299e..f28beb965abe 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index 41777e41cee0..46e708657046 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,8 +1,4 @@
-AUX widelands-1.0-boost-1.77.patch 473 BLAKE2B c874688efafde34c19b9362b4a744c054076bbdb62ad4bddf3f3960774852fac514e768e20d78b1908b2d0274534304f6629ac2bbf87200f4f44f7730cd63981 SHA512 8b1d989c208f917bd26e9ab6000a1367f1dc9f6fa7dcdf681503541b1dd6d1a6433463c4f547ff387aeceb38156e7e8c73790f329746b6b55350f17b96289f9c
-AUX widelands-1.0-gcc12-werror.patch 1130 BLAKE2B 814e0ae5d710cbd0f02df6888deea17c33f934cde25d7e6cf78ad5dde106f4b1534012eaea9996b66ad12ff1ea2578e08802a581db5a9f17438cfe7d9e0fce78 SHA512 a303972d15f2ad2fb895992358759f7a3006c81c875afbbbac4cf4ec76ca93d3ad93754b26eea2315bd9c82f2967912019759117c7004843d659d2d767c2f7ee
-DIST widelands-1.0.tar.gz 792124780 BLAKE2B 03f3eeacd8a9a867020be8ed086f139dc7f2fdf30b901edfc1d86bf9c245a71c3c4358d5589f1cd7734b6ac3bf93bab38870544050628f44863decbed86f6d47 SHA512 1092750944a8669682097dfbd2b578cdb8fab377f32cb81ce8d85b9d9b2e8ae8c4c73500c0a89be649b360fd7e086e19595eba37cecb8d64679e46f7da13e46e
 DIST widelands-1.1.tar.gz 416104611 BLAKE2B e217ff5a4e3ba0431b96290dd4908d7ddadaf1850e890cee135a54f88162b30d75dbf5bc5f086d6c5e8c5e4410a0a788201117c3615e15a3e2acfd00e8f01272 SHA512 29dbeae0940468c8aad6f0fa610c8467bdb6ecf2ba5fe9175683b7cdaab5f977fa86beb71de29057c829e9738568d15e10bc22fa7fc9e58132151a1a02d72d9d
-EBUILD widelands-1.0.ebuild 1402 BLAKE2B 4298ca52bfbd4da0305d685aa395d1e439e07d748d64ad7b6c9e87788597a5c9b1e620c4fe403fcbf71678aafcd200682ecd642e070fd08a840d5d2cebb30ffa SHA512 7dce68948ac145f1e68dea3aad856bece3913cb4127d50ef45ee310a95839f3557459e4937047ffccc3009f9851497d9088fc87fc8b8a72a371d81be847b7887
 EBUILD widelands-1.1.ebuild 1307 BLAKE2B aa7b006291aa96890aa2a9469b8bfb3af32d308d6b44dc15b8654bc9a3ee47649c902add180643e82614937c7c631716c8ccb57bd862799c3171ca06e32d3322 SHA512 84e6f55bd5c5fc0b2640db6d3494f4161cd4c11a8da6304023b0d7b1c8bd57a74cf8f9662c0c3a9fbf2a2c792b96787516f9295a67e05ed4c0a72dba51573628
 EBUILD widelands-9999.ebuild 1307 BLAKE2B aa7b006291aa96890aa2a9469b8bfb3af32d308d6b44dc15b8654bc9a3ee47649c902add180643e82614937c7c631716c8ccb57bd862799c3171ca06e32d3322 SHA512 84e6f55bd5c5fc0b2640db6d3494f4161cd4c11a8da6304023b0d7b1c8bd57a74cf8f9662c0c3a9fbf2a2c792b96787516f9295a67e05ed4c0a72dba51573628
 MISC metadata.xml 390 BLAKE2B 139ecbaa266c6fe37441b3e0dd05692dc9eff8301339b7ed358ff32e17c6a1a14cd52b2cf22f141381bcf76d5e9dd579575d204e5a3c1c3793b49ced61b090af SHA512 ecaa9b97ffb2302a7f356e53393f185b70b83563052066d4dd70ad7b725a9963c46b582e1a438f36d517cc52e0ff56316ea8be6c92b54fcdda1726776845f46f
diff --git a/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch b/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
deleted file mode 100644
index 69c1cb8caf43..000000000000
--- a/games-strategy/widelands/files/widelands-1.0-boost-1.77.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/808747
-
-https://github.com/widelands/widelands/commit/316eaea
-From: matthiakl <t-m.42@mailpost.spdns.org>
-Date: Sat, 14 Aug 2021 19:24:08 +0200
-Subject: [PATCH] Added missing direct incude (#5025)
---- a/src/network/bufferedconnection.h
-+++ b/src/network/bufferedconnection.h
-@@ -20,6 +20,7 @@
- #ifndef WL_NETWORK_BUFFEREDCONNECTION_H
- #define WL_NETWORK_BUFFEREDCONNECTION_H
- 
-+#include <map>
- #include <memory>
- #include <mutex>
- #include <thread>
diff --git a/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch b/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
deleted file mode 100644
index a00603a7969c..000000000000
--- a/games-strategy/widelands/files/widelands-1.0-gcc12-werror.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Drop -Werror= (uninitialized cause issues from gcc-12) and also backport
-fix for the offending variable.
-
-Note: upstream changed how -Werror is handled next release, currently pass
-a hard non-specific -Werror and disables it for gcc-12 (review on bump, see
-commit/PR below).
-
-https://bugs.gentoo.org/859277
-https://github.com/widelands/widelands/pull/5415
-https://github.com/widelands/widelands/commit/e4da6d624
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,8 +312,2 @@
- if(NOT MSVC)
--  # Turn some warnings into errors.
--  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
--  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
--  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
--  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
--
-   wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=c++11")
---- a/src/editor/editorinteractive.h
-+++ b/src/editor/editorinteractive.h
-@@ -87,4 +87,4 @@
- 		EditorIncreaseResourcesTool increase_resources;
--		EditorSetPortSpaceTool set_port_space;
- 		EditorUnsetPortSpaceTool unset_port_space;
-+		EditorSetPortSpaceTool set_port_space;
- 		EditorSetOriginTool set_origin;
diff --git a/games-strategy/widelands/widelands-1.0.ebuild b/games-strategy/widelands/widelands-1.0.ebuild
deleted file mode 100644
index 62799a6e424f..000000000000
--- a/games-strategy/widelands/widelands-1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit xdg cmake python-any-r1
-
-DESCRIPTION="Game similar to Settlers 2"
-HOMEPAGE="https://www.widelands.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/widelands/widelands.git"
-else
-	SRC_URI="https://github.com/widelands/widelands/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/icu:=
-	media-libs/glew:0=
-	media-libs/libglvnd
-	media-libs/libpng:=
-	media-libs/libsdl2[opengl,sound,video]
-	media-libs/sdl2-image[jpeg,png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-ttf
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/libintl"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-boost-1.77.patch
-	"${FILESDIR}"/${P}-gcc12-werror.patch
-)
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/bin
-		-DWL_INSTALL_BASEDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/${PN}
-		-DGTK_UPDATE_ICON_CACHE=OFF
-		-DOPTION_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 485f750bb084..5ebb1695c8a7 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/libstrangle/Manifest b/games-util/libstrangle/Manifest
index a00142d6eb9d..258530fe34bf 100644
--- a/games-util/libstrangle/Manifest
+++ b/games-util/libstrangle/Manifest
@@ -1,3 +1,3 @@
-DIST libstrangle-0.1.1_p20220222.tar.gz 947358 BLAKE2B 2222550e28d4af1dafc43691f3021fdac30445e3223673b74f69adfe681c9b1879925b3961dc9d086f2e5cadeeca7488e1a53bcdb6e302b2e4087a0f2a19a380 SHA512 5f6d7bc5acb95be4c0083a16134dfe7c6a95ab6a73cca69ec2d92cf75ebf5ecfaea08dda0d887e8e136fd410c988c0bd36289c2a17df3eb1698b453bb38c4011
-EBUILD libstrangle-0.1.1_p20220222-r1.ebuild 1303 BLAKE2B 6d79da2e9d19082a0f0cfbcfb8e1f2f69eca5602cc0a4bf561e392d44433723c7c69308f0f8c17b1dd9ddf29efdafa664c23078329878a064ed015e914e492de SHA512 34d2f6eb546033057901f491b855040605d29f70940fe0d7b64e91838224cf0f25ea5808cda96f51179bc8119b7169f6fe0481f5219d7661fa58a6938efeff8d
+DIST libstrangle-0.1.1_p20220222.tar.bz2 834715 BLAKE2B e849bf5da7a58ef081059471915d7488de5da4c805a42ff9d96fa477fcf6aada4769683020b0233215804e93e280c8b424e3fc56e2939714cc4c2ecc2794831d SHA512 a0b8a741d45e8bdda71a3b1a5ff905925d8b178253c0ac05e01e86c339aa15a207c9b514b17ae2c9810118fe749abf089c8d8efeef23b67a5718da85db264b68
+EBUILD libstrangle-0.1.1_p20220222-r1.ebuild 1304 BLAKE2B 2dd8924e1feb0ec7c4ff635493e1e1e17040dacd00e8998ae336533e6d005d8a37c9d2fbfdc964c6418837bd05a3033acb2d3bc4328d3facdba08f82bc1afda1 SHA512 9844be1351f535f48da8ea127c1c81e1d4fc82978d46b7cabc0f27b934da22933e9f47439ef5df8c5578ea259e591e6783f29d94106d8996818955fba96cae48
 MISC metadata.xml 332 BLAKE2B e75edf673556ac4f9fa191394e3984305272379efc2ca67149029dd037a16ea8679081ccde536648e57e61d7fc4cdeab7dd946dfc4dfe2222f9ca777636ae2b8 SHA512 2cd2bdaef93867ff657b5b752e548e74a43663549b02fe71ce0cef61662ed3a69b6d49e90f912486080e266308391f1b93a910ccf18879dd39e563a3327eb095
diff --git a/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild b/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild
index c39f31b01542..7424fd24e64a 100644
--- a/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild
+++ b/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild
@@ -9,7 +9,7 @@ STRANGLE_COMMIT="0273e318e3b0cc759155db8729ad74266b74cb9b"
 
 DESCRIPTION="Frame rate limiter for OpenGL/Vulkan"
 HOMEPAGE="https://gitlab.com/torkel104/libstrangle/"
-SRC_URI="https://gitlab.com/torkel104/libstrangle/-/archive/${STRANGLE_COMMIT}/${P}.tar.gz"
+SRC_URI="https://gitlab.com/torkel104/libstrangle/-/archive/${STRANGLE_COMMIT}/${P}.tar.bz2"
 S="${WORKDIR}/${PN}-${STRANGLE_COMMIT}"
 
 LICENSE="GPL-3+"
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
index 6f6ac21fba89..029740cb4541 100644
--- a/games-util/xpadneo/Manifest
+++ b/games-util/xpadneo/Manifest
@@ -1,4 +1,4 @@
 DIST xpadneo-0.9.5.tar.gz 1341366 BLAKE2B d04a3e1b626af1f1a9ec114f0a8ed44c50ec8cde9da71483491d1afd7688611fd7548186ea68ef8a144aecec06acba816e81e9f0708c8dceb96fa1d40985bb44 SHA512 e7e299faf78c139d4cd189c4adc9bcbd52e1e1011ff90513cc09fc3e6cac1961018883933ad1db23dc02c8d5006f3166fbb42ae66150dff71138f2ed95f4576c
-EBUILD xpadneo-0.9.5.ebuild 2303 BLAKE2B d2fb6917074519884902d2037c2d07259ef1e9c65199f0734c0265d29f432712157e1d2ec7e8aa97e005be8b7c7691d8015ef584111afa2a5f284135c6eae858 SHA512 f63983701cd920e01526a7f01d318dc0d66365b1d79628bcf9e3d88ca65d1d4de324b69e904f179e7d0107dd5a60302ef8168d2ad63bb29a94b5d6673d822552
+EBUILD xpadneo-0.9.5.ebuild 2302 BLAKE2B 812746fd441bf7c61ff665082e2cf07cd97ed48e6586679b127da8759b80c5a31db68a4322a78b3a20ec7716aa586e0ffab6b2dabb9fb5d9831ca427439020c1 SHA512 545bdcaedef3ea8152a8a1cca1a90b6ae5baaa92530b7e8c3975668185c43d405c1965eb6fc1a8e3842f934418ae8dc5cbd10632d90fc1d0c97710ddb1dcf49b
 EBUILD xpadneo-9999.ebuild 2303 BLAKE2B d2fb6917074519884902d2037c2d07259ef1e9c65199f0734c0265d29f432712157e1d2ec7e8aa97e005be8b7c7691d8015ef584111afa2a5f284135c6eae858 SHA512 f63983701cd920e01526a7f01d318dc0d66365b1d79628bcf9e3d88ca65d1d4de324b69e904f179e7d0107dd5a60302ef8168d2ad63bb29a94b5d6673d822552
 MISC metadata.xml 328 BLAKE2B 6511430d43b855d83d42dc94ea83bf20867568e9dbf642240ac279179d9f26d0a315f3fb90bebd4a564d4bc63beefcb8aa24af7acf25a60f9b25f732265de41b SHA512 defbfc601b6b61d10edf8947e2251f96416787a1141fccff1e017a6110eb4d8e8801fcd72cc678f816064eb5a5dc796c9c895ca9f74ad288f1338ccaaf3ee5c8
diff --git a/games-util/xpadneo/xpadneo-0.9.5.ebuild b/games-util/xpadneo/xpadneo-0.9.5.ebuild
index b193e5517951..79cd580942bb 100644
--- a/games-util/xpadneo/xpadneo-0.9.5.ebuild
+++ b/games-util/xpadneo/xpadneo-0.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_MIN_CLONE_TYPE="single"
 else
 	SRC_URI="https://github.com/atar-axis/xpadneo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Advanced Linux Driver for Xbox One Wireless Controller"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index a67f9cfe3aa9..73ac5dc319bf 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 283827af9e7b..a45177fd2ce2 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-42.0.tar.xz 663824 BLAKE2B bf1ceae255a6166cda81be57e0cae14c25e4668d70e16bafb3aeaf0958b2393c4c6be8a4575b24fc7560fdddd60c3790b89890015d13f4124445f037549781de SHA512 70d86bedd00fd38ffefb82962b591b710aa6ba59f9a12c968d5c47afeed9f4afecfb5e1228fbaba3acab5d5673cb6511d3d51674f7602f5001835d9c134fedda
 DIST yelp-xsl-42.1.tar.xz 667448 BLAKE2B 45f19a6cc7a0ff9f3f31e0f33935d757c07e403c77d2adfa20fda46a7f22da5b6196e7dc40a3e83ef0604f6c681c5ca99d5565d070d3fdcbf732312aa73d34c8 SHA512 90c7cc244dba038d6fcc1344adf950640a0affb8e5a1a6945a776d3308bf9b5071320856968f7a31688855a18a872f63553bd643b7776801cc68b182b455fc10
-EBUILD yelp-xsl-42.0.ebuild 577 BLAKE2B d0ada46e925a9cf0f7a0374c29d28cda3eebf779873dd77349b78a9f59b109e77d778aadcc255d351c6e62410712950280876b0dd76c686cb8f26c92c3cb1ce1 SHA512 81e51a501d561e3866dd7ed83736587bdece73bf5910aaefb692f46ea6abb941f1e50f9c6af5c9d024be85c491c02999b04615016a017fab00f449d5a8c2ed1d
-EBUILD yelp-xsl-42.1.ebuild 577 BLAKE2B d0ada46e925a9cf0f7a0374c29d28cda3eebf779873dd77349b78a9f59b109e77d778aadcc255d351c6e62410712950280876b0dd76c686cb8f26c92c3cb1ce1 SHA512 81e51a501d561e3866dd7ed83736587bdece73bf5910aaefb692f46ea6abb941f1e50f9c6af5c9d024be85c491c02999b04615016a017fab00f449d5a8c2ed1d
+EBUILD yelp-xsl-42.0.ebuild 586 BLAKE2B 1df2ceda3a277cb64f90f6f99e820752a51e7b451258b891e6418a3c59e273b211bf6a361848aa385f5ed7a751ddd8faa007d72af673bb0339ce4511a61e1bf8 SHA512 c1547896e1319c0a66728d63556aad4cadf1aa968c87f69cedba6000b1c9775c0996ac807b9cffbdd8b6bbaf1d26a8aed11de2724261dd4014e09f00ca652bd0
+EBUILD yelp-xsl-42.1.ebuild 586 BLAKE2B 1df2ceda3a277cb64f90f6f99e820752a51e7b451258b891e6418a3c59e273b211bf6a361848aa385f5ed7a751ddd8faa007d72af673bb0339ce4511a61e1bf8 SHA512 c1547896e1319c0a66728d63556aad4cadf1aa968c87f69cedba6000b1c9775c0996ac807b9cffbdd8b6bbaf1d26a8aed11de2724261dd4014e09f00ca652bd0
 MISC metadata.xml 349 BLAKE2B c96a25198e4abaf563ef514c3edcb162b218147130de410823349a852d8b79379a6401c21e66068b66099f710d0af5c97921dcfe7afbe55edfcb5b2a0a5512ca SHA512 992f5befc861e713494b07329a9357462e88193d070baf7282289f8774694b8138f1ffbca312f760212ec37849d0f09f7b80f27d620f1c1c8319a916819543b1
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
index b4e465c7bc46..5547dd8cbe05 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
@@ -19,6 +19,6 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	>=dev-util/itstool-1.2.0
 	>=sys-devel/gettext-0.19.8
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 "
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.1.ebuild
index b4e465c7bc46..5547dd8cbe05 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-42.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-42.1.ebuild
@@ -19,6 +19,6 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	>=dev-util/itstool-1.2.0
 	>=sys-devel/gettext-0.19.8
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 "
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 42406b4f4621..a7a4005f09f3 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/display-manager-init/Manifest b/gui-libs/display-manager-init/Manifest
index e58b91d9ecfb..a51bdad9c2b2 100644
--- a/gui-libs/display-manager-init/Manifest
+++ b/gui-libs/display-manager-init/Manifest
@@ -6,5 +6,5 @@ AUX display-manager.initd-r4 5196 BLAKE2B f8ea46550a6810e9c929052eec7a7313bc49fd
 AUX startDM-r1 778 BLAKE2B 134345da401d5d75cb4e3cf79189a2594e508d4afe748bc209e8a93ea754169b205b114fcdb830ed95908788d0bf9cf071cd50de0c37df7fe5b83827f406d766 SHA512 e0cbb1f0ca6d6d3ae3f963bb5508e5b58e03682aba3f35cb2c1819c17e2d94ee240a5dc603f9fd93d22ecca060d131e46c0a0a25685aa8deac280294ff76b8c9
 AUX xdm.initd 200 BLAKE2B ec997b7080037a7197a6f75728d9075c846168115d705015afc6518e1e72d815cdf87c2e9e3f3ad950034599e548d015e530cb7821f83b9d289337908455c17a SHA512 4552215cc2cdffa3298a9136e2a22f600f55958d7f74b2d06bbf48568d8034ef24deea27ad9f8d6d100516b0efb4e2688c1f454dc556120f759b1da7fecd877c
 EBUILD display-manager-init-1.0-r4.ebuild 1678 BLAKE2B 6f660ee635bf419c54e8a72efc4f5a8a8a3044cdfdf71a94d3a170408f5e9587a68d5ca0744e8f880144c18ba20b2af70086732d9b1cdbf0fb3c3351554e21b8 SHA512 c7ecf09d9a875ed9216a9e2b343f996610d20427d4c9f5e427784a6700f8473c720c4051011ad99e5c4ea95177ead20ac0fe251adbfbdbe73e400759f066cb2a
-EBUILD display-manager-init-1.1.1.ebuild 1683 BLAKE2B 5f8c27e828a5bb0afd1cd5c5687ea954d3fc64be70f7716e6500f55c6452361f7907335641af35281b1b63f1255452db07e61f66f42156e1de46b4c9699ee10b SHA512 7b877b6e72c732ed3992f3f251526f8dd68310f52969b18042baaaa526cd80b4b70024ace446962da669997474c96ba9a7be60a3fa78024d4efc47d00bee5a49
+EBUILD display-manager-init-1.1.1.ebuild 1682 BLAKE2B 173d006d891a598f3ef104310a81d85af418b6be5873fa8fad3a6006091bba4321c045037f2cb4b0185b075a1462200a594dc9e4366e1eed350fab702b71819c SHA512 4baa7853142b9b0836ab2d901505bdf0b2128d382f883f15131af7b1762be3932e28ca19394292d3fcebe3104afe7fdbcf267a8506673e8a4309c9c71766667a
 MISC metadata.xml 259 BLAKE2B cc7abf54ed4398a2cfb77310c63f5fae3e432488b0c7466f8148c5d009d38aa4ca78eef78712f0b7b6aca6710aab1dfe3c07440f36179fde03f8a97a49b3c080 SHA512 6f50c5d3c735db431156906312a7c1dab3723d8c9e51d15148b92d97a998221c6838eb926f36c6b924c9fc8a6a64ba904e36482ff5164867c482502aa638462f
diff --git a/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild b/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
index 801d0287873b..e7f303b0d33d 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.1.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 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"
 
 S="${WORKDIR}"
 
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index b1062b64a69d..fe970ae3f834 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index 41924167a54d..41e3741eeb2c 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1,5 +1,5 @@
 DIST s-nail-14.9.22.tar.xz 799296 BLAKE2B 4db1b74be9de38d8879b00852545840aa50022f44efc42bc338575111e391db527ba850033a9f25e6d0269f68673a13bbdcd2609c0e74fb88c409040be2d165b SHA512 016e3403fbb3d9954c160690184545fdb4fc384ffb13b146ac8b60b40e43ad1b1a8967f4660904d40a99071eb1addf2b1dd98b06c6033a1a886379c05fc0c9be
 DIST s-nail-14.9.24.tar.xz 803100 BLAKE2B 4d82c747ff082a1a13d8832eb2bf1e96f05d6b3cf61c77a67bc061b1971032b41d8f5fe5520b96b9b74bc4d0661a4a9ef0f8f93b5e7b9eef66906b78260cef2f SHA512 03f6a6f446391b6f91ed3c8875c3e7fdfac9d4e77ea1d52a7e98aa84cfd0edae137d5b9afba3bdc9a31ab67cee5237930b74b42ae3acb54aee4758553a4f1df2
-EBUILD s-nail-14.9.22.ebuild 1996 BLAKE2B e7f168e13f383e7f7128f9dbca25acb4999941dc07f1b13ed4e26d13c8dc80500780f2d475e3e186cc5e2c789a4d8fda56734239fbce4b9c9b19153f9d41d8a1 SHA512 bfc779dd534387b0521774788ac3c24621ecc4b7e6e4a32ab75c5063c54d44325591616d0f87c0dfc53930c61d95436b1aceb55e82ffbdc40cc7ecb8404e8ebf
-EBUILD s-nail-14.9.24.ebuild 2010 BLAKE2B 107ae6b64e7ea95ea43fb3c9fb4890508d5b869a0c511ec505decbffadb81d38436792bc2d0c4d1f533866372c5085f219d1b3863be939fb7985e624de0930c0 SHA512 bdd3941206802c68ef7d7e2e78ad615893aa3f853ceeb4d208c585eba8d2b09ba5e565c1ce0c47aa5e8513af28a67e20b3b19186e51719f438b422a22bd8376d
+EBUILD s-nail-14.9.22.ebuild 2005 BLAKE2B b2aa754f310792ac1d8c2dcfbcda0c826d18b14ae076c5b3f400d21d7a326709c5b443f36f39a3e3440a7524931d7834ab4aad7937065e8aeef8bf16f4f06bdb SHA512 6748f71ea0dab81f5f6473352927e0beb85f615f4f2f176601058954aeb2e37c3a43cc76201b49c5b699e175ceb7cccb2b15c4596fbc0fdc301b4e0b7bcfe509
+EBUILD s-nail-14.9.24.ebuild 2019 BLAKE2B dd48a7d752dde49bdd32d974b316f0790dc4e3cc8035525263e0488f57b2f4b6f185473ed9fdd1e79c39129cc6416b1d06e98306d73976f24a443e7e5afa8311 SHA512 0836043bbb5535149e4bcc5610a234242fb136e7595e8a88458fa56c9a16d6961b6a6ccc3b80969eadb5ea0172b883b316e02398c519e8790da2590cc97e2d90
 MISC metadata.xml 828 BLAKE2B 7664d3cb16b1dfe54ed2ab4d06e379402c593069008000dff1ef533182ef16cc90b6384d6a09c8fe982afa7deba65782d3fe13c86f322b639c9c0e89aee4f525 SHA512 eef6877163f7fcabbf4da6574483db2d37889ae3c298ee994a38cd9703554cd565e74ac70cc41317028d47050875ddbe2fe109c7e04b97e1f45b56acdda27b0a
diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild b/mail-client/s-nail/s-nail-14.9.22.ebuild
index 822c7e20fc58..5dd4cf9fe267 100644
--- a/mail-client/s-nail/s-nail-14.9.22.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.22.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/xz-utils[extra-filters(-)]
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_configure() {
diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild b/mail-client/s-nail/s-nail-14.9.24.ebuild
index 78877855757c..bcd89a795767 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/xz-utils[extra-filters(-)]
-	virtual/awk
+	app-alternatives/awk
 "
 
 src_configure() {
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index f79d49340e17..9ab87d95e59d 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 4ca57977531d..e07966f602f3 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,3 @@
 DIST terminus-font-4.49.1.tar.gz 648345 BLAKE2B 8c2edff7e57572361cf9a4907a165f8af69cbd5a3ae15817d02d43ab5134278ab64b269e6bd8c79d2107e5c8c51b58f07ab45c308891464cbc8e3e15767efadb SHA512 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8
-EBUILD terminus-font-4.49.1.ebuild 2791 BLAKE2B 4a5687cfd8b2d9ce691ef70f8d55e5f98413458a5dba3d98dca10d1dceaad9958ded09c381df3413fc658f94f4c2f67e462c91b5e7a90a126cecbdd3bf216da7 SHA512 482a3b387089818ef5fdc080b7540859437abf16b1ceac4a5139e4a51b53cde24ed3acca4820d35587e83759e122d52499b915fd6bf4a28d36c1cc1ebecb4076
+EBUILD terminus-font-4.49.1.ebuild 2800 BLAKE2B a7407a78a9f51276352f6859c6ae9420bae27477a1f9d6e0182402a5f0a4a9f5b7330f5884b06c4b65734e7f9091a4e9ef0d20d434b8719dab199e30f7226d19 SHA512 64219f24e95cee6ae73ec175ca044463683a5b1aa6c192ffcc79c128493439b83d4dc73a8156227b206df32e29c69dd6a594d08da60cfdc546d1e52fae01e7a2
 MISC metadata.xml 1945 BLAKE2B 8008e4a45a776a1e2aa9e13c8dd7374e300b323f547ece9908604a48d0f80d7942db54e4c34f144b5637865dbeffde7aa20df4451fbfee895ba7a6786f603c48 SHA512 a856c5d4e19a102c3172b96f6df89f2d2ea5eb8c042433fe65fda9654956781a7c7fb6c6b1d8ba4c139b0639301da746a2fc97cd3eaf44677f23f1ed51ae8700
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
index 48483a49ca14..038aad658a84 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
@@ -18,7 +18,7 @@ IUSE="a-like-o +center-tilde distinct-l +otf pcf-8bit +pcf-unicode +psf quote
 
 BDEPEND="app-arch/gzip
 	${PYTHON_DEPS}
-	virtual/awk
+	app-alternatives/awk
 	pcf-8bit? ( x11-apps/bdftopcf )
 	pcf-unicode? ( x11-apps/bdftopcf )"
 RDEPEND=""
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 02c1aab6de13..8cc06162b4da 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index c6bb110750c9..b17974762d00 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -2,5 +2,5 @@ AUX 3.2.2-Fix-aliasing-violation.patch 2746 BLAKE2B 37dbcfbebaf7609fd292305b7fdc
 DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
 DIST freeglut-3.4.0.tar.gz 413389 BLAKE2B 47b073c4e81473417358452ede3891b6fc36e324f66eec42fcbbadebb2144680e3b52caded504135239e170fd8f30a1fe8b6666a746b06d48cd7226c98a8114e SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
 EBUILD freeglut-3.2.2.ebuild 1462 BLAKE2B bfa87569994be7ae1c8a374bcb38e88db905b0a2349268df81d69a54979a80ed6ddb347821f9da6951fdde5fff07d82bc99b8d5c9f3b4136ee179069d2a64d4b SHA512 426d97d6fbf11029d1f9620ce3dcbf5fd503002c967ba70b4071778ca89a498bb5e942b4a87491e44c42150eb2fb68cd80e4848e7d2bd8f8879ace8ef5cf1290
-EBUILD freeglut-3.4.0.ebuild 1313 BLAKE2B 5e3d449fee08aacf463d1d86c896a8decbb78a6f6eb1935a87ba787897aa65f9136fde99f372ce6f4723516f625e4b559661b766ca39cc019a2c1f38a403e941 SHA512 06c93fba6dee08a51f1a0d8936b19df2499d563b9024d525a6490920d2684037dc3627fa87da15a7deadb2af1fb1e2268fca44c112453cfcc950aabd574376fb
+EBUILD freeglut-3.4.0.ebuild 1312 BLAKE2B 119d2dbe745e891061d6cdacfb8d78ed80617f27dab8a39161587d279f69372553f74b7b2542c2b09b7d92061e77a3c54c06379fc84f731bcfa5c7d34c2dc112 SHA512 71673683f2c7490fadcf5df4e92e8d2e71bf14c560898bed3d7cf5e365bf3ab669275557767c078bc8df6a2744328891daa232c72873f7c4504000d0aa777b80
 MISC metadata.xml 594 BLAKE2B 984028f68aa76f8cfe537ea8a9f090af580cbe5ec33007c91b5b95b1f8c5396c779f67155d99fce7708e4fba8ee661f35fb01f5fd714a5ccc08794516df15820 SHA512 159f5756565afb1a55ac874afc42e49591c94519970d10eb7857159262bf4f6e372e5c0584f03ed1ad70e28bb5d328d3f36fdb0208d9de8f22e307973ee38167
diff --git a/media-libs/freeglut/freeglut-3.4.0.ebuild b/media-libs/freeglut/freeglut-3.4.0.ebuild
index 297daf00bebb..d2553af73d02 100644
--- a/media-libs/freeglut/freeglut-3.4.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 # enabling GLES support seems to cause build failures
 RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 5563d31cffc9..f3e08a0fbaae 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -2,7 +2,7 @@ DIST libglvnd-1.4.0.tar.bz2 563441 BLAKE2B 079b37571da7f1eb3cf8f87ea727aeec04a27
 DIST libglvnd-1.5.0.tar.bz2 565918 BLAKE2B b81bbd231ec66e045690aac877681f1a09ee3596519d86cf8952e1c91e4b79979e8fd76867ccb713e133ae127aec37010d1f09c1c15e77a9e173878adc75b2b9 SHA512 8bb6b53a92160bcee9ab37a3bce9e51a855f1e5e94d22ef42b9ae0a04fec2c19bd29070084a021ce34938856790f505462cfc653c2f517117d166284688c4dfd
 DIST libglvnd-1.6.0.tar.bz2 565006 BLAKE2B c18909aecc9f0f59819146c2194b20dc34abe3f4fc4bae68131aef18e9eb5713aadec3785e359850d91946fcb816a0b3a0390653fd46c5058e0d5fde6209ce13 SHA512 44752ebd30b46f64c668239716eda34f54286d3dde419ca0526e057f3be34a198986ce11b4df555b62395dbadf1485412d5ba5b9c52f1c6aa8224d7ebd34efbe
 EBUILD libglvnd-1.4.0.ebuild 1437 BLAKE2B 772798de493e8afbb5b97b12aa776d86a100efafab9a4f944cad088d689f7cb262caf5074e625432377e2c1cea1f949634798e310e95eac9e22de14ab5e5628e SHA512 141e6413f34ce6febcee77a086cf137400a21f5b71465a6e97477e14fb8029d05bb6803d7b231f581664962bda92d548611bebfad9d4659ac15774e15c76d603
-EBUILD libglvnd-1.5.0.ebuild 1439 BLAKE2B 71b9200530e4e830425cd4b4ea1d9d923c76b492302362929fe9751fbcd0e4f1fd3edfc964fed8597cf561f6b4ab35905f21b71ac95fc52b4b1f1d335206ab8c SHA512 b438865f0d3647bb3bfa6261964fbacfe2a4d79305c04996c31301f3585a462401780aa08e36a3eecc1aa0e480fcea4aec2bb0a84e575d5c3e30bd7afbd6f8ec
+EBUILD libglvnd-1.5.0.ebuild 1438 BLAKE2B 27f1e4782355eee33d3ce8356b5a96ee5fdce6535228177fb071593396f9a9c05e2ea99fe7ae1b2e9779550c3ae135c37a45ea7924a1549d246100491b334097 SHA512 a1da6f08d5d2e9f7f4757352a81efce09b82dd7e2758b5fb8eb916a5f44bc46700c03a74e9d484ee6912eda0880eaa6466aeb9b9c8e4ae88b127391c813ee5ff
 EBUILD libglvnd-1.6.0.ebuild 1445 BLAKE2B 374172bbd2bb127694f05b17a8bc45f4848b3062d52444ca528699ee18d9672e18aaa6d5518c52c00e2865762a5294333afb7a2119380153aa746fa8a2b966b4 SHA512 284ab5787517368ddc6d9503934d624bebc49b04f1fa6e1c1c67e79616cefbc3eeac40de2da71cfe10318b87a5183882a7a9429a4a5cfbc74ed9f9e207580b38
 EBUILD libglvnd-9999.ebuild 1445 BLAKE2B 374172bbd2bb127694f05b17a8bc45f4848b3062d52444ca528699ee18d9672e18aaa6d5518c52c00e2865762a5294333afb7a2119380153aa746fa8a2b966b4 SHA512 284ab5787517368ddc6d9503934d624bebc49b04f1fa6e1c1c67e79616cefbc3eeac40de2da71cfe10318b87a5183882a7a9429a4a5cfbc74ed9f9e207580b38
 MISC metadata.xml 336 BLAKE2B 4bf6bd6267610a40d3966ded2563015cc2cdf4100bb5b56f14311d8f2ab4796c6bdb08f7fd9922a83bd9738e47f2c603ccf35117c0ef4fabfb6858048f34f4fe SHA512 52454eacfef943242844a5c244372c902fff7d801dd73372a4105c998b209fd333057ec47acbb7036613e6cc656b9bda52023e2d1a202d993d8a42c8055378c5
diff --git a/media-libs/libglvnd/libglvnd-1.5.0.ebuild b/media-libs/libglvnd/libglvnd-1.5.0.ebuild
index ba1b0de0a6c0..8032490c73ac 100644
--- a/media-libs/libglvnd/libglvnd-1.5.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.5.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	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"
 	SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
 	S=${WORKDIR}/${PN}-v${PV}
 fi
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index 224f22138a1e..eafc6bcec6d0 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1,5 +1,7 @@
 DIST libshumate-1.0.1.tar.xz 109884 BLAKE2B b1a4838b3f43df00ded7973e78acaceaa1c2fa6bb3a67214e475026a980c03f610e68b8d2a992093f091731e8d8e48e954d1ba917e93071f63a984f45a3142bc SHA512 19bf8a563d9b5c9cca3adfc337ec8843c7d8b891fcdd789adecfb79a46c3ba6f674795d39199ce154c5a3f6b95eac5d6e56ba73066f2ab18c8a95d3646b9ad25
 DIST libshumate-1.0.2.tar.xz 110656 BLAKE2B 75abbfd9b4e1e7eb1044a33ff1b46391024005487f01aa4401552727322f92f28120104af4c2f90bb91c70ada6282882b9ee7f50ac62542aab8c88cc227799f8 SHA512 15539ce50462b345e4329fc27f52a5d1fb143e82821a990ce818a576fec94d1fe1fbef9926d0251d169f22394f3f21c62e56fe4d97bbdd4482429c70f22c6b2d
+DIST libshumate-1.0.3.tar.xz 110868 BLAKE2B 56d2304208dd41e1c6dc14b76bd6c5cadfb3359576c1c74405851e63be06deaa92bce4fae7bb91855fee53f561dfa84ccbb7ff61eed2f3195d6a93f76e3e2668 SHA512 dc72955bdbe6eee3d4d82dd884c5e74341fa5de25af388d3cc41a368170e4d8f5edf32acdf320e7dde9bc6ace94694e166eafb864887f66a60fb4053d12e1462
 EBUILD libshumate-1.0.1.ebuild 1441 BLAKE2B aafe203c13f50943bb4bddfc0350471c3838cb0981d86ab0fd0b49c678dd1d7d653463c734804e7fec8a7f7828a97d5928bcb7e96d52531cf6ad891f990ab6f7 SHA512 2df30a99fcd43784f78da8d6bf4e2d59b430020c8c0ab36d5db766c411945eb4bdcba8d7c8e541cbcb8508e439d3a8f88240d76ffddc2d0912d852b614334d91
 EBUILD libshumate-1.0.2.ebuild 1472 BLAKE2B 44fc3b38717f1916e9e717eada46d55051d160c0da872dc19f7b78311dedff0f3714f05222c9bed2131062d5124c5112556b4607ac965af16308863ecfdff9c1 SHA512 83a52d565a8351a22dbe7a566ad2a656e1290d08430b70b854aea7a349abc8d406d1384d2fb8fe2065fc9c200f22f13ab23581235d83b9e489e5896ceedaa78a
+EBUILD libshumate-1.0.3.ebuild 1578 BLAKE2B 1e8f71b91f0c236ce7be07b87ae1266b87885c10e5db7e00116a27fb8160aa27ccdd23ad1f47dd8cdd952022485bc25207cc3d9a4891a34ef872a8b74ce19e1b SHA512 023d3c1cf44bd4730ead0422168f6dfe96e734a4d63da951ef2585daa340d07e04f4945007fd898ec51c8249d56f68047f37534ea555e528d216c66a08d11a53
 MISC metadata.xml 351 BLAKE2B 0156fcc6cd262dc795ba78bf80f0ff69452458d8fe7116f2e3712f46c31b232cdc4a10a7d1b2fbf566a723ca7bc8a7c61b8299730e702c3bb40c6fa94c2647d7 SHA512 a4944c1629f135d09bc2d49fa0ff8d674076d669d312d7650113b2f5f89704faf67ff34ae0392684aa97459c6117b99ec8fd822817c99a6a02e4959c59dea095
diff --git a/media-libs/libshumate/libshumate-1.0.3.ebuild b/media-libs/libshumate/libshumate-1.0.3.ebuild
new file mode 100644
index 000000000000..8da598a7cdb6
--- /dev/null
+++ b/media-libs/libshumate/libshumate-1.0.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala virtualx
+
+DESCRIPTION="Shumate is a GTK toolkit providing widgets for embedded maps"
+HOMEPAGE="https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate"
+
+SLOT="1.0/1"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+REQUIRED_USE="gtk-doc? ( introspection )"
+
+IUSE="gtk-doc +introspection vala" # vector-renderer is still experimental, maybe put in at a later release
+
+RDEPEND="
+	>=dev-libs/glib-2.68.0:2
+	>=x11-libs/cairo-1.4
+	>=dev-db/sqlite-1.12:3
+	>=gui-libs/gtk-4:4
+	>=net-libs/libsoup-3.0:3.0
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+"
+# vector-renderer? (
+#	>=dev-libs/json-glib-1.6.0[introspection?]
+#	dev-libs/protobuf-c
+# )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e 's/^valgrind =.*/valgrind = disabler()/' tests/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+		# $(meson_use vector-renderer vector_renderer)
+		-Dvector_renderer=false
+		-Dlibsoup3=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/doc/libshumate-1.0 "${ED}"/usr/share/gtk-doc/libshumate-1.0 || die
+	fi
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index aca676bf85b0..8894cc505817 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,10 @@
 DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120
 DIST mesa-22.2.2.tar.xz 16424508 BLAKE2B 08ab46718a767a7771affb4b5b6164fbc5430fd5a657cdf4008f16a84892673824976ba84450afbbb3a9431868dddc7f3570c11ab319f1bc9b892f46327b2c59 SHA512 a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c
 DIST mesa-22.2.3.tar.xz 16464020 BLAKE2B 8f1482983ff9de9565a7f48f22e315b022ea8a07d7157e0d202c4d027d13ad4563c40ea63e1d0a92675af7f23d5245be9ed137955c3a9dd85171a35d497a94b2 SHA512 08e9ce43392c46f9c0d122d70e118511eea81422d06f93ab6d330689b46feed3ac1c3bdcdcfd4a27cd5b9eaf26aab518d152a2c753f07b8ed19575d4ed892ad6
+DIST mesa-22.3.0.tar.xz 16878600 BLAKE2B 16b11bfad509292338fc46b36e49d747e5cd43a96c753cc2a8c0b915c7b86198a30aa78c8e2bcbaa0daf8cadd79a82046cf32ee6f6e373dcc00e2fdef554bc66 SHA512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da
 EBUILD mesa-22.1.7.ebuild 12037 BLAKE2B 36b57a2a4184e6788a4ccee1bab1b1281defbb1a26443266a6ede1d63fcac8f07994045b1dbcc725be4e4b1191603dc4ecf305159861fc3423799fb97652fa2e SHA512 e5b1099fc84179b3feaa4bdd94b01e286ab208cd2207bdbe61d951752b6e7f1ddc3942c260c8e24c5bd6019be2b8e0f7cb69685ef18e7271b065aba859cd5b36
 EBUILD mesa-22.2.2.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d
-EBUILD mesa-22.2.3.ebuild 12664 BLAKE2B ddcc161f0d81580e1fc300b39c4d479b263643c71dd7630592c39686f6ce7c72db9798be48f0419c8ed9169e610e3031668924e1824f1fea205e6eccc89d14b1 SHA512 290e658349460a6586894a29e18ef33d741d2011a516088c22d75193b2cb5c414474527547432d0e537a3bdb031c78ba316f31c05c76f36d77593ed4b497415f
+EBUILD mesa-22.2.3.ebuild 12663 BLAKE2B 1e0be5234ead31d5fa3554f76d1923bd0ed0fcaebe63b36f59a5aa2ece933dbfb220e2225a136678b91b802b84c6b06d61d8dee73625bfce1b3f911bb61fa793 SHA512 cb076cd9783f375ea3cbf28f3b82e3eebe20a9b7767435052e288b37e4d90b24da860a5ae53b22dcbc20b07e3dfb8abeaf0c5ceb8712b41b6a2a43a25acb6393
+EBUILD mesa-22.3.0.ebuild 12270 BLAKE2B e8a0af6cb91c8028d7516a664ae0b0c639811b384af1ad7de2d09058282c610f6e9901ae08e4da15e855fd505707d8ff8d989ea58bf38ae27e6a70b7367feaea SHA512 a400233014d63b8e17022c6cd6456988b3786404a3e90e42ef4210bb4ee205e1d6d40f61ff572a26136367b55f73c5a403b24464e49c1101352a5b2f04806893
 EBUILD mesa-9999.ebuild 12270 BLAKE2B e8a0af6cb91c8028d7516a664ae0b0c639811b384af1ad7de2d09058282c610f6e9901ae08e4da15e855fd505707d8ff8d989ea58bf38ae27e6a70b7367feaea SHA512 a400233014d63b8e17022c6cd6456988b3786404a3e90e42ef4210bb4ee205e1d6d40f61ff572a26136367b55f73c5a403b24464e49c1101352a5b2f04806893
 MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0
diff --git a/media-libs/mesa/mesa-22.2.3.ebuild b/media-libs/mesa/mesa-22.2.3.ebuild
index 38b92d496016..45a5d7918231 100644
--- a/media-libs/mesa/mesa-22.2.3.ebuild
+++ b/media-libs/mesa/mesa-22.2.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-22.3.0.ebuild b/media-libs/mesa/mesa-22.3.0.ebuild
new file mode 100644
index 000000000000..b0737f166279
--- /dev/null
+++ b/media-libs/mesa/mesa-22.3.0.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	xa? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+				>=virtual/opencl-3[${MULTILIB_USEDEP}]
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="16"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:16[${MULTILIB_USEDEP}]
+		sys-devel/llvm:15[${MULTILIB_USEDEP}]
+		sys-devel/llvm:14[${MULTILIB_USEDEP}]
+		sys-devel/llvm:13[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) )
+	vulkan-overlay? ( dev-util/glslang )
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	# opencl stuff
+	emesonargs+=(
+		-Dgallium-opencl="$(usex opencl icd disabled)"
+	)
+
+	if use vulkan; then
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2eb478150ac7..ce1d4b7b61b2 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cava/Manifest b/media-sound/cava/Manifest
index 8e6903252fb1..174509e3570d 100644
--- a/media-sound/cava/Manifest
+++ b/media-sound/cava/Manifest
@@ -1,6 +1,4 @@
 AUX cava-0.8.0-gentoo-iniparser4.patch 702 BLAKE2B 9ea8f952f0a9673d7348b4abeb46e480022205b3bf6a296b5f742e0dee15c81181c876829177159570b239c6c46c4b1177523eb60d3abf6e89640239e5192ba6 SHA512 ed474fc10475731ef733e77469782308c693d4b7214e911257e69499ab5cc598a13e0293644698f98d749e71c3002cbab857f8fda6e36a050bc8ff6be50af881
-DIST cava-0.8.2.tar.gz 103930 BLAKE2B feeb8313bd9b74029d101acaecfeed02e449cc29dceb2c119d7deef65befae418526274e6bad14dc0df7eaed90850ecae4a4064a414d94950ab3c24943281017 SHA512 8ab146987324fad97dea5e9fd893de6c12b00cbb074d835c1e334d75c0d32cb4cbbc13cf72f7899191ebd5d346505b2639dcad5312e5ab00975b29a006ba41b3
 DIST cava-0.8.3.tar.gz 104797 BLAKE2B 0617273669fbd8d1c122e6b19975d54d42b5779339de89613b4fe5d6087bcf0ff93afe6234af238e489d6b72c3eca481140105000951ef007cc864b77ef49b65 SHA512 cd176428ff293572325d21769fd4fdb666b6301e0fe5c7a2c53af2399a26b3fd10e83647f9c9cc318f4c69cc28835323fb949cd76340c14670df8b544bffa0f0
-EBUILD cava-0.8.2-r1.ebuild 1519 BLAKE2B 9397e6cf0e4a52e09ad740c8c3865c3740ce6222dcaccbf798e525ecfb8aeff62c3b8280949901a6b15961d1bda03bf1110857c43795beb55a47da9db11aee64 SHA512 767224bf295a4df9e40ba3c0f88651693b73560a1ef0cfc16cf85264cb16ed2dc2fae3d0039944f3ab2f6b10eb88663bb08aed8276a9173045333b70223b8212
 EBUILD cava-0.8.3.ebuild 1429 BLAKE2B d68709ff51c6bd35aa418dad1a4682ad7e594f7a70cac02603e8f30b314406ddac11aee0f0343799265eba00cad2dacb51ca9d0ad47867c95f0354b4a31ae315 SHA512 7d3355742b32c92e3035eb1890e0dc9664fe650bc2fa0890b2be23664eb0209130a36aad88db5f1822b84d364343325b3e36e4d9d89a54683d4431b55b80acdc
 MISC metadata.xml 427 BLAKE2B 94797ecc93cc139cde50a9c04e5d413d9356083740a2a3130894f7bd2fe30e8caf007712566a53cf2a28ad81be79d46aba6c57355491b75f9f3501dd0523ee10 SHA512 21289938ed3ecdfc6d15e3df7577c0a560b403b27d6b6b944cf007af9abaab6a96045d2cc35cb44a869e321a678bc85e9f02d285729ebaffb09797d8726001c6
diff --git a/media-sound/cava/cava-0.8.2-r1.ebuild b/media-sound/cava/cava-0.8.2-r1.ebuild
deleted file mode 100644
index e24cc76b4c0b..000000000000
--- a/media-sound/cava/cava-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Console-based Audio Visualizer for Alsa"
-HOMEPAGE="https://github.com/karlstav/cava/"
-SRC_URI="https://github.com/karlstav/cava/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa +ncurses portaudio pulseaudio sdl sndio"
-
-RDEPEND="
-	dev-libs/iniparser:4
-	sci-libs/fftw:3.0=
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:= )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-libs/libpulse )
-	sdl? ( media-libs/libsdl2[opengl,video] )
-	sndio? ( media-sound/sndio:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-gentoo-iniparser4.patch
-)
-
-src_prepare() {
-	default
-
-	# https://github.com/karlstav/cava/issues/450
-	sed -i 's/-Werror //' Makefile.am || die
-
-	echo ${PV} > version || die
-	eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		$(use_enable alsa input-alsa)
-		$(use_enable portaudio input-portaudio)
-		$(use_enable pulseaudio input-pulse)
-		$(use_enable sndio input-sndio)
-
-		$(use_enable ncurses output-ncurses)
-		$(use_enable sdl output-sdl)
-
-		GENTOO_SYSROOT="${ESYSROOT}" # see iniparser4.patch
-	)
-
-	econf "${econfargs[@]}"
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "A default ~/.config/cava/config will be created after initial"
-		elog "use of ${PN}, see it and ${EROOT}/usr/share/doc/${PF}/README*"
-		elog "for configuring audio input and more."
-	fi
-}
diff --git a/media-sound/jack-example-tools/Manifest b/media-sound/jack-example-tools/Manifest
index 227d9bbceb71..e1593797f5eb 100644
--- a/media-sound/jack-example-tools/Manifest
+++ b/media-sound/jack-example-tools/Manifest
@@ -1,3 +1,3 @@
 DIST jack-example-tools-3.tar.gz 125686 BLAKE2B b0fbb68f2a21711113516a6754e13230b009f21d73a4fa8b94f2e8e81b71f6d95c246eae88d479daf3f4f6e0ccf3eb8295ff1b1b76603676c6d8b09d0594f9db SHA512 2fe33c4fc294a4e4e2c0c271d5e2f28bac162939c25536902c772fcc919d2a0923fcefd27305f3fce283edfe043d2da7773b66988a1f14f8670d5cac90c8d7e9
-EBUILD jack-example-tools-3.ebuild 1440 BLAKE2B 6e8f5f5092747838a334bb59f88944f481978f3bb6e6ac131c8470b31ee4c74c6480cacd2813574d7f46f8a9401462a2629cce2a1a8f3796c6abad24817173aa SHA512 e1dd7436626ca6b55c7eca1b895335467e73335e5b5334d79691b85afc4e796cf05362bdc3d8b0ee599861a0706057a4da9341d296d316bef9e31fa3cccf6d97
+EBUILD jack-example-tools-3.ebuild 1434 BLAKE2B d558b1cef6a14fd314b01f46e38d33478e77019a2b6696240bfd3e221a5c6ff261e2f10fa1dbf3eb8ca61c8006b4acf9e14f413a3ae14d929ea6a0febb778a9b SHA512 a53ee68ec3ca7f029e19e46e69bc32ac943c3a71b4baffc1b99472050e8882efafbdb775f957b254ca63bdeb74110a8ac3d04975796846fd9df56cfb7e816d9d
 MISC metadata.xml 731 BLAKE2B 7c83aa6f9f1e4c7c43d6104cd089a69755c72577e728592ccedb8153687257c267609636832797d7dbfdac7f73bf55a3f0a195baaac442bf919f783589fb98b2 SHA512 1db07c3ba14f3a096c333630690e2b6bb1fd060fafe9aa132d7e455a5f89351b3074112eaac24bddf0e8697c0a8008ca4de192c78947cacea43a3aa2b71ef492
diff --git a/media-sound/jack-example-tools/jack-example-tools-3.ebuild b/media-sound/jack-example-tools/jack-example-tools-3.ebuild
index cfd43a654532..29d01081d9c3 100644
--- a/media-sound/jack-example-tools/jack-example-tools-3.ebuild
+++ b/media-sound/jack-example-tools/jack-example-tools-3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jackaudio/jack-example-tools/archive/refs/tags/${PV}
 
 LICENSE="GPL-2+ zalsa? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="alsa jack-net jack-netsource opus +readline sndfile zalsa"
 
 RDEPEND="
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 936da1c1e878..3b433010d7a2 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,5 @@
 AUX jack2-1.9.21-python3.11.patch 635 BLAKE2B 8e9168c2d44e087c20f0b6b1ac7a08bf957a5427f3c396e88ba3d0918e636500265e8182a39a8831b9cd37f9db3e86ff3ff6222e191d18f110b964a36c446982 SHA512 be0bb5fb4d65f99dc8355393a02c79ac36f64f7bb0e36a0e6c08ca99cc5c5340a5457fa13e7937d70349a4e0b86074c69232f69cab26779a7e53de5710b4b7fe
-DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
 DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
-EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 43cef82b53dc0f37ca9114e90a1419031ba5bf7fa7fd02f8f5a5c9e87c3b030b97b16c063f20f593740c88ec077f4690d493059cd827e3e86ee63e155ff2e8fa SHA512 1e6ae9ceb32b43b2008d9f2687a8e8dbc42f6a099d36c096b5a30aa6c9b4e1cf9e494b343724454e0fc2f764fea195aec6a7466ecbdba953e2d024c1a51a21dd
-EBUILD jack2-1.9.21.ebuild 2624 BLAKE2B 79c29ce393f8a368862bb941656b38389b6f1a965f7bc30ae79e46264f48ae478c3d97b16c14a988fd6d15386ebfc27b81a2d3d032c5e0bd6cb66a017a690a79 SHA512 3289575be2e7184454bd90b1ff0059b275aff0d5580a148cc8b7da1d22b79a4479ae35c23eb21ea71bc5a8e85d59d6339ceece61b857b0665ac76f2da44aea74
-EBUILD jack2-9999.ebuild 2447 BLAKE2B 7d8a8a69e3bc2e15e355ee9a6ea43cb5673024d1e540bda2e5b447ba1dd3e4c09de9190cd346f302c7ff0c9acfc275fee5b861218a5a43ac22717acc4167c614 SHA512 4c7523fcc1e0116aadce1f92b9441f0bff768483942513bfd043223ee5b78e09f138db60be9599ec624321632278dcdf5fd65d2825dafbc89d12b4d5fd0e5167
+EBUILD jack2-1.9.21-r1.ebuild 2804 BLAKE2B 63c416828e84f56a4cc2efe265807301b1c0066b0a668cb2061aa2541f1c5892b305384b1a1da7479217a74a0a33f69f7f0c8e47df73d8fb9c915f95dab90cc1 SHA512 867504bc14598120dc85e39c497ba1757b76788645ab586e66c22fefaf3cbe56f3125b93f6bb34d9f1bd65f4859d16ad82a68d732151516980bf85cb2b919eb2
+EBUILD jack2-9999.ebuild 2633 BLAKE2B df913b0507bfe8471ab04532c47a4ae6393ede6bbf3c3dc018407043ed1dd93e2bb9782d4f61f7ced9221b4555d7b923a5ec2d84e7274e5e3260c390cc1c8064 SHA512 d97ad73ac25140a5e22604e52cf047d751d7b3ca196e40c5c56ffa2bb62737bb89ee7150a3527cf851f4fe58945b90e1c9888b6b7a72390db833e08128ef518b
 MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/jack2-1.9.19.ebuild b/media-sound/jack2/jack2-1.9.19.ebuild
deleted file mode 100644
index 8b2b7719b6e4..000000000000
--- a/media-sound/jack2/jack2-1.9.19.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	dbus? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
-
-src_prepare() {
-	default
-	python_fix_shebang waf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.21.ebuild b/media-sound/jack2/jack2-1.9.21-r1.ebuild
index 4ed7d3847d9c..356cbe29a718 100644
--- a/media-sound/jack2/jack2-1.9.21.ebuild
+++ b/media-sound/jack2/jack2-1.9.21-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
 	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2"
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
@@ -34,7 +34,8 @@ DEPEND="
 	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
 	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+	systemd? ( classic? ( sys-apps/systemd:= ) )"
 RDEPEND="
 	${DEPEND}
 	dbus? (
@@ -72,6 +73,8 @@ multilib_src_configure() {
 	filter-lto
 
 	local wafargs=(
+		--mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1
+
 		--alsa=$(usex alsa)
 		--celt=no
 		$(usev classic --classic)
@@ -83,6 +86,7 @@ multilib_src_configure() {
 		--opus=$(usex opus)
 		--portaudio=no
 		--samplerate=$(usex libsamplerate)
+		--systemd=$(multilib_native_usex systemd $(usex classic))
 		--winmme=no
 
 		# obsolete options, migrated to media-sound/jack-example-tools
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 49be304b89f7..52a3a799904b 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://jackaudio.org/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2"
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
@@ -34,7 +34,8 @@ DEPEND="
 	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
 	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
 	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
+	systemd? ( classic? ( sys-apps/systemd:= ) )"
 RDEPEND="
 	${DEPEND}
 	dbus? (
@@ -72,6 +73,8 @@ multilib_src_configure() {
 	filter-lto
 
 	local wafargs=(
+		--mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1
+
 		--alsa=$(usex alsa)
 		--celt=no
 		$(usev classic --classic)
@@ -83,6 +86,7 @@ multilib_src_configure() {
 		--opus=$(usex opus)
 		--portaudio=no
 		--samplerate=$(usex libsamplerate)
+		--systemd=$(multilib_native_usex systemd $(usex classic))
 		--winmme=no
 	)
 
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 4cd1f1be4e77..2bbf789753c7 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,8 @@
+AUX schismtracker-20221201-bashism.patch 1102 BLAKE2B 69d03032f77f6c60076f35ba3632c642f5bf5ab717adf08cb8039bcab6edcb5c38360a7874e92f1161df67f4f599e6adffc68e30a57b623f11418425c9b7ad5b SHA512 67e267856f0f11db23a3ef291ec8e6630047958d3dfce1034ecbb72fe21c6ac27802398acc4c863bacd16097624ea8883a98bfb17eb6a3d57167a7eb054843f4
 DIST schismtracker-20220905.tar.gz 1278816 BLAKE2B 6f461732c99a01c8f4a17afbac61b9b52686cd6c0e58c99f75337b4e33e187b5465f9adf5422ec3a455e9448f1beac845080816001af02cf2afa5740b9f384a7 SHA512 2429e6a3ed6004a0d327ddb8ae7c379fbed4e4d2e2fe87be225fb85c990327fa3008115f9dbdcf08b3691c50411bf5aad04e97264a2f9ef6c05c7cfdc6231bda
 DIST schismtracker-20221020.tar.gz 1276386 BLAKE2B d498eba07d05729640eb78de3253a47aad9f09594ea4b45195a4f829b581ca293cef5f12ddcb8bdf7c9b2f01ff9b3e00c5e7c54a23a179d3af23567c233a96f5 SHA512 1653800b0967926c8edab96636fcad547d94f20b6bc06f27780c75d48d7944983ba36013c62bfc9c0f6fcf33e3e8f9fb4c70fff19fd2a56c672ecfc1ba2f2cd7
+DIST schismtracker-20221201.source.tar.gz 1633099 BLAKE2B 6f376323002f85031140be7d54b1ab8bd830f8654e90c07596c9a45ce2ce76dfda51f124ff01247c1a371269b2924470faab06d7692a76ced694fdf05937f384 SHA512 062dc54b541709be0a5c8b0c5edadc9710106154c15b2a40847998db33aaba7d07740cdd32da94f56725e66834221bc5470f9a111eb41a06fbfbd70fdc920113
 EBUILD schismtracker-20220905.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a
 EBUILD schismtracker-20221020.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a
+EBUILD schismtracker-20221201.ebuild 1458 BLAKE2B 7bf2e8f990816b4f5d68c79c3eafba00802f5689f0385591c545bd8058f1d9e3e031b0b4bf1a072da43381021c2350ca80dece6289cebd9fd724ecf85dcb58bb SHA512 3455d5adafc1c318e0a4ba4a427200b61236735b4b2725c9ce76dec67fe212ee512729242aa18301cd86b2b645d79949f11e2aeef46de61d0a9ca62f33ee7299
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch
new file mode 100644
index 000000000000..64cad709efe0
--- /dev/null
+++ b/media-sound/schismtracker/files/schismtracker-20221201-bashism.patch
@@ -0,0 +1,29 @@
+https://github.com/schismtracker/schismtracker/pull/340
+
+From 5f2f594b6a4055318fa31d3c0cd6ecc8dc3666f7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Dec 2022 01:39:06 +0000
+Subject: [PATCH] Fix bashism in configure.ac sdl2-config check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,7 @@ AC_C_BIGENDIAN
+ dnl Check for SDL libs
+ AC_CHECK_TOOL([SDL_CONFIG], [sdl2-config])
+ AC_SUBST(SDL_CONFIG)
+-if test "x$SDL_CONFIG" == "x"; then
++if test "x$SDL_CONFIG" = "x"; then
+         AC_MSG_ERROR([*** sdl2-config not found.])
+ fi
+ AS_VERSION_COMPARE([$($SDL_CONFIG --version)], [2.0.5], [AC_MSG_ERROR([*** SDL version >= 2.0.5 not found.])])
+
diff --git a/media-sound/schismtracker/schismtracker-20221201.ebuild b/media-sound/schismtracker/schismtracker-20221201.ebuild
new file mode 100644
index 000000000000..980ebc3426fa
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20221201.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://schismtracker.org/"
+SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/${P}.source.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.5[X]
+	x11-libs/libX11
+	x11-libs/libXv
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20221201-bashism.patch
+)
+
+src_prepare() {
+	default
+
+	# Can drop this once bashism patch unnecessary
+	eautoreconf
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto || die
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index c0f946ee285d..04ca27ffbc3e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 9a6dada1a437..f5dd0aeb645e 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,3 +1,3 @@
 DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830
-EBUILD mjpegtools-2.2.1.ebuild 2624 BLAKE2B 9b2073590e34946a6cce3b7589492ba2a303ddbd5a3bfda1ca202103b076c5cd28d4dbef2bbe3a37010c064b35d7730caf2dd17bb45d1f298b73cfb0389271db SHA512 6d839bbb39cabd4ddfc8d58012d2a7a664a1ecda51d83511e0a474ff52eda921683c7a7043d255cec84fd4a139a43474e7c3dfc1f872940c2e5a89a5a715a7a4
+EBUILD mjpegtools-2.2.1.ebuild 2633 BLAKE2B 8d32763cc5cdd0d9241f0eb35bab53e898f424041c3f8aafa67a14e60a300b1c716f541090949c474be79fc813de099414967410ce4c1ba8365ff8aeca6a2fbb SHA512 a39c49b3e2d0612a3fba044ef909f5d5f040d7a1a16ecfeab76200844ead14de287986ac5fc3569cf349360720993f8f3c4c7c47831f08c2a0df3904591bd433
 MISC metadata.xml 538 BLAKE2B 420dc5b1516f83aed28539d6c9cb3964135bd67d9a8c334eb5ad72bc95156fe3795ca8098cebc46e7a263e3a84cdb8bfe1a393b7f9a9f47eeaf24527748723a9 SHA512 c53c44b7a0bdea16c3c56d11edde87edea9849ffb37b2eba21701ad5791f1348d61d7216457efa0964c1503d89e2d86c4616d1fda240129f98ab2b68ec5e6926
diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
index bf16b8d668e7..e6ab3d86817d 100644
--- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	>=sys-apps/sed-4
-	virtual/awk
+	app-alternatives/awk
 	cpu_flags_x86_mmx? ( dev-lang/nasm )
 "
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 284f5c5949dd..882c83609e98 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b8eb187510d2..a199f2a6d958 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Dec 2022 02:12:15 +0000
+Fri, 02 Dec 2022 08:09:59 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 1d14dd6b8194..7bc079c22f1c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 537682 BLAKE2B 5ea36706e9f3100f98a8bfc48465fc9c9965ad20b834454f02d0d345f47d095e5a9ed35b5f6e37007ee947d09446b720eafc19bfcbc8f9bac4db48a6a80580dd SHA512 0f5654de23f73899b445d3d10fa87c3ab643f77308df25999549e1b63748b5f101eb3f130afac8fb3e03eab64646d0e2016efd11a0f4eccc7a3b6117155d8d63
-TIMESTAMP 2022-12-02T02:12:18Z
+TIMESTAMP 2022-12-02T08:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOJXwJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOJstxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBa4w//c+Y3xERT1SUqyQiByep75tV4DwZSZ+9i2vr/pawBsolnwlL45gANTR6g
-d+9xuxAYDqpP3FMCpZDF9+J3bElmnWVq97q08nzPvyvhBWtLkO3+qQY7X5rI/HHI
-Zsl4ciJtHPfIyxIMu49f3aq98onUAF65dkD5FzPOqiMpKvX8qbMvQth43yKfQgH6
-QXet2PiAgaWOf+Q/6d/ZvR2UGjWleqypmHNXJgx9vYDVHr6v9szpuCZSF5gPXtzc
-MRy272KDr4J1pFxyTrMZPLZxRdVVN8/dCa74syuIhyPhp5glJNpwIJLb9IdqSn2X
-6PeLNIwzWMnyhrijOG367xlrx8N1AbFkndU0pQf9IPK+bp8J/sW/s0ezHsDLiG9x
-daWn2U9uf5BjN9j2SJxEtLvsvARGl0SaVxO7BGPwXogYDwOE254yqd1SqaaO/Ap6
-P6q1R7M2UOQRlZvmoVSE0tmE2vyqig7YvPf5lSgNO2l3qgSkcSvghc9C4v3AT040
-ah5ScYg6I0+Lsy0ZhFPi1BySfOhz3HG+bN1ORYA7UwVzi4Rd+K3Mvgt1jkoCsj2/
-qqpf1iglWqcsc67O6ghHSiKD5nZy6r6IQ9CS3HMESmAZgm19PBkdlohBpk2zG2RX
-fnofBjhc5PVue5x9jL1k1Ax/6Copy7jExqLiWMbt/aO3CHV3nnQ=
-=pcZb
+klDxuQ/9EldJFdPacmQBaCWiEUSrnUZZgPlajfc4rDif0ILbPVn1HOjVdbTFnoPg
+wZA0iyoYphYgK0t/r9EJMyGLrnr541C58ndCB+aDZkUeRrXUP9Q2Zf7JpgO9w82Z
+t4YHjYMeNMcguGO4ZQQObCUw5EiwWE1fs4A0PV854qOPYTpy2tR7fa8UNDLoVM1D
++7MajRvNKEct/GzEaXEq9YtnFLJw359ggPXQIRY1f04N8fgkHBqvoZ9bTsumAERp
+eoDdlp7GEx5kO7q0FglQTs+hfJSl90krAQUttmDv5hHH7XXqc2R8VA1B91qlkZ6N
+Ram6HOcCVlGPZJuFJsAxMGuRUp4ZZdC86+3LtKuq+hO4ZU2HtHHwoGFt/sTWLU+C
+UQAhnqQkcT0oHUb64d+t8+4JA4W72zCP4rTdgBGHKF2DrT/WSSxA4ZGIutIjB56P
+IdhKCUBerMr1HmfKTUa+WC0/kzwCyIhZItrhr2csRtS7Ah/sS0RkjIlTXudJvWn+
+ziStedTMb3qmxSMUJNJKj78UEIQ+UzSYg/kUqVHuvnyRuWBnQvoHNW7TTKLLfayc
+pAWS/S0hxkRKxGsAjplsRSX0yS/Vmfh60uSuyWZ9Oku5sep41cdj61/foBeHRH01
+PCFs2pY5lZROml7JANQsJEYAXlSNmUVtKLu6fk+Mk5GAHIp/O3U=
+=zu1/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b8eb187510d2..a199f2a6d958 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Dec 2022 02:12:15 +0000
+Fri, 02 Dec 2022 08:09:59 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index bfbf89cbd89e..39378cd8b1a4 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 9f52ea6bda8f..e1e7aca7690e 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/authbind-2.1.2 b/metadata/md5-cache/app-admin/authbind-2.1.2
index 86ee1b4fa97d..3bede050f484 100644
--- a/metadata/md5-cache/app-admin/authbind-2.1.2
+++ b/metadata/md5-cache/app-admin/authbind-2.1.2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/awk
+BDEPEND=app-alternatives/awk
 DEFINED_PHASES=configure install
 DESCRIPTION=Bind sockets to privileged ports without root
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/authbind/authbind_2.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cc3e1d005fecead6a9dd162245c7f6b6
+_md5_=6b0563ea33906ffd593e787edcfcf3cc
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.38.1 b/metadata/md5-cache/app-admin/syslog-ng-3.38.1
index ea7e5c47ac03..52044e1a050a 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.38.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.38.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.syslog-ng.com/products/open-source-log-management/
 INHERIT=autotools python-single-r1 systemd
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( python )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.38.1/syslog-ng-3.38.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1441e8ae3bbaaea81946a376c9c9cfe2
+_md5_=2cba507d2284cd8e933ef10d04dee666
diff --git a/metadata/md5-cache/app-alternatives/Manifest.gz b/metadata/md5-cache/app-alternatives/Manifest.gz
index 4557cc721f32..2dcf03ec6967 100644
--- a/metadata/md5-cache/app-alternatives/Manifest.gz
+++ b/metadata/md5-cache/app-alternatives/Manifest.gz
diff --git a/metadata/md5-cache/virtual/awk-1 b/metadata/md5-cache/app-alternatives/awk-1
index 490419fdc6b9..a453f9519525 100644
--- a/metadata/md5-cache/virtual/awk-1
+++ b/metadata/md5-cache/app-alternatives/awk-1
@@ -1,7 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for awk implementation
 EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=metapackage
 RDEPEND=|| ( >=sys-apps/gawk-4.0.1-r1 sys-apps/mawk sys-apps/nawk sys-apps/busybox )
 SLOT=0
-_md5_=bcd7b43281113626a5c281318586dc61
+_md5_=ce4a360efa729fcfa120219454327c3f
diff --git a/metadata/md5-cache/app-alternatives/awk-0 b/metadata/md5-cache/app-alternatives/awk-2
index e1cc235629bb..e1cc235629bb 100644
--- a/metadata/md5-cache/app-alternatives/awk-0
+++ b/metadata/md5-cache/app-alternatives/awk-2
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 28bf542cb9c4..748e58b9bc14 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/unrar-6.2.2 b/metadata/md5-cache/app-arch/unrar-6.2.2
new file mode 100644
index 000000000000..add2e3bc71c2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-6.2.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=8
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+INHERIT=multilib toolchain-funcs
+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 ~x86-solaris
+LICENSE=unRAR
+SLOT=0/6
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.2.2.tar.gz -> unrar-6.2.2.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=171fa17bc8eab2895b96d36d9df51cdc
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 213d37be6a2d..49bcab12a2df 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/amanda-3.5.1-r3 b/metadata/md5-cache/app-backup/amanda-3.5.1-r3
index 862bae01e874..64cd1eb4ba11 100644
--- a/metadata/md5-cache/app-backup/amanda-3.5.1-r3
+++ b/metadata/md5-cache/app-backup/amanda-3.5.1-r3
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd dev-lang/swig dev-libs/libxslt virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=acct-group/amanda acct-user/amanda app-arch/dump app-arch/tar dev-libs/glib:2 dev-lang/perl:= dev-perl/Encode-Locale dev-perl/JSON net-misc/openssh sys-libs/readline:= virtual/awk kerberos? ( app-crypt/mit-krb5 ) ndmp? ( net-libs/libtirpc:= ) nls? ( virtual/libintl ) samba? ( net-fs/samba:= ) s3? ( net-misc/curl ) !s3? ( curl? ( net-misc/curl ) ) xfs? ( sys-fs/xfsdump ) !minimal? ( app-arch/mt-st:= app-crypt/aespipe app-crypt/gnupg dev-perl/XML-Simple sys-block/mtx virtual/mailx gnuplot? ( sci-visualization/gnuplot ) ) dev-lang/perl
+DEPEND=acct-group/amanda acct-user/amanda app-arch/dump app-arch/tar dev-libs/glib:2 dev-lang/perl:= dev-perl/Encode-Locale dev-perl/JSON net-misc/openssh sys-libs/readline:= app-alternatives/awk kerberos? ( app-crypt/mit-krb5 ) ndmp? ( net-libs/libtirpc:= ) nls? ( virtual/libintl ) samba? ( net-fs/samba:= ) s3? ( net-misc/curl ) !s3? ( curl? ( net-misc/curl ) ) xfs? ( sys-fs/xfsdump ) !minimal? ( app-arch/mt-st:= app-crypt/aespipe app-crypt/gnupg dev-perl/XML-Simple sys-block/mtx virtual/mailx gnuplot? ( sci-visualization/gnuplot ) ) dev-lang/perl
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=7
 HOMEPAGE=http://www.amanda.org/
@@ -8,8 +8,8 @@ INHERIT=autotools perl-module systemd toolchain-funcs
 IUSE=curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs
 KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=acct-group/amanda acct-user/amanda app-arch/dump app-arch/tar dev-libs/glib:2 dev-lang/perl:= dev-perl/Encode-Locale dev-perl/JSON net-misc/openssh sys-libs/readline:= virtual/awk kerberos? ( app-crypt/mit-krb5 ) ndmp? ( net-libs/libtirpc:= ) nls? ( virtual/libintl ) samba? ( net-fs/samba:= ) s3? ( net-misc/curl ) !s3? ( curl? ( net-misc/curl ) ) xfs? ( sys-fs/xfsdump ) !minimal? ( app-arch/mt-st:= app-crypt/aespipe app-crypt/gnupg dev-perl/XML-Simple sys-block/mtx virtual/mailx gnuplot? ( sci-visualization/gnuplot ) ) dev-lang/perl:=
+RDEPEND=acct-group/amanda acct-user/amanda app-arch/dump app-arch/tar dev-libs/glib:2 dev-lang/perl:= dev-perl/Encode-Locale dev-perl/JSON net-misc/openssh sys-libs/readline:= app-alternatives/awk kerberos? ( app-crypt/mit-krb5 ) ndmp? ( net-libs/libtirpc:= ) nls? ( virtual/libintl ) samba? ( net-fs/samba:= ) s3? ( net-misc/curl ) !s3? ( curl? ( net-misc/curl ) ) xfs? ( sys-fs/xfsdump ) !minimal? ( app-arch/mt-st:= app-crypt/aespipe app-crypt/gnupg dev-perl/XML-Simple sys-block/mtx virtual/mailx gnuplot? ( sci-visualization/gnuplot ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.5.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d28714dca65aaa98e510705040fed22a
+_md5_=4b413ebcef06c4fb7501464e3ec8fbad
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 202d1907e9b9..346033bb2df6 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/snapd-2.58 b/metadata/md5-cache/app-containers/snapd-2.58
new file mode 100644
index 000000000000..032215b4f160
--- /dev/null
+++ b/metadata/md5-cache/app-containers/snapd-2.58
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-lang/go-1.9 dev-python/docutils sys-devel/gettext sys-fs/xfsprogs sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma]
+DESCRIPTION=Service and tools for management of snap packages
+EAPI=7
+HOMEPAGE=http://snapcraft.io/
+INHERIT=autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd tmpfiles xdg-utils
+IUSE=apparmor +forced-devmode gtk kde systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT
+PDEPEND=sys-auth/polkit[gtk?,kde?]
+RDEPEND=sys-libs/libseccomp:= apparmor? ( sec-policy/apparmor-profiles sys-apps/apparmor:= ) dev-libs/glib virtual/libudev systemd? ( sys-apps/systemd ) sys-libs/libcap:= sys-fs/squashfs-tools[lzma] virtual/tmpfiles
+REQUIRED_USE=!forced-devmode? ( apparmor ) systemd
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/snapcore/snapd/releases/download/2.58/snapd_2.58.vendor.tar.xz -> snapd-2.58.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	go-module	4c4b34f361efda91762ffeda8f632c02	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d1d34bb9783a1a1b8f2f688dfc9445d1
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 36b9e5cb01eb..138ca2f601a0 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/dxvk-1.10.3 b/metadata/md5-cache/app-emulation/dxvk-1.10.3
index 8896642eb1c5..2e54c347f410 100644
--- a/metadata/md5-cache/app-emulation/dxvk-1.10.3
+++ b/metadata/md5-cache/app-emulation/dxvk-1.10.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/doitsujin/dxvk/
 INHERIT=flag-o-matic meson-multilib
 IUSE=+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=ZLIB
 REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) dxgi? ( d3d11 ) || ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v1.10.3.tar.gz -> dxvk-1.10.3.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8c92f25f8beeb8abf336efa679835498
+_md5_=0bab1dbb21c0c45b3aeca6adddedd741
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.0 b/metadata/md5-cache/app-emulation/dxvk-2.0
index 2379a2f8d416..2726fa96a66e 100644
--- a/metadata/md5-cache/app-emulation/dxvk-2.0
+++ b/metadata/md5-cache/app-emulation/dxvk-2.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/doitsujin/dxvk/
 INHERIT=flag-o-matic meson-multilib
 IUSE=+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=ZLIB Apache-2.0 MIT
 REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) dxgi? ( d3d11 ) || ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v2.0.tar.gz -> dxvk-2.0.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/98f440ce6868c94f5ec6e198cc1adda4760e8849.tar.gz -> dxvk-vulkan-headers-98f440ce68.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dd4b7bc7fd799b7f7146e708ffee7512
+_md5_=0406f6bee8788e065e5a3d1b59833dfe
diff --git a/metadata/md5-cache/app-emulation/ruffle-0_p20221015 b/metadata/md5-cache/app-emulation/ruffle-0_p20221015
deleted file mode 100644
index 574e72c0b820..000000000000
--- a/metadata/md5-cache/app-emulation/ruffle-0_p20221015
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) virtual/jre:* virtual/pkgconfig >=virtual/rust-1.64 >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib media-libs/fontconfig media-libs/freetype sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libxcb:=
-DESCRIPTION=Flash Player emulator written in Rust
-EAPI=8
-HOMEPAGE=https://ruffle.rs/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cargo desktop flag-o-matic python-any-r1 xdg
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB curl
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib media-libs/fontconfig media-libs/freetype sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libxcb:=
-SLOT=0
-SRC_URI=https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-2022-10-15.tar.gz -> ruffle-nightly-2022-10-15.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/alsa/0.6.0/download -> alsa-0.6.0.crate https://crates.io/api/v1/crates/alsa-sys/0.3.1/download -> alsa-sys-0.3.1.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/anyhow/1.0.65/download -> anyhow-1.0.65.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/ash/0.37.0+1.3.209/download -> ash-0.37.0+1.3.209.crate https://crates.io/api/v1/crates/async-channel/1.7.1/download -> async-channel-1.7.1.crate https://crates.io/api/v1/crates/atk-sys/0.15.1/download -> atk-sys-0.15.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.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.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bindgen/0.59.2/download -> bindgen-0.59.2.crate https://crates.io/api/v1/crates/bit-set/0.5.3/download -> bit-set-0.5.3.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags_serde_shim/0.2.2/download -> bitflags_serde_shim-0.2.2.crate https://crates.io/api/v1/crates/bitstream-io/1.5.0/download -> bitstream-io-1.5.0.crate https://crates.io/api/v1/crates/bitvec/0.19.6/download -> bitvec-0.19.6.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/build_const/0.2.2/download -> build_const-0.2.2.crate https://crates.io/api/v1/crates/bumpalo/3.11.0/download -> bumpalo-3.11.0.crate https://crates.io/api/v1/crates/bytemuck/1.12.1/download -> bytemuck-1.12.1.crate https://crates.io/api/v1/crates/bytemuck_derive/1.2.1/download -> bytemuck_derive-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.1/download -> bytes-1.2.1.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cairo-sys-rs/0.15.1/download -> cairo-sys-rs-0.15.1.crate https://crates.io/api/v1/crates/calloop/0.10.1/download -> calloop-0.10.1.crate https://crates.io/api/v1/crates/castaway/0.1.2/download -> castaway-0.1.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cesu8/1.1.0/download -> cesu8-1.1.0.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-expr/0.10.3/download -> cfg-expr-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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/cfg_aliases/0.1.1/download -> cfg_aliases-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.22/download -> chrono-0.4.22.crate https://crates.io/api/v1/crates/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/4.0.15/download -> clap-4.0.15.crate https://crates.io/api/v1/crates/clap_derive/4.0.13/download -> clap_derive-4.0.13.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/clipboard/0.5.0/download -> clipboard-0.5.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cmake/0.1.48/download -> cmake-0.1.48.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.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/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/colored/2.0.0/download -> colored-2.0.0.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.4/download -> concurrent-queue-1.2.4.crate https://crates.io/api/v1/crates/console/0.15.2/download -> console-0.15.2.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.7/download -> console_error_panic_hook-0.1.7.crate https://crates.io/api/v1/crates/console_log/0.2.0/download -> console_log-0.2.0.crate https://crates.io/api/v1/crates/convert_case/0.6.0/download -> convert_case-0.6.0.crate https://crates.io/api/v1/crates/cookie-factory/0.3.2/download -> cookie-factory-0.3.2.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-text/19.2.0/download -> core-text-19.2.0.crate https://crates.io/api/v1/crates/coreaudio-rs/0.10.0/download -> coreaudio-rs-0.10.0.crate https://crates.io/api/v1/crates/coreaudio-sys/0.2.10/download -> coreaudio-sys-0.2.10.crate https://crates.io/api/v1/crates/cpal/0.14.0/download -> cpal-0.14.0.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.11/download -> crossbeam-epoch-0.9.11.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download -> crossbeam-utils-0.8.12.crate https://crates.io/api/v1/crates/crossfont/0.5.0/download -> crossfont-0.5.0.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.23/download -> ctor-0.1.23.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/curl/0.4.44/download -> curl-0.4.44.crate https://crates.io/api/v1/crates/curl-sys/0.4.56+curl-7.83.1/download -> curl-sys-0.4.56+curl-7.83.1.crate https://crates.io/api/v1/crates/cxx/1.0.78/download -> cxx-1.0.78.crate https://crates.io/api/v1/crates/cxx-build/1.0.78/download -> cxx-build-1.0.78.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.78/download -> cxxbridge-flags-1.0.78.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.78/download -> cxxbridge-macro-1.0.78.crate https://crates.io/api/v1/crates/d3d12/0.5.0/download -> d3d12-0.5.0.crate https://crates.io/api/v1/crates/darling/0.13.4/download -> darling-0.13.4.crate https://crates.io/api/v1/crates/darling/0.14.1/download -> darling-0.14.1.crate https://crates.io/api/v1/crates/darling_core/0.13.4/download -> darling_core-0.13.4.crate https://crates.io/api/v1/crates/darling_core/0.14.1/download -> darling_core-0.14.1.crate https://crates.io/api/v1/crates/darling_macro/0.13.4/download -> darling_macro-0.13.4.crate https://crates.io/api/v1/crates/darling_macro/0.14.1/download -> darling_macro-0.14.1.crate https://crates.io/api/v1/crates/derive-try-from-primitive/1.0.0/download -> derive-try-from-primitive-1.0.0.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/embed-resource/1.7.2/download -> embed-resource-1.7.2.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enum-map/2.4.1/download -> enum-map-2.4.1.crate https://crates.io/api/v1/crates/enum-map-derive/0.10.0/download -> enum-map-derive-0.10.0.crate https://crates.io/api/v1/crates/enumset/1.0.12/download -> enumset-1.0.12.crate https://crates.io/api/v1/crates/enumset_derive/0.6.1/download -> enumset_derive-0.6.1.crate https://crates.io/api/v1/crates/env_logger/0.9.1/download -> env_logger-0.9.1.crate https://crates.io/api/v1/crates/euclid/0.22.7/download -> euclid-0.22.7.crate https://crates.io/api/v1/crates/event-listener/2.5.3/download -> event-listener-2.5.3.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/exr/1.5.2/download -> exr-1.5.2.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/float_next_after/0.1.5/download -> float_next_after-0.1.5.crate https://crates.io/api/v1/crates/flume/0.10.14/download -> flume-0.10.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.2/download -> foreign-types-macros-0.2.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/foreign-types-shared/0.3.1/download -> foreign-types-shared-0.3.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.24/download -> futures-0.3.24.crate https://crates.io/api/v1/crates/futures-channel/0.3.24/download -> futures-channel-0.3.24.crate https://crates.io/api/v1/crates/futures-core/0.3.24/download -> futures-core-0.3.24.crate https://crates.io/api/v1/crates/futures-executor/0.3.24/download -> futures-executor-0.3.24.crate https://crates.io/api/v1/crates/futures-io/0.3.24/download -> futures-io-0.3.24.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.24/download -> futures-macro-0.3.24.crate https://crates.io/api/v1/crates/futures-sink/0.3.24/download -> futures-sink-0.3.24.crate https://crates.io/api/v1/crates/futures-task/0.3.24/download -> futures-task-0.3.24.crate https://crates.io/api/v1/crates/futures-util/0.3.24/download -> futures-util-0.3.24.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/gdk-pixbuf-sys/0.15.10/download -> gdk-pixbuf-sys-0.15.10.crate https://crates.io/api/v1/crates/gdk-sys/0.15.1/download -> gdk-sys-0.15.1.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gif/0.11.4/download -> gif-0.11.4.crate https://crates.io/api/v1/crates/gio-sys/0.15.10/download -> gio-sys-0.15.10.crate https://crates.io/api/v1/crates/glib-sys/0.15.10/download -> glib-sys-0.15.10.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glow/0.11.2/download -> glow-0.11.2.crate https://crates.io/api/v1/crates/gobject-sys/0.15.10/download -> gobject-sys-0.15.10.crate https://crates.io/api/v1/crates/gpu-alloc/0.5.3/download -> gpu-alloc-0.5.3.crate https://crates.io/api/v1/crates/gpu-alloc-types/0.2.0/download -> gpu-alloc-types-0.2.0.crate https://crates.io/api/v1/crates/gpu-descriptor/0.2.3/download -> gpu-descriptor-0.2.3.crate https://crates.io/api/v1/crates/gpu-descriptor-types/0.1.1/download -> gpu-descriptor-types-0.1.1.crate https://crates.io/api/v1/crates/gtk-sys/0.15.3/download -> gtk-sys-0.15.3.crate https://crates.io/api/v1/crates/half/2.1.0/download -> half-2.1.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hexf-parse/0.2.1/download -> hexf-parse-0.2.1.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.51/download -> iana-time-zone-0.1.51.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.0/download -> iana-time-zone-haiku-0.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/image/0.24.4/download -> image-0.24.4.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/indicatif/0.17.1/download -> indicatif-0.17.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/isahc/1.7.2/download -> isahc-1.7.2.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/jni/0.19.0/download -> jni-0.19.0.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.25/download -> jobserver-0.1.25.crate https://crates.io/api/v1/crates/jpeg-decoder/0.2.6/download -> jpeg-decoder-0.2.6.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/khronos-egl/4.1.0/download -> khronos-egl-4.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lebe/0.5.2/download -> lebe-0.5.2.crate https://crates.io/api/v1/crates/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.135/download -> libc-0.2.135.crate https://crates.io/api/v1/crates/libflate/1.2.0/download -> libflate-1.2.0.crate https://crates.io/api/v1/crates/libflate_lz77/1.1.0/download -> libflate_lz77-1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.7+1.45.0/download -> libnghttp2-sys-0.1.7+1.45.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.7/download -> link-cplusplus-1.0.7.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/lyon/1.0.0/download -> lyon-1.0.0.crate https://crates.io/api/v1/crates/lyon_algorithms/1.0.1/download -> lyon_algorithms-1.0.1.crate https://crates.io/api/v1/crates/lyon_geom/1.0.1/download -> lyon_geom-1.0.1.crate https://crates.io/api/v1/crates/lyon_path/1.0.1/download -> lyon_path-1.0.1.crate https://crates.io/api/v1/crates/lyon_tessellation/1.0.4/download -> lyon_tessellation-1.0.4.crate https://crates.io/api/v1/crates/lzma-rs/0.2.0/download -> lzma-rs-0.2.0.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.7/download -> memmap2-0.5.7.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/metal/0.24.0/download -> metal-0.24.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/minimp3/0.5.1/download -> minimp3-0.5.1.crate https://crates.io/api/v1/crates/minimp3-sys/0.3.2/download -> minimp3-sys-0.3.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.4/download -> mio-0.8.4.crate https://crates.io/api/v1/crates/naga/0.10.0/download -> naga-0.10.0.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/ndk/0.6.0/download -> ndk-0.6.0.crate https://crates.io/api/v1/crates/ndk/0.7.0/download -> ndk-0.7.0.crate https://crates.io/api/v1/crates/ndk-context/0.1.1/download -> ndk-context-0.1.1.crate https://crates.io/api/v1/crates/ndk-glue/0.7.0/download -> ndk-glue-0.7.0.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.3.0/download -> ndk-sys-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.4.0/download -> ndk-sys-0.4.0.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nix/0.24.2/download -> nix-0.24.2.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.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-rational/0.4.1/download -> num-rational-0.4.1.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/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_enum/0.5.7/download -> num_enum-0.5.7.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.7/download -> num_enum_derive-0.5.7.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_exception/0.1.2/download -> objc_exception-0.1.2.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/oboe/0.4.6/download -> oboe-0.4.6.crate https://crates.io/api/v1/crates/oboe-sys/0.4.5/download -> oboe-sys-0.4.5.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.76/download -> openssl-sys-0.9.76.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/ouroboros/0.15.5/download -> ouroboros-0.15.5.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.5/download -> ouroboros_macro-0.15.5.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/pango-sys/0.15.10/download -> pango-sys-0.15.10.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pin-project/1.0.12/download -> pin-project-1.0.12.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.12/download -> pin-project-internal-1.0.12.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/png/0.17.6/download -> png-0.17.6.crate https://crates.io/api/v1/crates/polling/2.3.0/download -> polling-2.3.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/primal-check/0.3.3/download -> primal-check-0.3.3.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.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-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/profiling/1.0.7/download -> profiling-1.0.7.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/range-alloc/0.1.2/download -> range-alloc-0.1.2.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.3/download -> raw-window-handle-0.4.3.crate https://crates.io/api/v1/crates/raw-window-handle/0.5.0/download -> raw-window-handle-0.5.0.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.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/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/regress/0.4.1/download -> regress-0.4.1.crate https://crates.io/api/v1/crates/renderdoc-sys/0.7.1/download -> renderdoc-sys-0.7.1.crate https://crates.io/api/v1/crates/rfd/0.10.0/download -> rfd-0.10.0.crate https://crates.io/api/v1/crates/rle-decode-fast/1.0.3/download -> rle-decode-fast-1.0.3.crate https://crates.io/api/v1/crates/ron/0.8.0/download -> ron-0.8.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustdct/0.7.0/download -> rustdct-0.7.0.crate https://crates.io/api/v1/crates/rustfft/6.0.1/download -> rustfft-6.0.1.crate https://crates.io/api/v1/crates/rustversion/1.0.9/download -> rustversion-1.0.9.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/safe_arch/0.5.2/download -> safe_arch-0.5.2.crate https://crates.io/api/v1/crates/safe_arch/0.6.0/download -> safe_arch-0.6.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.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.2/download -> scratch-1.0.2.crate https://crates.io/api/v1/crates/sctk-adwaita/0.4.2/download -> sctk-adwaita-0.4.2.crate https://crates.io/api/v1/crates/semver/1.0.14/download -> semver-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.145/download -> serde-1.0.145.crate https://crates.io/api/v1/crates/serde-wasm-bindgen/0.4.5/download -> serde-wasm-bindgen-0.4.5.crate https://crates.io/api/v1/crates/serde-xml-rs/0.6.0/download -> serde-xml-rs-0.6.0.crate https://crates.io/api/v1/crates/serde_derive/1.0.145/download -> serde_derive-1.0.145.crate https://crates.io/api/v1/crates/serde_json/1.0.86/download -> serde_json-1.0.86.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/simple_asn1/0.6.2/download -> simple_asn1-0.6.2.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/slice-deque/0.3.0/download -> slice-deque-0.3.0.crate https://crates.io/api/v1/crates/slotmap/1.0.6/download -> slotmap-1.0.6.crate https://crates.io/api/v1/crates/sluice/0.5.5/download -> sluice-0.5.5.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.16.0/download -> smithay-client-toolkit-0.16.0.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/spin/0.9.4/download -> spin-0.9.4.crate https://crates.io/api/v1/crates/spirv/0.2.0+1.5.4/download -> spirv-0.2.0+1.5.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/symphonia/0.5.1/download -> symphonia-0.5.1.crate https://crates.io/api/v1/crates/symphonia-bundle-mp3/0.5.1/download -> symphonia-bundle-mp3-0.5.1.crate https://crates.io/api/v1/crates/symphonia-core/0.5.1/download -> symphonia-core-0.5.1.crate https://crates.io/api/v1/crates/symphonia-metadata/0.5.1/download -> symphonia-metadata-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/system-deps/6.0.2/download -> system-deps-6.0.2.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/tiff/0.7.3/download -> tiff-0.7.3.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.3.15/download -> time-0.3.15.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tiny-skia/0.7.0/download -> tiny-skia-0.7.0.crate https://crates.io/api/v1/crates/tiny-skia-path/0.7.0/download -> tiny-skia-path-0.7.0.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/transpose/0.2.1/download -> transpose-0.2.1.crate https://crates.io/api/v1/crates/typed-arena/2.0.1/download -> typed-arena-2.0.1.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.0/download -> unicode-segmentation-1.10.0.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/unicode-xid/0.2.4/download -> unicode-xid-0.2.4.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version-compare/0.1.0/download -> version-compare-0.1.0.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/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.1/download -> vswhom-sys-0.1.1.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.33/download -> wasm-bindgen-futures-0.4.33.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/wayland-client/0.29.5/download -> wayland-client-0.29.5.crate https://crates.io/api/v1/crates/wayland-commons/0.29.5/download -> wayland-commons-0.29.5.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.5/download -> wayland-cursor-0.29.5.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.5/download -> wayland-protocols-0.29.5.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.5/download -> wayland-scanner-0.29.5.crate https://crates.io/api/v1/crates/wayland-sys/0.29.5/download -> wayland-sys-0.29.5.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/web-sys/0.3.60/download -> web-sys-0.3.60.crate https://crates.io/api/v1/crates/webbrowser/0.8.0/download -> webbrowser-0.8.0.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/wgpu/0.14.0/download -> wgpu-0.14.0.crate https://crates.io/api/v1/crates/wgpu-core/0.14.0/download -> wgpu-core-0.14.0.crate https://crates.io/api/v1/crates/wgpu-hal/0.14.0/download -> wgpu-hal-0.14.0.crate https://crates.io/api/v1/crates/wgpu-types/0.14.0/download -> wgpu-types-0.14.0.crate https://crates.io/api/v1/crates/wide/0.7.5/download -> wide-0.7.5.crate https://crates.io/api/v1/crates/widestring/1.0.2/download -> widestring-1.0.2.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.37.0/download -> windows-0.37.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.37.0/download -> windows_aarch64_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.37.0/download -> windows_i686_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.37.0/download -> windows_i686_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.37.0/download -> windows_x86_64_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.37.0/download -> windows_x86_64_msvc-0.37.0.crate https://crates.io/api/v1/crates/winit/0.27.4/download -> winit-0.27.4.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.3.3/download -> x11-clipboard-0.3.3.crate https://crates.io/api/v1/crates/x11-dl/2.20.0/download -> x11-dl-2.20.0.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://github.com/RustAudio/dasp/archive/f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz -> dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz https://github.com/ruffle-rs/gc-arena/archive/081b6883a522b38030b13744c80c84efbfcbae1f.tar.gz -> gc-arena-081b6883a522b38030b13744c80c84efbfcbae1f.tar.gz https://github.com/ruffle-rs/h263-rs/archive/023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz -> h263-rs-023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz https://github.com/ruffle-rs/nellymoser/archive/4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz -> nellymoser-4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz https://github.com/ruffle-rs/nihav-vp6/archive/9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz -> nihav-vp6-9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz https://github.com/ruffle-rs/quick-xml/archive/8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz -> quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz https://github.com/ruffle-rs/rust-flash-lso/archive/19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz -> rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz
-_eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=74547308c828d7f56e27dfbb85e2c67e
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-2.6 b/metadata/md5-cache/app-emulation/vkd3d-proton-2.6
index 7c4b14a50929..aa12c1ad9dea 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-2.6
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-2.6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/HansKristian-Work/vkd3d-proton/
 INHERIT=flag-o-matic meson-multilib toolchain-funcs
 IUSE=+abi_x86_32 crossdev-mingw debug extras abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-2.1+ Apache-2.0 MIT
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.6.tar.gz -> vkd3d-proton-2.6.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/b537bbb91bccdbc695cb7e5211d608f8d1c205bd.tar.gz -> vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/ae217c17809fadb232ec94b29304b4afcd417bb4.tar.gz -> vkd3d-proton-spirv-headers-ae217c1780.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/83e1a9ed8ce289cebb1c02c8167d663dc1befb24.tar.gz -> vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=feacb6fff00ed889c495fdb5b7c98f53
+_md5_=64199fc1765ae5e670a4b91e5fee7f99
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-2.7 b/metadata/md5-cache/app-emulation/vkd3d-proton-2.7
index d821e0390ece..f304955002e5 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-2.7
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-2.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/HansKristian-Work/vkd3d-proton/
 INHERIT=flag-o-matic meson-multilib toolchain-funcs
 IUSE=+abi_x86_32 crossdev-mingw debug extras abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-2.1+ Apache-2.0 MIT
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v2.7.tar.gz -> vkd3d-proton-2.7.tar.gz https://github.com/HansKristian-Work/dxil-spirv/archive/2166bc7ea0ceb2d7ff6d787d9b007f7eb7d4aaa8.tar.gz -> vkd3d-proton-dxil-spirv-2166bc7ea0.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/ae217c17809fadb232ec94b29304b4afcd417bb4.tar.gz -> vkd3d-proton-spirv-headers-ae217c1780.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/87d5b782bec60822aa878941e6b13c0a9a954c9b.tar.gz -> vkd3d-proton-spirv-headers-87d5b782be.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/5177b119bbdf463b7b909855a83230253c2d8b68.tar.gz -> vkd3d-proton-vulkan-headers-5177b119bb.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5fc513a50ef9c5ab828238c0b988de8a
+_md5_=3ff804c3f95b4db9c79eaa17fa8ca278
diff --git a/metadata/md5-cache/app-emulation/vkd3d-proton-9999 b/metadata/md5-cache/app-emulation/vkd3d-proton-9999
index 70698b8f7bc1..c05ea5ea73d5 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-proton-9999
+++ b/metadata/md5-cache/app-emulation/vkd3d-proton-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=aaa158c617e93fb4f051ebf4d5f70ea5
+_md5_=525e850d567c969072fa9313df4cd88a
diff --git a/metadata/md5-cache/app-emulation/wine-gecko-2.47.2 b/metadata/md5-cache/app-emulation/wine-gecko-2.47.2
index 89f972e50ce8..cf542150ad53 100644
--- a/metadata/md5-cache/app-emulation/wine-gecko-2.47.2
+++ b/metadata/md5-cache/app-emulation/wine-gecko-2.47.2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A Mozilla Gecko based version of Internet Explorer for Wine
-EAPI=6
-HOMEPAGE=https://winehq.org
-IUSE=abi_x86_32 abi_x86_64 +shared
+DESCRIPTION=Mozilla Gecko based version of Internet Explorer for Wine
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Gecko https://gitlab.winehq.org/wine/wine-gecko/
+IUSE=+abi_x86_32 abi_x86_64 +shared
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=2.47.2
-SRC_URI=!shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.msi ) ) shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.tar.xz ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.tar.xz ) )
-_md5_=ed0d970e9706fa1e63768de4428c2ecb
+SRC_URI=shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.tar.xz ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.tar.xz ) ) !shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86_64.msi ) )
+_md5_=a068cdcd41b1c06dce7c95b253cce257
diff --git a/metadata/md5-cache/app-emulation/wine-gecko-2.47.3 b/metadata/md5-cache/app-emulation/wine-gecko-2.47.3
index 2767d8968832..0375c32e0482 100644
--- a/metadata/md5-cache/app-emulation/wine-gecko-2.47.3
+++ b/metadata/md5-cache/app-emulation/wine-gecko-2.47.3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=A Mozilla Gecko based version of Internet Explorer for Wine
-EAPI=6
-HOMEPAGE=https://winehq.org
-IUSE=abi_x86_32 abi_x86_64 +shared
-KEYWORDS=~amd64 ~x86
+DESCRIPTION=Mozilla Gecko based version of Internet Explorer for Wine
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Gecko https://gitlab.winehq.org/wine/wine-gecko/
+IUSE=+abi_x86_32 abi_x86_64 +shared
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=2.47.3
-SRC_URI=!shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86_64.msi ) ) shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86.tar.xz ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86_64.tar.xz ) )
-_md5_=6d948b801ec14889d88558cceecc92e0
+SRC_URI=shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86.tar.xz ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86_64.tar.xz ) ) !shared? ( abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86.msi ) abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86_64.msi ) )
+_md5_=a068cdcd41b1c06dce7c95b253cce257
diff --git a/metadata/md5-cache/app-emulation/wine-mono-7.0.0 b/metadata/md5-cache/app-emulation/wine-mono-7.0.0
index 9144d0892cf4..11d6e143f1ee 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-7.0.0
+++ b/metadata/md5-cache/app-emulation/wine-mono-7.0.0
@@ -1,11 +1,10 @@
 DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
+DESCRIPTION=Replacement for the .NET runtime and class libraries in Wine
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Mono
 IUSE=+shared
 KEYWORDS=amd64 x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
 SLOT=7.0.0
-SRC_URI=!shared? ( https://dl.winehq.org/wine/wine-mono/7.0.0/wine-mono-7.0.0-x86.msi ) shared? ( https://dl.winehq.org/wine/wine-mono/7.0.0/wine-mono-7.0.0-x86.tar.xz )
-_md5_=48a7d9e8b1ba37a44c41b5f93a700b36
+SRC_URI=shared? ( https://dl.winehq.org/wine/wine-mono/7.0.0/wine-mono-7.0.0-x86.tar.xz ) !shared? ( https://dl.winehq.org/wine/wine-mono/7.0.0/wine-mono-7.0.0-x86.msi )
+_md5_=de1691a1b69567bb2ff1b85b984ae0d1
diff --git a/metadata/md5-cache/app-emulation/wine-mono-7.3.0 b/metadata/md5-cache/app-emulation/wine-mono-7.3.0
index 5463ab34f998..08c0d5ee46ae 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-7.3.0
+++ b/metadata/md5-cache/app-emulation/wine-mono-7.3.0
@@ -1,11 +1,10 @@
 DEFINED_PHASES=install
-DEPEND=!!app-emulation/wine:0
-DESCRIPTION=Wine Mono is a replacement for the .NET runtime and class libraries in Wine
-EAPI=7
-HOMEPAGE=https://www.winehq.org/
+DESCRIPTION=Replacement for the .NET runtime and class libraries in Wine
+EAPI=8
+HOMEPAGE=https://wiki.winehq.org/Mono
 IUSE=+shared
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
 SLOT=7.3.0
-SRC_URI=!shared? ( https://dl.winehq.org/wine/wine-mono/7.3.0/wine-mono-7.3.0-x86.msi ) shared? ( https://dl.winehq.org/wine/wine-mono/7.3.0/wine-mono-7.3.0-x86.tar.xz )
-_md5_=5062ae428b4e5d9dc8e0d6a7284ce2f7
+SRC_URI=shared? ( https://dl.winehq.org/wine/wine-mono/7.3.0/wine-mono-7.3.0-x86.tar.xz ) !shared? ( https://dl.winehq.org/wine/wine-mono/7.3.0/wine-mono-7.3.0-x86.msi )
+_md5_=c23c6a3c8f125b32e166ecfd1894f1bc
diff --git a/metadata/md5-cache/app-emulation/wine-mono-7.3.1 b/metadata/md5-cache/app-emulation/wine-mono-7.3.1
index 9a10c5f34dfc..e85a5eb9eac4 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-7.3.1
+++ b/metadata/md5-cache/app-emulation/wine-mono-7.3.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Replacement for the .NET runtime and class libraries in Wine
 EAPI=8
-HOMEPAGE=https://www.winehq.org/
+HOMEPAGE=https://wiki.winehq.org/Mono
 IUSE=+shared
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
 SLOT=7.3.1
 SRC_URI=shared? ( https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.3.1/wine-mono-7.3.1-x86.tar.xz ) !shared? ( https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.3.1/wine-mono-7.3.1-x86.msi )
-_md5_=ecd2f6e66b7d59947bf64ff934460375
+_md5_=44ec0d4ba6b7fab2d5e35a77b4121c46
diff --git a/metadata/md5-cache/app-emulation/wine-mono-7.4.0 b/metadata/md5-cache/app-emulation/wine-mono-7.4.0
index 8705d2636f6d..c89f792ab9b8 100644
--- a/metadata/md5-cache/app-emulation/wine-mono-7.4.0
+++ b/metadata/md5-cache/app-emulation/wine-mono-7.4.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Replacement for the .NET runtime and class libraries in Wine
 EAPI=8
-HOMEPAGE=https://www.winehq.org/
+HOMEPAGE=https://wiki.winehq.org/Mono
 IUSE=+shared
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1
 SLOT=7.4.0
 SRC_URI=shared? ( https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.4.0/wine-mono-7.4.0-x86.tar.xz ) !shared? ( https://github.com/madewokherd/wine-mono/releases/download/wine-mono-7.4.0/wine-mono-7.4.0-x86.msi )
-_md5_=ecd2f6e66b7d59947bf64ff934460375
+_md5_=d2f3d5f4ff87eba9f594606b1d1c6855
diff --git a/metadata/md5-cache/app-emulation/wine-proton-7.0.5 b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
index 7c86a99e0dca..9db215aee97a 100644
--- a/metadata/md5-cache/app-emulation/wine-proton-7.0.5
+++ b/metadata/md5-cache/app-emulation/wine-proton-7.0.5
@@ -7,7 +7,7 @@ HOMEPAGE=https://github.com/ValveSoftware/wine/
 IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 IUSE=+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l +vkd3d +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
 RDEPEND=dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.3.1 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.5
 SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-7.0-5.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f60fab72f9deb9d2ba984453297f3daf
+_md5_=f8e6d99c130701a8e1e6152d306c87d7
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
index a89312df32d7..c827585b0b4e 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-7.0.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
 IDEPEND=>=app-eselect/eselect-wine-2
 INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
 IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vkd3d +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff
 RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?] ) openal? ( media-libs/openal[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.0.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=7.0.1
 SRC_URI=https://dl.winehq.org/wine/source/7.0/wine-7.0.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8ca62c59ad8c8c5b7e780bc33e18ea43
+_md5_=661993c9e64ceb9f160f22d9a82c5745
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 1d8cde668421..90d0b27f6fbe 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-wine-2.0.0 b/metadata/md5-cache/app-eselect/eselect-wine-2.0.0
deleted file mode 100644
index 37df76aa7554..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-wine-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst preinst prerm pretend
-DESCRIPTION=Manage active Wine slots and variants
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Wine
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/eselect-wine-2.0.0.tar.bz2
-_md5_=e07b2a724c8d0e8974d0a2042769eeec
diff --git a/metadata/md5-cache/app-eselect/eselect-wine-2.0.1 b/metadata/md5-cache/app-eselect/eselect-wine-2.0.1
index 18299a932cb2..0b41cbd9002d 100644
--- a/metadata/md5-cache/app-eselect/eselect-wine-2.0.1
+++ b/metadata/md5-cache/app-eselect/eselect-wine-2.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst preinst prerm pretend
 DESCRIPTION=Manage active Wine slots and variants
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Wine
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/eselect-wine-2.0.1.tar.bz2
-_md5_=e07b2a724c8d0e8974d0a2042769eeec
+_md5_=fc3237d31241c25b5c2f5b688359ae63
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 2d51b41c9491..29dc25265ebf 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/ibus-1.5.27 b/metadata/md5-cache/app-i18n/ibus-1.5.27
index 47b39023d1e0..6251b9811009 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.27
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.27
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 INHERIT=autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
 IUSE=X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.65.0:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) gtk4? ( gui-libs/gtk:4 ) gui? ( x11-libs/libX11 x11-libs/libXi ) introspection? ( dev-libs/gobject-introspection ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gui? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=appindicator? ( gtk3 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) introspection ) test? ( gtk3 ) vala? ( introspection ) X? ( gtk3 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.27/ibus-1.5.27.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b6f2f350c17c726d49f7eb2e278452b
+_md5_=46593b8ffab3de407d8af1f077a96702
diff --git a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117 b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117-r1
index a4bd39e6dad3..bf9a9da1bcb7 100644
--- a/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117
+++ b/metadata/md5-cache/app-i18n/ibus-chewing-1.6.1_p20210117-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/cmake-fedora virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
+DEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 nls? ( virtual/libintl )
 DESCRIPTION=Chinese Chewing engine for IBus
 EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 INHERIT=cmake gnome2-utils vcs-snapshot virtualx
-IUSE=gconf nls test
+IUSE=nls test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )
+RDEPEND=app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/libX11 nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/definite/ibus-chewing/archive/8e17848d3fe3bd7de052a1c26b4161092ba1df9f.tar.gz -> ibus-chewing-1.6.1_p20210117.tar.gz https://dev.gentoo.org/~hattya/distfiles/ibus-chewing-gob2.patch.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f9b0f755fec551c422793825db583c0c
+_md5_=e7f96d5dbfe9109ec7cc9e3fe159b5db
diff --git a/metadata/md5-cache/app-i18n/imsettings-1.8.2 b/metadata/md5-cache/app-i18n/imsettings-1.8.2-r1
index cd21d387ef57..55524bd4bb76 100644
--- a/metadata/md5-cache/app-i18n/imsettings-1.8.2
+++ b/metadata/md5-cache/app-i18n/imsettings-1.8.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/glib-utils sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig 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=configure install postinst prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )
+DEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )
 DESCRIPTION=Delivery framework for general Input Method configuration
 EAPI=8
 HOMEPAGE=https://tagoh.bitbucket.io/imsettings
 INHERIT=autotools
-IUSE=gconf qt5 +introspection xfconf
+IUSE=qt5 +introspection xfconf
 KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify gconf? ( gnome-base/gconf ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )
+RDEPEND=dev-libs/glib:2 sys-apps/dbus virtual/libintl x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/imsettings/downloads/imsettings-1.8.2.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=69e3649a869773fed5289f29f81f028c
+_md5_=8ce1ece281dddfc819fb5a4bf5ba1b91
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-202005 b/metadata/md5-cache/app-i18n/skk-jisyo-202005
index 6cf9b868d4a8..3e9030b440f6 100644
--- a/metadata/md5-cache/app-i18n/skk-jisyo-202005
+++ b/metadata/md5-cache/app-i18n/skk-jisyo-202005
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
+DEPEND=app-alternatives/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
 DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
 EAPI=8
 HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
@@ -8,4 +8,4 @@ KEYWORDS=amd64 arm ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=CC-BY-SA-3.0 GPL-2+ public-domain unicode
 SLOT=0
 SRC_URI=mirror://gentoo/skk-jisyo-202005.tar.xz https://dev.gentoo.org/~hattya/distfiles/skk-jisyo-202005.tar.xz
-_md5_=961a7ff422d26036b0feb544c77e85a7
+_md5_=4ecbbed9c7ec2f63465c8c8c72d07d7f
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-999999 b/metadata/md5-cache/app-i18n/skk-jisyo-999999
index fece565089a6..9d11c73589d0 100644
--- a/metadata/md5-cache/app-i18n/skk-jisyo-999999
+++ b/metadata/md5-cache/app-i18n/skk-jisyo-999999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=|| ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems app-i18n/skktools virtual/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
+DEPEND=|| ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems app-i18n/skktools app-alternatives/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
 DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
 EAPI=8
 HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
@@ -10,4 +10,4 @@ LICENSE=CC-BY-SA-3.0 GPL-2+ public-domain unicode
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22
-_md5_=187658168fd6ed4a29c519d4cbb59479
+_md5_=27da236a951b0cb26ed50550737e2d0f
diff --git a/metadata/md5-cache/app-i18n/skkfep-0.87-r1 b/metadata/md5-cache/app-i18n/skkfep-0.87-r1
index dda05d0241fd..b006cc56a4c0 100644
--- a/metadata/md5-cache/app-i18n/skkfep-0.87-r1
+++ b/metadata/md5-cache/app-i18n/skkfep-0.87-r1
@@ -1,4 +1,4 @@
-BDEPEND=sys-apps/sed virtual/awk virtual/pkgconfig
+BDEPEND=sys-apps/sed app-alternatives/awk virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
 DEPEND=sys-libs/ncurses:=
 DESCRIPTION=A SKK-like Japanese input method for console
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:= app-i18n/skk-jisyo
 SLOT=0
 SRC_URI=http://aitoweb.world.coocan.jp/skkfep/skkfep-0.87.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f7ca6aba5e0494615bc6508c2b4c21ad
+_md5_=c61e1f7b7cd12945e0b7a7156b5ce796
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 21dd522683c5..68b2b96a5211 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/fmawk-1.2 b/metadata/md5-cache/app-misc/fmawk-1.2
index 90c026afcd75..44a0fa8f8770 100644
--- a/metadata/md5-cache/app-misc/fmawk-1.2
+++ b/metadata/md5-cache/app-misc/fmawk-1.2
@@ -5,8 +5,8 @@ HOMEPAGE=https://github.com/huijunchen9260/fm.awk/
 INHERIT=optfeature
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=virtual/awk
+RDEPEND=app-alternatives/awk
 SLOT=0
 SRC_URI=https://github.com/huijunchen9260/fm.awk/archive/refs/tags/1.2.tar.gz -> fmawk-1.2.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=a2e79f72e22ff7edd6781b10ad3c3fc7
+_md5_=132408ba4fd60ee36266c695effb6636
diff --git a/metadata/md5-cache/app-misc/fmawk-1.3 b/metadata/md5-cache/app-misc/fmawk-1.3
index 57a702e09a9d..ef2bd6c78cea 100644
--- a/metadata/md5-cache/app-misc/fmawk-1.3
+++ b/metadata/md5-cache/app-misc/fmawk-1.3
@@ -5,8 +5,8 @@ HOMEPAGE=https://github.com/huijunchen9260/fm.awk/
 INHERIT=optfeature
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=virtual/awk
+RDEPEND=app-alternatives/awk
 SLOT=0
 SRC_URI=https://github.com/huijunchen9260/fm.awk/archive/refs/tags/1.3.tar.gz -> fmawk-1.3.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=1437528d081501de5bd33c5413dea12e
+_md5_=9c4f5b579a3fcb7b2bea9e7f221af13f
diff --git a/metadata/md5-cache/app-misc/fmawk-9999 b/metadata/md5-cache/app-misc/fmawk-9999
index 76427e83a958..b4bf1a566ada 100644
--- a/metadata/md5-cache/app-misc/fmawk-9999
+++ b/metadata/md5-cache/app-misc/fmawk-9999
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/huijunchen9260/fm.awk/
 INHERIT=optfeature git-r3
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=virtual/awk
+RDEPEND=app-alternatives/awk
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=1437528d081501de5bd33c5413dea12e
+_md5_=9c4f5b579a3fcb7b2bea9e7f221af13f
diff --git a/metadata/md5-cache/app-misc/ktoblzcheck-1.49-r2 b/metadata/md5-cache/app-misc/ktoblzcheck-1.49-r2
index b1e3067a9a71..7524a1d60d38 100644
--- a/metadata/md5-cache/app-misc/ktoblzcheck-1.49-r2
+++ b/metadata/md5-cache/app-misc/ktoblzcheck-1.49-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install
-DEPEND=app-text/recode:0= sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget www-client/lynx ) sys-devel/libtool
+DEPEND=app-text/recode:0= sys-apps/grep sys-apps/sed app-alternatives/awk || ( net-misc/wget www-client/lynx ) sys-devel/libtool
 DESCRIPTION=Library to check account numbers and bank codes of German banks
 EAPI=7
 HOMEPAGE=http://ktoblzcheck.sourceforge.net/
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=app-text/recode:0= sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget www-client/lynx )
+RDEPEND=app-text/recode:0= sys-apps/grep sys-apps/sed app-alternatives/awk || ( net-misc/wget www-client/lynx )
 SLOT=0
 SRC_URI=mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.49.tar.gz
-_md5_=b7fc7ec7171792c4c4a0d20fdb883d16
+_md5_=e6bb0df621cdd24080e20fa7f37af14b
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.15.0 b/metadata/md5-cache/app-misc/tmuxp-1.15.0
index 4d3ccdb80c3a..8d2847b43923 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.15.0
+++ b/metadata/md5-cache/app-misc/tmuxp-1.15.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://tmuxp.git-pull.com
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/libtmux-0.15*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.15.0.tar.gz -> tmuxp-1.15.0.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=eec4e194fcdec3fb79eb10dcd3291db3
+_md5_=469be3bc1c48ec0475e963da9764bd55
diff --git a/metadata/md5-cache/app-misc/wayland-utils-1.1.0 b/metadata/md5-cache/app-misc/wayland-utils-1.1.0
index b2e6fded109d..10cd90bbe527 100644
--- a/metadata/md5-cache/app-misc/wayland-utils-1.1.0
+++ b/metadata/md5-cache/app-misc/wayland-utils-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=Display information about supported Wayland protocols and current co
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/wayland/wayland-utils
 INHERIT=meson
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.20.0 x11-libs/libdrm
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/wayland/wayland-utils/-/archive/1.1.0/wayland-utils-1.1.0.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b2415ce9e7cb7f0e31e57cfe76966620
+_md5_=f38ef12a249b970318450b301a8948e4
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index f07bbba68bfc..094e4835dc6c 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.6.1-r3 b/metadata/md5-cache/app-portage/gentoolkit-0.6.1-r3
index 4fc2822db223..dcaff553a28b 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.6.1-r3
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.6.1-r3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/awk sys-apps/gentoo-functions ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] )
+BDEPEND=test? ( >=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-alternatives/awk sys-apps/gentoo-functions ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] )
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Collection of administration scripts for Gentoo
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 tmpfiles
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/awk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] ) virtual/tmpfiles
+RDEPEND=>=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-alternatives/awk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.6.1.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0257ae3ee0fa3350a7d39ad545073c14
+_md5_=b246fef5a4d2c6178094852bddde89a0
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index 6349e7e986e0..bad6de04e06b 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/awk sys-apps/gentoo-functions ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-alternatives/awk sys-apps/gentoo-functions ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DEPEND=>=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Collection of administration scripts for Gentoo
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 tmpfiles git-r3
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/awk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] ) virtual/tmpfiles
+RDEPEND=>=sys-apps/portage-3.0.32[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-alternatives/awk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[xml(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[xml(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+),threads(+)] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4863f18a360b9ee1739542ec0b345f71
+_md5_=f172dced6bbadb517f0d6b28b7b598be
diff --git a/metadata/md5-cache/app-portage/iwdevtools-0.12.1 b/metadata/md5-cache/app-portage/iwdevtools-0.12.1
index 42331faf7cc2..d2dd39a1835d 100644
--- a/metadata/md5-cache/app-portage/iwdevtools-0.12.1
+++ b/metadata/md5-cache/app-portage/iwdevtools-0.12.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ionenwks/iwdevtools
 INHERIT=meson optfeature
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=BSD-2
 RDEPEND=app-misc/pax-utils app-portage/portage-utils >=app-shells/bash-5.1 dev-libs/libxml2:2 sys-apps/diffutils sys-apps/file sys-apps/portage || ( sys-apps/util-linux app-misc/getopt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ionenwks/iwdevtools/archive/refs/tags/v0.12.1.tar.gz -> iwdevtools-0.12.1.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=38dbace2cc50b20d9339350875faf52f
+_md5_=1dd1090faafac2d29fabef91c44e72c0
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index adbc13eedf41..f71cc4e09673 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/gnome-doc-utils-0.20.10-r3 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r3
index b3196a3de928..6b976ced83d3 100644
--- a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r3
+++ b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/intltool-0.35 sys-devel/gettext virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+BDEPEND=>=dev-util/intltool-0.35 sys-devel/gettext app-alternatives/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-libs/libxml2-2.6.12:2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-libs/libxslt-1.1.8 app-text/docbook-xml-dtd:4.4 app-text/scrollkeeper-dtd
 DESCRIPTION=A collection of documentation utilities for the Gnome project
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a85faa35230759b7ab613a5b5bf07387
+_md5_=29837b1ffcdccd3479ed6f756d00d60f
diff --git a/metadata/md5-cache/app-text/idnits-2.17.1 b/metadata/md5-cache/app-text/idnits-2.17.1
index 53f4765a0420..e12516480182 100644
--- a/metadata/md5-cache/app-text/idnits-2.17.1
+++ b/metadata/md5-cache/app-text/idnits-2.17.1
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://www.ietf.org/tools/idnits/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=app-shells/bash sys-apps/coreutils virtual/awk
+RDEPEND=app-shells/bash sys-apps/coreutils app-alternatives/awk
 SLOT=0
 SRC_URI=https://github.com/ietf-tools/idnits/archive/refs/tags/2.17.1.tar.gz -> idnits-2.17.1.tar.gz
-_md5_=6b21a8aea34de15e3b67e463aed00ddf
+_md5_=4286d734ac76e0545c22732fd682e9e7
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
index b97705de31f8..72aafccc7cdf 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -1,6 +1,6 @@
 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 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex virtual/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base )
+DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex app-alternatives/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base )
 DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
 EAPI=7
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
@@ -12,4 +12,4 @@ RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/p
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=66c0c6261850b64fa14be1a728a2ad31
+_md5_=752f85885f5bfb20a100018fc7d65c07
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index ae6589f9ab2f..9671c6d111a3 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/gprconfig_kb-22.0.0 b/metadata/md5-cache/dev-ada/gprconfig_kb-22.0.0-r1
index 41d65fa7d5a5..41d65fa7d5a5 100644
--- a/metadata/md5-cache/dev-ada/gprconfig_kb-22.0.0
+++ b/metadata/md5-cache/dev-ada/gprconfig_kb-22.0.0-r1
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 99e326da8d4d..919490010ddd 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/catch-3.0.1 b/metadata/md5-cache/dev-cpp/catch-3.0.1
index 191d86b7a43e..8b77cb4e429c 100644
--- a/metadata/md5-cache/dev-cpp/catch-3.0.1
+++ b/metadata/md5-cache/dev-cpp/catch-3.0.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/catchorg/Catch2
 INHERIT=cmake python-any-r1
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v3.0.1.tar.gz -> Catch2-3.0.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=89df619ed9cfc28bbe7a75261f1fccd3
+_md5_=a17bd0083b555dca61c3d3822f19d6af
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 3434be5e1f6a..79c737c5d801 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/barman-3.2.0 b/metadata/md5-cache/dev-db/barman-3.2.0
new file mode 100644
index 000000000000..cdb2dff39b04
--- /dev/null
+++ b/metadata/md5-cache/dev-db/barman-3.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/snappy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argcomplete[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/rsync dev-db/postgresql[server] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Administration tool for disaster recovery of PostgreSQL servers
+EAPI=7
+HOMEPAGE=https://www.pgbarman.org https://sourceforge.net/projects/pgbarman/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argcomplete[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/rsync dev-db/postgresql[server] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/2ndquadrant-it/barman/archive/release/3.2.0.tar.gz -> barman-3.2.0.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=78fdfcb9e371a7197da0d0db11eaee98
diff --git a/metadata/md5-cache/dev-db/freetds-1.2.18 b/metadata/md5-cache/dev-db/freetds-1.2.18
index 11d38c2a6040..2e0ad7ce2c2e 100644
--- a/metadata/md5-cache/dev-db/freetds-1.2.18
+++ b/metadata/md5-cache/dev-db/freetds-1.2.18
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=virtual/awk gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:0= )
+DEPEND=app-alternatives/awk gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Tabular Datastream Library
 EAPI=7
 HOMEPAGE=https://www.freetds.org/
 IUSE=debug gnutls iconv kerberos mssql iodbc odbc ssl static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=virtual/awk gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:0= ) net-dns/bind-tools
+RDEPEND=app-alternatives/awk gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:0= ) net-dns/bind-tools
 REQUIRED_USE=?? ( iodbc odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.freetds.org/pub/freetds/current/freetds-dev.1.2.18.tar.gz
-_md5_=52690b77fe4a9302187e047222b3ac76
+_md5_=42573917f9d3e0a2db4903d3eb725dc1
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.31 b/metadata/md5-cache/dev-db/mysql-8.0.31
index ab3509f49ad9..9d4a42865f7e 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.31
+++ b/metadata/md5-cache/dev-db/mysql-8.0.31
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mysql.com/
 INHERIT=check-reqs cmake flag-o-matic linux-info multiprocessing prefix toolchain-funcs
 IUSE=cjk cracklib debug jemalloc latin1 numa +perl profiling router selinux +server tcmalloc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips -ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=>=app-arch/lz4-0_p131:= app-arch/zstd:= sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= >=dev-libs/openssl-1.0.0:0= server? ( dev-libs/icu:= dev-libs/libevent:=[ssl,threads] >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) tcmalloc? ( dev-util/google-perftools:0= ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !dev-db/mysql:0 !dev-db/mysql:5.7 selinux? ( sec-policy/selinux-mysql ) !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.31.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.31.tar.gz https://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.31.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-db/mysql/mysql-8.0.31-patches-01.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=41491f65bb4f30dfa033ace861cefe36
+_md5_=a6c60a60cd97bf7858c090691888d914
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31
index a4d47a56b36d..8f719bfca16d 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.31
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
 INHERIT=cmake
 IUSE=+legacy
-KEYWORDS=~amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 -ppc ~ppc64 -sparc ~x86
 LICENSE=Artistic GPL-2
 RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/openssl:= dev-libs/protobuf:= sys-libs/zlib legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-8.0.27:= )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.31-src.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3badbca380a73de38a7545abbeb66cfb
+_md5_=de8157120ec5e06a39135e60e9594a48
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31
index efc96dbd27ed..64d9fbdfee9a 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.31
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 INHERIT=cmake-multilib flag-o-matic
 IUSE=ldap 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-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(-)?] ldap? ( dev-libs/cyrus-sasl:=[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/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.31.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=335c63874a545504bf43ace3b8c75e56
+_md5_=0b2238b32a8efd38502f0ead7e99d91c
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.31 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.31
index 58150a21ef2c..3af82421ab7f 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.31
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.31
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.mysql.com/products/workbench/
 INHERIT=gnome2 flag-o-matic python-single-r1 cmake
 IUSE=debug doc python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[sqlite] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm:* dev-cpp/pangomm:1.4 >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 >=x11-libs/cairo-1.5.12[glib,svg(+)] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 dev-libs/boost[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-fs/e2fsprogs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-8.0.27-r1 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.31-src.tar.gz https://www.antlr.org/download/antlr-4.9.1-complete.jar
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=61fb87fdf5684ca7a4d226ac59b4adb0
+_md5_=63fda3a1d1de585b2067e83464a80edf
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index b7c6b54ebf52..51a157d1d7af 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-4.0_beta5 b/metadata/md5-cache/dev-games/godot-4.0_beta7
index 28a2a2c6bab0..0dc09bc87478 100644
--- a/metadata/md5-cache/dev-games/godot-4.0_beta5
+++ b/metadata/md5-cache/dev-games/godot-4.0_beta7
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
+DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] || ( >x11-libs/libX11-1.8.2-r1 <x11-libs/libX11-1.8.2-r1 ) x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
 DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
 EAPI=8
 HOMEPAGE=https://godotengine.org/
@@ -9,9 +9,9 @@ INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
 IUSE=+dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +webp
 KEYWORDS=~amd64
 LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
-RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] || ( >x11-libs/libX11-1.8.2-r1 <x11-libs/libX11-1.8.2-r1 ) x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
 RESTRICT=test
 SLOT=4
-SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/beta5/godot-4.0-beta5.tar.xz
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/beta7/godot-4.0-beta7.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3bf507060534f6284972c03975669cc9
+_md5_=df0da1d8fe992ef1530f81b69e9d2082
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4fb14ba19f5a..aa8243c7308e 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/byaccj-1.15-r3 b/metadata/md5-cache/dev-java/byaccj-1.15-r3
index 0ff1593bb197..c5d22adcf21d 100644
--- a/metadata/md5-cache/dev-java/byaccj-1.15-r3
+++ b/metadata/md5-cache/dev-java/byaccj-1.15-r3
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
-DESCRIPTION=A java extension of BSD YACC-compatible parser generator
+DESCRIPTION=A Java extension of BSD YACC-compatible parser generator
 EAPI=8
-HOMEPAGE=http://byaccj.sourceforge.net/
+HOMEPAGE=https://byaccj.sourceforge.net/
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=46bfeef1aa3c8f7e592a8344aade81b4
+_md5_=dffe0832c25cd0244cdfc6f06811c450
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.21-r1 b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
index 5ca87af1ec84..f1c2edd88ae1 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.21-r1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.21-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-compress/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/asm:9 dev-java/brotli-dec:0 dev-java/xz-java:0 dev-java/zstd-jni:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/compress/source/commons-compress-1.21-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=974fbc0458f8d715c70e994e4a8ac533
+_md5_=bdfbf7712db39bc32f4e7b2cdf284ad8
diff --git a/metadata/md5-cache/dev-java/easymock-2.5.2 b/metadata/md5-cache/dev-java/easymock-2.5.2
index 06df383371ef..da1c416e2bda 100644
--- a/metadata/md5-cache/dev-java/easymock-2.5.2
+++ b/metadata/md5-cache/dev-java/easymock-2.5.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://easymock.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2.5
 SRC_URI=https://github.com/easymock/easymock/archive/easymock-2.5.2.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=05b1b7a2d72546c613c9df2146a63d42
+_md5_=896bd39d2efebdfd9923590a0470d582
diff --git a/metadata/md5-cache/dev-java/felix-framework-7.0.5 b/metadata/md5-cache/dev-java/felix-framework-7.0.5
index 4ea3d4c92d56..f53b1207da3f 100644
--- a/metadata/md5-cache/dev-java/felix-framework-7.0.5
+++ b/metadata/md5-cache/dev-java/felix-framework-7.0.5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/subprojects/apache-felix-framework.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/animal-sniffer-annotations:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz -> felix-framework-7.0.5.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=aa6b90d05664e35c075ce285b60d722a
+_md5_=cb8a2dabdccd549f6d9566bb9d034316
diff --git a/metadata/md5-cache/dev-java/felix-resolver-2.0.4 b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
index 1e6124fef81b..afcf6430b57c 100644
--- a/metadata/md5-cache/dev-java/felix-resolver-2.0.4
+++ b/metadata/md5-cache/dev-java/felix-resolver-2.0.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/index.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/osgi-annotation:0 dev-java/osgi-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz -> felix-resolver-2.0.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=18ccf3e02dfec0c2b30c3851f27604be
+_md5_=29385725ca3b653aec4c712fdd13cfe2
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.11.8 b/metadata/md5-cache/dev-java/felix-utils-1.11.8
index 1fccb1424986..6fb70e714ac8 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.11.8
+++ b/metadata/md5-cache/dev-java/felix-utils-1.11.8
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://felix.apache.org/documentation/index.html
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64
+KEYWORDS=amd64 ~arm arm64 ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz -> felix-utils-1.11.8.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=804362963971f593e5f4a6d7dce7bacf
+_md5_=89b0ebbaf4be369918217c033cf902db
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b33f78573d98..624da4bcc797 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p16 b/metadata/md5-cache/dev-lang/python-2.7.18_p16
index 3d8741742232..0b661c95a30c 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p16
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p16
@@ -1,4 +1,4 @@
-BDEPEND=virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( dev-libs/openssl:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p16.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3cf016b1920cc8c32ca0ec5645d54f6d
+_md5_=ad1e0a65215596182f4b4acaedddf71e
diff --git a/metadata/md5-cache/dev-lang/python-3.10.8_p3 b/metadata/md5-cache/dev-lang/python-3.10.8_p3
index 9ff1d63bdaf3..ceaa9f225baa 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.8_p3
+++ b/metadata/md5-cache/dev-lang/python-3.10.8_p3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) valgrind? ( dev-util/valgrind ) test? ( app-arch/xz-utils[extra-filters(+)] )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.8_p3-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2e0f707b4f43a9b048d8e942fd6ea140
+_md5_=525dfaed8dd386101db93ec2cea9517e
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_p2 b/metadata/md5-cache/dev-lang/python-3.11.0_p2
index d298ef8fd66b..983e0b12e60f 100644
--- a/metadata/md5-cache/dev-lang/python-3.11.0_p2
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_p2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0_p2-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3157caa8b027fc6a20982a146ce251b8
+_md5_=0fb0da9c34682a121ba486d18118345e
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_alpha1_p2 b/metadata/md5-cache/dev-lang/python-3.12.0_alpha1_p2
index 9360e16add9f..592a2cbe4f1e 100644
--- a/metadata/md5-cache/dev-lang/python-3.12.0_alpha1_p2
+++ b/metadata/md5-cache/dev-lang/python-3.12.0_alpha1_p2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.12
 SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0a1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0a1_p2-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0a1.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=686e6cca2fc7d8fa731be5d84c816021
+_md5_=8f921880104342821792f52eb3ab4db9
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_alpha2 b/metadata/md5-cache/dev-lang/python-3.12.0_alpha2
index 157a13c74581..4d29524439df 100644
--- a/metadata/md5-cache/dev-lang/python-3.12.0_alpha2
+++ b/metadata/md5-cache/dev-lang/python-3.12.0_alpha2
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.12
 SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0a2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0a2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0a2.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9e39b13d13f60e6ad14a1abe474c859a
+_md5_=aa2c1b4f73e677f799ca9e62c67f3654
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15_p3 b/metadata/md5-cache/dev-lang/python-3.8.15_p3
index 4631e026af5c..9a5159e41881 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.15_p3
+++ b/metadata/md5-cache/dev-lang/python-3.8.15_p3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15_p3-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2652b7b048967b04ef1a21535bbcb828
+_md5_=8834cb548aeebdc559f77d63c837c990
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15_p3 b/metadata/md5-cache/dev-lang/python-3.9.15_p3
index 606eace9b65f..d1c5773280e4 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.15_p3
+++ b/metadata/md5-cache/dev-lang/python-3.9.15_p3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) valgrind? ( dev-util/valgrind )
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.15_p3-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f6b5a134acde5ed59061c272c26be3d0
+_md5_=010ce758a3008ca4725ab2fc2f14675f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6ae976555ca7..1a98540aa6c2 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/glib-2.74.2 b/metadata/md5-cache/dev-libs/glib-2.74.2
deleted file mode 100644
index e087187d1d18..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.74.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.74.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=The GLib library of C routines
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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
-LICENSE=LGPL-2.1+
-PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.74.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.2.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dfdc62b9f7431304c2d3306d91ce6106
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.3 b/metadata/md5-cache/dev-libs/glib-2.74.3-r1
index ff693e1c4443..23fb0622ce51 100644
--- a/metadata/md5-cache/dev-libs/glib-2.74.3
+++ b/metadata/md5-cache/dev-libs/glib-2.74.3-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] >=dev-lang/python-3.10.8_p3:3.10[xml(+)] >=dev-lang/python-3.9.15_p3:3.9[xml(+)] >=dev-lang/python-3.8.15_p3:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.74.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=!<dev-util/gdbus-codegen-2.74.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=The GLib library of C routines
 EAPI=8
 HOMEPAGE=https://www.gtk.org/
@@ -9,9 +9,9 @@ IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test ut
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.74.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=!<dev-util/gdbus-codegen-2.74.3 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre2-10.32: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(-)?,unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=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(-)?] >=virtual/libintl-0-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.3.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dfdc62b9f7431304c2d3306d91ce6106
+_md5_=9f5aca865ed3f02a582174bc080d0d0c
diff --git a/metadata/md5-cache/dev-libs/libchdr-0_p20221129 b/metadata/md5-cache/dev-libs/libchdr-0_p20221129
new file mode 100644
index 000000000000..b043f1ae2df8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libchdr-0_p20221129
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib:=
+DESCRIPTION=Standalone library for reading MAME's CHDv1-v5 formats
+EAPI=8
+HOMEPAGE=https://github.com/rtissera/libchdr/
+INHERIT=cmake
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://github.com/rtissera/libchdr/archive/a20e04c12c0c20048bf771da6df7aa2e51f5e0cb.tar.gz -> libchdr-0_p20221129.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9763191384fca029dc3b72f11f395bfe
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.5 b/metadata/md5-cache/dev-libs/libclc-15.0.5
index f412dd2a2e78..68b19e3f494d 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.5
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.5
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://libclc.llvm.org/
 INHERIT=cmake llvm llvm.org python-any-r1
 IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eeebbbfc98f5a06d2bbd11b3e38e10d1
+_md5_=a6fbf149e8e6dff89e12015217339e15
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.13.0 b/metadata/md5-cache/dev-libs/libevdev-1.13.0
index d3c891c10cb9..b84fd04b065f 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.13.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.13.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
 INHERIT=meson-multilib python-any-r1
 IUSE=doc 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 ~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
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.13.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=181848e7822ccdb0ea6089ee25a6bcbe
+_md5_=eb42416250105662d1ed4ade54f7327b
diff --git a/metadata/md5-cache/dev-libs/libintl-0.21.1 b/metadata/md5-cache/dev-libs/libintl-0.21.1
index 691d9fe6521d..68acf9d674b3 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.21.1
+++ b/metadata/md5-cache/dev-libs/libintl-0.21.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gettext/
 INHERIT=multilib-minimal libtool usr-ldscript verify-sig
 IUSE=static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=738457676a9c4acf7d0fed8d1f7233a6
+_md5_=2d0a5510c2f9c3b07f973456fa1f2ba6
diff --git a/metadata/md5-cache/dev-libs/modsecurity-3.0.8 b/metadata/md5-cache/dev-libs/modsecurity-3.0.8
index acea60d24cbf..79045cc3ecfd 100644
--- a/metadata/md5-cache/dev-libs/modsecurity-3.0.8
+++ b/metadata/md5-cache/dev-libs/modsecurity-3.0.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/SpiderLabs/ModSecurity
 INHERIT=lua-single
 IUSE=doc fuzzyhash geoip geoip2 json lmdb lua pcre2 lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libpcre:= dev-libs/libxml2 net-misc/curl fuzzyhash? ( app-crypt/ssdeep ) geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb ) json? ( dev-libs/yajl ) lmdb? ( dev-db/lmdb ) lua? ( 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 ) ) pcre2? ( dev-libs/libpcre2:= )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7e2d1f37907b9c46aa347b17d1fc1ce4
+_md5_=192ca825abf586ad3a86a8e16ae6ac43
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.27 b/metadata/md5-cache/dev-libs/wayland-protocols-1.27
index d11144f2334d..f70087ef2f1b 100644
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.27
+++ b/metadata/md5-cache/dev-libs/wayland-protocols-1.27
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/
 INHERIT=meson
 IUSE=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
 SRC_URI=https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.27/downloads/wayland-protocols-1.27.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=68572a4f749f2e74e1b1cd904d2fbda6
+_md5_=5ebcde70c929d6062b93a29eb5408f6b
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 369d3be2777f..9193413df544 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5 b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5
index 1852d5407bf3..3b4bd3f821a6 100644
--- a/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5
+++ b/metadata/md5-cache/dev-php/pecl-mcrypt-1.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pecl.php.net/mcrypt
 INHERIT=php-ext-pecl-r3
 IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=PHP-3.01
 RDEPEND=dev-libs/libltdl dev-libs/libmcrypt php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/mcrypt-1.0.5.tgz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5b597157c82316c60b782aa855df788a
+_md5_=cb900ee20214b3b96309c18a887ed4c6
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index df6f4c997e6b..bf5f5cfbe780 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/cairocffi-1.4.0 b/metadata/md5-cache/dev-python/cairocffi-1.4.0
index 0d65b989224c..5b8be1190c53 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.4.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Kozea/cairocffi/ https://pypi.org/project/cairocffi/
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1.0:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/xcffib-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo:0=[X,xcb(+)] x11-libs/gdk-pixbuf[jpeg] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.4.0.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=966f769d2e9e79e06ce1d73370d752ff
+_md5_=af47f7ef27abc35ae4acc835cd65c68f
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.5 b/metadata/md5-cache/dev-python/clang-python-15.0.5
index 5bee94b29f19..8ecf4234082e 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.5
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=llvm.org python-r1
 IUSE=test verify-sig python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=>=sys-devel/clang-15.0.5:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=55b25b8d0a9112890816515063d5f565
+_md5_=49954e9ab8d09b2f272b2871b93ca022
diff --git a/metadata/md5-cache/dev-python/lit-15.0.5 b/metadata/md5-cache/dev-python/lit-15.0.5
index 752c187d5765..cddea2fb7c93 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.5
+++ b/metadata/md5-cache/dev-python/lit-15.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=distutils-r1 llvm.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=cb42930a27817feb229ede05de0a64f1
+_md5_=2b3e6d953713ba97c087b1f39562c1af
diff --git a/metadata/md5-cache/dev-python/pikepdf-6.2.4 b/metadata/md5-cache/dev-python/pikepdf-6.2.4
index 6dd27c1a2c84..7918a2f2e5ea 100644
--- a/metadata/md5-cache/dev-python/pikepdf-6.2.4
+++ b/metadata/md5-cache/dev-python/pikepdf-6.2.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pikepdf/pikepdf/ https://pypi.org/project/pikepdf/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=app-text/qpdf-11.1.1:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pikepdf/pikepdf/archive/v6.2.4.tar.gz -> pikepdf-6.2.4.gh.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3228d3ee094eeb5d49be1265ebe1a277
+_md5_=40676bbf553b8ce6b88884b9e696e331
diff --git a/metadata/md5-cache/dev-python/pybind11-2.10.1 b/metadata/md5-cache/dev-python/pybind11-2.10.1
index 801970a3d7e0..56885ab251e4 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.10.1
+++ b/metadata/md5-cache/dev-python/pybind11-2.10.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pybind11.readthedocs.io/en/stable/ https://github.com/pybind/pybind11/ https://pypi.org/project/pybind11/
 INHERIT=cmake distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.10.1.tar.gz -> pybind11-2.10.1.gh.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d0613b9900a0aa306de53ceb638424ed
+_md5_=402be0def4cdc6efdcdc3f56b58193cb
diff --git a/metadata/md5-cache/dev-python/pyglet-1.5.27 b/metadata/md5-cache/dev-python/pyglet-1.5.27
index eb45520060e7..6530553b81cd 100644
--- a/metadata/md5-cache/dev-python/pyglet-1.5.27
+++ b/metadata/md5-cache/dev-python/pyglet-1.5.27
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pyglet.org/ https://github.com/pyglet/pyglet/ https://pypi.org/project/pyglet/
 INHERIT=distutils-r1 virtualx xdg-utils
 IUSE=examples image +sound test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/glu virtual/opengl image? ( || ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/gtk+:2 ) ) sound? ( || ( media-libs/openal media-sound/pulseaudio ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyglet/pyglet/archive/v1.5.27.tar.gz -> pyglet-1.5.27.gh.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6e0ebf3b5fcf7929ee27b4058c024073
+_md5_=1d8441ce41fefb7754f2f27151a74ac2
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 57cb11287d2b..b2fd00ed4940 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-gcrypt-0.4.0 b/metadata/md5-cache/dev-scheme/guile-gcrypt-0.4.0
new file mode 100644
index 000000000000..bcf251fc9490
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/guile-gcrypt-0.4.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=prepare
+DEPEND=>=dev-scheme/guile-2.0.11:= dev-libs/libgcrypt:0=
+DESCRIPTION=Guile bindings of libgcrypt
+EAPI=8
+HOMEPAGE=https://notabug.org/cwebber/guile-gcrypt
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-scheme/guile-2.0.11:= dev-libs/libgcrypt:0=
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://notabug.org/cwebber/guile-gcrypt/archive/v0.4.0.tar.gz -> guile-gcrypt-0.4.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0b2ca5940591899a8069ce9b6f166cd8
diff --git a/metadata/md5-cache/dev-util/FlameGraph-1.0 b/metadata/md5-cache/dev-util/FlameGraph-1.0
index 2b55ce3333b6..88acab12e9dc 100644
--- a/metadata/md5-cache/dev-util/FlameGraph-1.0
+++ b/metadata/md5-cache/dev-util/FlameGraph-1.0
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph
 KEYWORDS=amd64 x86
 LICENSE=CDDL
-RDEPEND=dev-lang/perl virtual/awk
+RDEPEND=dev-lang/perl app-alternatives/awk
 SLOT=0
 SRC_URI=https://github.com/brendangregg/FlameGraph/archive/v1.0.tar.gz -> FlameGraph-1.0.tar.gz
-_md5_=0f270510973cd7b339987925e75660f1
+_md5_=35a15046d6a5504a3381c0de535122a8
diff --git a/metadata/md5-cache/dev-util/FlameGraph-1.0_p20210830 b/metadata/md5-cache/dev-util/FlameGraph-1.0_p20210830
index b41d4af359a4..9a1b68ea8355 100644
--- a/metadata/md5-cache/dev-util/FlameGraph-1.0_p20210830
+++ b/metadata/md5-cache/dev-util/FlameGraph-1.0_p20210830
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph
 KEYWORDS=amd64 x86
 LICENSE=CDDL
-RDEPEND=dev-lang/perl virtual/awk
+RDEPEND=dev-lang/perl app-alternatives/awk
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flow/distfiles/FlameGraph/FlameGraph-1.0_p20210830.tar.gz
-_md5_=8fe1532bf65eac61db89c1be3efb1943
+_md5_=7e0b8726bbb864ef879cc5ff1c285528
diff --git a/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918 b/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918
index 2470d9b1d81d..a16bc4c7e43e 100644
--- a/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918
+++ b/metadata/md5-cache/dev-util/FlameGraph-1.0_p20220918
@@ -4,7 +4,7 @@ EAPI=8
 HOMEPAGE=https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph
 KEYWORDS=~amd64 ~x86
 LICENSE=CDDL
-RDEPEND=dev-lang/perl virtual/awk
+RDEPEND=dev-lang/perl app-alternatives/awk
 SLOT=0
 SRC_URI=https://github.com/brendangregg/FlameGraph/archive/d9fcc272b6a08c3e3e5b7919040f0ab5f8952d65.tar.gz -> FlameGraph-1.0_p20220918.tar.gz
-_md5_=a7119045419185d9cf4e1d0255b09bac
+_md5_=d6bb821e070658dbc1be78fab66fa271
diff --git a/metadata/md5-cache/dev-util/FlameGraph-9999 b/metadata/md5-cache/dev-util/FlameGraph-9999
index e58de024384f..2c34f7490afb 100644
--- a/metadata/md5-cache/dev-util/FlameGraph-9999
+++ b/metadata/md5-cache/dev-util/FlameGraph-9999
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.brendangregg.com/flamegraphs.html https://github.com/brenda
 INHERIT=git-r3
 LICENSE=CDDL
 PROPERTIES=live
-RDEPEND=dev-lang/perl virtual/awk
+RDEPEND=dev-lang/perl app-alternatives/awk
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=c6de2b5713e050844f510a5884076259
+_md5_=4181a465aa0f5cbb6d9dd2e659bea1e8
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 53df9d322399..bb9bf409ad52 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/cmake-3.24.2 b/metadata/md5-cache/dev-util/cmake-3.24.2
deleted file mode 100644
index da23da3ad6c4..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.24.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=8
-HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
-IUSE=doc emacs ncurses qt5 test test verify-sig
-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=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.24/cmake-3.24.2.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.24.2-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=09bae11df18ffa13d5e1de498fea931b
diff --git a/metadata/md5-cache/dev-util/cmake-3.25.0 b/metadata/md5-cache/dev-util/cmake-3.25.0
deleted file mode 100644
index 44c279de7d14..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.25.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Cross platform Make
-EAPI=8
-HOMEPAGE=https://cmake.org/
-INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils verify-sig
-IUSE=doc emacs ncurses qt5 test test verify-sig
-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=CMake
-RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.25/cmake-3.25.0.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.25.0-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3cbefc3486064e5b6b988ebd99be4fac
diff --git a/metadata/md5-cache/dev-util/cucumber-3.2.0 b/metadata/md5-cache/dev-util/cucumber-3.2.0
deleted file mode 100644
index 204fb2b02064..000000000000
--- a/metadata/md5-cache/dev-util/cucumber-3.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby27(-)] >=dev-ruby/syntax-1.0.0[ruby_targets_ruby27(-)] >=dev-util/aruba-0.6.1[ruby_targets_ruby27(-)] =dev-util/aruba-0.6*[ruby_targets_ruby27(-)] dev-ruby/json[ruby_targets_ruby27(-)] >=dev-util/cucumber-3[ruby_targets_ruby27(-)] >=dev-ruby/mime-types-2.99:2[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby27? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby27(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Executable feature scenarios
-EAPI=7
-HOMEPAGE=https://cucumber.io/
-INHERIT=ruby-fakegem
-IUSE=examples test test ruby_targets_ruby27 test test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby27(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby27(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby27(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby27(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.2.0.tar.gz -> cucumber-3.2.0.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c6151cf56697e8e8ef6b6c924b9053c6
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.3 b/metadata/md5-cache/dev-util/dejagnu-1.6.3
index f9aa026186be..b0fe8798d1d8 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.3
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/awk
+BDEPEND=app-alternatives/awk
 DEFINED_PHASES=-
 DESCRIPTION=Framework for testing other programs
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=dev-tcltk/expect
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.3.tar.gz
-_md5_=189a437ee083a820812ded935df42c88
+_md5_=5cc649c387b53ab791442d28ecfdefa8
diff --git a/metadata/md5-cache/dev-util/diffoscope-224 b/metadata/md5-cache/dev-util/diffoscope-224
deleted file mode 100644
index 92cfaa041308..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-224
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[ncurses] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-224.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9be013debb09ba2029cf6735cfc80c71
diff --git a/metadata/md5-cache/dev-util/diffoscope-226 b/metadata/md5-cache/dev-util/diffoscope-227
index 40a518d23f10..760ffe319870 100644
--- a/metadata/md5-cache/dev-util/diffoscope-226
+++ b/metadata/md5-cache/dev-util/diffoscope-227
@@ -11,6 +11,6 @@ RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-226.tar.gz
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-227.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=802742b4f4e959641bd2d0639d82fefa
diff --git a/metadata/md5-cache/dev-util/directx-headers-1.606.4 b/metadata/md5-cache/dev-util/directx-headers-1.606.4
index 1dde0cfdd112..bbd4dc9ad7f2 100644
--- a/metadata/md5-cache/dev-util/directx-headers-1.606.4
+++ b/metadata/md5-cache/dev-util/directx-headers-1.606.4
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/DirectX-Headers
 INHERIT=meson-multilib
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.606.4.tar.gz -> directx-headers-1.606.4.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0eacbe93952372acde1d8ac87dd7cfc3
+_md5_=43f39e2a1fe1fbce80a31a8dab38e57e
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.5 b/metadata/md5-cache/dev-util/lldb-15.0.5
index 4ee666548cc4..69ed544d94d1 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.5
+++ b/metadata/md5-cache/dev-util/lldb-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org python-single-r1
 IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-15.0.5 ~sys-devel/llvm-15.0.5 python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7f2d145dfa63f8b43af957d1d25fe222
+_md5_=db664d12000cdff8e81049d1daceae1d
diff --git a/metadata/md5-cache/dev-util/maturin-0.14.1 b/metadata/md5-cache/dev-util/maturin-0.14.1
deleted file mode 100644
index f80f60ed3354..000000000000
--- a/metadata/md5-cache/dev-util/maturin-0.14.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/boltons[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=8
-HOMEPAGE=https://maturin.rs/
-INHERIT=cargo distutils-r1 flag-o-matic
-IUSE=doc test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 openssl doc? ( CC-BY-4.0 OFL-1.1 )
-RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.14.1.tar.gz -> maturin-0.14.1.gh.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/anyhow/1.0.66/download -> anyhow-1.0.66.crate https://crates.io/api/v1/crates/askama/0.11.1/download -> askama-0.11.1.crate https://crates.io/api/v1/crates/askama_derive/0.11.2/download -> askama_derive-0.11.2.crate https://crates.io/api/v1/crates/askama_escape/0.10.3/download -> askama_escape-0.10.3.crate https://crates.io/api/v1/crates/askama_shared/0.12.2/download -> askama_shared-0.12.2.crate https://crates.io/api/v1/crates/async-io/1.10.0/download -> async-io-1.10.0.crate https://crates.io/api/v1/crates/async-lock/2.6.0/download -> async-lock-2.6.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.66/download -> backtrace-0.3.66.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.8.1/download -> block-modes-0.8.1.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.1/download -> bytes-1.2.1.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/camino/1.1.1/download -> camino-1.1.1.crate https://crates.io/api/v1/crates/cargo-options/0.5.2/download -> cargo-options-0.5.2.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.12.2/download -> cargo-xwin-0.12.2.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.14.1/download -> cargo-zigbuild-0.14.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.0/download -> cargo_metadata-0.15.0.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.76/download -> cc-1.0.76.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.3.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/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chumsky/0.8.0/download -> chumsky-0.8.0.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/3.2.23/download -> clap-3.2.23.crate https://crates.io/api/v1/crates/clap/4.0.26/download -> clap-4.0.26.crate https://crates.io/api/v1/crates/clap_complete/4.0.5/download -> clap_complete-4.0.5.crate https://crates.io/api/v1/crates/clap_complete_fig/4.0.1/download -> clap_complete_fig-4.0.1.crate https://crates.io/api/v1/crates/clap_derive/3.2.18/download -> clap_derive-3.2.18.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/concolor/0.0.9/download -> concolor-0.0.9.crate https://crates.io/api/v1/crates/concolor-query/0.1.0/download -> concolor-query-0.1.0.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.4/download -> concurrent-queue-1.2.4.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.2/download -> console-0.15.2.crate https://crates.io/api/v1/crates/const-random/0.1.15/download -> const-random-0.1.15.crate https://crates.io/api/v1/crates/const-random-macro/0.1.15/download -> const-random-macro-0.1.15.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.11/download -> crossbeam-epoch-0.9.11.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download -> crossbeam-utils-0.8.12.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/crypto-mac/0.11.1/download -> crypto-mac-0.11.1.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.2/download -> dialoguer-0.10.2.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.3/download -> dunce-1.0.3.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.3/download -> event-listener-2.5.3.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.6/download -> fat-macho-0.4.6.crate https://crates.io/api/v1/crates/filetime/0.2.18/download -> filetime-0.2.18.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs-err/2.9.0/download -> fs-err-2.9.0.crate https://crates.io/api/v1/crates/futures/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/gimli/0.26.2/download -> gimli-0.26.2.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.9/download -> globset-0.4.9.crate https://crates.io/api/v1/crates/goblin/0.5.4/download -> goblin-0.5.4.crate https://crates.io/api/v1/crates/goblin/0.6.0/download -> goblin-0.6.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.11.0/download -> hkdf-0.11.0.crate https://crates.io/api/v1/crates/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/indicatif/0.17.2/download -> indicatif-0.17.2.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/0.7.5/download -> io-lifetimes-0.7.5.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/keyring/1.2.0/download -> keyring-1.2.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.3.2/download -> lddtree-0.3.2.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.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/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.26.0/download -> minijinja-0.26.0.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.4/download -> miniz_oxide-0.5.4.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/normpath/0.3.2/download -> normpath-0.3.2.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.2/download -> num-complex-0.4.2.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-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.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/num_cpus/1.14.0/download -> num_cpus-1.14.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/object/0.29.0/download -> object-0.29.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.42/download -> openssl-0.10.42.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.24.0+1.1.1s/download -> openssl-src-111.24.0+1.1.1s.crate https://crates.io/api/v1/crates/openssl-sys/0.9.77/download -> openssl-sys-0.9.77.crate https://crates.io/api/v1/crates/os_pipe/1.1.1/download -> os_pipe-1.1.1.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.0/download -> os_str_bytes-6.4.0.crate https://crates.io/api/v1/crates/os_type/2.6.0/download -> os_type-2.6.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/paste/1.0.9/download -> paste-1.0.9.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pep440/0.2.0/download -> pep440-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/1.0.1/download -> platform-info-1.0.1.crate https://crates.io/api/v1/crates/polling/2.4.0/download -> polling-2.4.0.crate https://crates.io/api/v1/crates/portable-atomic/0.3.15/download -> portable-atomic-0.3.15.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.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.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.5/download -> python-pkginfo-0.5.5.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.0/download -> rayon-1.6.0.crate https://crates.io/api/v1/crates/rayon-core/1.10.1/download -> rayon-core-1.10.1.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/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.0/download -> regex-1.7.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.2.0/download -> rfc2047-decoder-0.2.0.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/7.1.0/download -> rpassword-7.1.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.35.13/download -> rustix-0.35.13.crate https://crates.io/api/v1/crates/rustls/0.20.7/download -> rustls-0.20.7.crate https://crates.io/api/v1/crates/rustversion/1.0.9/download -> rustversion-1.0.9.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.2/download -> secret-service-2.0.2.crate https://crates.io/api/v1/crates/security-framework/2.7.0/download -> security-framework-2.7.0.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.14/download -> semver-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.147/download -> serde-1.0.147.crate https://crates.io/api/v1/crates/serde_derive/1.0.147/download -> serde_derive-1.0.147.crate https://crates.io/api/v1/crates/serde_json/1.0.88/download -> serde_json-1.0.88.crate https://crates.io/api/v1/crates/serde_repr/0.1.9/download -> serde_repr-0.1.9.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snapbox/0.4.1/download -> snapbox-0.4.1.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.1/download -> snapbox-macros-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.5/download -> target-lexicon-0.12.5.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/terminal_size/0.2.2/download -> terminal_size-0.2.2.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.17/download -> time-0.3.17.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.6/download -> time-macros-0.2.6.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_datetime/0.5.0/download -> toml_datetime-0.5.0.crate https://crates.io/api/v1/crates/toml_edit/0.15.0/download -> toml_edit-0.15.0.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.16/download -> tracing-subscriber-0.3.16.crate https://crates.io/api/v1/crates/trycmd/0.14.4/download -> trycmd-0.14.4.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.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/uniffi_bindgen/0.21.0/download -> uniffi_bindgen-0.21.0.crate https://crates.io/api/v1/crates/uniffi_meta/0.21.0/download -> uniffi_meta-0.21.0.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.5.0/download -> ureq-2.5.0.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/uuid/1.2.2/download -> uuid-1.2.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.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/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/web-sys/0.3.60/download -> web-sys-0.3.60.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.5/download -> webpki-roots-0.22.5.crate https://crates.io/api/v1/crates/weedle2/4.0.0/download -> weedle2-4.0.0.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.3.0/download -> which-4.3.0.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-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.8/download -> xwin-0.2.8.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zbus/1.9.3/download -> zbus-1.9.3.crate https://crates.io/api/v1/crates/zbus_macros/1.9.3/download -> zbus_macros-1.9.3.crate https://crates.io/api/v1/crates/zip/0.6.3/download -> zip-0.6.3.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/cargo_metadata/0.14.2/download -> cargo_metadata-0.14.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cc/1.0.74/download -> cc-1.0.74.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/libc/0.2.134/download -> libc-0.2.134.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.6/download -> python3-dll-a-0.2.6.crate https://crates.io/api/v1/crates/serde_json/1.0.87/download -> serde_json-1.0.87.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/uniffi/0.21.0/download -> uniffi-0.21.0.crate https://crates.io/api/v1/crates/uniffi_build/0.21.0/download -> uniffi_build-0.21.0.crate https://crates.io/api/v1/crates/uniffi_macros/0.21.0/download -> uniffi_macros-0.21.0.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate )
-_eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=471bd59829738ae53b517fdb38ed9f97
diff --git a/metadata/md5-cache/dev-util/statifier-1.7.4-r2 b/metadata/md5-cache/dev-util/statifier-1.7.4-r2
index d13743820b29..0283d269fb49 100644
--- a/metadata/md5-cache/dev-util/statifier-1.7.4-r2
+++ b/metadata/md5-cache/dev-util/statifier-1.7.4-r2
@@ -6,9 +6,9 @@ INHERIT=flag-o-matic multilib-build toolchain-funcs
 IUSE=abi_x86_32 abi_x86_x32 abi_x86_64
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-shells/bash sys-apps/coreutils virtual/awk
+RDEPEND=app-shells/bash sys-apps/coreutils app-alternatives/awk
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_x32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/statifier/files/statifier/1.7.4/statifier-1.7.4.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cbf6d059f698489bf6024ea682e869c4
+_md5_=fe59f9a7258a7e3f8e87ae5eb922f0d4
diff --git a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7 b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
index 7caeb3216d69..52adc0f31143 100644
--- a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
+++ b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 INHERIT=cargo
 IUSE=debug
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0 BSD-2 CC0-1.0 ISC MIT
 RDEPEND=~dev-libs/tree-sitter-0.20.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.7.tar.gz -> tree-sitter-0.20.7.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/ascii/1.0.0/download -> ascii-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.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.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/html-escape/0.2.6/download -> html-escape-0.2.6.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.48/download -> js-sys-0.3.48.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.0/download -> once_cell-1.7.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.7.2/download -> pretty_assertions-0.7.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.3/download -> regex-1.4.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/1.0.5/download -> semver-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.63/download -> serde_json-1.0.63.crate https://crates.io/api/v1/crates/smallbitvec/2.5.1/download -> smallbitvec-2.5.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.67/download -> syn-1.0.67.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tiny_http/0.8.0/download -> tiny_http-0.8.0.crate https://crates.io/api/v1/crates/tinyvec/1.1.1/download -> tinyvec-1.1.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/utf8-width/0.1.4/download -> utf8-width-0.1.4.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.71/download -> wasm-bindgen-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.71/download -> wasm-bindgen-backend-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.71/download -> wasm-bindgen-macro-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.71/download -> wasm-bindgen-macro-support-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.71/download -> wasm-bindgen-shared-0.2.71.crate https://crates.io/api/v1/crates/web-sys/0.3.48/download -> web-sys-0.3.48.crate https://crates.io/api/v1/crates/webbrowser/0.5.5/download -> webbrowser-0.5.5.crate https://crates.io/api/v1/crates/which/4.1.0/download -> which-4.1.0.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.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
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=aca76c7cf0b918bd496abdfa1f048524
+_md5_=e048c122d7a58727c369d31f80ba1c09
diff --git a/metadata/md5-cache/dev-util/wiggle-1.0 b/metadata/md5-cache/dev-util/wiggle-1.0
index b856dedc42d5..9363a521b006 100644
--- a/metadata/md5-cache/dev-util/wiggle-1.0
+++ b/metadata/md5-cache/dev-util/wiggle-1.0
@@ -1,6 +1,6 @@
 BDEPEND=sys-apps/groff virtual/pkgconfig test? ( sys-process/time )
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils app-alternatives/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
 DESCRIPTION=Tool for applying patches that patch cannot apply because of conflicting changes
 EAPI=7
 HOMEPAGE=https://neil.brown.name/wiggle https://git.neil.brown.name/?p=wiggle.git
@@ -8,9 +8,9 @@ INHERIT=fixheadtails toolchain-funcs
 IUSE=test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils app-alternatives/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://neil.brown.name/wiggle/wiggle-1.0.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ec1e65218230b054c7786adece98bb74
+_md5_=b3c1dcb44ee6017841a5942af58dfbcd
diff --git a/metadata/md5-cache/dev-util/wiggle-1.2 b/metadata/md5-cache/dev-util/wiggle-1.2
index 4a68d047af7b..5cf2a8a683ef 100644
--- a/metadata/md5-cache/dev-util/wiggle-1.2
+++ b/metadata/md5-cache/dev-util/wiggle-1.2
@@ -1,6 +1,6 @@
 BDEPEND=sys-apps/groff virtual/pkgconfig test? ( sys-process/time )
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+DEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils app-alternatives/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
 DESCRIPTION=Tool for applying patches that patch cannot apply because of conflicting changes
 EAPI=7
 HOMEPAGE=https://neil.brown.name/wiggle https://git.neil.brown.name/?p=wiggle.git
@@ -8,9 +8,9 @@ INHERIT=fixheadtails toolchain-funcs
 IUSE=test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils virtual/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
+RDEPEND=dev-util/diffstat dev-util/patchutils sys-apps/diffutils sys-apps/findutils app-alternatives/awk sys-apps/grep sys-apps/less sys-apps/sed sys-apps/coreutils sys-devel/patch sys-libs/ncurses:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://neil.brown.name/wiggle/wiggle-1.2.tar.gz
 _eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0ede6d62f61b3b6ac9f89bdd5daa18db
+_md5_=5438e66447713eab36d10dfa2bcb307c
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 97d5bd0b217e..151cb3edd78a 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.19.13 b/metadata/md5-cache/dev-vcs/topgit-0.19.13
index d066a4aba1da..a124a47e929f 100644
--- a/metadata/md5-cache/dev-vcs/topgit-0.19.13
+++ b/metadata/md5-cache/dev-vcs/topgit-0.19.13
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl sys-apps/sed virtual/awk
+BDEPEND=dev-lang/perl sys-apps/sed app-alternatives/awk
 DEFINED_PHASES=compile install test
 DESCRIPTION=A different patch queue manager
 EAPI=8
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mackyle/topgit/archive/topgit-0.19.13.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=66595324335be592c6349a92e359a323
+_md5_=bf3fc7c65d167d1249745916f7f4d628
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 901486dbf46b..5d0a402a494e 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/cdogs-sdl-1.3.1 b/metadata/md5-cache/games-arcade/cdogs-sdl-1.3.1
deleted file mode 100644
index a6ba07df4172..000000000000
--- a/metadata/md5-cache/games-arcade/cdogs-sdl-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[mp3,vorbis,wav] net-libs/enet:1.3=
-DESCRIPTION=Classic overhead run-and-gun game
-EAPI=8
-HOMEPAGE=https://cxong.github.io/cdogs-sdl/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake flag-o-matic xdg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-3.0 CC0-1.0 WTFPL-2 XMAME
-RDEPEND=media-libs/libsdl2[haptic,opengl] media-libs/sdl2-image[png] media-libs/sdl2-mixer[mp3,vorbis,wav] net-libs/enet:1.3=
-SLOT=0
-SRC_URI=https://github.com/cxong/cdogs-sdl/archive/1.3.1.tar.gz -> cdogs-sdl-1.3.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a04dbe1d05d344b1c7ce9fd009510dc5
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 2ba86da604ba..cd3fd14c665c 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/mgba-0.9.3-r2 b/metadata/md5-cache/games-emulation/mgba-0.9.3-r2
deleted file mode 100644
index 9ff6a022491b..000000000000
--- a/metadata/md5-cache/games-emulation/mgba-0.9.3-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libpng:= sys-libs/zlib:=[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) gles2? ( media-libs/libglvnd ) gles3? ( media-libs/libglvnd ) opengl? ( media-libs/libglvnd ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[sound,joystick,opengl?,video] ) sqlite? ( dev-db/sqlite:3 ) test? ( dev-util/cmocka )
-DESCRIPTION=Game Boy Advance Emulator
-EAPI=8
-HOMEPAGE=https://mgba.io/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=debug discord elf ffmpeg gles2 gles3 gui libretro opengl +sdl sqlite test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )
-RDEPEND=media-libs/libpng:= sys-libs/zlib:=[minizip] debug? ( dev-libs/libedit ) elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) gles2? ( media-libs/libglvnd ) gles3? ( media-libs/libglvnd ) opengl? ( media-libs/libglvnd ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[sound,joystick,opengl?,video] ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=|| ( gui sdl ) gles2? ( opengl ) gles3? ( opengl ) gui? ( || ( gles2 opengl ) )
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/mgba-emu/mgba/archive/0.9.3.tar.gz -> mgba-0.9.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9b2feb3082adfb4639197c8132314f37
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.7.3468 b/metadata/md5-cache/games-emulation/pcsx2-1.7.3468
deleted file mode 100644
index 5b0f3057fe87..000000000000
--- a/metadata/md5-cache/games-emulation/pcsx2-1.7.3468
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools[linguist] ) !qt6? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 media-libs/libsamplerate x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
-DESCRIPTION=PlayStation 2 emulator
-EAPI=8
-HOMEPAGE=https://pcsx2.net/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=cmake fcaps flag-o-matic wxwidgets
-IUSE=alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland +filecaps
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
-RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 media-libs/libsamplerate x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )
-REQUIRED_USE=cpu_flags_x86_sse4_1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PCSX2/pcsx2/archive/refs/tags/v1.7.3468.tar.gz -> pcsx2-1.7.3468.tar.gz https://github.com/fastfloat/fast_float/archive/32d21dcecb404514f94fb58660b8029a4673c2c1.tar.gz -> pcsx2-fast_float-32d21dcecb.tar.gz https://github.com/RetroAchievements/rcheevos/archive/31f8788fe0e694e99db7ce138d45a655c556fa96.tar.gz -> pcsx2-rcheevos-31f8788fe0.tar.gz vulkan? ( https://github.com/KhronosGroup/glslang/archive/c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5.tar.gz -> pcsx2-glslang-c9706bdda0.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/9f4c61a31435a7a90a314fc68aeb386c92a09c0f.tar.gz -> pcsx2-vulkan-headers-9f4c61a314.tar.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0433815db792d3b84a2987b1f0f328dd
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index efa35c678561..77387bdab00f 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc3 b/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc3
index a35823b25836..fcd0746f9bad 100644
--- a/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc3
+++ b/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) sys-devel/gettext virtual/awk virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) sys-devel/gettext app-alternatives/awk virtual/pkgconfig
 DEFINED_PHASES=configure postinst postrm preinst prepare setup
 DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) media-libs/libjpeg-turbo media-libs/libpng:= media-libs/libsdl[opengl?,sound?,video] media-libs/sdl-gfx:= media-libs/sdl-image[jpeg,png] sys-libs/zlib:= virtual/libintl devtools? ( media-libs/sdl-ttf ) opengl? ( media-libs/glew:0= virtual/opengl ) sound? ( media-libs/libogg media-libs/libvorbis media-libs/sdl-mixer[vorbis] )
 DESCRIPTION=Modification of the classical Freedroid engine into an RPG
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-3 )
 SLOT=0
 SRC_URI=https://ftp.osuosl.org/pub/freedroid/freedroidRPG-1.0/freedroidRPG-1.0rc3.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=abfb75bbd4149801eb5a39ccc5e4cbf3
+_md5_=b97b740a709d82c818fee2a00bbd516d
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 5384dcb0bf93..48636b1c7bb9 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/widelands-1.0 b/metadata/md5-cache/games-strategy/widelands-1.0
deleted file mode 100644
index a367a1a98b5d..000000000000
--- a/metadata/md5-cache/games-strategy/widelands-1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:= media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf net-misc/curl sys-libs/zlib:= virtual/libintl dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Game similar to Settlers 2
-EAPI=7
-HOMEPAGE=https://www.widelands.org/
-INHERIT=xdg cmake python-any-r1
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=|| ( Apache-2.0 GPL-3 ) BitstreamVera CC-BY-SA-3.0 GPL-2 GPL-2+ MIT OFL-1.1 ZLIB
-RDEPEND=dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:= media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf net-misc/curl sys-libs/zlib:= virtual/libintl
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/widelands/widelands/archive/refs/tags/v1.0.tar.gz -> widelands-1.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7a730b4e478cc3b2ad5685bf361def7d
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 04f881096bdf..ac1cf3d47250 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1 b/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1
index bae5f3dca3aa..d89dadaf6191 100644
--- a/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1
+++ b/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=sys-apps/grep[pcre] elibc_glibc? ( || ( >=sys-libs/glibc-2.36-r3[hash-sysv-compat] <sys-libs/glibc-2.36 ) )
 SLOT=0
-SRC_URI=https://gitlab.com/torkel104/libstrangle/-/archive/0273e318e3b0cc759155db8729ad74266b74cb9b/libstrangle-0.1.1_p20220222.tar.gz
+SRC_URI=https://gitlab.com/torkel104/libstrangle/-/archive/0273e318e3b0cc759155db8729ad74266b74cb9b/libstrangle-0.1.1_p20220222.tar.bz2
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=161b68d810726a933df6826e4a3efdc9
+_md5_=508ad4150f2412dd2901bcb3b3a322a1
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9.5 b/metadata/md5-cache/games-util/xpadneo-0.9.5
index 3db22f28e337..1b1a97ede8f9 100644
--- a/metadata/md5-cache/games-util/xpadneo-0.9.5
+++ b/metadata/md5-cache/games-util/xpadneo-0.9.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://atar-axis.github.io/xpadneo/
 INHERIT=linux-mod toolchain-funcs udev
 IUSE=dist-kernel
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.5.tar.gz -> xpadneo-0.9.5.tar.gz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=ebe65ed99541bdafdd12b6aea3197e23
+_md5_=207489f9a3cef4929c8ef3d09d9c0929
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 26e4fc6697bb..60ad981d8b81 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-42.0 b/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
index 8e9a521e80ed..f3ec8b3207d8 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+BDEPEND=>=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 app-alternatives/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 DESCRIPTION=XSL stylesheets for yelp
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/42/yelp-xsl-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1c0dd083f765ba566a3b536bd95998d1
+_md5_=2745faf8c0d0111f236bfffe01412cb7
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-42.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-42.1
index 69584654a154..3b5e9476cd6c 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-42.1
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-42.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+BDEPEND=>=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 app-alternatives/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 DESCRIPTION=XSL stylesheets for yelp
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/42/yelp-xsl-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1c0dd083f765ba566a3b536bd95998d1
+_md5_=2745faf8c0d0111f236bfffe01412cb7
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 71f9b8226a19..c74574d616b0 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/display-manager-init-1.1.1 b/metadata/md5-cache/gui-libs/display-manager-init-1.1.1
index 73f3cf110bf4..d56acef3ab04 100644
--- a/metadata/md5-cache/gui-libs/display-manager-init-1.1.1
+++ b/metadata/md5-cache/gui-libs/display-manager-init-1.1.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=RC init files for starting display and login managers
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:X11
-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=sys-apps/gentoo-functions !<=sys-apps/sysvinit-2.98 !<=x11-apps/xinit-1.4.1 !<=x11-base/xorg-server-1.20.10 !=x11-base/xorg-server-1.20.10-r2
 SLOT=0
-_md5_=d9acea2564858cb0489ca38029083271
+_md5_=2e79708162ab6e6d6d3d5b15767d42dd
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 4e4f84165e55..17642aac33db 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/s-nail-14.9.22 b/metadata/md5-cache/mail-client/s-nail-14.9.22
index 93b286aae6dd..0df641299728 100644
--- a/metadata/md5-cache/mail-client/s-nail-14.9.22
+++ b/metadata/md5-cache/mail-client/s-nail-14.9.22
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/awk
+BDEPEND=app-arch/xz-utils[extra-filters(-)] app-alternatives/awk
 DEFINED_PHASES=compile configure install
 DEPEND=sys-libs/ncurses:0= virtual/libiconv idn? ( net-dns/libidn2 ) net? ( ssl? ( dev-libs/openssl:0= ) kerberos? ( virtual/krb5 ) ) !mail-client/mailx !net-mail/mailutils !mail-client/nail
 DESCRIPTION=Enhanced mailx-compatible mail client based on Heirloom mailx (nail)
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:0= virtual/libiconv idn? ( net-dns/libidn2 ) net? ( ssl
 SLOT=0
 SRC_URI=https://ftp.sdaoden.eu/s-nail-14.9.22.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2ee26df2b5efdd49da56c077529f4704
+_md5_=c3df2399be1bbaed37787f4115dc1394
diff --git a/metadata/md5-cache/mail-client/s-nail-14.9.24 b/metadata/md5-cache/mail-client/s-nail-14.9.24
index a935862eed0b..baeb87b6d8aa 100644
--- a/metadata/md5-cache/mail-client/s-nail-14.9.24
+++ b/metadata/md5-cache/mail-client/s-nail-14.9.24
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils[extra-filters(-)] virtual/awk
+BDEPEND=app-arch/xz-utils[extra-filters(-)] app-alternatives/awk
 DEFINED_PHASES=compile configure install
 DEPEND=sys-libs/ncurses:0= virtual/libiconv idn? ( net-dns/libidn2 ) net? ( ssl? ( dev-libs/openssl:0= ) kerberos? ( virtual/krb5 ) ) !mail-client/mailx !net-mail/mailutils !mail-client/nail
 DESCRIPTION=Enhanced mailx-compatible mail client based on Heirloom mailx (nail)
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:0= virtual/libiconv idn? ( net-dns/libidn2 ) net? ( ssl
 SLOT=0
 SRC_URI=https://ftp.sdaoden.eu/s-nail-14.9.24.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4e38142f83a5393cf401f6be850e6491
+_md5_=a00169719bdeaf18fd46c8dc6a0cd4c6
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 768ec8c37cc8..bbaeffac3396 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.49.1 b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
index 3a4e5646e096..de0eb630148d 100644
--- a/metadata/md5-cache/media-fonts/terminus-font-4.49.1
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.49.1
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) virtual/awk pcf-8bit? ( x11-apps/bdftopcf ) pcf-unicode? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/gzip || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) app-alternatives/awk pcf-8bit? ( x11-apps/bdftopcf ) pcf-unicode? ( x11-apps/bdftopcf ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
 DESCRIPTION=A clean fixed font for the console and X11
 EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=X? ( || ( otf pcf-8bit pcf-unicode ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/terminus-font/terminus-font-4.49/terminus-font-4.49.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	5e03cb70902daa9ff8967c61130f0f60	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b8794c9dcb48bad6952660a9b5e875c2
+_md5_=d27113af6425f74d19f70e3757fe1723
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 8cf70a67f5e6..a0dc29266d58 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/freeglut-3.4.0 b/metadata/md5-cache/media-libs/freeglut-3.4.0
index 5534a0272323..dab7f0e956a4 100644
--- a/metadata/md5-cache/media-libs/freeglut-3.4.0
+++ b/metadata/md5-cache/media-libs/freeglut-3.4.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://freeglut.sourceforge.net/
 INHERIT=cmake-multilib
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.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/libXi-1.7.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/libXrandr-1.4.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/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/freeglut/freeglut-3.4.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=66c5052328c146ac5aa434590e3367af
+_md5_=ca6f0e37211d4038730c1b99d3f641d4
diff --git a/metadata/md5-cache/media-libs/libglvnd-1.5.0 b/metadata/md5-cache/media-libs/libglvnd-1.5.0
index 894c8f50d804..196d0f403351 100644
--- a/metadata/md5-cache/media-libs/libglvnd-1.5.0
+++ b/metadata/md5-cache/media-libs/libglvnd-1.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/glvnd/libglvnd
 INHERIT=meson-multilib python-any-r1 virtualx
 IUSE=test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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
 RDEPEND=!media-libs/mesa[-libglvnd(+)] X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v1.5.0/libglvnd-v1.5.0.tar.bz2 -> libglvnd-1.5.0.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=32663e8b172d072b7a4e02f4a0b4ed3a
+_md5_=cec5f017b8f74dd5fb3aa9f8102d7455
diff --git a/metadata/md5-cache/media-libs/libshumate-1.0.3 b/metadata/md5-cache/media-libs/libshumate-1.0.3
new file mode 100644
index 000000000000..960e0fbcd6b7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libshumate-1.0.3
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+DESCRIPTION=Shumate is a GTK toolkit providing widgets for embedded maps
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/libshumate https://gitlab.gnome.org/GNOME/libshumate
+INHERIT=gnome.org meson vala virtualx
+IUSE=gtk-doc +introspection vala test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.68.0:2 >=x11-libs/cairo-1.4 >=dev-db/sqlite-1.12:3 >=gui-libs/gtk-4:4 >=net-libs/libsoup-3.0:3.0 introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
+REQUIRED_USE=gtk-doc? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=1.0/1
+SRC_URI=mirror://gnome/sources/libshumate/1.0/libshumate-1.0.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=3aac455c5181a9818f3fc1f812134e1a
diff --git a/metadata/md5-cache/media-libs/mesa-22.2.3 b/metadata/md5-cache/media-libs/mesa-22.2.3
index 213dfc98e7e1..4c8745c8f44e 100644
--- a/metadata/md5-cache/media-libs/mesa-22.2.3
+++ b/metadata/md5-cache/media-libs/mesa-22.2.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.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/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-16:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.2.3.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c10cc142c327291de50ab61e35d56971
+_md5_=c09aba871183f224e92c2d641c4f1dbd
diff --git a/metadata/md5-cache/media-libs/mesa-22.3.0 b/metadata/md5-cache/media-libs/mesa-22.3.0
new file mode 100644
index 000000000000..771b44cbff83
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-22.3.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) ) vulkan-overlay? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.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/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+INHERIT=llvm meson-multilib python-any-r1 linux-info
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[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-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.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/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.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/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[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/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-22.3.0.tar.xz
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=621a17244994e5706bd077e995e5ef22
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a40b878403aa..1878f2acc073 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/cava-0.8.2-r1 b/metadata/md5-cache/media-sound/cava-0.8.2-r1
deleted file mode 100644
index b43406f527a3..000000000000
--- a/metadata/md5-cache/media-sound/cava-0.8.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure postinst prepare
-DEPEND=dev-libs/iniparser:4 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:= ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sdl? ( media-libs/libsdl2[opengl,video] ) sndio? ( media-sound/sndio:= )
-DESCRIPTION=Console-based Audio Visualizer for Alsa
-EAPI=8
-HOMEPAGE=https://github.com/karlstav/cava/
-INHERIT=autotools
-IUSE=alsa +ncurses portaudio pulseaudio sdl sndio
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/iniparser:4 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:= ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sdl? ( media-libs/libsdl2[opengl,video] ) sndio? ( media-sound/sndio:= )
-SLOT=0
-SRC_URI=https://github.com/karlstav/cava/archive/refs/tags/0.8.2.tar.gz -> cava-0.8.2.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=424fa68799fbb468c29de7d2ed297bff
diff --git a/metadata/md5-cache/media-sound/jack-example-tools-3 b/metadata/md5-cache/media-sound/jack-example-tools-3
index 407fdd47265b..9ea2d87c9516 100644
--- a/metadata/md5-cache/media-sound/jack-example-tools-3
+++ b/metadata/md5-cache/media-sound/jack-example-tools-3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://jackaudio.org/
 INHERIT=meson
 IUSE=alsa jack-net jack-netsource opus +readline sndfile zalsa
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ zalsa? ( GPL-3+ )
 RDEPEND=virtual/jack alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) jack-net? ( || ( media-sound/jack2[libsamplerate] media-video/pipewire[jack-sdk(-)] ) ) jack-netsource? ( media-libs/libsamplerate opus? ( media-libs/opus[custom-modes] ) ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) zalsa? ( media-libs/alsa-lib media-libs/zita-alsa-pcmi media-libs/zita-resampler:= ) !<media-sound/jack-audio-connection-kit-0.126.0 !<media-sound/jack2-1.9.21
 SLOT=0
 SRC_URI=https://github.com/jackaudio/jack-example-tools/archive/refs/tags/3.tar.gz -> jack-example-tools-3.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8e6a9e61824ced8e617a4e4fb0661225
+_md5_=2f64485d8fb18c7aea04776fd4b5444f
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.19 b/metadata/md5-cache/media-sound/jack2-1.9.19
deleted file mode 100644
index 8a08339ed878..000000000000
--- a/metadata/md5-cache/media-sound/jack2-1.9.19
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Jackdmp jack implemention for multi-processor machine
-EAPI=7
-HOMEPAGE=https://jackaudio.org/
-INHERIT=python-single-r1 waf-utils multilib-minimal
-IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( classic dbus )
-SLOT=2
-SRC_URI=https://github.com/jackaudio/jack2/archive/v1.9.19/v1.9.19.tar.gz -> jack2-1.9.19.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	waf-utils	b339462e3ff724f101dcab3ea5a7a341
-_md5_=e4b5ef3551c68b796bc1a1c1e06ab9e7
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.21 b/metadata/md5-cache/media-sound/jack2-1.9.21-r1
index db66121eb3a9..4156c226dc26 100644
--- a/metadata/md5-cache/media-sound/jack2-1.9.21
+++ b/metadata/md5-cache/media-sound/jack2-1.9.21-r1
@@ -1,17 +1,17 @@
 BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( classic? ( sys-apps/systemd:= ) )
 DESCRIPTION=Jackdmp jack implemention for multi-processor machine
 EAPI=8
 HOMEPAGE=https://jackaudio.org/
 INHERIT=flag-o-matic python-single-r1 waf-utils multilib-minimal
-IUSE=+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+IUSE=+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_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=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=tools? ( media-sound/jack-example-tools )
-RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit !media-video/pipewire[jack-sdk(-)]
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( classic? ( sys-apps/systemd:= ) ) dbus? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit !media-video/pipewire[jack-sdk(-)]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( classic dbus )
 SLOT=2
 SRC_URI=https://github.com/jackaudio/jack2/archive/refs/tags/v1.9.21.tar.gz -> jack2-1.9.21.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	waf-utils	b339462e3ff724f101dcab3ea5a7a341
-_md5_=f767cffe2cc6af0c8571678d419e2a2d
+_md5_=ec516977c2cb8e9ca045ef1d8362d503
diff --git a/metadata/md5-cache/media-sound/jack2-9999 b/metadata/md5-cache/media-sound/jack2-9999
index 95d4c5e40773..3f5e146d4b3a 100644
--- a/metadata/md5-cache/media-sound/jack2-9999
+++ b/metadata/md5-cache/media-sound/jack2-9999
@@ -1,16 +1,16 @@
 BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( classic? ( sys-apps/systemd:= ) )
 DESCRIPTION=Jackdmp jack implemention for multi-processor machine
 EAPI=8
 HOMEPAGE=https://jackaudio.org/
 INHERIT=flag-o-matic python-single-r1 waf-utils multilib-minimal git-r3
-IUSE=+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_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
+IUSE=+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_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=GPL-2+ LGPL-2.1+
 PDEPEND=tools? ( media-sound/jack-example-tools )
 PROPERTIES=live
-RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit !media-video/pipewire[jack-sdk(-)]
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( 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(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( classic? ( sys-apps/systemd:= ) ) dbus? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit !media-video/pipewire[jack-sdk(-)]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( classic dbus )
 SLOT=2
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	waf-utils	b339462e3ff724f101dcab3ea5a7a341
-_md5_=e78b48b3a3d10f104522d0e1d33d02e5
+_md5_=ca8b92a22c74758efbd69caa85d0749a
diff --git a/metadata/md5-cache/media-sound/schismtracker-20221201 b/metadata/md5-cache/media-sound/schismtracker-20221201
new file mode 100644
index 000000000000..8ace3c087117
--- /dev/null
+++ b/metadata/md5-cache/media-sound/schismtracker-20221201
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=media-libs/libsdl2-2.0.5[X] x11-libs/libX11 x11-libs/libXv virtual/os-headers x11-base/xorg-proto
+DESCRIPTION=Free implementation of Impulse Tracker, a tool used to create high quality music
+EAPI=8
+HOMEPAGE=http://schismtracker.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools desktop xdg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2 public-domain
+RDEPEND=>=media-libs/libsdl2-2.0.5[X] x11-libs/libX11 x11-libs/libXv
+SLOT=0
+SRC_URI=https://github.com/schismtracker/schismtracker/releases/download/20221201/schismtracker-20221201.source.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7facec582016e117e8b2e2a480994669
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 743c6a4309cb..2198da64b11d 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.2.1 b/metadata/md5-cache/media-video/mjpegtools-2.2.1
index 077f722c77d1..de6ae7fa94f9 100644
--- a/metadata/md5-cache/media-video/mjpegtools-2.2.1
+++ b/metadata/md5-cache/media-video/mjpegtools-2.2.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=virtual/jpeg: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(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[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-1.6.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(-)?] sdlgfx? ( media-libs/sdl-gfx ) ) >=sys-apps/sed-4 virtual/awk cpu_flags_x86_mmx? ( dev-lang/nasm )
+DEPEND=virtual/jpeg: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(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[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-1.6.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(-)?] sdlgfx? ( media-libs/sdl-gfx ) ) >=sys-apps/sed-4 app-alternatives/awk cpu_flags_x86_mmx? ( dev-lang/nasm )
 DESCRIPTION=Tools for MJPEG video
 EAPI=7
 HOMEPAGE=http://mjpeg.sourceforge.net/
@@ -13,4 +13,4 @@ REQUIRED_USE=sdlgfx? ( sdl )
 SLOT=1/2.2
 SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.2.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0a0701027ca417d45c17b207f46d04c2
+_md5_=bb31105df5903b75e62d02094cf01068
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index df3be2a520f9..622f9933d919 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/fragroute-1.2.6-r4 b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
index 3616222b18f1..63ed8adae2d9 100644
--- a/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
+++ b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
@@ -1,4 +1,4 @@
-BDEPEND=virtual/awk 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
+BDEPEND=app-alternatives/awk 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=configure prepare
 DEPEND=>=dev-libs/libdnet-1.14-r1 dev-libs/libevent:= net-libs/libpcap
 DESCRIPTION=Testing of network intrusion detection systems, firewalls and TCP/IP stacks
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libdnet-1.14-r1 dev-libs/libevent:= net-libs/libpcap
 SLOT=0
 SRC_URI=https://fragroute-ipv6.googlecode.com/files/fragroute-1.2.6-ipv6.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=21f86216b0b604045239d00b09f5b17a
+_md5_=68829f38048218b947e5a4eb3fbf0526
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.67-r7 b/metadata/md5-cache/net-analyzer/munin-2.0.67-r7
index e8a88d24ba67..0532abe085d0 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.67-r7
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.67-r7
@@ -8,10 +8,10 @@ INHERIT=java-pkg-opt-2 systemd tmpfiles
 IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 java
 KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.67.tar.gz -> munin-2.0.67.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.67-gentoo-1.tar.xz
 _eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0c3d7cf5877a103211bd33b40d90ac37
+_md5_=5b1cb51b5e9b324bc8e56261a8ecc037
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.69 b/metadata/md5-cache/net-analyzer/munin-2.0.69
index 0f9ef7aeffde..aeeac7b223de 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.69
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.69
@@ -8,10 +8,10 @@ INHERIT=java-pkg-opt-2 systemd tmpfiles
 IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 java
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.69.tar.gz -> munin-2.0.69.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.69-gentoo-1.tar.xz
 _eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=11961999457296142ef7904bfbf08314
+_md5_=1fed967468408901d6332e6333b78f3d
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.69-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.69-r1
index 0b14e29d5b68..5fe66cb5761c 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.69-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.69-r1
@@ -8,10 +8,10 @@ INHERIT=java-pkg-opt-2 systemd tmpfiles
 IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 java
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] dev-perl/TimeDate virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] dev-perl/TimeDate virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.69.tar.gz -> munin-2.0.69.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.69-gentoo-1.tar.xz https://github.com/munin-monitoring/munin/commit/47a2ea75899a6395a80918d043a21d61fe712b44.patch -> munin-remove-Date-Manip-DM5.patch
 _eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e7e13e680ffd84c044876fdfce4573eb
+_md5_=acdd336fba6646d96ebda4f1cd4696d7
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r2
new file mode 100644
index 000000000000..e9b8ee19eb1b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r2
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 )
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=8
+HOMEPAGE=https://www.net-snmp.org/
+INHERIT=autotools distutils-r1 perl-module systemd
+IUSE=X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) rpm? ( bzip2 zlib )
+RESTRICT=test
+SLOT=0/40
+SRC_URI=mirror://sourceforge/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	da32ffc285e9f13313f2387570e35b87	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=362039f200922062ae3f2d329852dcce
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-9999 b/metadata/md5-cache/net-analyzer/net-snmp-9999
index 6dd0d9ea4663..ee9aa6178a3e 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-9999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-9999
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jsmolic/distfiles/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	da32ffc285e9f13313f2387570e35b87	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=467ce32d2273f1d2f1c128064d2d99fb
+_md5_=362039f200922062ae3f2d329852dcce
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.35.1 b/metadata/md5-cache/net-analyzer/netdata-1.35.1
index a32f9a1b92a4..15f5d4c37443 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.35.1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.35.1
@@ -1,6 +1,6 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
@@ -9,9 +9,9 @@ INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolcha
 IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.35.1/netdata-v1.35.1.tar.gz -> netdata-1.35.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=71965a59e3fb0916f43802b870d4eac7
+_md5_=df5b63429ea01bb2e07bece792373b00
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.36.0 b/metadata/md5-cache/net-analyzer/netdata-1.36.0
index 4a6f67a88c86..a26933b61221 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.36.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.36.0
@@ -1,6 +1,6 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
@@ -9,9 +9,9 @@ INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolcha
 IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.36.0/netdata-v1.36.0.tar.gz -> netdata-1.36.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=71965a59e3fb0916f43802b870d4eac7
+_md5_=df5b63429ea01bb2e07bece792373b00
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
index 65bd3cb8d390..5cc50c8ccc15 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
+++ b/metadata/md5-cache/net-analyzer/netdata-1.36.1-r1
@@ -1,6 +1,6 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
@@ -9,9 +9,9 @@ INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolcha
 IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.36.1/netdata-v1.36.1.tar.gz -> netdata-1.36.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c0619b37edbcbe94b9dc573d561b1eec
+_md5_=204163f03abdde49c440f7d4faecdfa3
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.37.0 b/metadata/md5-cache/net-analyzer/netdata-1.37.0
index f5fc5eadb7ea..5f5807dcc195 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.37.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.37.0
@@ -1,6 +1,6 @@
 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 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
@@ -9,9 +9,9 @@ INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolcha
 IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 SRC_URI=https://github.com/netdata/netdata/releases/download/v1.37.0/netdata-v1.37.0.tar.gz -> netdata-1.37.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c0619b37edbcbe94b9dc573d561b1eec
+_md5_=204163f03abdde49c440f7d4faecdfa3
diff --git a/metadata/md5-cache/net-analyzer/netdata-9999 b/metadata/md5-cache/net-analyzer/netdata-9999
index 1d365f76959b..a5da46533d6b 100644
--- a/metadata/md5-cache/net-analyzer/netdata-9999
+++ b/metadata/md5-cache/net-analyzer/netdata-9999
@@ -1,6 +1,6 @@
 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 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
+DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
 DESCRIPTION=Linux real time system monitoring, done right!
 EAPI=8
 HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
@@ -9,8 +9,8 @@ INHERIT=autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolcha
 IUSE=caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-3+ MIT BSD
 PROPERTIES=live
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv:= cloud? ( dev-libs/protobuf:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( app-arch/snappy:= dev-libs/protobuf:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) mysql? ( python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mysqlclient[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mysqlclient[python_targets_python3_10(-)] ) ) postgres? ( python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) ) tor? ( python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) python_single_target_python3_9? ( net-libs/stem[python_targets_python3_9(-)] ) python_single_target_python3_10? ( net-libs/stem[python_targets_python3_10(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) tor? ( python )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=10528ff6497dca8ba892edd220204a4c
+_md5_=9b9421d13e44cf0a2a3db74dfab20a0a
diff --git a/metadata/md5-cache/net-analyzer/nmbscan-1.2.5-r1 b/metadata/md5-cache/net-analyzer/nmbscan-1.2.5-r1
index 4a4b6e2f1d14..356bef21df2d 100644
--- a/metadata/md5-cache/net-analyzer/nmbscan-1.2.5-r1
+++ b/metadata/md5-cache/net-analyzer/nmbscan-1.2.5-r1
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=http://nmbscan.g76r.eu/
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=net-dns/bind-tools net-fs/samba net-misc/iputils sys-apps/net-tools virtual/awk
+RDEPEND=net-dns/bind-tools net-fs/samba net-misc/iputils sys-apps/net-tools app-alternatives/awk
 SLOT=0
 SRC_URI=http://nmbscan.g76r.eu/down/nmbscan-1.2.5.tar.gz
-_md5_=446763f3ac9d6a7edaed08eb191ad330
+_md5_=9333d6f577ac03683c28c8319dcbab2f
diff --git a/metadata/md5-cache/net-analyzer/prettyping-1.0.1 b/metadata/md5-cache/net-analyzer/prettyping-1.0.1
index 352a8b156d9d..b5cbb8251834 100644
--- a/metadata/md5-cache/net-analyzer/prettyping-1.0.1
+++ b/metadata/md5-cache/net-analyzer/prettyping-1.0.1
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=http://denilson.sa.nom.br/prettyping/
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=app-shells/bash net-misc/iputils virtual/awk
+RDEPEND=app-shells/bash net-misc/iputils app-alternatives/awk
 SLOT=0
 SRC_URI=https://github.com/denilsonsa/prettyping/archive/v1.0.1.tar.gz -> prettyping-1.0.1.tar.gz
-_md5_=8678f50bb3c04d1ad2ce49254a99d4d8
+_md5_=82a905a010767e7b1a4cb793ba244e7a
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.8.0-r2 b/metadata/md5-cache/net-analyzer/rrdtool-1.8.0-r2
index 3bdca0c2ef72..b4877b824e76 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.8.0-r2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.8.0-r2
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) sys-apps/groff virtual/pkgconfig virtual/awk python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) ) test? ( sys-devel/bc 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 ) ) ) 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
+BDEPEND=python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] ) sys-apps/groff virtual/pkgconfig app-alternatives/awk python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) ) test? ( sys-devel/bc 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 ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/glib:2[static-libs(+)?] dev-libs/libxml2:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( media-libs/libpng:0=[static-libs(+)?] x11-libs/cairo[svg(+),static-libs(+)?] x11-libs/pango ) 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 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) rados? ( sys-cluster/ceph ) rrdcached? ( acct-group/rrdcached acct-user/rrdcached ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
 DESCRIPTION=A data logging and graphing system for time series data
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://github.com/oetiker/rrdtool-1.x/releases/download/v1.8.0/rrdtool-1.8.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=10122695b804e128a7c70678b95d8c66
+_md5_=56c13d68e484b732480a443e00446ca3
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 8485e12126e5..184d44a5de11 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4 b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4
index 35549b7d2c7d..ab9ba1535e02 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo virtual/awk fax? ( !net-misc/efax )
+DEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo app-alternatives/awk fax? ( !net-misc/efax )
 DESCRIPTION=A programm for sending and receiving fax and voice
 EAPI=8
 HOMEPAGE=http://mgetty.greenie.net/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic systemd toolchain-funcs
 IUSE=+fax fidonet split-usr
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo virtual/awk fax? ( !net-misc/efax ) acct-group/fax acct-user/fax fax? ( app-text/ghostscript-gpl media-libs/netpbm )
+RDEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo app-alternatives/awk fax? ( !net-misc/efax ) acct-group/fax acct-user/fax fax? ( app-text/ghostscript-gpl media-libs/netpbm )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b9dacdf1714e99077c53e69c9c1fc522
+_md5_=b8e1410ad88d4cac81a3003c8e1f4272
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f5f537e8928d..e28da26fab01 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/aqbanking-6.5.3 b/metadata/md5-cache/net-libs/aqbanking-6.5.3
new file mode 100644
index 000000000000..3afd8c914e13
--- /dev/null
+++ b/metadata/md5-cache/net-libs/aqbanking-6.5.3
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.10.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt] ) ofx? ( >=dev-libs/libofx-0.9.5:= )
+DESCRIPTION=Generic Online Banking Interface
+EAPI=8
+HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
+IUSE=debug doc ebics examples ofx
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.10.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt] ) ofx? ( >=dev-libs/libofx-0.9.5:= )
+SLOT=0
+SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/467/aqbanking-6.5.3.tar.gz
+_md5_=253de68eb50297d17606c5aa0b693a96
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.74.0 b/metadata/md5-cache/net-libs/glib-networking-2.74.0
index b2cea7f31ae7..1f2894bd96c8 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.74.0
+++ b/metadata/md5-cache/net-libs/glib-networking-2.74.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.74/glib-networking-2.74.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3346ecb958904eea39639b7e7b673072
+_md5_=9a035150277fdc361079f8a766e3a7a1
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.7 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.7
index 3c8d28fe6057..f50371d16c99 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.7
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-2.0.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libtorrent.org/ https://github.com/arvidn/libtorrent
 INHERIT=cmake python-single-r1
 IUSE=+dht debug gnutls python ssl test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( dev-libs/boost[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost[python,python_targets_python3_11(-)] ) ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.0
 SRC_URI=https://github.com/arvidn/libtorrent/releases/download/v2.0.7/libtorrent-rasterbar-2.0.7.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ed7968e06ea4655152df4a7ce58da463
+_md5_=ca99fc9f2c5aabeccf0fa91bbb31ab17
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c3feed3df0e2..4234a071889c 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r5 b/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r5
index f95827d6c3d7..8bbfc5ac780a 100644
--- a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r5
+++ b/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-text/ghostscript-gpl media-libs/tiff:0[jbig?] !net-dialup/mgetty[fax] >=sys-libs/zlib-1.1.4 virtual/awk virtual/jpeg:0 virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
+DEPEND=app-text/ghostscript-gpl media-libs/tiff:0[jbig?] !net-dialup/mgetty[fax] >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/jpeg:0 virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
 DESCRIPTION=Enterprise client-server fax package for class 1 and 2 fax modems
 EAPI=7
 HOMEPAGE=https://hylafax.sourceforge.io/
@@ -7,8 +7,8 @@ INHERIT=pam toolchain-funcs
 IUSE=html jbig lcms ldap mgetty pam
 KEYWORDS=amd64 x86
 LICENSE=hylafaxplus
-RDEPEND=app-text/ghostscript-gpl media-libs/tiff:0[jbig?] !net-dialup/mgetty[fax] >=sys-libs/zlib-1.1.4 virtual/awk virtual/jpeg:0 virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/sendpage
+RDEPEND=app-text/ghostscript-gpl media-libs/tiff:0[jbig?] !net-dialup/mgetty[fax] >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/jpeg:0 virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/sendpage
 SLOT=0
 SRC_URI=mirror://sourceforge/hylafax/hylafax-7.0.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c31c6b81205a24aabca941e41b126902
+_md5_=04983064a947a4f093d80e071f1e0669
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r6 b/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r6
index 25695754c3bf..a282a7efdc8b 100644
--- a/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r6
+++ b/metadata/md5-cache/net-misc/hylafaxplus-7.0.3-r6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 virtual/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
+DEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
 DESCRIPTION=Enterprise client-server fax package for class 1 and 2 fax modems
 EAPI=7
 HOMEPAGE=https://hylafax.sourceforge.io/
@@ -7,8 +7,8 @@ INHERIT=edo pam toolchain-funcs
 IUSE=html jbig lcms ldap mgetty pam
 KEYWORDS=~amd64 ~x86
 LICENSE=hylafaxplus
-RDEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 virtual/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/mgetty[fax] !net-dialup/sendpage
+RDEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/mgetty[fax] !net-dialup/sendpage
 SLOT=0
 SRC_URI=mirror://sourceforge/hylafax/hylafax-7.0.3.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5eb39a702f20ac7be3f8a052a85ee1d1
+_md5_=7ee131a0603f51ff3134e126826ee534
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r1 b/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r1
index 89f8ebddb767..f7270cf4864c 100644
--- a/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r1
+++ b/metadata/md5-cache/net-misc/hylafaxplus-7.0.6-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 virtual/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
+DEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam )
 DESCRIPTION=Enterprise client-server fax package for class 1 and 2 fax modems
 EAPI=7
 HOMEPAGE=https://hylafax.sourceforge.io/
@@ -7,8 +7,8 @@ INHERIT=edo pam toolchain-funcs
 IUSE=html jbig lcms ldap mgetty pam
 KEYWORDS=~amd64 ~x86
 LICENSE=hylafaxplus
-RDEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 virtual/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/mgetty[fax] !net-dialup/sendpage
+RDEPEND=app-text/ghostscript-gpl media-libs/tiff[jbig?] media-libs/libjpeg-turbo:= >=sys-libs/zlib-1.1.4 app-alternatives/awk virtual/libcrypt:= virtual/mta jbig? ( media-libs/jbigkit ) lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap:= ) mgetty? ( net-dialup/mgetty[-fax] ) pam? ( sys-libs/pam ) !net-dialup/mgetty[fax] !net-dialup/sendpage
 SLOT=0
 SRC_URI=mirror://sourceforge/hylafax/hylafax-7.0.6.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b998d25a9fe08173e03c4f60c9788a19
+_md5_=fdb38cd4966e583d51610c0933644027
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.5.4 b/metadata/md5-cache/net-misc/nextcloud-client-3.5.4
deleted file mode 100644
index b1bd4790dcd3..000000000000
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.5.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-qt/qttest:5 dev-util/cmocka )
-DESCRIPTION=Desktop Syncing Client for Nextcloud
-EAPI=8
-HOMEPAGE=https://github.com/nextcloud/desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake virtualx xdg
-IUSE=doc dolphin nautilus test webengine test
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nextcloud/desktop/archive/v3.5.4.tar.gz -> nextcloud-client-3.5.4.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d0c5e4eed983b80fd74784786ef0f700
diff --git a/metadata/md5-cache/net-misc/shmux-1.0.3 b/metadata/md5-cache/net-misc/shmux-1.0.3
index 6ac188d318ea..7028895d397f 100644
--- a/metadata/md5-cache/net-misc/shmux-1.0.3
+++ b/metadata/md5-cache/net-misc/shmux-1.0.3
@@ -1,6 +1,6 @@
 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=configure install prepare
-DEPEND=pcre? ( dev-libs/libpcre ) sys-libs/ncurses:0= virtual/awk
+DEPEND=pcre? ( dev-libs/libpcre ) sys-libs/ncurses:0= app-alternatives/awk
 DESCRIPTION=run the same command across many hosts in parallel
 EAPI=8
 HOMEPAGE=http://web.taranis.org/shmux/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://web.taranis.org/shmux/dist/shmux-1.0.3.tgz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c3f47db111c10eb16a1af929bf244853
+_md5_=d6e10d264fa2a10e0bdb7da10c5dd12d
diff --git a/metadata/md5-cache/net-misc/tiers-1.1 b/metadata/md5-cache/net-misc/tiers-1.1
index 951dd128df86..c7f24771364e 100644
--- a/metadata/md5-cache/net-misc/tiers-1.1
+++ b/metadata/md5-cache/net-misc/tiers-1.1
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=http://www.isi.edu/nsnam/ns/ns-topogen.html#tiers
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=mapm
-RDEPEND=sci-visualization/gnuplot virtual/awk
+RDEPEND=sci-visualization/gnuplot app-alternatives/awk
 SLOT=0
 SRC_URI=http://www.isi.edu/nsnam/dist/topogen/tiers1.1.tar.gz http://www.isi.edu/nsnam/dist/topogen/tiers2ns-lan.awk
-_md5_=71ce8a63d4524daeb46d49a1103c4c58
+_md5_=c98216050a906b8db3cb0e9c4f918d5a
diff --git a/metadata/md5-cache/net-misc/yt-dlp-2022.10.4 b/metadata/md5-cache/net-misc/yt-dlp-2022.10.4
deleted file mode 100644
index 9fb5fa92a301..000000000000
--- a/metadata/md5-cache/net-misc/yt-dlp-2022.10.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !net-misc/youtube-dl[-yt-dlp(-)] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=youtube-dl fork with additional features and fixes
-EAPI=8
-HOMEPAGE=https://github.com/yt-dlp/yt-dlp/
-INHERIT=bash-completion-r1 distutils-r1 optfeature wrapper
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos
-LICENSE=Unlicense
-RDEPEND=dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !net-misc/youtube-dl[-yt-dlp(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/y/yt-dlp/yt-dlp-2022.10.4.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=65e9e160041c301a5536c7056d6f1fc6
diff --git a/metadata/md5-cache/net-misc/ytfzf-2.5.2 b/metadata/md5-cache/net-misc/ytfzf-2.5.2
index f53e92fe0175..72c9a40c4b22 100644
--- a/metadata/md5-cache/net-misc/ytfzf-2.5.2
+++ b/metadata/md5-cache/net-misc/ytfzf-2.5.2
@@ -6,8 +6,8 @@ INHERIT=optfeature
 IUSE=X minimal
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=app-misc/jq net-misc/curl[ssl] virtual/awk !minimal? ( X? ( media-gfx/ueberzug ) app-shells/fzf media-video/mpv[lua] net-misc/yt-dlp )
+RDEPEND=app-misc/jq net-misc/curl[ssl] app-alternatives/awk !minimal? ( X? ( media-gfx/ueberzug ) app-shells/fzf media-video/mpv[lua] net-misc/yt-dlp )
 SLOT=0
 SRC_URI=https://github.com/pystardust/ytfzf/archive/refs/tags/v2.5.2.tar.gz -> ytfzf-2.5.2.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=6699d3284acf579583806c9c8a645584
+_md5_=791f944a00568e1789209e625f31fc5e
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index f5eb2ec8ff38..cc879cb300d7 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/newsboat-2.21-r1 b/metadata/md5-cache/net-news/newsboat-2.21-r1
index b1b7e9a58baf..b5fb8f839695 100644
--- a/metadata/md5-cache/net-news/newsboat-2.21-r1
+++ b/metadata/md5-cache/net-news/newsboat-2.21-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-ruby/asciidoctor virtual/awk virtual/pkgconfig >=virtual/rust-1.42.0 >=virtual/rust-1.37.0
+BDEPEND=dev-ruby/asciidoctor app-alternatives/awk virtual/pkgconfig >=virtual/rust-1.42.0 >=virtual/rust-1.37.0
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl sys-devel/gettext
 DESCRIPTION=An RSS/Atom feed reader for text terminals
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.21/newsboat-2.21.tar.xz https://crates.io/api/v1/crates/addr2line/0.12.2/download -> addr2line-0.12.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.49/download -> backtrace-0.3.49.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.2/download -> bit-vec-0.6.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.57/download -> cc-1.0.57.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.15/download -> chrono-0.4.15.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/curl-sys/0.4.36+curl-7.71.1/download -> curl-sys-0.4.36+curl-7.71.1.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gettext-rs/0.5.0/download -> gettext-rs-0.5.0.crate https://crates.io/api/v1/crates/gettext-sys/0.19.9/download -> gettext-sys-0.19.9.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lexical-core/0.7.4/download -> lexical-core-0.7.4.crate https://crates.io/api/v1/crates/libc/0.2.77/download -> libc-0.2.77.crate https://crates.io/api/v1/crates/libz-sys/1.1.0/download -> libz-sys-1.1.0.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.20.0/download -> object-0.20.0.crate https://crates.io/api/v1/crates/once_cell/1.4.1/download -> once_cell-1.4.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proptest/0.10.1/download -> proptest-0.10.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_xorshift/0.2.0/download -> rand_xorshift-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/section_testing/0.0.4/download -> section_testing-0.0.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/0.3.3/download -> tinyvec-0.3.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.13/download -> unicode-normalization-0.1.13.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=29ab69e3de0244ee60e0b63a98f0e689
+_md5_=353a7d850ce920725843200524c071bb
diff --git a/metadata/md5-cache/net-news/newsboat-2.23-r1 b/metadata/md5-cache/net-news/newsboat-2.23-r1
index e98c083479ab..fde164ae78c0 100644
--- a/metadata/md5-cache/net-news/newsboat-2.23-r1
+++ b/metadata/md5-cache/net-news/newsboat-2.23-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-ruby/asciidoctor-1.5.3 virtual/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.37.0
+BDEPEND=>=dev-ruby/asciidoctor-1.5.3 app-alternatives/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.37.0
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl sys-devel/gettext
 DESCRIPTION=An RSS/Atom feed reader for text terminals
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.23/newsboat-2.23.tar.xz https://crates.io/api/v1/crates/addr2line/0.14.0/download -> addr2line-0.14.0.crate https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/backtrace/0.3.55/download -> backtrace-0.3.55.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitvec/0.19.4/download -> bitvec-0.19.4.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.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.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/codespan-reporting/0.9.5/download -> codespan-reporting-0.9.5.crate https://crates.io/api/v1/crates/curl-sys/0.4.41+curl-7.75.0/download -> curl-sys-0.4.41+curl-7.75.0.crate https://crates.io/api/v1/crates/cxx/0.5.10/download -> cxx-0.5.10.crate https://crates.io/api/v1/crates/cxx-build/0.5.10/download -> cxx-build-0.5.10.crate https://crates.io/api/v1/crates/cxxbridge-flags/0.5.10/download -> cxxbridge-flags-0.5.10.crate https://crates.io/api/v1/crates/cxxbridge-macro/0.5.10/download -> cxxbridge-macro-0.5.10.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.15/download -> getrandom-0.1.15.crate https://crates.io/api/v1/crates/getrandom/0.2.0/download -> getrandom-0.2.0.crate https://crates.io/api/v1/crates/gettext-rs/0.6.0/download -> gettext-rs-0.6.0.crate https://crates.io/api/v1/crates/gettext-sys/0.21.0/download -> gettext-sys-0.21.0.crate https://crates.io/api/v1/crates/gimli/0.23.0/download -> gimli-0.23.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lexical-core/0.7.5/download -> lexical-core-0.7.5.crate https://crates.io/api/v1/crates/libc/0.2.90/download -> libc-0.2.90.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.4/download -> link-cplusplus-1.0.4.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.22.0/download -> object-0.22.0.crate https://crates.io/api/v1/crates/once_cell/1.7.2/download -> once_cell-1.7.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/proptest/0.10.1/download -> proptest-0.10.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.8/download -> quote-1.0.8.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/rand_xorshift/0.2.0/download -> rand_xorshift-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.4/download -> redox_syscall-0.2.4.crate https://crates.io/api/v1/crates/regex/1.4.2/download -> regex-1.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.21/download -> regex-syntax-0.6.21.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download -> rustc-demangle-0.1.18.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/scratch/1.0.0/download -> scratch-1.0.0.crate https://crates.io/api/v1/crates/section_testing/0.0.5/download -> section_testing-0.0.5.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/syn/1.0.55/download -> syn-1.0.55.crate https://crates.io/api/v1/crates/tap/1.0.0/download -> tap-1.0.0.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.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/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=142fbb0bb5ef6fc978eb45bcdb0acc54
+_md5_=cde36de0f6c6347376ebaf170e7a9427
diff --git a/metadata/md5-cache/net-news/newsboat-2.28 b/metadata/md5-cache/net-news/newsboat-2.28
index faaac09f208a..34da92b8f9dd 100644
--- a/metadata/md5-cache/net-news/newsboat-2.28
+++ b/metadata/md5-cache/net-news/newsboat-2.28
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-ruby/asciidoctor-1.5.3 virtual/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.53
+BDEPEND=>=dev-ruby/asciidoctor-1.5.3 app-alternatives/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl sys-devel/gettext
 DESCRIPTION=An RSS/Atom feed reader for text terminals
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.28/newsboat-2.28.tar.xz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.64/download -> backtrace-0.3.64.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.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/curl-sys/0.4.55+curl-7.83.1/download -> curl-sys-0.4.55+curl-7.83.1.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.68/download -> cxxbridge-flags-1.0.68.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.68/download -> cxxbridge-macro-1.0.68.crate https://crates.io/api/v1/crates/cxx/1.0.68/download -> cxx-1.0.68.crate https://crates.io/api/v1/crates/cxx-build/1.0.68/download -> cxx-build-1.0.68.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.2.5/download -> getrandom-0.2.5.crate https://crates.io/api/v1/crates/gettext-rs/0.7.0/download -> gettext-rs-0.7.0.crate https://crates.io/api/v1/crates/gettext-sys/0.21.3/download -> gettext-sys-0.21.3.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lexopt/0.2.0/download -> lexopt-0.2.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libz-sys/1.1.5/download -> libz-sys-1.1.5.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.6/download -> link-cplusplus-1.0.6.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md5/0.7.0/download -> md5-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.27.1/download -> object-0.27.1.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proptest/1.0.0/download -> proptest-1.0.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_xorshift/0.3.0/download -> rand_xorshift-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/redox_users/0.4.2/download -> redox_users-0.4.2.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/scratch/1.0.1/download -> scratch-1.0.1.crate https://crates.io/api/v1/crates/section_testing/0.0.5/download -> section_testing-0.0.5.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/temp-dir/0.1.11/download -> temp-dir-0.1.11.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.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/xdg/2.4.1/download -> xdg-2.4.1.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4515fd5db9d58f1c7be2b877344c8cad
+_md5_=723904fd820a43959923cefd7c6181da
diff --git a/metadata/md5-cache/net-news/newsboat-2.29 b/metadata/md5-cache/net-news/newsboat-2.29
index 7ac6528880dc..a788589c3bcb 100644
--- a/metadata/md5-cache/net-news/newsboat-2.29
+++ b/metadata/md5-cache/net-news/newsboat-2.29
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-ruby/asciidoctor-1.5.3 virtual/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.53
+BDEPEND=>=dev-ruby/asciidoctor-1.5.3 app-alternatives/awk virtual/pkgconfig >=virtual/rust-1.46.0 >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:=[unicode(+)] sys-libs/zlib dev-libs/openssl sys-devel/gettext
 DESCRIPTION=An RSS/Atom feed reader for text terminals
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.29/newsboat-2.29.tar.xz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.65/download -> backtrace-0.3.65.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.22/download -> chrono-0.4.22.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/curl-sys/0.4.57+curl-7.85.0/download -> curl-sys-0.4.57+curl-7.85.0.crate https://crates.io/api/v1/crates/cxx/1.0.76/download -> cxx-1.0.76.crate https://crates.io/api/v1/crates/cxx-build/1.0.76/download -> cxx-build-1.0.76.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.76/download -> cxxbridge-flags-1.0.76.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.76/download -> cxxbridge-macro-1.0.76.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gettext-rs/0.7.0/download -> gettext-rs-0.7.0.crate https://crates.io/api/v1/crates/gettext-sys/0.21.3/download -> gettext-sys-0.21.3.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.47/download -> iana-time-zone-0.1.47.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.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.59/download -> js-sys-0.3.59.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lexopt/0.2.1/download -> lexopt-0.2.1.crate https://crates.io/api/v1/crates/libc/0.2.133/download -> libc-0.2.133.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.6/download -> link-cplusplus-1.0.6.crate https://crates.io/api/v1/crates/locale_config/0.3.0/download -> locale_config-0.3.0.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/md5/0.7.0/download -> md5-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.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/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/object/0.28.4/download -> object-0.28.4.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro2/1.0.40/download -> proc-macro2-1.0.40.crate https://crates.io/api/v1/crates/proptest/1.0.0/download -> proptest-1.0.0.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_xorshift/0.3.0/download -> rand_xorshift-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rusty-fork/0.3.0/download -> rusty-fork-0.3.0.crate https://crates.io/api/v1/crates/scratch/1.0.1/download -> scratch-1.0.1.crate https://crates.io/api/v1/crates/section_testing/0.0.5/download -> section_testing-0.0.5.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/temp-dir/0.1.11/download -> temp-dir-0.1.11.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.1/download -> unicode-ident-1.0.1.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.20/download -> unicode-normalization-0.1.20.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/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.82/download -> wasm-bindgen-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.82/download -> wasm-bindgen-backend-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.82/download -> wasm-bindgen-macro-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.82/download -> wasm-bindgen-macro-support-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.82/download -> wasm-bindgen-shared-0.2.82.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/xdg/2.4.1/download -> xdg-2.4.1.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=107eb7b0dda97692cb0e93d07ca9a86e
+_md5_=f583f5f77006ffcecc92cdc30f46a1ff
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 9dfbed53acd8..e78c5c17b746 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/apsfilter-7.2.8-r1 b/metadata/md5-cache/net-print/apsfilter-7.2.8-r1
index ad44eb5b7e24..b55b698b7b5c 100644
--- a/metadata/md5-cache/net-print/apsfilter-7.2.8-r1
+++ b/metadata/md5-cache/net-print/apsfilter-7.2.8-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=app-text/ghostscript-gpl >=app-text/psutils-1.17 >=app-text/a2ps-4.13b-r4 net-print/cups virtual/awk virtual/imagemagick-tools virtual/mta
+DEPEND=app-text/ghostscript-gpl >=app-text/psutils-1.17 >=app-text/a2ps-4.13b-r4 net-print/cups app-alternatives/awk virtual/imagemagick-tools virtual/mta
 DESCRIPTION=Apsfilter Prints So Fine, It Leads To Extraordinary Results
 EAPI=7
 HOMEPAGE=http://www.apsfilter.org
 IUSE=cups
 KEYWORDS=~alpha ~amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl >=app-text/psutils-1.17 >=app-text/a2ps-4.13b-r4 net-print/cups virtual/awk virtual/imagemagick-tools virtual/mta
+RDEPEND=app-text/ghostscript-gpl >=app-text/psutils-1.17 >=app-text/a2ps-4.13b-r4 net-print/cups app-alternatives/awk virtual/imagemagick-tools virtual/mta
 SLOT=0
 SRC_URI=http://www.apsfilter.org/download/apsfilter-7.2.8.tar.bz2
-_md5_=6de11d8a99bfa0ed133ef5c3efb87dc9
+_md5_=9b47e2f75b377b402e6aaf783bd2ed62
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 3bfd4cc91810..b6ceee9da2cd 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/gnome-maps-43.2 b/metadata/md5-cache/sci-geosciences/gnome-maps-43.2
new file mode 100644
index 000000000000..35acf789cfdd
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-43.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
+DESCRIPTION=A map application for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Maps
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-maps/43/gnome-maps-43.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fb5f15ebb60d950497700409f8fa27dd
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 9eb3e8c0b921..5aab7e10cb88 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/geos-3.11.1 b/metadata/md5-cache/sci-libs/geos-3.11.1
new file mode 100644
index 000000000000..9ef37396105b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/geos-3.11.1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Geometry engine library for Geographic Information Systems
+EAPI=8
+HOMEPAGE=https://libgeos.org/
+INHERIT=cmake
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.osgeo.org/geos/geos-3.11.1.tar.bz2
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=9c84dd42c93967875e5a8a03ba174313
diff --git a/metadata/md5-cache/sci-libs/proj-9.0.1 b/metadata/md5-cache/sci-libs/proj-9.0.1
deleted file mode 100644
index e045b9f1a5aa..000000000000
--- a/metadata/md5-cache/sci-libs/proj-9.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff ) test? ( dev-cpp/gtest )
-DESCRIPTION=PROJ coordinate transformation software
-EAPI=8
-HOMEPAGE=https://proj.org/
-INHERIT=cmake
-IUSE=curl test +tiff
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://download.osgeo.org/proj/proj-9.0.1.tar.gz https://download.osgeo.org/proj/proj-data-1.9.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=219f354bcbe84db214b5d45f5714de30
diff --git a/metadata/md5-cache/sci-libs/proj-9.0.0 b/metadata/md5-cache/sci-libs/proj-9.1.1
index 3a185f3d6659..56ef62dfb371 100644
--- a/metadata/md5-cache/sci-libs/proj-9.0.0
+++ b/metadata/md5-cache/sci-libs/proj-9.1.1
@@ -11,6 +11,6 @@ LICENSE=MIT
 RDEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
 RESTRICT=!test? ( test )
 SLOT=0/9
-SRC_URI=https://download.osgeo.org/proj/proj-9.0.0.tar.gz https://download.osgeo.org/proj/proj-data-1.9.tar.gz
+SRC_URI=https://download.osgeo.org/proj/proj-9.1.1.tar.gz https://download.osgeo.org/proj/proj-data-1.12.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=219f354bcbe84db214b5d45f5714de30
+_md5_=d7e716291be51b653c3ad692131dd386
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 2851cc7f91e8..2d1e6c96cccf 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/grub-2.06-r4 b/metadata/md5-cache/sys-boot/grub-2.06-r4
index 4d09ce1ebb23..e64a5fa1e70f 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06-r4
+++ b/metadata/md5-cache/sys-boot/grub-2.06-r4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/grub/
 INHERIT=autotools bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
 IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
 RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
 REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2/2.06-r4
 SRC_URI=mirror://gnu/grub/grub-2.06.tar.xz https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r2.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=59e0100ecafa83b211e169ebdc661930
+_md5_=b44443adda1f35386cf5926bfece4094
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index a5232e82d500..e2627d117268 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1 b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1
index 5e5abf8c08a8..1351023da261 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://ceph.com/
 INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.17.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ba5088120a2e293b26714277aee627b5
+_md5_=b41729753f07dad21cf875a66a59d572
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3 b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3
index a72d8e89e167..5eec97dd7503 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f4ca65595aa41fe74a937485797f8156
+_md5_=01a1d0fd0abf838125f37a793c788fbc
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.9-r3 b/metadata/md5-cache/sys-cluster/ceph-16.2.9-r3
index b64cad6a2e69..33c3ac155d65 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.9-r3
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.9-r3
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
 KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d7e6e13b35d80ee6d20aaf2354459a81
+_md5_=358bf268d222d0d25801f0623905bbbf
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.3-r4 b/metadata/md5-cache/sys-cluster/ceph-17.2.3-r4
index fdd4464baf18..d54daf7a0014 100644
--- a/metadata/md5-cache/sys-cluster/ceph-17.2.3-r4
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.3-r4
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.3.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.3.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f60ab64dad1e318770344a2d6b1ed616
+_md5_=aff97379ac4211972dbfa1f279ac7f51
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.4-r1 b/metadata/md5-cache/sys-cluster/ceph-17.2.4-r1
index 4a238cf622b1..059d9ab73243 100644
--- a/metadata/md5-cache/sys-cluster/ceph-17.2.4-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.4-r1
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.4.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=02594451329e37a9bbe96ca8764f204f
+_md5_=679f60e845c6ab4fe238b157a221024c
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.5-r1 b/metadata/md5-cache/sys-cluster/ceph-17.2.5-r1
index 64bd9e99829b..e3b70527c7b0 100644
--- a/metadata/md5-cache/sys-cluster/ceph-17.2.5-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.5-r1
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( >=dev-libs/pmdk-1.10.0:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( >=dev-libs/pmdk-1.10.0:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] app-alternatives/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.5.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.5.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e7279d6f90b971e9a12a8dec631f615e
+_md5_=9bd9202a2b9572b2597549dac6b56f91
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index 0d61c3c87d0e..3aa32291c779 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils virtual/awk )
+DEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils app-alternatives/awk )
 DESCRIPTION=OpenVZ ConTainers control utility
 EAPI=7
 HOMEPAGE=https://openvz.org/
@@ -8,8 +8,8 @@ INHERIT=bash-completion-r1 optfeature udev
 IUSE=+ploop +vzmigrate
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils virtual/awk )
+RDEPEND=>=dev-libs/libcgroup-0.38 net-firewall/iptables sys-apps/attr sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 virtual/udev ploop? ( dev-libs/libxml2 sys-block/parted >=sys-cluster/ploop-1.13 sys-fs/quota ) vzmigrate? ( app-arch/tar[xattr,acl] net-misc/openssh net-misc/rsync[xattr,acl] net-misc/bridge-utils app-alternatives/awk )
 SLOT=0
 SRC_URI=https://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=348bda5e701de72e6dbbc07e7d5aa657
+_md5_=8c8ae89330b97a6e92253f8bb8ac9712
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7d876a239f6c..dcaa98b1ee1c 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.5 b/metadata/md5-cache/sys-devel/clang-15.0.5
index 765a51c4fbe5..f3434ed14e5b 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.5
+++ b/metadata/md5-cache/sys-devel/clang-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
 IUSE=debug doc +extra +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.5
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ~sys-devel/llvm-15.0.5:15=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-15.0.5 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.5[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.5[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.5[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.5[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.5[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.5[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.5[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.5[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.5[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.5[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.5[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.5[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.5[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.5[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.5[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.5[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.5[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.5[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.5[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.5[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.5[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.5[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.5[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.5[llvm_targets_SPIRV] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.5-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.5.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8d23636ceff6e6f4a7991de9ed2cd85f
+_md5_=2ba31e43c0d60f8f0df7dfcd68a49c43
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.5 b/metadata/md5-cache/sys-devel/clang-common-15.0.5
index 2a6a995b7a35..f69b7d0ca200 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.5
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.5
@@ -6,10 +6,10 @@ HOMEPAGE=https://llvm.org/
 IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
 INHERIT=bash-completion-r1 llvm.org
 IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind stricter verify-sig
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.5 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	4116184ca57906bce9d50b1e442d444e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=7871f3ba4c9ea235ff7a61a23062ed91
+_md5_=08234c00dd11137a5c3a02887c9318c5
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-15.0.5 b/metadata/md5-cache/sys-devel/clang-runtime-15.0.5
index 6191e3963c8f..863db0934c5e 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-15.0.5
+++ b/metadata/md5-cache/sys-devel/clang-runtime-15.0.5
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://clang.llvm.org/
 INHERIT=multilib-build
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-15.0.5:15.0.5[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-15.0.5:15.0.5[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-15.0.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(-)?] ) openmp? ( >=sys-libs/libomp-15.0.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(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=15.0.5
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6bd2262a1fe7a99823e3889fd69a6d6a
+_md5_=79fa498955cfca260fc943f339d6498a
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221110 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221110
deleted file mode 100644
index c49650983ead..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221110
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20221110/gcc-10-20221110.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221117 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221117
deleted file mode 100644
index a51b483996f0..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221117
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20221117/gcc-10-20221117.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a571ad6bc96d976395d1a45ad75e47d2
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221111 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221111
deleted file mode 100644
index df3288008911..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221111
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20221111/gcc-11-20221111.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3a72e2cb137d035c1bd4bb6273a4c1c5
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221118 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221118
deleted file mode 100644
index 4495c2cf58e3..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221118
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20221118/gcc-11-20221118.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=58ce513f45d91e404e761ca6622ad447
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221112 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221112
deleted file mode 100644
index 0ef1ca723fcd..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221112
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20221112/gcc-12-20221112.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221119 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221119
deleted file mode 100644
index 4683676d809f..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20221119
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20221119/gcc-12-20221119.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1b9d60ea6c1cee0279a4a8f0f25b4b1a
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221030 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221030
deleted file mode 100644
index 26ac96cf5bb6..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221030
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags default-znow default-stack-clash-protection
-KEYWORDS=~loong
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=13
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20221030/gcc-13-20221030.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221120 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221120
deleted file mode 100644
index 1dd36eba989c..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221120
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags default-znow default-stack-clash-protection
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=13
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20221120/gcc-13-20221120.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-13.1.0-patches-3.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=01855bbbda3b1bccef43d2bbf649b4d8
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221127 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221127
index e2dca4830dda..d498de4f3b0d 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221127
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221127
@@ -6,6 +6,7 @@ EAPI=8
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags default-znow default-stack-clash-protection
+KEYWORDS=~loong
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
@@ -13,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20221127/gcc-13-20221127.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-13.1.0-patches-3.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	daeab241ba4999bdaabe9f41f3f27c7e	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=01855bbbda3b1bccef43d2bbf649b4d8
+_md5_=0aa781b06e7c7d6bd0c22602393fd79c
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1 b/metadata/md5-cache/sys-devel/gdb-12.1
deleted file mode 100644
index ab84f11231e2..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-12.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
-DESCRIPTION=GNU debugger
-EAPI=7
-HOMEPAGE=https://sourceware.org/gdb/
-INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-IUSE=cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=ia64? ( test ) !test? ( test ) test
-SLOT=0
-SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=77d7ca1facae8949d15d843780ddfd14
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1-r1 b/metadata/md5-cache/sys-devel/gdb-12.1-r1
deleted file mode 100644
index 1a28fa69c19c..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-12.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
-DESCRIPTION=GNU debugger
-EAPI=7
-HOMEPAGE=https://sourceware.org/gdb/
-INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-IUSE=cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=ia64? ( test ) !test? ( test ) test
-SLOT=0
-SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1dd5f084514d18193f238556f0440175
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1-r2 b/metadata/md5-cache/sys-devel/gdb-12.1-r2
index 580c63857c61..38029018c147 100644
--- a/metadata/md5-cache/sys-devel/gdb-12.1-r2
+++ b/metadata/md5-cache/sys-devel/gdb-12.1-r2
@@ -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 source-highlight test vanilla xml xxhash python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=ia64? ( test ) !test? ( test ) test
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d263a883bfaea7a0538da4e3924d7c35
+_md5_=e28ecdc084a15fbf7340b784825e6d89
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.5 b/metadata/md5-cache/sys-devel/lld-15.0.5
index 974a3c376987..98a8a059e589 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.5
+++ b/metadata/md5-cache/sys-devel/lld-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=debug test test verify-sig
-KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=>=sys-devel/lld-toolchain-symlinks-15-r2:15
 RDEPEND=~sys-devel/llvm-15.0.5 sys-libs/zlib:= !sys-devel/lld:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dd04a079bb53374170bbb0615b52d2f4
+_md5_=03517981cdd0b6a195e46f20314e4142
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.5 b/metadata/md5-cache/sys-devel/llvm-15.0.5
index 214f6723ede5..95939412e2b0 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.5
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
 IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:15 binutils-plugin? ( >=sys-devel/llvmgold-15 )
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.5-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.5.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0d5c8c665450106c1c185454a6c3cfcb
+_md5_=f876c53281d49ce16a410d3ea777b162
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.5 b/metadata/md5-cache/sys-devel/llvm-common-15.0.5
index 66a6b04fb4ce..28e750e8e62a 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.5
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=llvm.org
 IUSE=verify-sig
-KEYWORDS=~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=llvm.org	4116184ca57906bce9d50b1e442d444e	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=0f322518add6e72dc9d835ffa76ef2ae
+_md5_=0956d45ed539f817e93b82b4e4bad78b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index eb769ad0bc8d..2243ec2cbbc2 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/zfs-2.1.5-r6 b/metadata/md5-cache/sys-fs/zfs-2.1.5-r6
index d0d50199b967..5d002b19ec34 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.5-r6
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.5-r6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) verify-sig? ( sec-keys/openpgp-keys-openzfs ) 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 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) verify-sig? ( sec-keys/openpgp-keys-openzfs ) 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 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
 DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
@@ -9,10 +9,10 @@ IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +root
 KEYWORDS=amd64 arm64 ppc64 ~riscv
 LICENSE=BSD-2 CDDL MIT
 PDEPEND=dist-kernel? ( ~sys-fs/zfs-kmod-2.1.5[dist-kernel] )
-RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.5:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.5:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts app-alternatives/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-fs/zfs/zfs-2.1.5-patches.tar.xz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d3738da97441e2589b544cb33c3c15aa
+_md5_=e8b74b84580ccbb4742d45c1299cf27f
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.6 b/metadata/md5-cache/sys-fs/zfs-2.1.6
index a460f3710171..e7d3b8843686 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.6
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) verify-sig? ( sec-keys/openpgp-keys-openzfs ) 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 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) verify-sig? ( sec-keys/openpgp-keys-openzfs ) 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 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
 DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
@@ -9,10 +9,10 @@ IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +root
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
 LICENSE=BSD-2 CDDL MIT
 PDEPEND=dist-kernel? ( ~sys-fs/zfs-kmod-2.1.6[dist-kernel] )
-RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.6:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.6:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts app-alternatives/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6233cd35ab9f35cc602ca93cb2428f23
+_md5_=abf173acb4f9039b3c5e1b536bb43e2b
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.7 b/metadata/md5-cache/sys-fs/zfs-2.1.7
new file mode 100644
index 000000000000..0e454e9d49c0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.7
@@ -0,0 +1,18 @@
+BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) verify-sig? ( sec-keys/openpgp-keys-openzfs ) 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 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=8
+HOMEPAGE=https://github.com/openzfs/zfs
+INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript verify-sig
+IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 split-usr verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
+LICENSE=BSD-2 CDDL MIT
+PDEPEND=dist-kernel? ( ~sys-fs/zfs-kmod-2.1.7[dist-kernel] )
+RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.7:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts app-alternatives/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
+RESTRICT=test
+SLOT=0/5
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=4e3cb3db6322c0416d375f3d4f10af8e
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index 16fd0b3a6cb9..2b045243b49d 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -1,17 +1,17 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) 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 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) 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 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/openzfs/zfs
 INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript git-r3 linux-mod
 IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 split-usr dist-kernel
 LICENSE=BSD-2 CDDL MIT
 PDEPEND=dist-kernel? ( ~sys-fs/zfs-kmod-9999[dist-kernel] )
 PROPERTIES=live
-RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts virtual/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts app-alternatives/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 REQUIRED_USE=!minimal? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) python? ( !minimal ) test-suite? ( !minimal )
 RESTRICT=test
 SLOT=0/5
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d01091fec796de485d76c8d9153193e7
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	da32ffc285e9f13313f2387570e35b87	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=1e67eb944e0e6b920e42e831dde161c3
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1
index 73935aeeaf6c..4b3a7aa6d1ca 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.5-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl virtual/awk verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( <virtual/dist-kernel-5.19:= ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=dev-lang/perl app-alternatives/awk verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( <virtual/dist-kernel-5.19:= ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
@@ -14,4 +14,4 @@ RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.5-r1
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-fs/zfs/zfs-2.1.5-patches.tar.xz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9e64752a89e34be9b70db0c4ced24995
+_md5_=6b56b57d314ec845519db20659d92fae
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6
index 7674c926ab88..ead451038c9c 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl virtual/awk verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( <virtual/dist-kernel-5.20:= ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=dev-lang/perl app-alternatives/awk verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( <virtual/dist-kernel-5.20:= ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
@@ -14,4 +14,4 @@ RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.6
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.6/zfs-2.1.6.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2bb81fefa6f82b3e38ae13b2d30abf7f
+_md5_=3329031c662b86f017eda288d9d9543a
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.7 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.7
new file mode 100644
index 000000000000..ad0112550fa3
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.7
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl app-alternatives/awk verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( <virtual/dist-kernel-6.1:= ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
+EAPI=8
+HOMEPAGE=https://github.com/openzfs/zfs
+INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs verify-sig
+IUSE=custom-cflags debug +rootfs dist-kernel verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
+LICENSE=CDDL MIT debug? ( GPL-2+ )
+PDEPEND=dist-kernel? ( ~sys-fs/zfs-2.1.7[dist-kernel] )
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RESTRICT=debug? ( strip ) test
+SLOT=0/2.1.7
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz.asc )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=6fbe660d3a3998076beb4085e9483e21
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index cdd5daefb07e..e927d74408cb 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -1,8 +1,8 @@
-BDEPEND=dev-lang/perl virtual/awk sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl app-alternatives/awk sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/openzfs/zfs
 INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs git-r3
 IUSE=custom-cflags debug +rootfs dist-kernel
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=debug? ( strip ) test
 SLOT=0/9999
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9544a38040f9591a542ceced9ac0acd9
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=479d006610de90943024b8b944d99fe8
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 7187b4454275..e27d1ed7ccac 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.225 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.225
index 11c770382173..a476cdc1eb92 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.225
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.225
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.kernel.org/
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-build
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.225
 RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.225 virtual/libelf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.225
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-230.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-230.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	556e93c4ddc2e0c5dfa8d7ec5193fa5c	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e995a91f93789fc24669f34e54127486
+_md5_=6f19f4a66c436e3c81b37aeb22c0af7c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.225 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.225
index 2c621500528e..be2beff584c6 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.225
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.225
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.kernel.org/
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
-KEYWORDS=~amd64 arm64 ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-5.4.225
 RDEPEND=!sys-kernel/gentoo-kernel:5.4.225 virtual/libelf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.225
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-230.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-230.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225-1.gpkg.tar -> gentoo-kernel-5.4.225-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225-1.gpkg.tar -> gentoo-kernel-5.4.225-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225-1.gpkg.tar -> gentoo-kernel-5.4.225-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225-1.gpkg.tar -> gentoo-kernel-5.4.225-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	238be8d2f82d53a648a5905b57a4969b	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=e894f9f4ff46be0231e61795640fa316
+_md5_=035c9ba63aab34bf12faa78448a2e5bd
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 95e932e06465..fb505b8770b5 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.5 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.5
index a1ac71d6fa78..f153a69c2c3e 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.5
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=~amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.5
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.5.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ff1f24ff7fdc4a6b665e038a622e8fa
+_md5_=8381bbd4c877ec9fd9af322268c1c4fa
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.5 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.5
index 208860a0aaf0..62b34e152374 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.5
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
-KEYWORDS=~amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.5
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.5.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8ca9ba37de581f2b4797c08a1736e9ce
+_md5_=e9d56f584acdc7441aad8b200f7766a3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r8 b/metadata/md5-cache/sys-libs/glibc-2.32-r8
index 7f4ea8c4cf64..397d49ffeb04 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r8
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +mu
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-8.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c1f6c4882bcadf315316b949d60707af
+_md5_=fb6a1997b3fa7e88de62e775fe1b3f77
diff --git a/metadata/md5-cache/sys-libs/glibc-2.33-r14 b/metadata/md5-cache/sys-libs/glibc-2.33-r14
index 76c20f727086..87b5a09e2dd0 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.33-r14
+++ b/metadata/md5-cache/sys-libs/glibc-2.33-r14
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.1 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.1 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +mu
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.1 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.1 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.33.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.33-patches-11.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210814.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ecf78936511e3feb38f24ca269aa3ccb
+_md5_=bfdf4907704f5102c2e49b1878830fff
diff --git a/metadata/md5-cache/sys-libs/glibc-2.34-r14 b/metadata/md5-cache/sys-libs/glibc-2.34-r14
index 8fa52b075407..2772d564f78e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.34-r14
+++ b/metadata/md5-cache/sys-libs/glibc-2.34-r14
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet +clone3 compile-locales +crypt custom-cflags doc gd headers-
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.34-patches-17.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=25c5bd933176153104189e53c90f19ae
+_md5_=cd6b941b709eccd4ab0d4775f0507918
diff --git a/metadata/md5-cache/sys-libs/glibc-2.35-r10 b/metadata/md5-cache/sys-libs/glibc-2.35-r10
index 6c40dcc5afb0..755a1bc509a0 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.35-r10
+++ b/metadata/md5-cache/sys-libs/glibc-2.35-r10
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet +clone3 compile-locales +crypt custom-cflags doc experimenta
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-11.tar.xz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7fae89cdfab60db3a04f252189069644
+_md5_=52600244fc341f45b60cd9a085dd798a
diff --git a/metadata/md5-cache/sys-libs/glibc-2.35-r11 b/metadata/md5-cache/sys-libs/glibc-2.35-r11
index 42a4aa6db6a6..017e0aa5709a 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.35-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.35-r11
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet +clone3 compile-locales +crypt custom-cflags doc experimenta
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-12.tar.xz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b4227322eb953be405246746e7b9dcf
+_md5_=9c5a3b7a9f2f4d2583cfa2e10316a704
diff --git a/metadata/md5-cache/sys-libs/glibc-2.35-r8 b/metadata/md5-cache/sys-libs/glibc-2.35-r8
index 5d8c7f05acc4..450c47aea5da 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.35-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.35-r8
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet +clone3 compile-locales +crypt custom-cflags doc experimenta
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-9.tar.xz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a050552e7f9e5851646c085006862935
+_md5_=24e01449ab26d7a5a485adfdf6556ae8
diff --git a/metadata/md5-cache/sys-libs/glibc-2.36-r5 b/metadata/md5-cache/sys-libs/glibc-2.36-r5
index 68406a9273d7..d3e1457e0275 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.36-r5
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-5.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=88243b45c4c9ddf056a5ee301833fae3
+_md5_=93a0215736ef845e2994bdc79551173e
diff --git a/metadata/md5-cache/sys-libs/glibc-2.36-r6 b/metadata/md5-cache/sys-libs/glibc-2.36-r6
index 82db1edc13b2..33dc07c4d7b7 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.36-r6
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-6.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7a6462b61e959143f8cdd6a23c339244
+_md5_=7538c8edc470a92fdb4f42b288a09f20
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 33e3996e5c7f..86fcbf8ba552 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,6 +1,6 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep app-alternatives/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
 DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
@@ -9,9 +9,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 PROPERTIES=live
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep app-alternatives/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a19fc6e25c5589e0c8d3c7c76e50a43d
+_md5_=f0701c23239eace030d5de7e6aa8c800
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-5.10.1 b/metadata/md5-cache/sys-libs/gwenhywfar-5.10.1
new file mode 100644
index 000000000000..8e06c43046f5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/gwenhywfar-5.10.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install
+DEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/libxml2:2 dev-libs/openssl:0= net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl gtk? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 )
+DESCRIPTION=Multi-platform helper library for other libraries
+EAPI=8
+HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
+INHERIT=qmake-utils
+IUSE=debug doc gtk qt5 test
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/libxml2:2 dev-libs/openssl:0= net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl gtk? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) gtk? ( !<app-office/gnucash-3.7[aqbanking] )
+RESTRICT=test
+SLOT=0/79
+SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/465/gwenhywfar-5.10.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d97b1a9595dbd59d0f67e5c9fbca23a2
diff --git a/metadata/md5-cache/sys-libs/libchipcard-5.1.6 b/metadata/md5-cache/sys-libs/libchipcard-5.1.6
new file mode 100644
index 000000000000..c9c756d1a8d0
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libchipcard-5.1.6
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gettext doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=>=sys-apps/pcsc-lite-1.6.2 >=sys-libs/gwenhywfar-4.99.22_rc6:= sys-libs/zlib virtual/libintl
+DESCRIPTION=Library for accessing chip cards via chip card readers (terminals)
+EAPI=8
+HOMEPAGE=https://www.aquamaniac.de/rdm/projects/libchipcard
+IUSE=doc examples
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/pcsc-lite-1.6.2 >=sys-libs/gwenhywfar-4.99.22_rc6:= sys-libs/zlib virtual/libintl
+SLOT=0
+SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/382/libchipcard-5.1.6.tar.gz
+_md5_=08f31c1e16168e118e48c22383448a1d
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.5 b/metadata/md5-cache/sys-libs/libcxx-15.0.5
index c475e76ff50c..65fdc1eb757e 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.5
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 arm arm64 ~riscv sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.5[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7bac24d737ac8a0fa6186b670fd6e812
+_md5_=7022b6514cbb436190dcc14c24e3b72b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.5 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.5
index fa019e93c51e..cabd017183c5 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.5
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxxabi.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 arm arm64 ~riscv sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=103f6be3811c0eb662614b81fc5fcb55
+_md5_=56fbbd6aa97ff562779bea51a2f50539
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.5 b/metadata/md5-cache/sys-libs/libomp-15.0.5
index 0545c155b7b4..0f968ace7d5f 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.5
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openmp.llvm.org
 INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
 IUSE=debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=20acf86be77b60fff8d6a3462322975a
+_md5_=2ddded0d521f5d15197d95aa108cb478
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.5 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.5
index 3f9ef43dc588..593e09ba1171 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.5
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/llvm-project-15.0.5.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	4116184ca57906bce9d50b1e442d444e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a0d745b11574ef856c8f283302dd7c4b
+_md5_=816eb848fe2a43578ab33383f0eb5c85
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2022g b/metadata/md5-cache/sys-libs/timezone-data-2022g
index 414cfd18996d..aa8d39f58e7f 100644
--- a/metadata/md5-cache/sys-libs/timezone-data-2022g
+++ b/metadata/md5-cache/sys-libs/timezone-data-2022g
@@ -11,4 +11,4 @@ RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
 SLOT=0
 SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2022g.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2022g.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4462785bfd123c7870da9835b5db7b16
+_md5_=05519fd195292fa99a1f6b64a7a7d67e
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index fb7826dabab9..addba464c699 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2 b/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
index 311cec5b4b0e..6229976ff63a 100644
--- a/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
+++ b/metadata/md5-cache/sys-power/powermgmt-base-1.31-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=virtual/awk sys-apps/grep sys-apps/kmod[tools]
+DEPEND=app-alternatives/awk sys-apps/grep sys-apps/kmod[tools]
 DESCRIPTION=Script to test whether computer is running on AC power
 EAPI=7
 HOMEPAGE=http://packages.debian.org/testing/utils/powermgmt-base
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm ~ia64 ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=virtual/awk sys-apps/grep sys-apps/kmod[tools]
+RDEPEND=app-alternatives/awk sys-apps/grep sys-apps/kmod[tools]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/powermgmt-base/powermgmt-base_1.31.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b9d225f5ea337a939daad04ffe8d3a42
+_md5_=224c47c2ef40e74631e346a30750103a
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index edb502877d84..9ad9b47672da 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.225 b/metadata/md5-cache/virtual/dist-kernel-5.4.225
index 3672bd201b4d..dda2082e687b 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.225
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.225
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ppc64 ~x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.225 ~sys-kernel/gentoo-kernel-bin-5.4.225 ~sys-kernel/vanilla-kernel-5.4.225 )
 SLOT=0/5.4.225
-_md5_=77aa33a42a01706848a9049ca69d8d05
+_md5_=f63e8621255c4a5633388cd9303a2510
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index c2b5977c8f94..1f8999648de8 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_security-2.9.6 b/metadata/md5-cache/www-apache/mod_security-2.9.6
index a27cd0f97236..af93b1a44ec7 100644
--- a/metadata/md5-cache/www-apache/mod_security-2.9.6
+++ b/metadata/md5-cache/www-apache/mod_security-2.9.6
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/SpiderLabs/ModSecurity
 INHERIT=autotools apache-module lua-single
 IUSE=doc fuzzyhash geoip jit json lua mlogc lua_single_target_lua5-1 lua_single_target_lua5-3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 PDEPEND=>=www-apache/modsecurity-crs-3.3.2
 RDEPEND=dev-libs/apr dev-libs/apr-util[openssl] dev-libs/libxml2 dev-libs/libpcre[jit?] virtual/libcrypt:= fuzzyhash? ( app-crypt/ssdeep ) json? ( dev-libs/yajl ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) mlogc? ( net-misc/curl ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) mlogc? ( dev-lang/perl ) =www-servers/apache-2*
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SpiderLabs/ModSecurity/releases/download/v2.9.6/modsecurity-2.9.6.tar.gz
 _eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9a0a1d991a5be87edd10988e36e25fa7
+_md5_=16ee29c946c3fbc201b8a4aec63ec0c1
diff --git a/metadata/md5-cache/www-apache/modsecurity-crs-3.3.2 b/metadata/md5-cache/www-apache/modsecurity-crs-3.3.2
deleted file mode 100644
index f17ce4dc8199..000000000000
--- a/metadata/md5-cache/www-apache/modsecurity-crs-3.3.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=OWASP ModSecurity Core Rule Set
-EAPI=8
-HOMEPAGE=https://coreruleset.org/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=www-apache/mod_security-2.9.1
-SLOT=0
-SRC_URI=https://github.com/coreruleset/coreruleset/archive/v3.3.2.tar.gz -> modsecurity-crs-3.3.2.tar.gz
-_md5_=8bfe06956288d3da808abc00ce408170
diff --git a/metadata/md5-cache/www-apache/modsecurity-crs-3.3.4 b/metadata/md5-cache/www-apache/modsecurity-crs-3.3.4
index 3167cf0c930a..240eeb6102dd 100644
--- a/metadata/md5-cache/www-apache/modsecurity-crs-3.3.4
+++ b/metadata/md5-cache/www-apache/modsecurity-crs-3.3.4
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://coreruleset.org/
 INHERIT=optfeature
 IUSE=+apache2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=apache2? ( >=www-apache/mod_security-2.9.6 )
 SLOT=0
 SRC_URI=https://github.com/coreruleset/coreruleset/archive/v3.3.4.tar.gz -> modsecurity-crs-3.3.4.tar.gz
 _eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
-_md5_=5e2e2b8b29fee7cc2266c7209ecab318
+_md5_=5c42105258f24ccfa616fd0177a6b6f8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index cfe7b1a58080..d2f7c36f55fe 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/nextcloud-23.0.10 b/metadata/md5-cache/www-apps/nextcloud-23.0.10
deleted file mode 100644
index 3b840bfd0693..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-23.0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-admin/webapp-config
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=8
-HOMEPAGE=https://nextcloud.com/
-INHERIT=webapp
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=<dev-lang/php-8.1[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=23.0.10
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-23.0.10.tar.bz2
-_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=7a53827163532918954795fe86d0f62c
diff --git a/metadata/md5-cache/www-apps/nextcloud-25.0.0 b/metadata/md5-cache/www-apps/nextcloud-25.0.0
deleted file mode 100644
index 599fd4709f21..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-25.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-admin/webapp-config
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=8
-HOMEPAGE=https://nextcloud.com/
-INHERIT=webapp
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=25.0.0
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-25.0.0.tar.bz2
-_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=a8ff3c6c90e9b826aadbdf86b7422e3d
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 2c3d5b01684a..8195dcf643c3 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/bdftopcf-1.1.1 b/metadata/md5-cache/x11-apps/bdftopcf-1.1.1
index 2ef20496ed81..350b5bb7bcee 100644
--- a/metadata/md5-cache/x11-apps/bdftopcf-1.1.1
+++ b/metadata/md5-cache/x11-apps/bdftopcf-1.1.1
@@ -5,9 +5,9 @@ DESCRIPTION=X.Org bdftopcf application
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/bdftopcf
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~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=MIT
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/util/bdftopcf-1.1.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=5a42d0320643105514c853acbf5895ec
+_md5_=3ccab496ddb3b477a085c43ecfed7db9
diff --git a/metadata/md5-cache/x11-apps/fslsfonts-1.0.6 b/metadata/md5-cache/x11-apps/fslsfonts-1.0.6
index e0c2525f0bad..6d84aaa1cc02 100644
--- a/metadata/md5-cache/x11-apps/fslsfonts-1.0.6
+++ b/metadata/md5-cache/x11-apps/fslsfonts-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=list fonts served by X font server
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fslsfonts
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libFS
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fslsfonts-1.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=86aea6a285fc2e66e1184cb1b138bc3d
+_md5_=214e7e4ee24626fad21843bea2f62c6e
diff --git a/metadata/md5-cache/x11-apps/fstobdf-1.0.7 b/metadata/md5-cache/x11-apps/fstobdf-1.0.7
index e983f9e8f6dd..dfc395558e29 100644
--- a/metadata/md5-cache/x11-apps/fstobdf-1.0.7
+++ b/metadata/md5-cache/x11-apps/fstobdf-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=generate BDF font from X font server
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/fstobdf
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libFS
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/fstobdf-1.0.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=1fab650f536dd15d46ad39a538e61684
+_md5_=37197020ef384539432d1912eec115a3
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.6 b/metadata/md5-cache/x11-apps/ico-1.0.6
index b9158fe98a4a..e4d80f77e167 100644
--- a/metadata/md5-cache/x11-apps/ico-1.0.6
+++ b/metadata/md5-cache/x11-apps/ico-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=animate an icosahedron or other polyhedron
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/ico
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/ico-1.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=2f47491fa937203e4ab675826490a16e
+_md5_=8f10988a2d3ec5f64fb9071effebc5db
diff --git a/metadata/md5-cache/x11-apps/oclock-1.0.5 b/metadata/md5-cache/x11-apps/oclock-1.0.5
index 663d125abd2c..2bc87bf70138 100644
--- a/metadata/md5-cache/x11-apps/oclock-1.0.5
+++ b/metadata/md5-cache/x11-apps/oclock-1.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=round X clock
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/oclock
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/oclock-1.0.5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=aa3c23765e2aa03da3d4966b8979d312
+_md5_=1848c749c6ec0244ca27a2e1ef72bdba
diff --git a/metadata/md5-cache/x11-apps/rgb-1.1.0 b/metadata/md5-cache/x11-apps/rgb-1.1.0
index bffeea8ec8a3..f474295b2fc3 100644
--- a/metadata/md5-cache/x11-apps/rgb-1.1.0
+++ b/metadata/md5-cache/x11-apps/rgb-1.1.0
@@ -5,9 +5,9 @@ DESCRIPTION=uncompile an rgb color-name database
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/rgb
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/rgb-1.1.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=d686bcc20df2318988a3b88e782208da
+_md5_=90416440ad543b4d0fc5c9d1a8e5c43b
diff --git a/metadata/md5-cache/x11-apps/sessreg-1.1.3 b/metadata/md5-cache/x11-apps/sessreg-1.1.3
index c9065868f415..1aba19ef00b2 100644
--- a/metadata/md5-cache/x11-apps/sessreg-1.1.3
+++ b/metadata/md5-cache/x11-apps/sessreg-1.1.3
@@ -5,9 +5,9 @@ DESCRIPTION=manage utmp/wtmp entries for non-init clients
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/sessreg
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/sessreg-1.1.3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=b303e26802dc1c95b37fe66d9b5a9b4d
+_md5_=7511ee08e05ad628253932ece4d48372
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.6 b/metadata/md5-cache/x11-apps/showfont-1.0.6
index e22671b34f7c..592c56bff9ea 100644
--- a/metadata/md5-cache/x11-apps/showfont-1.0.6
+++ b/metadata/md5-cache/x11-apps/showfont-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=font dumper for X font server
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/showfont
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libFS
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/showfont-1.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=775dad2f6a54fd35548fe89b5e42bcde
+_md5_=901d4f2cbd7ea388c9abaa5dc28e84e6
diff --git a/metadata/md5-cache/x11-apps/smproxy-1.0.7 b/metadata/md5-cache/x11-apps/smproxy-1.0.7
index 440b3be15efb..586c1c09dfd9 100644
--- a/metadata/md5-cache/x11-apps/smproxy-1.0.7
+++ b/metadata/md5-cache/x11-apps/smproxy-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=Session Manager Proxy
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/smproxy
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libSM x11-libs/libICE x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/smproxy-1.0.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=cca89850b83037d5696fcfa018c96a42
+_md5_=91f3c1df4f3f611258508579824acfa3
diff --git a/metadata/md5-cache/x11-apps/viewres-1.0.7 b/metadata/md5-cache/x11-apps/viewres-1.0.7
index c884cb943586..f6e9e95a7d69 100644
--- a/metadata/md5-cache/x11-apps/viewres-1.0.7
+++ b/metadata/md5-cache/x11-apps/viewres-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=graphical class browser for Xt
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/viewres
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/viewres-1.0.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=c2f4a121247380344ede6f6489663ac6
+_md5_=8b250b3ce16ce8df8c7c91de71123518
diff --git a/metadata/md5-cache/x11-apps/x11perf-1.6.2 b/metadata/md5-cache/x11-apps/x11perf-1.6.2
index 0822d9a2832c..bc9ad4e9c435 100644
--- a/metadata/md5-cache/x11-apps/x11perf-1.6.2
+++ b/metadata/md5-cache/x11-apps/x11perf-1.6.2
@@ -5,10 +5,10 @@ DESCRIPTION=X rendering operation stress test utility
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/x11perf
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXft x11-libs/libXrender x11-libs/libXext
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/test/x11perf-1.6.2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=3cbe541c547485b9d806977e4750167a
+_md5_=05b4f500241b023067c3cdb17c8c7732
diff --git a/metadata/md5-cache/x11-apps/xditview-1.0.6 b/metadata/md5-cache/x11-apps/xditview-1.0.6
index 656cea4051f0..6dac06883ddc 100644
--- a/metadata/md5-cache/x11-apps/xditview-1.0.6
+++ b/metadata/md5-cache/x11-apps/xditview-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=display ditroff output
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xditview
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xditview-1.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=f312e937e23afbbdd743fd880cca5a88
+_md5_=c9ed5c409bdee3647786ebc2702d746d
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.6 b/metadata/md5-cache/x11-apps/xgc-1.0.6
index 9d820abd4a55..edcdf60be74b 100644
--- a/metadata/md5-cache/x11-apps/xgc-1.0.6
+++ b/metadata/md5-cache/x11-apps/xgc-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=X graphics demo
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xgc
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xgc-1.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=90d0149289c9aaa4cae146f2be29f219
+_md5_=a9f0bfb4c1d8f91494084db885851cca
diff --git a/metadata/md5-cache/x11-apps/xisxwayland-2 b/metadata/md5-cache/x11-apps/xisxwayland-2
index 661abb7c64c9..155a66b8c7d7 100644
--- a/metadata/md5-cache/x11-apps/xisxwayland-2
+++ b/metadata/md5-cache/x11-apps/xisxwayland-2
@@ -5,10 +5,10 @@ DESCRIPTION=Tool to determine whether the X server in use is Xwayland
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/xorg/app/xisxwayland
 INHERIT=meson
-KEYWORDS=~amd64 ~loong
+KEYWORDS=amd64 ~loong
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/app/xisxwayland-2.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=08a141b24396a36f38d5cadaa8d82630
+_md5_=5759463bac52def99bc3daf00a3a268a
diff --git a/metadata/md5-cache/x11-apps/xkbprint-1.0.6 b/metadata/md5-cache/x11-apps/xkbprint-1.0.6
index bc73c8a3af24..b49226cf54bc 100644
--- a/metadata/md5-cache/x11-apps/xkbprint-1.0.6
+++ b/metadata/md5-cache/x11-apps/xkbprint-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=Print an XKB keyboard description
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbprint
 INHERIT=xorg-3
-KEYWORDS=~amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile >=x11-libs/libX11-1.6.9
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xkbprint-1.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=c2f7ed68325a195f0c86921196374fab
+_md5_=9e2fb9cde5bee7da17565ec15976d3a7
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.3 b/metadata/md5-cache/x11-apps/xsetroot-1.1.3
index 0ae9dbf7aaa0..d012c72106a3 100644
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.3
+++ b/metadata/md5-cache/x11-apps/xsetroot-1.1.3
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org xsetroot application
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsetroot
 INHERIT=xorg-3
-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=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXmu x11-misc/xbitmaps
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xsetroot-1.1.3.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=5cee9360cb1142b46f757ad40a3c81ef
+_md5_=fd9d20fa1b7c7680dc7dcb7ed93914d7
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 30ca9138ed6d..e54c4725d489 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/xorg-proto-2022.2 b/metadata/md5-cache/x11-base/xorg-proto-2022.2
index a5908b9edb4a..1185c18b86c4 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2022.2
+++ b/metadata/md5-cache/x11-base/xorg-proto-2022.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
 INHERIT=meson python-any-r1
 IUSE=test
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-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 ~x64-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2022.2.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=48f0b1bf68bf9daf1c20f3e6bcefedab
+_md5_=3e24afee196e32e13bb96829ec23aa82
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.5 b/metadata/md5-cache/x11-base/xwayland-22.1.5
index b35b9a120a12..5674f1b2866f 100644
--- a/metadata/md5-cache/x11-base/xwayland-22.1.5
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.5
@@ -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.20 >=dev-libs/wayland-protocols-1.22 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.89 >=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-22.1.5.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e074d054e50f0b8102b7f604033c9cd6
+_md5_=a909dad433fc74ae632eee21652378a9
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 937e68798ec1..db5ae85ad5c7 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
index 834cd0cec783..b81ec35ae181 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
 IUSE=+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools dist-kernel driver
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT
 RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.157/NVIDIA-Linux-x86-390.157.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=4f82434522168b6dfd936aeaef213285
+_md5_=c405af25eaab8b6e7337e9f43e5b84a9
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03
index f243e1923e67..e90acb6f5546 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
 IUSE=+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools wayland dist-kernel driver
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( ~gui-libs/egl-wayland-1.1.7 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/470
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.161.03/NVIDIA-Linux-x86_64-470.161.03.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.161.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.161.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.161.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.161.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.161.03.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=327604acd091fb0ec069312b91907ceb
+_md5_=89586c7d7093216973725988447f4aec
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.108.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.108.03
index ee1e00c4d553..085145dd20ca 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.108.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.108.03
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
 IUSE=+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools wayland dist-kernel driver
-KEYWORDS=-* ~amd64 ~arm64
+KEYWORDS=-* amd64 ~arm64
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm =gui-libs/egl-wayland-1.1.9* media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 SLOT=0/510
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/510.108.03/NVIDIA-Linux-x86_64-510.108.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/510.108.03/NVIDIA-Linux-aarch64-510.108.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-510.108.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-510.108.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-510.108.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-510.108.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-510.108.03.tar.bz2
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=8fbcff667d31580125297a17738b0aba
+_md5_=73f1b66cfd4fa6ad05c7601ad3d7e57a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01
index 146fccb0a0f7..d979e5323ad4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nvidia.com/download/index.aspx
 INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
 IUSE=+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland dist-kernel driver
-KEYWORDS=-* ~amd64 ~arm64
+KEYWORDS=-* amd64 ~arm64
 LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
 RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
 REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/515
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/515.86.01/NVIDIA-Linux-x86_64-515.86.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/515.86.01/NVIDIA-Linux-aarch64-515.86.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.86.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.86.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.86.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.86.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.86.01.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-515.86.01.tar.xz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=84bbc327be2824f8f7f3987af8076dfb
+_md5_=c366681b42d922025ac803f314f3f2e3
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06 b/metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06
deleted file mode 100644
index 200336f9099f..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-520.56.06
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/m4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) static-libs? ( x11-libs/libX11 x11-libs/libXext ) tools? ( media-libs/libglvnd sys-apps/dbus x11-base/xorg-proto x11-libs/libXrandr x11-libs/libXv x11-libs/libvdpau ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) ) driver? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=8
-HOMEPAGE=https://www.nvidia.com/download/index.aspx
-INHERIT=desktop flag-o-matic linux-mod multilib readme.gentoo-r1 systemd toolchain-funcs unpacker user-info
-IUSE=+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland dist-kernel driver
-KEYWORDS=-* ~amd64 ~arm64
-LICENSE=NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl
-RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) tools? ( >=app-accessibility/at-spi2-core-2.46:2 dev-libs/glib:2 dev-libs/jansson:= media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/pango ) X? ( media-libs/libglvnd[X,abi_x86_32(-)?] x11-libs/libX11[abi_x86_32(-)?] x11-libs/libXext[abi_x86_32(-)?] ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 media-libs/libglvnd ) driver? ( kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) )
-REQUIRED_USE=kernel-open? ( driver )
-SLOT=0/520
-SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/520.56.06/NVIDIA-Linux-x86_64-520.56.06.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/520.56.06/NVIDIA-Linux-aarch64-520.56.06.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-520.56.06.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-520.56.06.tar.xz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	3167123d17b3550117c7e554fd22ca02	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=84bbc327be2824f8f7f3987af8076dfb
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.2.0 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.2.0
index a4664ae575d7..a6a6675bddb4 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.2.0
@@ -5,10 +5,10 @@ DESCRIPTION=VMWare mouse input driver
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-vmmouse
 INHERIT=udev xorg-3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=010b984141cc13f0ef077c5d7d77d0f7
+_md5_=74e347a28651e46c88ed4cf7c9966c8d
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.2 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.2
index 8eaaf925e40e..b94c4817f824 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.2
@@ -5,10 +5,10 @@ DESCRIPTION=null input driver
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-void
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-void-1.4.2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=98d902c2cf89f05e38bd4b1174131213
+_md5_=9043b6a3590e245e985be5aa20cdcd4e
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 742c424749f8..58238b183ca1 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/libFS-1.0.9 b/metadata/md5-cache/x11-libs/libFS-1.0.9
index c00dff1c6b89..bac1651713db 100644
--- a/metadata/md5-cache/x11-libs/libFS-1.0.9
+++ b/metadata/md5-cache/x11-libs/libFS-1.0.9
@@ -5,9 +5,9 @@ DESCRIPTION=X.Org FS library
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libFS
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libFS-1.0.9.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=ecf3a141b1b45e9ff0a21161748cd61e
+_md5_=97b59014dfb2c5feb3d8571bb0c28c1d
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.10 b/metadata/md5-cache/x11-libs/libXau-1.0.10
index a2a682141a7a..8924060344ee 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.10
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.10
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXau
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXau-1.0.10.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=97d740eddedd12d4b03188bb846255f1
+_md5_=73f9deadf69fd82fda8d6310765d8911
diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.4 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.4
index 056a19ed872a..e2a9019aefbb 100644
--- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.4
+++ b/metadata/md5-cache/x11-libs/libXaw3d-1.6.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXaw3d
 INHERIT=xorg-3
 IUSE=xpm
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt xpm? ( x11-libs/libXpm )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXaw3d-1.6.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=5e297ae37a2c5ea42380d084c65fc82c
+_md5_=66aeb184ae3fe77cb6d29a0707b9c960
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.5 b/metadata/md5-cache/x11-libs/libXext-1.3.5
index 802c813dea73..f12dfb1c5be3 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.5
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXext
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXext-1.3.5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=9d478cbd6ea775b1900f4c158f0fa81a
+_md5_=4f07214c100eb51cceb35f07415dce6d
diff --git a/metadata/md5-cache/x11-libs/libXfont2-2.0.6 b/metadata/md5-cache/x11-libs/libXfont2-2.0.6
index e71d265fb67f..b8e2a1a0da6e 100644
--- a/metadata/md5-cache/x11-libs/libXfont2-2.0.6
+++ b/metadata/md5-cache/x11-libs/libXfont2-2.0.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxfont
 INHERIT=xorg-3
 IUSE=bzip2 truetype doc
-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=MIT
 RDEPEND=sys-libs/zlib dev-libs/libbsd x11-libs/libfontenc bzip2? ( app-arch/bzip2 ) truetype? ( >=media-libs/freetype-2 )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXfont2-2.0.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=034546b2d64705ffe251a245831fee57
+_md5_=ac420554acae76c715f827cdf53477e0
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.6 b/metadata/md5-cache/x11-libs/libXft-2.3.6
index 7a850d61394c..570440673b46 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.6
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXft
 INHERIT=xorg-3
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.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(-)?] virtual/ttf-fonts >=x11-libs/libX11-1.6.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/libXext-1.3.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/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXft-2.3.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=b5c0a0ef6b62d3d13430d2c0209743f3
+_md5_=423ce6a115a160bc781cdba68dc5d571
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.5 b/metadata/md5-cache/x11-libs/libXinerama-1.1.5
index 948f7a38eca9..b7681b8dd3dc 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.5
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXinerama
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.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/libXext-1.3.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXinerama-1.1.5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=c436af64d2cc980c25a59fb786ef6ce5
+_md5_=af8018c0632711c6288d1e72c6dac2d9
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.4 b/metadata/md5-cache/x11-libs/libXmu-1.1.4
index b3509c016438..80cc18a2d6c0 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.4
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXmu
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.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/libXext-1.3.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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXmu-1.1.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=3b8764a71f666b5ac8fb50ba4e8e4f3c
+_md5_=ee353714bf844c60765cb0cf15d57550
diff --git a/metadata/md5-cache/x11-libs/libXpresent-1.0.1 b/metadata/md5-cache/x11-libs/libXpresent-1.0.1
index 3c4d8003416a..11f244499cd0 100644
--- a/metadata/md5-cache/x11-libs/libXpresent-1.0.1
+++ b/metadata/md5-cache/x11-libs/libXpresent-1.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXpresent
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[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/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXpresent-1.0.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=654b1b78638f15d071ec2b40860a99d6
+_md5_=3c36cf904701c5d47e769df4671aeb3c
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.11 b/metadata/md5-cache/x11-libs/libXrender-0.9.11
index cc23084d265f..8cdb5e526bc7 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.11
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXrender
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXrender-0.9.11.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=fc2e721794b4323374eef103360b2ffb
+_md5_=b2a2baa766ce42fb4b0b1589a34767d1
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.4 b/metadata/md5-cache/x11-libs/libXtst-1.2.4
index 7bd6d643ed63..987911779612 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.4
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXtst
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.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/libXext-1.3.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/libXi-1.7.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXtst-1.2.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=6cfebb6142543625462d1ecaf15d8930
+_md5_=8ac23f5ac734a078bf02c7e6d3b21248
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.5 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.5
index fabecd46bf4e..b0029243a229 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.5
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXxf86vm
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.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/libXext-1.3.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXxf86vm-1.1.5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=19bdd5a7ce49ce7c0e0efb0f986174a4
+_md5_=e1abfa5fe38dd8b7a00b0436bda59275
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.114 b/metadata/md5-cache/x11-libs/libdrm-2.4.114
index c16ac2d2e520..2dec2ff1bffc 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.114
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.114
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 INHERIT=python-any-r1 meson-multilib
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware valgrind 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=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-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(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.114.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=402e9760cc439b2bc377601a6db0d525
+_md5_=cbc97019602b5120c93a257c6ac1d62f
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.6 b/metadata/md5-cache/x11-libs/libfontenc-1.1.6
index a2fc12239589..aed31465c0a1 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.6
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.6
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org fontenc library
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libfontenc
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libfontenc-1.1.6.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=08d3ac8d5fb9c060712540dcfb69eabb
+_md5_=6956b638557198b4bee8fc79f0f96854
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.17 b/metadata/md5-cache/x11-libs/libpciaccess-0.17
index 5367e758191f..10885c0358d6 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.17
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.17
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libpciaccess
 INHERIT=xorg-3 meson-multilib
 IUSE=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
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=zlib? ( >=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(-)?] ) sys-apps/hwdata
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libpciaccess-0.17.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=0d4e287bf2d85154589a9b779fe0e416
+_md5_=907cd0ae0c192c3e5e8d6218b4449526
diff --git a/metadata/md5-cache/x11-libs/libvdpau-1.5 b/metadata/md5-cache/x11-libs/libvdpau-1.5
index d764a1576b15..1ae6713af04d 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-1.5
+++ b/metadata/md5-cache/x11-libs/libvdpau-1.5
@@ -11,6 +11,6 @@ LICENSE=MIT
 RDEPEND=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(-)?] dri? ( x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.5/libvdpau-1.5.tar.gz
+SRC_URI=https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/1.5/libvdpau-1.5.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=c3ac373a42173636fd1fbc67ef09214c
+_md5_=346e670c7c908de0594cdf3dd2827cc6
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.1.1 b/metadata/md5-cache/x11-libs/libxkbfile-1.1.1
index 2d2b143db0f0..bf59fbbe6e59 100644
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.1.1
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.1.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxkbfile
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RDEPEND=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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libxkbfile-1.1.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=89c8e2a57e3f9b404344b282458c2589
+_md5_=6a85e297b0da678ba9ad44e60106c2a7
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.3.1 b/metadata/md5-cache/x11-libs/libxshmfence-1.3.1
index 0507f6c975dd..eb312d62beba 100644
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.3.1
+++ b/metadata/md5-cache/x11-libs/libxshmfence-1.3.1
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libxshmfence
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libxshmfence-1.3.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=252b7b744b063c7fc305cde9e1584486
+_md5_=c06f604efbce24494bcd4f9921045622
diff --git a/metadata/md5-cache/x11-libs/pixman-0.42.2 b/metadata/md5-cache/x11-libs/pixman-0.42.2
index 6688190c19bc..45ba207686fe 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.42.2
+++ b/metadata/md5-cache/x11-libs/pixman-0.42.2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
 INHERIT=flag-o-matic meson-multilib multiprocessing toolchain-funcs
 IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.42.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e0ee2f2caaecfc2e49c1e27ed0b7f4f6
+_md5_=cf0f6831d3d231173c0ffbc88f4215ee
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.4 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.4
index 5e9e0b316f7e..4ef74d4a21bb 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.4
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.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(-)?] >=x11-libs/xcb-util-image-0.3.9-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(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-cursor-0.1.4.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=a4f364c99bfac4baad875851d81af636
+_md5_=26c9d32e7435ac56827211f60b0c2d09
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.1 b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.1
index 5aaf912f7d55..f0eaed449726 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.1
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.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(-)?] >=x11-libs/xcb-util-0.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-image-0.4.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=a2d55f1d79d3dc5e15a79726714d2191
+_md5_=7a217258afa559768e81de243a598a2a
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.1 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.1
index 6848d903c37a..10eb6f65f2e0 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.1
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=30bfeccc802f5316db30e3cd20887234
+_md5_=f66670b8998ada6b59623b1853dca328
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.10 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.10
index 62834e27e445..6ee5297ba596 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.10
+++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=9722aeb1d1e2031fef1ab13cfa450a9a
+_md5_=d4d18819c69137ac88d5fa53e8bd02c7
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.2 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.2
index d0a49d538c33..cd97c0f65c79 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.2
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm
 INHERIT=xorg-3
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.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(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/xcb/xcb-util-wm-0.4.2.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=8adb4d8b3be02e49bb5b1f5ce55a9d94
+_md5_=8bae292df60c82fcf8d7cd9655a1d80f
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index a8da53779a10..d53342abdc7c 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/imake-1.0.9 b/metadata/md5-cache/x11-misc/imake-1.0.9
index fb2ca32d9581..53fb353e1c96 100644
--- a/metadata/md5-cache/x11-misc/imake-1.0.9
+++ b/metadata/md5-cache/x11-misc/imake-1.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=C preprocessor interface to the make utility
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
 INHERIT=toolchain-funcs xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-misc/xorg-cf-files
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.9.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=7c40c223c78d7ef739560798349b9cbb
+_md5_=a1be604c223af225d373906ba15bc9b0
diff --git a/metadata/md5-cache/x11-misc/makedepend-1.0.7 b/metadata/md5-cache/x11-misc/makedepend-1.0.7
index 223b8753708b..3a4633ea68c0 100644
--- a/metadata/md5-cache/x11-misc/makedepend-1.0.7
+++ b/metadata/md5-cache/x11-misc/makedepend-1.0.7
@@ -5,9 +5,9 @@ DESCRIPTION=create dependencies in makefiles
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/makedepend
 INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/util/makedepend-1.0.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xorg-3	c0aa5351d86840baa910da59e2c4a2dc
-_md5_=92a97d8efb52a53eb1fa47530a9319c3
+_md5_=ced5f06175ceb224823ceda7f900df90
diff --git a/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1 b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
index 633588d823d7..432437d332cf 100644
--- a/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
+++ b/metadata/md5-cache/x11-misc/vdpauinfo-1.5-r1
@@ -9,6 +9,6 @@ KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libvdpau-1.5 x11-libs/libX11
 SLOT=0
-SRC_URI=https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/1.5/vdpauinfo-1.5.tar.gz
+SRC_URI=https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/1.5/vdpauinfo-1.5.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=631d36ef60ad112508ccf0ce0301136c
+_md5_=8bbf129e7bfa91d5538510bbf7fa3161
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
index fc7dc309ea8d..9bc8ba339c53 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20200220-r5
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/xmlto-0.0.28-r3[text(+)] virtual/awk 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
+BDEPEND=>=app-text/xmlto-0.0.28-r3[text(+)] app-alternatives/awk 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=configure install postinst prepare
 DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
 EAPI=7
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197/xdg-utils-1.1.3_p20200220.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8ee48b31ee1ff9774a1540f0fe25264d
+_md5_=f9775afd0bf77e69f6b6d58faa012ef1
diff --git a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805 b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805
index 34a4b8bf6255..9e83d3414bb6 100644
--- a/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805
+++ b/metadata/md5-cache/x11-misc/xdg-utils-1.1.3_p20210805
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/xmlto-0.0.28-r3[text(+)] virtual/awk 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
+BDEPEND=>=app-text/xmlto-0.0.28-r3[text(+)] app-alternatives/awk 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=configure install postinst prepare
 DESCRIPTION=Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/1a58bc28f6844898532daf9ee1bf6da7764955a9/xdg-utils-1.1.3_p20210805.tar.bz2 https://dev.gentoo.org/~sam/distfiles/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-no-which.patch.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3ecdbe8d4cb315fe788bae4122f5d1d6
+_md5_=6e41633b683a349172580023630a3957
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.37 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.37
index 9ee37f02c483..71ca7f70a503 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.37
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.37
@@ -4,9 +4,9 @@ DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 INHERIT=meson python-any-r1
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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 ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.37.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a9c980a534366742afb1f02eb9405ccd
+_md5_=498e508c9c39bdba6b779147ab677ae3
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 185ab876b5ae..14fc52c5526d 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/kitty-0.26.4 b/metadata/md5-cache/x11-terms/kitty-0.26.4
deleted file mode 100644
index b4006b4b180e..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.26.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) sys-libs/ncurses virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] ) ) wayland? ( dev-util/wayland-scanner ) verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.4 ~x11-terms/kitty-terminfo-0.26.4 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland ) X? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr ) wayland? ( dev-libs/wayland-protocols )
-DESCRIPTION=Fast, feature-rich, GPU-based terminal
-EAPI=8
-HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg verify-sig
-IUSE=+X test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
-KEYWORDS=amd64 ~ppc64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.4 ~x11-terms/kitty-terminfo-0.26.4 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
-REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz.sig )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=caabea32b1ad9378b485274204897e5f
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4
deleted file mode 100644
index 85a8f5c7780f..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Shell integration scripts for kitty, a GPU-based terminal emulator
-EAPI=8
-HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=amd64 ~ppc64 ~riscv x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz
-_md5_=ee7faba1c6d745aad1c562c249237e30
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4
deleted file mode 100644
index ab4050fe8146..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.4
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=sys-libs/ncurses
-DEFINED_PHASES=compile install
-DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
-EAPI=8
-HOMEPAGE=https://sw.kovidgoyal.net/kitty/
-KEYWORDS=amd64 ~ppc64 ~riscv x86
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.4/kitty-0.26.4.tar.xz
-_md5_=9abf1d008afbb6d83de32698179705a4
diff --git a/metadata/md5-cache/x11-terms/terminology-1.13.0 b/metadata/md5-cache/x11-terms/terminology-1.13.0
new file mode 100644
index 000000000000..67b21135b4cc
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/terminology-1.13.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) virtual/libintl virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 >=dev-libs/efl-1.26.1[eet,fontconfig]
+DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Libraries
+EAPI=8
+HOMEPAGE=https://www.enlightenment.org/about-terminology
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson python-any-r1 xdg
+IUSE=extras nls
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD-2
+RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 >=dev-libs/efl-1.26.1[eet,fontconfig]
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.13.0.tar.xz https://downloads.terminolo.gy/terminology-1.13.0.tar.xz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7fdd7ca8ace0fcdb3ce754e3f40e8406
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 7779371b7678..09a694e3ee82 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1
index b1c84d7c8943..791a12a3bfd2 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1
@@ -6,9 +6,9 @@ INHERIT=readme.gentoo-r1 python-single-r1 optfeature
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/fvwm-crystal >=x11-wm/fvwm-2.6.9[png] virtual/imagemagick-tools || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer ) || ( x11-misc/hsetroot media-gfx/feh ) sys-apps/sed sys-devel/bc virtual/awk x11-apps/xwd media-sound/alsa-utils
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) acct-group/fvwm-crystal >=x11-wm/fvwm-2.6.9[png] virtual/imagemagick-tools || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer ) || ( x11-misc/hsetroot media-gfx/feh ) sys-apps/sed sys-devel/bc app-alternatives/awk x11-apps/xwd media-sound/alsa-utils
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.7.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4761792d1b0b4a33519ef5009833d353
+_md5_=61a04a0a4d38a43165c88da56b2645e3
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5
index 6e1a87ed4e53..ef972bfb0461 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.7.5
@@ -6,9 +6,9 @@ INHERIT=readme.gentoo-r1 python-single-r1 optfeature
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) acct-group/fvwm-crystal || ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] ) virtual/imagemagick-tools || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer ) || ( x11-misc/hsetroot media-gfx/feh ) sys-apps/sed sys-devel/bc virtual/awk x11-apps/xwd media-sound/alsa-utils
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) acct-group/fvwm-crystal || ( >=x11-wm/fvwm3-1.0.4[go] >=x11-wm/fvwm-2.6.9[png] ) virtual/imagemagick-tools || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer ) || ( x11-misc/hsetroot media-gfx/feh ) sys-apps/sed sys-devel/bc app-alternatives/awk x11-apps/xwd media-sound/alsa-utils
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.7.5.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c2c60e5e0156cd2f6a3088a13a243933
+_md5_=9284c4625d44d90bc59917912e762d45
diff --git a/metadata/md5-cache/x11-themes/wm-icons-0.4.0 b/metadata/md5-cache/x11-themes/wm-icons-0.4.0
index e5d0604360cd..aca2042b15a4 100644
--- a/metadata/md5-cache/x11-themes/wm-icons-0.4.0
+++ b/metadata/md5-cache/x11-themes/wm-icons-0.4.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst
-DEPEND=virtual/awk dev-lang/perl
+DEPEND=app-alternatives/awk dev-lang/perl
 DESCRIPTION=A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind
 EAPI=7
 HOMEPAGE=http://wm-icons.sourceforge.net/
 INHERIT=readme.gentoo-r1
 KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/awk dev-lang/perl
+RDEPEND=app-alternatives/awk dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/wm-icons/wm-icons-0.4.0.tar.bz2
 _eclasses_=readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=5b61e16f238fd56475237a2d13722c02
+_md5_=527896714f6150a1318a22d1379edc92
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index fae4fa2855a2..6d02a9355439 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14599 BLAKE2B aa7561b35b3a906adb3ee194869ba11db4d8bf246ffbe64bb40e842e4206cd3dc1a9a483b23806e663dc2b6dadcf28cb76ae0c680aedb396cf4cc94ea51667c7 SHA512 0a2754da6017ade39957bf3272d6f9c7b55980889c20509b7c191037e097312158a2f4435ce79f798fd09ca4ab22aebea18ef44a3f8006ce02798af82523be49
-TIMESTAMP 2022-12-02T02:12:18Z
+TIMESTAMP 2022-12-02T08:10:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOJXwJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOJstxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAsmA//Qp8UU4dYhXQb5Q6V0qjDuZuHbgEisS6GavFJ6IksRs8/rLyVnkvQXHHQ
-ZfXi6IflN8ZwHKd2XtJ/EY90mVmcfmH3NDA6WqktEnAIiYKyQ/wKplLERrt2EbOL
-FKmLt8I6mOECqDsW702rb4gugqK0Wk7mdummMJslBgUX8ZO6c8iZ8A/YeHhTrpLr
-PlJTB/U3FI1NXGCLvhgkLMaV9KgXFPVbp7/ZCzbtsTEcXder1qXelKog3/R32CmN
-phHbHleE50QgymwLgdhfSVCu2Bw3BxcJ9ZWh5aHGC2KgxdgM/ZpFNs/fkUtLfcSu
-fcj6JD9chf4PXAszAUdQf97oz4Z2Gy3QcXQpgjh6Kab8qjb97ZJh9NITKdY/xzEG
-MyjslcCFTqBudEznGWgeWK5nUsYXZEPkVs7ZxTUgM7fNVrFJ2s76hvt+SrIVfbkp
-RzO84wMjQvUWtojpBYQRzN2zOonfRidC5w9XiB14qRXjTXrYG+sjZJn+D/AyPL4P
-FHMOCws0+/kP9v6nbPNCy/L/tQWmd6o1CJcdOQ2qHLYuypwePiJf2Y6USxcr48Pl
-HhtC6LtSjTF9F0SdK3OXwY/SjYZHfms61vxyV/WdSrhjIyF39MjVtE7m/we3S3FR
-25v1tvf7Rkv5VoMLdw8mjr4oJ+EmEnC0cd2w5pB9+uS7rwxllU8=
-=tCvr
+klAOng//ROfyAQj6Q85IKH8XrdqZWHEjXb0mvLu77Ts8DgHrFJv0WuwvaPmQtXkj
+IdZ3EmW6633W4DF9MW10Wqy30nX/YYzh2QooDa10MZr9TdsclI2GBEfsjGXsBJe3
+51m2n9IwEp4zvBG5VAelnuI/oSKrW+NLK5+m0VaKfWEcy2RW97RCGZng96O7/5i0
+2Bw88Si2tF4AQZm4TA5wEHBnaM+aXA9bkwJZ0XhA17uBgTfvoufyUaUkTc254UIt
+iHJOBxsnyfLioFYWzUlDZRzYOyPBRBkPrkqei4giRi19AWmlGJ8D7Q5TpqcZnumT
+rLFBa9RE5Y7i1A1dVeAt9QCPpUca+nsQ5JVZjpLTDl/ZiiE3sXDl91wvMyERmGlM
+9sKqwaulTzxaY+ojmMVXRn3J0zWfGj121Q93VJPossM5B9TuKs7TDkYdISvjVFKP
+SRupoA73YMZgJ1nNj83/DphAYwHOicnUYDl0Y8yTQxbwiplk2JoAsnKeTbLSMaoS
+CKMZ77gRTIJupjniesZXwP8K9agZ2ClqpoPEBXgLb1416YYrU+gX5hzDFMzKr9t9
+uK4sw7uPPtMc9bhoL+DiliIlBfKkKFzmo909K5p9JZzLT6HmhmUS3nGO045GGk8p
+f8Jl/rja6RU9WJ9W9dj/EO5lBxfxRknG88lxxKUVcXeAg64rJU0=
+=1rho
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0767996e4b94..9467e362bcfd 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Dec 2022 02:12:16 +0000
+Fri, 02 Dec 2022 08:10:00 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3b9a973e2b96..a0dcf87019d0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec  2 02:12:15 AM UTC 2022
+Fri Dec  2 08:09:59 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 51cc88ba2a0e..5f3af2f7f3ab 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Dec 2022 02:15:01 +0000
+Fri, 02 Dec 2022 08:15:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 131bb22a4d2f..81efb2d86f57 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-864091fdcf9b12cefe32bb27df069d779f5f37c4 1669944870 2022-12-02T01:34:30+00:00
+96646e867d4f6b28a9501692cdcf588474ff7713 1669968222 2022-12-02T08:03:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5fed59217870..9e56e82643d0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1669947001 Fri 02 Dec 2022 02:10:01 AM UTC
+1669968601 Fri 02 Dec 2022 08:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b8eb187510d2..a199f2a6d958 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 02 Dec 2022 02:12:15 +0000
+Fri, 02 Dec 2022 08:09:59 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8f4cfe112fb7..5f66c55f0771 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index 89eb836ba983..b4c9b84cd941 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,5 +1,5 @@
 AUX fragroute-1.2.6-libdir.patch 4634 BLAKE2B 71fa0052f4e9b15b8ba143fac4f2a1af8bac19dafc9ecae71056b62cf6090ea0182da0b8e7986eb90318cfd3e4e57e8ae9c3a7146dbfda1ed91595ccf14d9783 SHA512 9013a8d685a66b0c7bd051ea4a95ae45140cefc11db05a1b476c07ecdeb26e99e90bd74f19698c2e7e52d4126e0415b5c3427d8028d260860f40aa1e3f95d727
 AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a7dd7beef3c373a7f86414356d786f47b950561a74ed5bc9d404a7b39f63ab12c5b711835b056fccbda8583f8e7541c5ed SHA512 f60abf95fa5bd8798cf88f40d972311bbee4f877ee46cee1aa6e4438b5e4dd6c3b990b5e2565d24d1ce9c72d23f950ef13abd889d11a2f1bf6f34fb01957e7c6
 DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3
-EBUILD fragroute-1.2.6-r4.ebuild 1077 BLAKE2B fbe77b23cd6c06e54e19a5630ad72b3a5631407a3583e7d00cdc18ff6f40eda745dc52192561d7855753b8b6a967174e29e30328af5e845472b16d99da656eeb SHA512 fe09d76c6f4c9ef6b701a7af484c703dd6a64e818f2258410772965b98fe0b92c8779567ee9e1d7a149d37ba1dc429c16ad14f38852a46772575c3f0a78283ca
+EBUILD fragroute-1.2.6-r4.ebuild 1086 BLAKE2B 1fa32fd70460c0cb60b08f40b633e4138f4e534d0759930c445f4c22a2277d005b7c9c5bc99db8f6dc7e6edd7c562aaa0f252b6ac65259f8a6612df6d037e693 SHA512 d2d7a77d967f631eb9b0be6b08528ff394e5bc1fc86a885c6bf4c3585a728289f149da6b4f74a106db2c96971aecb97e5189f7f825c830dcba7dc18903aca464
 MISC metadata.xml 365 BLAKE2B eaccdf170ee91074f81321c0b92d1859be889b9f6431f37ffc17a4b0ec798deee1eae111fffc73459ddcd50fd9ad1dc178adb02467c22c106f0f1568579aed4f SHA512 fd734224fe70b4453e6d7e61d7b61eaf08253a4de6f6f9d8c4a5b715b85f6b74a5c406a9de1cc76729ef3c329cf678cd857bc18a0afc9a75ab9bdc5c73016c24
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
index 664c3d346e8c..4dabe888f8a2 100644
--- a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	virtual/awk
+	app-alternatives/awk
 "
 DOCS=( INSTALL README TODO )
 PATCHES=(
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 1005296b641d..48547c94a9ae 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -16,7 +16,7 @@ DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffd
 DIST munin-2.0.69-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.69.tar.gz 2258024 BLAKE2B 2d270f6f67fc9a86a592e2b7cbcf4111d6ae40bf1928b0ad0adb99ad32384810e5768c17019f9163e8b22fd8524b28257df527df023db9c1ba333691b384dd74 SHA512 4976e394e046d3fe1cbb000acdf081060188517e09abcf8b60dd7c55e0e1cdf46e33d1760368cb1423dfb9286e397df2072a2c55ba8b79adeae4ea2303130667
 DIST munin-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c93015d77ca6e58d9734a5a6bc17af6c3c7695ddf4257104cd69db4d3b3e1d36bb1d66a1893ddb51bfc52d0a1dd2efb3ba32a9c0 SHA512 976d7a50de6437a26fa77917368ab604c1987f686030e097c200fe9ebebd08e5fae10c04640cadbfecef90eda76ba123cf303d2d671cefa78b09752d1f6757af
-EBUILD munin-2.0.67-r7.ebuild 12201 BLAKE2B 335dd1b80c04d3f54ee725385b9d72f767e4661885ca47391cdb92e85ee1f12b721f5ddfcb28c582857372f09dc8cf17c7e6f33649f20e8e590bf5b595dae894 SHA512 aa599ca69388d3e7bbfb5271c34bb53fe3315370a4dc6e34cf2b55cf2fcccfa143a1d94e81525cf3ef30e6096fb82dba1e59a793c0bba37e3b42369021c17528
-EBUILD munin-2.0.69-r1.ebuild 12564 BLAKE2B 31e321eeaacfee96b60fb72e457972769b98d92b6abfde492213be2d55f9231827d45ba4ee5e22a5411bbe00642f6a60b85215653aff5c62e307c216f5f10263 SHA512 2a148dc80c771f148c135c1e623585f5a445f120b10bbf0ae1f060f2ca62fdec46f57d2b1d7d9e7870e76ffdfa68b60118b3897b54c3c287e98f6b8cba58bebe
-EBUILD munin-2.0.69.ebuild 12206 BLAKE2B 612a09e9d078c6595138257a3c9e172d75162611ffd52e93a6dd8b0ae1c24dadfcb5a0b9bf1328e6de9f1e989588c2415004375a8e9211d2c1cb8c64d2a7f67c SHA512 a81df81fe9c2e89b9e7c242f1634428cf50015a1df97a37199270a95a0445ecd99be243e7521c23f882883ffbf98a54d27b6c7a685d086d4c0c45a64e26a8f6e
+EBUILD munin-2.0.67-r7.ebuild 12210 BLAKE2B 617c37895b988f782b173b273e9eb5a2ef99fffc1b13a9b0d2981f5366def49df9d26214109842f2e79e121197ec544c46edd0894ca6a781596a8011533ffa8e SHA512 341f59ef4d2956cf2543862eeca71b696766a2e03189d650d1f2ff492ce53f5b92116ad93ce5890aa9b14714b6eda29b5d6c682cd7ecc1820f4f16b572d14ad0
+EBUILD munin-2.0.69-r1.ebuild 12573 BLAKE2B fc359426c56e08aa4ec63d2dd4395f4db30a3b23d07a9ee22e0fa92fd148f9b5c63bcf06410661746c1a6ba4c60e3a300e4d12e5f25f3237931739cc09da774b SHA512 a31d034a6b33a7db7e77233b717e415c5847c540b06bf0492bd821f96e4442817c2e68ba53b1ea671e5f04e968705107b1000a068f257da428ac66ccb762c649
+EBUILD munin-2.0.69.ebuild 12215 BLAKE2B 080a68bac7fad148d6205272ed093b2887ceae393ca495edd352506b5f9bc05cd10c77bbf3cc380d2159ef781a872c600130802e5c831861a599d9fcfbb3d81d SHA512 5fcb50e15646f957937ea16238c723145eb6a4a92a72deb539e30c735f5dc6030391e92c86beb85d5b12753bf5a0fee51685625830f6cbbdd7bb0d86c09619a4
 MISC metadata.xml 3933 BLAKE2B e13958d477a85e5f2327ffb529567dc129e6531a114b304d930399fe9cb81e6581f1df9d884860294984580c5b3e4335dfb623fca85e18e1de818430476eacfb SHA512 f824ef7f1a950ab81c4e3f2e81f44c6b3a49dc56a4aab977fad14e5d757875f8cb4900d8cd528c16449fafc8d08ab3792be8dc5a2a820932add7ce03ca35102c
diff --git a/net-analyzer/munin/munin-2.0.67-r7.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild
index 08d21fe6d7bd..6368339dd6f6 100644
--- a/net-analyzer/munin/munin-2.0.67-r7.ebuild
+++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild
@@ -97,7 +97,7 @@ DEPEND="${DEPEND_COM}
 		dev-perl/IO-Socket-INET6
 	)"
 RDEPEND="${DEPEND_COM}
-		virtual/awk
+		app-alternatives/awk
 		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
 		java? (
 			>=virtual/jre-1.8:*
diff --git a/net-analyzer/munin/munin-2.0.69-r1.ebuild b/net-analyzer/munin/munin-2.0.69-r1.ebuild
index 84e8a56bb83b..e47d869c5fcf 100644
--- a/net-analyzer/munin/munin-2.0.69-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.69-r1.ebuild
@@ -99,7 +99,7 @@ DEPEND="${DEPEND_COM}
 		dev-perl/IO-Socket-INET6
 	)"
 RDEPEND="${DEPEND_COM}
-		virtual/awk
+		app-alternatives/awk
 		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
 		java? (
 			>=virtual/jre-1.8:*
diff --git a/net-analyzer/munin/munin-2.0.69.ebuild b/net-analyzer/munin/munin-2.0.69.ebuild
index 4808bb940fcc..769dec8a5ea8 100644
--- a/net-analyzer/munin/munin-2.0.69.ebuild
+++ b/net-analyzer/munin/munin-2.0.69.ebuild
@@ -97,7 +97,7 @@ DEPEND="${DEPEND_COM}
 		dev-perl/IO-Socket-INET6
 	)"
 RDEPEND="${DEPEND_COM}
-		virtual/awk
+		app-alternatives/awk
 		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
 		java? (
 			>=virtual/jre-1.8:*
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 5fc9578bad07..0ecaab414de1 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -6,6 +6,10 @@ AUX net-snmp-5.8.1-net-snmp-config-libdir.patch 1395 BLAKE2B d22fa136b32cab28fff
 AUX net-snmp-5.8.1-pkg-config.patch 744 BLAKE2B bdcd74073b174fdf208f44bbe17546ab5e61420927e34cb1c9ecad5a208d00b52d3577cf686baf2ffb515c28ae6caa1d88696a3ddd6fde8eeabed17170d057c0 SHA512 10a1fcc115fdf19e03ba04651cd90063b9c05a6d075a5c79bcea5074145b22c65ab5a6974aade3072349b1f3b2543fff5000467d30526d02e22762ea9af5ff86
 AUX net-snmp-5.9-MakeMaker.patch 215 BLAKE2B 72b8b903d89bb7eff1dd69f9a212f6b1dcd13fcdc2a38650b3ffaadaae0ffe042bbb4ee3b2a8badb10c43f8179d405de45ff7dae42d83dc29f0929388bd0046d SHA512 2ade984435766624c2dcf3755644760d123745feaf9283f9f94230647df6fdc92cd27af7a8e144377ff17a6812b50c80d660d9a050e0a346b5260ec7963e0300
 AUX net-snmp-5.9.2-fix-LDFLAGS.patch 744 BLAKE2B 1d53469057630097c9c2a527ab276f8c30346c9b45b5ff4780cf9e51fb0f81193b9113e121a282d92268f73831fc3d4bf60ae2ea035f0eda9196351faa65f889 SHA512 7ebcc0128180c3690cd594dc3ec9c6428bff81ef31cf3b6f35be74a3d32c3753d0cb8e8b41b2dd6363a97811daa4786827a6a7a93b49804dfbb14545f157d360
+AUX net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch 9942 BLAKE2B 92214c4908da35c4cfa4c7fc0af2b93c0a577430ebdde489c89bcfc4b7d45d292f588af515f68dc13d84f285cebe63d008dccf538a027fce2a7e1a0a3f55220f SHA512 b095cb590f32410638d7d9e582eea53c19c37edb17a1e26f8bb1effc27037774ec0aede57dd54b8cebcab9fbff264911d8a6e3b0f64824fdd47c58c4724bfaab
+AUX net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch 1786 BLAKE2B 3f672a9e54f2242af10cc31a91e9522f330f13d761b79e8ef6913ce7ef5916d9859cdf05037c8c3954e94dd983551fcbd81861f07b103d41e0c2012b76d3007b SHA512 a00aa1877b9ee9ad3af87bde9749a43cae993e91cfa4ff9b806c5725ac0409f389e2d866d5375f66ddd15084f73cc3dfa6af2f928448ebd1f6bfa4dcb220c93e
+AUX net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch 1045 BLAKE2B 1cb4eb17363b9de90cecec0670ce220b04bdcb7e91af6931889139ba82ea69c24f399c5e4e1fd7ef3ae192372d7cd5bc5737b49a662cfeb685aab982ae321ede SHA512 0a1c51555359cec3f4294c0fe931c40e1cf1139a9a0e15fa7c75d6934b69cbedecc70b1bf44747f296274649bd39bf55ca55c0f9c4096a106e042b90698c95a1
+AUX net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch 722 BLAKE2B 00c301bbf6482f201ef2b4b82fb9899458a27e26bd0564bd98c69895f905b3abbbf5b1b8dc1ea7069059d9f1ad84a1335b84a6c151e7e75b81fc7fa3a135c578 SHA512 23e5e8920e41911dc4183a1c14b33f284a7d026a12c800dca6ddf0fa685e5a31041787599cab2671949163f539c85879e1e962128bab31ec478ebd47195ae3e0
 AUX net-snmp-5.9.3-configure-clang16.patch 4779 BLAKE2B fbe551a16272c6a374ed1abdcb024e7babd15bf8854cbfec568c3c58546b3f78302ea27cbb289faa5eb84b5e8b2086505fe74bba62e76e9d1a84a09949700f26 SHA512 3b85e813b645a3a3220d1ef1b5aceee4b2ea4150159f723249171f6283c1d45a034069b3d79e5ed0faa32556a0cb662c3a8b4ad93bd69ff12d517622df21291e
 AUX net-snmp-99999999-tinfo.patch 280 BLAKE2B 4a762bb037beb054d6afa1d3047e9bfa9df7746bdbcbf3ee4050377deee5d4107433e983f1e443a801adcabcd7f13c71f27e14ab49b729850beeb06a096d4c2b SHA512 19c65a7f80eea80fbe88bb5653dadb46f36b4921123aa7c7874c71ab82c6b14b5331b2d697a3d273d3bf93a961b80bf0a9252d833c21f81aa6f73d7e2a4a39d7
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
@@ -17,5 +21,6 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
 EBUILD net-snmp-5.9.3-r1.ebuild 6255 BLAKE2B 53424c917f876e72f1aa5e826253835a7944abbb2fccb8ae416d8073f29e10249e68f426d69c0c1a9977c8adade93a616b6c58ffeeb3ad43ccc87c3834b797bd SHA512 89c010837ea23ca8e83217bd6d1bcb2ba38884f78e843eda319a8b9706824f3f2793ac74d0c6924e4e7b7b61f8c43254aa6a6dbdeed97317725c20c579d008bd
-EBUILD net-snmp-9999.ebuild 6160 BLAKE2B e3c896d79e70bdaae6ac5894f6d15d7e724e22f88c4a031b40aa8c360d0dcf848684ccf263861e905339d659517d7bb1c9dbfcafc3527ef026153111194a47da SHA512 3506aa3d44003596c5854fab94bd999ac640fb7954eac8dc50cd2eedba01911b69fc27ff21fc63c5166ca704335b23001dea7e66dc060fc0b2267111ba707f71
+EBUILD net-snmp-5.9.3-r2.ebuild 6358 BLAKE2B 886b9f9bd672d71f4610ba4a810629046679158cfa5264057df543a1360b85fcd45402eff77ceaf9d1519c932bc8ad651faea7783996dccb58655606f36c722b SHA512 87e3a741d6959b2f1dd4bbdeda2252e5771f4f42becf799611533fddef9dff26ba7a1f99aad91cab5768c6dd3d6fcc995e71fbd8595566f912b1d994f651470d
+EBUILD net-snmp-9999.ebuild 6358 BLAKE2B 886b9f9bd672d71f4610ba4a810629046679158cfa5264057df543a1360b85fcd45402eff77ceaf9d1519c932bc8ad651faea7783996dccb58655606f36c722b SHA512 87e3a741d6959b2f1dd4bbdeda2252e5771f4f42becf799611533fddef9dff26ba7a1f99aad91cab5768c6dd3d6fcc995e71fbd8595566f912b1d994f651470d
 MISC metadata.xml 1384 BLAKE2B 7482ef34aa0a5fb60c32a11449e6eb53bcebc7852c013650151392401532ff66f56e0c43dc98ad8a47e8166c97ce04d24bbe1d8a2ee21b934a19983d0847d941 SHA512 9ed265ee76578df5f4edb04d7fbc3eacfab7c27603bac65a3ae5086a31d3a9ce4f128cc751d63e1c27fd13e16fcb83a7966771b73026b7339663802ce51023e4
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch
new file mode 100644
index 000000000000..785f5ee57d1c
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch
@@ -0,0 +1,231 @@
+https://github.com/net-snmp/net-snmp/pull/493
+
+From 1151979ecfba1ef10627175549d052cb76ef9d21 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Dec 2022 02:26:29 +0000
+Subject: [PATCH 1/4] Fix LDFLAGS vs LIBS ordering
+
+LDFLAGS must come before both LIBS & any listed objects in order
+for certain valid LDFLAGS, like '-Wl,--as-needed' to work correctly
+(otherwise it'll either take no effect or discard libraries when
+they're needed).
+
+Gentoo has been carrying this patch for a while.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -86,11 +86,11 @@ LIBCURRENT  = 40
+ LIBAGE      = 0
+ LIBREVISION = 0
+ 
+-LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
++LIB_LD_CMD      = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
+ LIB_EXTENSION   = la
+ LIB_VERSION     =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
+-LINK		= $(LIBTOOL) --mode=link $(LINKCC)
++LINK		= $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS)
+ # RANLIB 	= @RANLIB@
+ RANLIB		= :
+ 
+--- a/agent/Makefile.in
++++ b/agent/Makefile.in
+@@ -288,26 +288,26 @@ all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
+ # build stuff targets
+ #
+ getkstat: getkstat.o
+-	$(CC) $(CFLAGS) -o $@ $? $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS)
+ 
+ getkstat.o: mibgroup/kernel_sunos5.c
+-	$(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? 
++	$(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $?
+ 
+ getmibstat: getmibstat.o
+-	$(CC) $(CFLAGS) -o $@ $? $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS)
+ 
+ getmibstat.o: mibgroup/kernel_sunos5.c
+-	$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? 
++	$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $?
+ 
+-snmpd$(EXEEXT):	${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) 
+-	$(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS}
++snmpd$(EXEEXT):	${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG)
++	$(LINK) $(CFLAGS) $(LDFLAGS) -o $@ ${LAGENTOBJS} ${OUR_AGENT_LIBS}
+ 
+ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} $(USELIBS)
+-	$(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
++	$(LIB_LD_CMD) $(AGENTLIB) $(LDFLAGS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
+ 	$(RANLIB) $(AGENTLIB)
+ 
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS) subdirs
+-	$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
++	$(LIB_LD_CMD) $(MIBLIB) $(LDFLAGS) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
+ 	$(RANLIB) $(MIBLIB)
+ 
+ agentlib: $(AGENTLIB)
+--- a/agent/helpers/Makefile.in
++++ b/agent/helpers/Makefile.in
+@@ -32,5 +32,5 @@ LOBJS = dummy.lo
+ all: standardall
+ 
+ libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    $(LOBJS)
+-	$(LIB_LD_CMD) $@ $(LOBJS) $(LDFLAGS)
++	$(LIB_LD_CMD) $@ $(LDFLAGS) $(LOBJS)
+ 	$(RANLIB) $@
+--- a/apps/Makefile.in
++++ b/apps/Makefile.in
+@@ -163,37 +163,37 @@ OTHERUNINSTALL=snmpinformuninstall snmptrapdperluninstall	\
+ # build rules
+ #
+ snmpwalk$(EXEEXT):    snmpwalk.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LIBS}
+ 
+ snmpbulkwalk$(EXEEXT):    snmpbulkwalk.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LIBS}
+ 
+ snmpbulkget$(EXEEXT):    snmpbulkget.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LIBS}
+ 
+ snmptranslate$(EXEEXT):    snmptranslate.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LIBS}
+ 
+ snmpstatus$(EXEEXT):    snmpstatus.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LIBS}
+ 
+ snmpget$(EXEEXT):    snmpget.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpget.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpget.$(OSUFFIX) ${LIBS}
+ 
+ snmpdelta$(EXEEXT):    snmpdelta.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LIBS}
+ 
+ snmptable$(EXEEXT):    snmptable.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmptable.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptable.$(OSUFFIX) ${LIBS}
+ 
+ snmptest$(EXEEXT):    snmptest.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptest.$(OSUFFIX) ${LIBS}
+ 
+ snmptrapd$(EXEEXT):    $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
+-	$(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${TRAPLIBS}
+ 
+ snmptrap$(EXEEXT):    snmptrap.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LIBS}
+ 
+ snmpinform$(EXEEXT): snmptrap$(EXEEXT)
+ 	rm -f snmpinform
+@@ -204,40 +204,40 @@ snmptop$(EXEEXT): snmpps$(EXEEXT)
+ 	$(LN_S) snmpps$(EXEEXT) snmptop$(EXEEXT)
+ 
+ snmpset$(EXEEXT):    snmpset.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpset.$(OSUFFIX) ${LIBS}
+ 
+ snmpusm$(EXEEXT):    snmpusm.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LIBS}
+ 
+ snmpvacm$(EXEEXT):    snmpvacm.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LIBS}
+ 
+ snmptls$(EXEEXT):    snmptls.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmptls.$(OSUFFIX) ${LDFLAGS} ${LIBS} 
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptls.$(OSUFFIX) ${LIBS}
+ 
+ agentxtrap$(EXEEXT):    agentxtrap.$(OSUFFIX) $(USEAGENTLIBS)
+-	$(LINK) ${CFLAGS} -o $@ agentxtrap.$(OSUFFIX) ${LDFLAGS} $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS}
+ 
+ snmpgetnext$(EXEEXT):    snmpgetnext.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LIBS}
+ 
+ encode_keychange$(EXEEXT):    encode_keychange.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LIBS}
+ 
+ snmpdf$(EXEEXT):    snmpdf.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LIBS}
+ 
+ snmpps$(EXEEXT):    snmpps.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpps.$(OSUFFIX) ${LDFLAGS} @LIBCURSES@ ${LIBS}
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpps.$(OSUFFIX) @LIBCURSES@ ${LIBS}
+ 
+ snmpping$(EXEEXT):    snmpping.$(OSUFFIX) $(USELIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmpping.$(OSUFFIX) ${LDFLAGS} ${LIBS} -lm
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpping.$(OSUFFIX) ${LIBS} -lm
+ 
+ snmppcap$(EXEEXT):    snmppcap.$(OSUFFIX) $(USEAGENTLIBS)
+-	$(LINK) ${CFLAGS} -o $@ snmppcap.$(OSUFFIX) ${LDFLAGS} ${USEAGENTLIBS} ${LIBS} -lpcap
++	$(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmppcap.$(OSUFFIX) ${USEAGENTLIBS} ${LIBS} -lpcap
+ 
+ libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)
+-	$(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LDFLAGS)
++	$(LIB_LD_CMD) $@ $(LDFLAGS) ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS)
+ 	$(RANLIB) $@
+ 
+ snmpinforminstall:
+--- a/apps/snmpnetstat/Makefile.in
++++ b/apps/snmpnetstat/Makefile.in
+@@ -34,4 +34,4 @@ LIBS=	 ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) $(VAL_LIBS) @LIBS
+ all: standardall
+ 
+ snmpnetstat$(EXEEXT): ${LOBJS} ${USELIBS}
+-	${LINK} ${CFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LDFLAGS} ${LIBS}
++	${LINK} ${CFLAGS} ${LDFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LIBS}
+--- a/snmplib/Makefile.in
++++ b/snmplib/Makefile.in
+@@ -229,11 +229,11 @@ all: standardall
+ 
+ # how to build the libraries.
+ libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
+-	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
++	$(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@
+ 	$(RANLIB) $@
+ 
+ libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
+-	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
++	$(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@
+ 	$(RANLIB) $@
+ 
+ #
+--- a/testing/Makefile.in
++++ b/testing/Makefile.in
+@@ -64,16 +64,16 @@ test-mibs:
+ 	cd $(srcdir)/rfc1213 ; ./run
+ 
+ etest:    etimetest.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ etimetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
++	${CC} ${LDFLAGS} -o $@ etimetest.o $(PARSEOBJS) ${LIBS}
+ 
+ ktest:    keymanagetest.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ keymanagetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
++	${CC} ${LDFLAGS} -o $@ keymanagetest.o $(PARSEOBJS) ${LIBS}
+ 
+ misctest:    misctest.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ misctest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
++	${CC} ${LDFLAGS} -o $@ misctest.o $(PARSEOBJS) ${LIBS}
+ 
+ stest:    scapitest.o $(PARSEOBJS) $(USELIBS)
+-	${CC} -o $@ scapitest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} 
++	${CC} ${LDFLAGS} -o $@ scapitest.o $(PARSEOBJS) ${LIBS}
+ 
+ clean: testclean
+ 	rm -f *.o core *.core $(TARG)
+-- 
+2.38.1
+
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch
new file mode 100644
index 000000000000..83d05a86f0ac
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch
@@ -0,0 +1,51 @@
+https://github.com/net-snmp/net-snmp/pull/493
+
+From a73bda5ca7afbeaf3cf3b73101f7541cf92147ef Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Dec 2022 02:27:21 +0000
+Subject: [PATCH 2/4] Tidy up net-snmp-config output
+
+`net-snmp-config --libs` should return only the needed libraries linked to
+libraries which external consumers should use.
+
+Gentoo has been carrying this patch for a while, as has Fedora.
+
+Bug: https://bugs.gentoo.org/693970
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
+@@ -193,13 +193,13 @@ else
+     #################################################### client lib
+     --libs)
+       # use this one == --netsnmp-libs + --external-libs
+-      echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
++      echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
+       ;;
+     --netsnmp-libs)
+       echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
+       ;;
+     --external-libs)
+-      echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
++      echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
+       ;;
+     #################################################### agent lib
+     --base-agent-libs)
+@@ -210,13 +210,13 @@ else
+       ;;
+     --agent-libs)
+       # use this one == --netsnmp-agent-libs + --external-libs
+-      echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
++      echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
+       ;;
+     --netsnmp-agent-libs)
+       echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
+       ;;
+     --external-agent-libs)
+-      echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
++      echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
+       ;;
+     ####################################################
+     --version|--ver*)
+-- 
+2.38.1
+
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch
new file mode 100644
index 000000000000..8b825ae8cf5d
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch
@@ -0,0 +1,30 @@
+https://github.com/net-snmp/net-snmp/pull/493
+
+From 7261ea344004ac42b6099acfba49c0ea731d049c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Dec 2022 02:29:45 +0000
+Subject: [PATCH 3/4] Prune Libs.private entries in netsnmp*.pc.in
+
+Gentoo has been carrying this patch for a while, as has Fedora.
+
+Bug: https://bugs.gentoo.org/693970
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/netsnmp-agent.pc.in
++++ b/netsnmp-agent.pc.in
+@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org
+ Version: @PACKAGE_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
+-Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@
++Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @LNETSNMPLIBS@ @LIBS@
+--- a/netsnmp.pc.in
++++ b/netsnmp.pc.in
+@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org
+ Version: @PACKAGE_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lnetsnmp
+-Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@
++Libs.private: @LNETSNMPLIBS@ @LIBS@
+-- 
+2.38.1
+
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch
new file mode 100644
index 000000000000..c92c88cfbb2f
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch
@@ -0,0 +1,24 @@
+https://github.com/net-snmp/net-snmp/pull/493
+
+From 6b70bd4ffa7a905700807eecd3e07a472e2eda55 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Dec 2022 02:31:15 +0000
+Subject: [PATCH 4/4] Search for -ltinfo in configure if needed
+
+Gentoo has been carrying this patch for a while.
+
+Bug: https://bugs.gentoo.org/883945
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.d/config_os_libs2
++++ b/configure.d/config_os_libs2
+@@ -774,6 +774,7 @@ NETSNMP_SEARCH_LIBS([endwin], [curses ncurses], [
+   [HAVE_LIBCURSES=FALSE],,
+   [LIBCURSES])
+ AC_SUBST([HAVE_LIBCURSES])
++NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,)
+ AC_SUBST([LIBCURSES])
+ 
+ #   libm for ceil
+-- 
+2.38.1
+
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
new file mode 100644
index 000000000000..b6009335d250
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=yes
+DISTUTILS_SINGLE_IMPL=yes
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{8..10} )
+WANT_AUTOMAKE=none
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="https://www.net-snmp.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
+	inherit git-r3
+else
+	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/40"
+IUSE="
+	X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		>=dev-libs/openssl-0.9.6d:0=
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? (
+			virtual/perl-Carp
+			virtual/perl-Data-Dumper
+			virtual/perl-Getopt-Long
+			dev-perl/JSON
+			dev-perl/Mail-Sender
+			dev-perl/TermReadKey
+			virtual/perl-Term-ReadLine
+		)
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
+	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+	# https://github.com/net-snmp/net-snmp/pull/493
+	"${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch
+	"${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch
+	"${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch
+	"${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared \
+		--with-default-snmp-version="3" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	emake sedscript
+
+	local subdir
+	for subdir in snmplib agent/mibgroup agent apps .; do
+		emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all
+	done
+
+	use doc && emake docsdox
+}
+
+src_install() {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild
index 1aed4861943b..b6009335d250 100644
--- a/net-analyzer/net-snmp/net-snmp-9999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild
@@ -20,7 +20,7 @@ else
 	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
-	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
@@ -84,14 +84,15 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
 	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
 	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
 	"${FILESDIR}"/${PN}-5.9-MakeMaker.patch
-	"${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-99999999-tinfo.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+	# https://github.com/net-snmp/net-snmp/pull/493
+	"${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch
+	"${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch
+	"${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch
+	"${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index fa1c6a2ac674..72d1c495cc51 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -2,9 +2,9 @@ DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3
 DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961cafe060d285fcd63f968c5f33cd2c4393288c44262eb12665c6471d757d65a9a2406c7d80997736ada6189ba1c8450 SHA512 1748c5f6ea392b6cfc6b761632bc632422fb6910f53fb26a796003cdc0048f28ab550daa0658a6d5de5fec65b0a5aae8f44f68ec65c19f06b11eda6fd337c8d4
 DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d
 DIST netdata-1.37.0.tar.gz 25151327 BLAKE2B 7e83df21e50d721d7e8a226fbc4470972393ab086fa575298b36f5699dfa4fffa406ce8a532661b1adfb7b5755e69c227f85f7c36e96f3cc585004082c25eda2 SHA512 7234d8b414df6674e612718085f446b1321833772d2d28e01da13f1d296b772e5dc73bf39495ab9a8db7f3118f3053000c16d6b17fe2a28e8340cef0d208d4bf
-EBUILD netdata-1.35.1.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870
-EBUILD netdata-1.36.0.ebuild 3915 BLAKE2B ed0582d4ef9d60aa1fe7867b11c26883b1bdf8bd4d628acc8621bf3c98e2eb81dddf4ad23931f0dfaa1f237d5d8739387a2f6ee50e8caac2b479254ee1d32f4d SHA512 4296a274877e0df4929128b2992e079aba92e3a5f7c47e632b47c29c5f97973dbf671397bdcb938511bf50331023588a5b5eb5ad23b48813dde2021f251e4870
-EBUILD netdata-1.36.1-r1.ebuild 3930 BLAKE2B c8ca57c0ed784e7a8d9ac6c8f7c76001a418003bd87307ba9d7f14a8415a4573a96f32018f5c35c8f648d3e5b9955f8c75c4f83aab707bd6e09f9619761a9ba2 SHA512 261c718e355e569a7caca714640821c9791bd8866fdd0af23eadfe47261b3ba9ade235ccf16da00a86780acce79e1870772cb82a4696572696b5933778689711
-EBUILD netdata-1.37.0.ebuild 3930 BLAKE2B c8ca57c0ed784e7a8d9ac6c8f7c76001a418003bd87307ba9d7f14a8415a4573a96f32018f5c35c8f648d3e5b9955f8c75c4f83aab707bd6e09f9619761a9ba2 SHA512 261c718e355e569a7caca714640821c9791bd8866fdd0af23eadfe47261b3ba9ade235ccf16da00a86780acce79e1870772cb82a4696572696b5933778689711
-EBUILD netdata-9999.ebuild 3923 BLAKE2B d0bb987251d17d36c82608b7d321a54f29468d79340d6f406c60ab1cf8c91c01a5871d51d0964b5d63fe9a039932136b998bca7839ea07e3dd1409fb40300660 SHA512 d4bb01715f36f64d2d5f7606afbe38471cd99da1271da982a3e0bfcc75d58b96d5e7d55754ffaeb7660fbb966908e310203c8e8c3a36b9d695f34b0581d87609
+EBUILD netdata-1.35.1.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2
+EBUILD netdata-1.36.0.ebuild 3924 BLAKE2B 7a340e74ad2ac97b477b8c851f9f1bb6f7b069be2a00d781e57e3f491f9153643315c0ec41357adb2dae651f7d1742b937e715f6e02a442665aef0ff6e98ce8b SHA512 4ebb2128f67c80d513d4063fd1d170926340a3b1052467a6d3eff39494fa15794a0b7addcfc6d7c967b3a84a548fd23cbc08726ec14d9dddacbe6e2417cfe4f2
+EBUILD netdata-1.36.1-r1.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
+EBUILD netdata-1.37.0.ebuild 3939 BLAKE2B 4af0fc9e27b1964c76d670a3623a98c35ddb6e073a4f8dc5e4021a212ffa08222b36091a93428f6b81c8bfe2b8a759643726abe0cfc9c31cfea6182b977fe245 SHA512 3ecdacf1f79a73d4da07c409dfd739731dfacf5b05138a44c88a866fcbe6e0a286e7bd8b5c000b966fa5dac023beb0f79ed7a99afef8ea02b0728f24d9212496
+EBUILD netdata-9999.ebuild 3932 BLAKE2B e826718e33e68458671e0e53fc0caee4d2f3c9d43f40b93c5db545e20980b7666daae00d855bdd9dc5d9fc4896fabf27c5ced0b3f16b6a4561be643abfb5aaf7 SHA512 6a60a4bd493efd848f0351d1b554690873e53552c473d3ce7362f4f549d1ea051a1ae04c1728c808be5cb8365c6a170768db7edcae0a876102290a71799ed94d
 MISC metadata.xml 1289 BLAKE2B 8c18928662fdfb9166a3dd147b73206d41b6038268121b23b464f5e8ff8cacf929ac6374aa8b54b63281599be21dd92c352ac229a0e0ff180a57b86faf020ea2 SHA512 e3a344e81572b366848b51022febaeb9f9f5df3555343757061370dc42757817b4b77de85a4f0efb6b52032461cb97edd4b9d41b44b9cec7681b06448f706484
diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild
index 3df5ef6ecd47..d4f2ab18da89 100644
--- a/net-analyzer/netdata/netdata-1.35.1.ebuild
+++ b/net-analyzer/netdata/netdata-1.35.1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
-	virtual/awk
+	app-alternatives/awk
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
 	dbengine? (
diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild
index 3df5ef6ecd47..d4f2ab18da89 100644
--- a/net-analyzer/netdata/netdata-1.36.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.0.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
-	virtual/awk
+	app-alternatives/awk
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
 	dbengine? (
diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
index 555475886149..e4af7059cb02 100644
--- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
-	virtual/awk
+	app-alternatives/awk
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
 	dbengine? (
diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild
index 555475886149..e4af7059cb02 100644
--- a/net-analyzer/netdata/netdata-1.37.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.37.0.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
-	virtual/awk
+	app-alternatives/awk
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
 	dbengine? (
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index 532e8e6f8fd3..1c367c2b30c4 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	net-misc/curl
 	net-misc/wget
 	sys-apps/util-linux
-	virtual/awk
+	app-alternatives/awk
 	caps? ( sys-libs/libcap )
 	cups? ( net-print/cups )
 	dbengine? (
diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest
index e21eef65818e..8b48644af62e 100644
--- a/net-analyzer/nmbscan/Manifest
+++ b/net-analyzer/nmbscan/Manifest
@@ -1,4 +1,4 @@
 AUX nmbscan-1.2.5-head.diff 442 BLAKE2B e97b6359f9479b76eae7cddc837df06a02b5adf886ee142f5e0b6dfe27debda30d49197c0184e802686d00df510ed0f6a47ea90c294ee1e124fb980b379121e9 SHA512 6fd79b7b9462700245df3c91345a197cbadafb30f60737b2426285f9a4bff969c752bd68bdde4f305cdd8079a5c89fa1be75360a2e35caf495489c01081b0ceb
 DIST nmbscan-1.2.5.tar.gz 44749 BLAKE2B be49afa46c6ed1533f3e3d7b5c6fbe54b83802385ed9b670f1cdc0105eae99135000be5e98a693ad2adca54f9948ebacc8cd4fc677828a61a5fa85667d584fcd SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9
-EBUILD nmbscan-1.2.5-r1.ebuild 548 BLAKE2B b303bc2aeb9b469bb9ab5a0f3515f574852bcbda7daa1cdebae51cb1453e7a47f7d9f2715b4cba5310b74273ec67a890e2f133ef6811caa14273e5f39c244be8 SHA512 e0142a058cb9c6e046f59e22f13745a2f65fac4e369ae73b4399146730e581b21e69d8cd6ff6fdb41c639d04f9eede0a3eaa19ac9047f500e7587c1fdb7868d9
+EBUILD nmbscan-1.2.5-r1.ebuild 557 BLAKE2B 85bee5fc874459bae3f78b6435e70eb8d96fa2683ed202d586ad77b35c94a0d87a70693e3633b040e49c61a6b3da136112ddcac5283f60b871509a519bba7b8a SHA512 ecc8059e880fb66eb6bab1e3b4a279341a0d1fd36ad597ca491e95a880b73752a6c42f1c4db346f88460cd6b6f08520cab28eceb4acea62668666154606afbb7
 MISC metadata.xml 684 BLAKE2B be4bc023868289d708b8deedc150eff4761956739b46ba76bd37779ed905ee9c6415636e5fb5bc794f637fcc3a9c58570e4bf3f6af11ef327bb8e3ad8f945963 SHA512 af6159546641c3dd0f9a840cfaab970b4a1b97575e0c5f4957476f6821c35190865f8cef3e22ecf8c581bf56a6c8a941c6d9e92a16b4fe38093c4c9d8862689f
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
index f98da58998dd..763b105c51e1 100644
--- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
@@ -15,7 +15,7 @@ RDEPEND="net-dns/bind-tools
 	net-fs/samba
 	net-misc/iputils
 	sys-apps/net-tools
-	virtual/awk"
+	app-alternatives/awk"
 
 S=${WORKDIR}
 PATCHES=( "${FILESDIR}"/${P}-head.diff )
diff --git a/net-analyzer/prettyping/Manifest b/net-analyzer/prettyping/Manifest
index 68cc3300a44a..37b9de9e3cbd 100644
--- a/net-analyzer/prettyping/Manifest
+++ b/net-analyzer/prettyping/Manifest
@@ -1,3 +1,3 @@
 DIST prettyping-1.0.1.tar.gz 10104 BLAKE2B 41158972fa41fcfaf078fd8fa4b9af10e2d3e65d547f81f0a6daf826f0a1c725de97e14dc597624d2c9281492d94c4b5cf7e6f40e9743aea0792ece0f84211fc SHA512 967626f11cd58fd9a0ce91a320caf6b6a296681ed809e04188f0cfe00d03c80a3620bf4d3ec86e855be363810763ff3ccd8bb0a959d03e62b31edba2cfae7f79
-EBUILD prettyping-1.0.1.ebuild 477 BLAKE2B 8113d88cb10b321d688ae7e33a1bf816f9b199e8486baedc9bab264bf4afbe305d10287375ccff6359bab6ad0921718d5d558329a37a00df636159b504777dd1 SHA512 aab108fe1b8c6503d7e5435751e0641aeb634bcd7c022c857e36fe49dd30d3d851560579b2383344cc35c219550ca83674dbf07733b6e153d489e7990561a4ff
+EBUILD prettyping-1.0.1.ebuild 486 BLAKE2B bc79f7b9a2f98e572f199d2ee1dcbcbe3c2054741a80f1cce6aad00e34b858a356be4dced8c161abc43afdd2dcd92fc70a5261914f239b7343ecd7d98f4c1271 SHA512 1b108fe6a419d9efc2181cab700a55146036aabf5cf5d92a76c551be99040598dbf6aff8ad95d937b39333ebbca97078b3712ad6aaf5580b9f5005e65bee53ee
 MISC metadata.xml 659 BLAKE2B 2d38a5d2e0f857515a58f5d405fc7b3d8bd2fcd8f31fe3438123d2c1681de7ed812f7c610bd48f7d17dd59d51f48c78adbf55cfb638148a22b05ca0ca3898105 SHA512 2af4b2f5b52dfb5827a03cbcab0ff11f1a5eab88aa87a6ab78dd35e004c4b42e4f5f14ff7f272ef2f5ebb4243062bfd2318cc96b1498e78962ee4fdf115f8d4e
diff --git a/net-analyzer/prettyping/prettyping-1.0.1.ebuild b/net-analyzer/prettyping/prettyping-1.0.1.ebuild
index ed84d65d0509..d8edee93db2a 100644
--- a/net-analyzer/prettyping/prettyping-1.0.1.ebuild
+++ b/net-analyzer/prettyping/prettyping-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="app-shells/bash
 	net-misc/iputils
-	virtual/awk"
+	app-alternatives/awk"
 
 src_install() {
 	dobin prettyping
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index f7c1da2ec125..9fbd1444d641 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -4,5 +4,5 @@ AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
-EBUILD rrdtool-1.8.0-r2.ebuild 5516 BLAKE2B 2708acb85baed87bf54790bcf36b71f9005b54e90ca5c8f11ff2fdda4680b0d9847df4dad5e6bf9d9b8e9f83109403c035d1742142ee5b4def6dd22a2bdbbf15 SHA512 aef7862eb7758d9690b716590c3cdeaefdb6e1f4929b3e3d05a56f63ed4c3e57d18519f068875a00447bf42a4229a3bf775521e38fccc2b9189782508e3b77be
+EBUILD rrdtool-1.8.0-r2.ebuild 5525 BLAKE2B 8208add85fe77e30cec5272703d621b9374fb59d599f8a5f876490ed316d7bb5031e29ea58651f9f508e9ebc2ddd63aea2838266973ac3acd0e77ca80a44dd8b SHA512 ca3a095ca75fa23a72492c942e5fa579388d6ec549f530a340ca10e9e6d403c23ced7f926387da410ef51a1ce497775924c78d6f3f84f15a963f5ceea92e898e
 MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild
index 59979289af1b..faed0047ac07 100644
--- a/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild
@@ -62,7 +62,7 @@ BDEPEND="
 	${DISTUTILS_DEPS}
 	sys-apps/groff
 	virtual/pkgconfig
-	virtual/awk
+	app-alternatives/awk
 	python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
 	test? (
 		sys-devel/bc
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 7746c19be71c..24552b61caa7 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 1426318b4e83..c3c1b9723380 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -8,5 +8,5 @@ AUX mgetty-1.2.1-gentoo.patch 4020 BLAKE2B fa9f609cc93cbc2287e415888bfcafc3f4069
 AUX mgetty-1.2.1-riscv64.patch 396 BLAKE2B 42403e6f59b247969845098671e57346adba31a96d7c781ba362d00c85a8ecfd251f457f0d205dc0163a01b5f4fe9768e52d47cbd20af320cd88069adbfa0b09 SHA512 a90b9b47f3718d8249dc37c49890c833f0789ca7fbb54e03ac5f506a4b98af7dd0dd2b8b1af2d361da6217e551d3b47f58c93df972f195a17825b7f789ca0ec2
 AUX mgetty.service 203 BLAKE2B d7bd55ab0f1acc02541cb19ed372faeb2ba1b88dae1d1114677ef955cc91006c7ff5e78f71d8ba3da1aecde111f9bbc4ae916c5c19df20061200731eaab038ac SHA512 c766385d101005980fd992d2e721ffb90a7b756afbd4ea24a55e828f39bd6106a0722461b581736816685c6d5dc3fbc4ebe5fca3faf1c1373d7e0c6658c80a8d
 DIST mgetty-1.2.1.tar.gz 1077415 BLAKE2B 09d48c6cb7917a3dbbfc97c1d32ce43b9a3e64e8a44c8a3a7bfdd168421c287357a9d43504fb4d1b354ffb0f8e2a9c52b56ac3464f196f56064d96a7651e0d6e SHA512 2a82dfb782044d9daf8d41158fa10e991dbd7bd37ab43ea44422166554dd790e989ac49e4ff471d168d1cbb49edc5bedb8762ab61884e4653650686d1bbc2a9b
-EBUILD mgetty-1.2.1-r4.ebuild 4816 BLAKE2B d8b3985bd6ba40da04793046b97026221a7938ec28e223fb048f90dc4969df11defacd9b92b282cdb4e64a88c3fc9d18f3dfc50bf2efc45e00c8e5c9cc26c6a2 SHA512 809f81cc160c1a26b353f1b2c88bee10c62515194bc591f0dd4bad54d003002f0f72fc4c636a86c533f9bfee68520fddb4d93f62dce30f0074292024d6278d7b
+EBUILD mgetty-1.2.1-r4.ebuild 4825 BLAKE2B dea7d1d7336463c0528c55d06c2b27d4a1d434244df4e6449ba789b06450aa89c304ea061a3594f4fa8179151870ef236da422505479200c65e3b2d88b1ba1b9 SHA512 895abd64087a4e211eec9ddb45e57e0c4232efdd40f7da9dd504c4c5f0a1a345b3acaa0225327bdfc6a4433bae47381e00c39b2fa92dd2a362eaf919c1b843f5
 MISC metadata.xml 590 BLAKE2B 40b9f40755b60ca842ab1e9af8678f0aa209534f8ff333e12dd80877e9284a903f8e0fb0d385eaa998ae17a192dd878043bcf7c5db319a83bf4c9e180076056a SHA512 13d49a0f90003c64d70ef5c302dbe2f3a8488f5d3a9e3358d93568cfd9f07d2c3b2b223b9c71ea97c20b1cb662dd4f7e79a7169c25de73699faee41fabbdad2a
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild
index bc8dcaa55114..672f3198a356 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r4.ebuild
@@ -13,7 +13,7 @@ DEPEND="
 	dev-lang/perl
 	sys-apps/groff
 	sys-apps/texinfo
-	virtual/awk
+	app-alternatives/awk
 	fax? ( !net-misc/efax )
 "
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e54a4ac6e780..202e28dba8e8 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 273933c66f2f..2e1fc7097ea1 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,3 +1,5 @@
 DIST aqbanking-6.2.5.tar.gz 2611057 BLAKE2B 05ba9b652f60ae79bc8446f65714ec72396669886d34e57ad09a21b4e5a563bc3f9fbb14431be076b9c05171fe6eac17b128d4bcd7af5250fd5c63d8d93e3e65 SHA512 aec71c16d8f0b3bdac1bba32f83fb22d5b4d2272b41845e7f63e770323a622fcabe1d2e1a9fc98977a38c467ab7cc0f934746216c2107363b81f51b90e65c88c
+DIST aqbanking-6.5.3.tar.gz 2690700 BLAKE2B 2a6407a9d6bfe6a7cfa3b3f4b6d3183b801bda8914770a11d48491fa7bc48e9b034b7eb5d220c6181725240e4475460a11c64df2d73dac98ccb30a61d5de5bca SHA512 bca4449981f9660dc7de8506a2088981b52dcf4ded765fd337263962b464b7903319878e8efbce6cbef043b65be8edb828fee873f19e8c6b2fed0cf7906d58b2
 EBUILD aqbanking-6.2.5.ebuild 1410 BLAKE2B 5ae237ac47d649bb68b8a2b6d5d8dc69babb322b9fdca904d70ff0df5d1905f59906234e18245a42dcde7de80561f7e5e8f6094fe4bf6428a255ba2d13acd9d4 SHA512 3c6adf5c66be001f511d27584a14661eb4606d7a0c4dc2075a6a194eac61ce763e8bf2440646de02fa9b9346e277e9865cd3d2eeb8983effb4b6df0bb5d7cf78
+EBUILD aqbanking-6.5.3.ebuild 1328 BLAKE2B 349645437375ff7ed1ca84fd304ecc92f5e29df31d61232af97f5994f9b59fa80280330154822f2e85d40413a486a9f4f1eae086505a68c43c3170cd94b417ca SHA512 9572fdf1ec46afd6db248a1a35d00d4653b934289f6c8de51542f5246b0a936e5fbff1d3d0925fc9180ffad8ebcb081a1803a86d8099d625bbd9ae278ec8c9d9
 MISC metadata.xml 294 BLAKE2B 3e8d1f1507f7ddb3187be8ca27bb737073510725cb99e38816a95ae321f3c06428131cd55ba2d825749d4788e7551c4c6492804b4f2b60039370209af1b2115e SHA512 f0d83a3d07d5fce12d53c0557f32648a8b3df0b2a85d927a53531910bfd24762f32284dbc2f2c8d5dbb2aecaf96060c0f5f3fee5adfb2b12fb2cc60194a5907a
diff --git a/net-libs/aqbanking/aqbanking-6.5.3.ebuild b/net-libs/aqbanking/aqbanking-6.5.3.ebuild
new file mode 100644
index 000000000000..9d0bc815c50b
--- /dev/null
+++ b/net-libs/aqbanking/aqbanking-6.5.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Generic Online Banking Interface"
+HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/467/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug doc ebics examples ofx"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	app-misc/ktoblzcheck
+	dev-libs/gmp:0=
+	>=sys-libs/gwenhywfar-5.10.1:=
+	virtual/libintl
+	ebics? ( dev-libs/xmlsec[gcrypt] )
+	ofx? ( >=dev-libs/libofx-0.9.5:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	local backends="aqhbci aqnone aqpaypal"
+	use ofx && backends="${backends} aqofxconnect"
+	use ebics && backends="${backends} aqebics"
+
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/"${PF}"
+		$(use_enable debug)
+		$(use_enable doc full-doc)
+		--with-backends="${backends}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rv "${ED}"/usr/share/doc/ || die "Failed to remove docs"
+
+	einstalldocs
+
+	if use examples; then
+		docinto tutorials
+		dodoc tutorials/*.{c,h} tutorials/README
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index f5c81e09a03c..007830cb706d 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,6 @@
+AUX glib-networking-2.74.0-gnutls-tls-1.3-test.patch 4342 BLAKE2B 5957d92382127f1f340f35fefa2e8b85355bc559985e950ae2ec89582832c3b603966a2bb1dd73562032f1970ceb4d5a6159fadaa6a11a8e02b09e862cfedf3c SHA512 a5fe07d92794e2917c7ae5c28323173d94e01b2cad71e88b79924774836a04cba0d1b373e1b28e1da51445b226f06acd64f95346ed0fe5ea3173105cc74ab334
 DIST glib-networking-2.72.2.tar.xz 265268 BLAKE2B 90e6eee44faeb495e26a61d15fab66034784637f43d2184901099a6daa69e36d39f732cd5ccd5262f213f19329982264138592b60a08009f4ff034a3ad20922a SHA512 b2837f1521ea8312fb508d3000d465898d409bb48033a63430609331f45628f6b49eaaf16278f2ef48c41b9fccf38f78a85374d23e9ea75692a11cbd7ef058ec
 DIST glib-networking-2.74.0.tar.xz 277232 BLAKE2B d0027a3beff276b2d0b008d1ed0bdeef231d8fb03c26c2e301a3eaef76ad4b704a5db36f6265c5516d73c5dbdb98c7c0919b6924038506dad0123f5ec77577b2 SHA512 f266c106f2c9379b95773a852c1b5c62ae1d6a758d25c436c3558f620d8e0a211201b3c4dfd89cdbe28b88430bba0cca621e62c01ea23d473983e203919bb1e6
 EBUILD glib-networking-2.72.2.ebuild 2004 BLAKE2B 7940597d2b326c67ce959273b033da365eb5f46825e837b02104947ec7557cd578b7b38605c495ed9fb89f8f0f827a64638a8f48846ae66965b61fb1dee9e470 SHA512 afdd73225c34ee65730ef93815a45de4787c8d42fab4212d4f24612c5935a43dd4980e421a6563efdd02b8089c737b507b43eaad30c98ef787b15a41a58401ec
-EBUILD glib-networking-2.74.0.ebuild 2044 BLAKE2B 16e013bc36c763fbfbc4bb790514ac3f1e57963835b81af58e98dff045d6d2add728ccc424e1fa22649ea2f74151f17ff5b73175edfcd8c2294733c553e63114 SHA512 890b9843c3b39f6db2725358374ab6f5768f7e3e3e51104f3c5da532a47412ae0ae5fd32887b5df642a08e4026f4c7a0d6ff574b0acc6873a69e8cfd938149a6
+EBUILD glib-networking-2.74.0.ebuild 2111 BLAKE2B fb19e3208b9939fed7a89bc729b8552003d2734e22cd0135f35954c03f02bea86737dcf10de3f111ce0ca4d6eda5e228ff35f3a5da414b4bffd460121755eee8 SHA512 e5c30da45361b5415083ed9ff172514c0c4734cc8e3ac52e33e44a1b92581cb340eaaec1d192a519beed4732ad3836b931f5921d0543698ce9eb38e20da2bb5b
 MISC metadata.xml 590 BLAKE2B c74ff24be718581a894745c99a4a6ace914fd396958f988986ea55ca4c2e271e1a417a27c7b63a9e3496260985fde1796a0f2fd9c0b5ee212eb2c8d0d33076a2 SHA512 c83668d49e2353f4608e15c0a5ba3b3700a042e8aa94e4214e5246db6fe31f6d668e5d190c9c3032798ece3725508b7063461dee9bbf039c1cf54dc2230f4b6a
diff --git a/net-libs/glib-networking/files/glib-networking-2.74.0-gnutls-tls-1.3-test.patch b/net-libs/glib-networking/files/glib-networking-2.74.0-gnutls-tls-1.3-test.patch
new file mode 100644
index 000000000000..b93cb8ab9828
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.74.0-gnutls-tls-1.3-test.patch
@@ -0,0 +1,85 @@
+https://bugs.gentoo.org/877077
+https://gitlab.gnome.org/GNOME/glib-networking/-/issues/201
+https://gitlab.gnome.org/GNOME/glib-networking/-/commit/205b578c6de0a6b42dd24d97f08ab47d0347431a
+
+From 205b578c6de0a6b42dd24d97f08ab47d0347431a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 2 Nov 2022 13:26:53 +0100
+Subject: [PATCH] tests: skip tls-exporter test for TLS 1.2
+
+TLS exporter does not exist before TLS 1.3 so skip the tls-exporter test
+for TLS 1.2.
+
+Fixes https://gitlab.gnome.org/GNOME/glib-networking/-/issues/201
+
+Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/227>
+--- a/tls/tests/connection.c
++++ b/tls/tests/connection.c
+@@ -2988,6 +2988,8 @@ test_connection_binding_match_tls_exporter (TestConnection *test,
+   GByteArray *client_cb, *server_cb;
+   gchar *client_b64, *server_b64;
+   GError *error = NULL;
++  gboolean client_supports_tls_exporter;
++  gboolean server_supports_tls_exporter;
+ 
+   test->database = g_tls_file_database_new (tls_test_file_path ("ca-roots.pem"), &error);
+   g_assert_no_error (error);
+@@ -3016,27 +3018,38 @@ test_connection_binding_match_tls_exporter (TestConnection *test,
+   g_main_loop_run (test->loop);
+ 
+   /* Smoke test: ensure both sides support tls-exporter */
+-  g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
+-                                                    G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL));
+-  g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
+-                                                    G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL));
++  client_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
++                                                    G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL);
++  server_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
++                                                    G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL);
+ 
+-  /* Real test: retrieve bindings and compare */
+-  client_cb = g_byte_array_new ();
+-  server_cb = g_byte_array_new ();
+-  g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
+-                                                    G_TLS_CHANNEL_BINDING_TLS_EXPORTER, client_cb, NULL));
+-  g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
+-                                                    G_TLS_CHANNEL_BINDING_TLS_EXPORTER, server_cb, NULL));
++  g_assert_true (client_supports_tls_exporter == server_supports_tls_exporter);
+ 
+-  client_b64 = g_base64_encode (client_cb->data, client_cb->len);
+-  server_b64 = g_base64_encode (server_cb->data, server_cb->len);
+-  g_assert_cmpstr (client_b64, ==, server_b64);
++  if (client_supports_tls_exporter)
++    {
++      /* Real test: retrieve bindings and compare */
++      client_cb = g_byte_array_new ();
++      server_cb = g_byte_array_new ();
++      g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
++                                                        G_TLS_CHANNEL_BINDING_TLS_EXPORTER, client_cb, NULL));
++      g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
++                                                        G_TLS_CHANNEL_BINDING_TLS_EXPORTER, server_cb, NULL));
+ 
+-  g_free (client_b64);
+-  g_free (server_b64);
+-  g_byte_array_unref (client_cb);
+-  g_byte_array_unref (server_cb);
++      client_b64 = g_base64_encode (client_cb->data, client_cb->len);
++      server_b64 = g_base64_encode (server_cb->data, server_cb->len);
++      g_assert_cmpstr (client_b64, ==, server_b64);
++
++      g_free (client_b64);
++      g_free (server_b64);
++      g_byte_array_unref (client_cb);
++      g_byte_array_unref (server_cb);
++    }
++  else
++    {
++      g_assert_true (g_tls_connection_get_protocol_version (
++            G_TLS_CONNECTION (test->client_connection)) == G_TLS_PROTOCOL_VERSION_TLS_1_2);
++      g_test_skip ("tls-exporter is not supported before TLS 1.3");
++    }
+ 
+   /* drop the mic */
+   close_server_connection (test);
+-- 
+GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.74.0.ebuild b/net-libs/glib-networking/glib-networking-2.74.0.ebuild
index e985a534551d..df3083026204 100644
--- a/net-libs/glib-networking/glib-networking-2.74.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.74.0.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 	test? ( sys-apps/dbus )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.74.0-gnutls-tls-1.3-test.patch
+)
+
 src_prepare() {
 	default
 	xdg_environment_reset
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 35dabb73a8dd..81b52287e51b 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -4,6 +4,6 @@ DIST libtorrent-rasterbar-2.0.7.tar.gz 4453469 BLAKE2B b04884c55cb96031f6bfcef78
 DIST libtorrent-rasterbar-2.0.8.tar.gz 4562750 BLAKE2B 6ea5855bd2e2d2ef56191ffea7bfc08a88ef43ffee177c1de12dbb62dc9167789abc5fcf2608856d5b23d5dc461fdc8d3f30c01286ce2ba9a11cb4d24fed477c SHA512 697988feae149876745097bedfbfb4cceae00ffe1cd4ba2063dcb93a8eee9e99344f772b8364e3df1986a50105e386e56b75fe362707d58ba3272139d9beb98f
 EBUILD libtorrent-rasterbar-1.2.18.ebuild 1789 BLAKE2B c5f86fcc9780ccd6568c304ede8664546dd0f4b1227a97dfa5863b000e8ecd33683c14a8ff16733d597f90514217e0b4d4b502d6d54447d10dee09a14dd64b3f SHA512 865c486f5a6439444935e470a97b577708b82008c0955e872adbb768167369f86e108aa029e15cd7da8281ce4c4685073217966d8d4c0ae0f30415ed24162e28
 EBUILD libtorrent-rasterbar-2.0.6.ebuild 1838 BLAKE2B 2500b8573865a8d6870a14d558d88fba63ca5369f172fe2a3d8a66594532b810f734f98545b56cb5f2135acc7a02c9db1e3af3253cd6d67760d4638bd0a040b6 SHA512 6d2e38952ba689adceb87f65bb6dac469cf99d234d85d65d0d33f9fba4c27de2789bd44d487609b8f5cc610852ceb3ef7ab9850335452c0e816c86dbd8e76325
-EBUILD libtorrent-rasterbar-2.0.7.ebuild 1895 BLAKE2B c65c006418b22b17981dc98f39d211d4edf52974cc3de3c622bac8614e132b030a01c24a5455456ad179f40d1c3777effaab3601c06d8d1829d873e2b8082846 SHA512 6f01c8fd38576aa2b3d331224d967338566ea364a95008cac8fde5b855332cf6f7d676dbd80a68e162d75993c0ab6776661ab41f89d6f8c407e4e271abb8c2e4
+EBUILD libtorrent-rasterbar-2.0.7.ebuild 1893 BLAKE2B 7b3ab0d9628e06a8214e06c24f97f0a3e22287add500f36816b8e7228d2279d14cf40fb4abbfbd4eaa2f1cbdf621dd52072c29a5c642832cca098b2d9aae3549 SHA512 151d1ce34d1f2d9918ec5c47fd504c9f1821567cc14aed163d72cd84444191d1f33eee6ce1238b6476be12e0d992e9ffb537bb0f337d61f226e2cdd29c2eecbb
 EBUILD libtorrent-rasterbar-2.0.8.ebuild 1895 BLAKE2B c65c006418b22b17981dc98f39d211d4edf52974cc3de3c622bac8614e132b030a01c24a5455456ad179f40d1c3777effaab3601c06d8d1829d873e2b8082846 SHA512 6f01c8fd38576aa2b3d331224d967338566ea364a95008cac8fde5b855332cf6f7d676dbd80a68e162d75993c0ab6776661ab41f89d6f8c407e4e271abb8c2e4
 MISC metadata.xml 638 BLAKE2B e4ea9381097b54924059f7682aead071561015a3842a6089927840ce24fdac16101cce2c57e01431800c1e471c34117038d10a8b82d70aaed555573a9d4d03d6 SHA512 49f5bd5348f054bec0a2646f96803ab6d2dcf6a0b0f32c9ccfb05a7055012a40703b1e9ddf912827c9197ab1a740fd41b98cd7e993f5f30633686e5b102bdec2
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild
index 576d7a257f62..1ceb96d28b7b 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="+dht debug gnutls python ssl test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8a87c5701bec..2e90dd0d6e19 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 2db12581935d..54bf63071249 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -5,7 +5,7 @@ AUX hylafaxplus-init-r1 3220 BLAKE2B d1cbf8ec446bffdfed9f78d2766b95a0bf6d645c2f3
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
 DIST hylafax-7.0.6.tar.gz 1418749 BLAKE2B 83fff43dbc5c51f542aa847f61ae1617514a4260695d5c79a036416578ac632a778d0b5263a80fa7ccea9e9923a783759295a39199bdd32a2cb0ecac47ac91b4 SHA512 d1f69e13017f5d013ff39cf050c3a7ac6cef19a9ee5910ebe774a7ae06d7d22fd21e31de9734847764caea995539f578c3c458ecec7b9523b5823a841337d9cb
-EBUILD hylafaxplus-7.0.3-r5.ebuild 4169 BLAKE2B f30fbdcc4af40423bbad7a4be0acc27a19f6f09f72fbff6f0c0bc6d0a4b3565a11bb279c93d143d3b3fa9b1cab8ce5e60bd232c8edcd758ce0000713fd7cc978 SHA512 b5336c1cdd451bc9fb097745cfaa9b2471ce10eec4da4ffe8eabd86b7591c9d84c193ebb6b1d860b6c886c665088d55869a1d83198ec4a44e647d2c8ba11c795
-EBUILD hylafaxplus-7.0.3-r6.ebuild 4021 BLAKE2B 5b564d7ebd89d4fbea6bd5a637eb1ca77177c42906a564ecfa05f1af30d62bf8c1992c8377f0d1d30a43128632f53e188251fa8c3ba1ec7bb413c77ecab8610f SHA512 19f5c7cb8affc35aed1200578cbf04f1589085ff372ea296893acb565f70595334de44823a50976fe33724f9a8082a459251902d355cb4610ccfda551057398d
-EBUILD hylafaxplus-7.0.6-r1.ebuild 4047 BLAKE2B 69fc80838b97f089fbc62c29c87bbeccf8a00760e4eddeafd35813b5817b8e0c9fbbcdf3c04b9bac7d9073bbe0b31e0def5a909547efe9c94b19e63c5c5897b0 SHA512 c7a37697987fa35d8cdc0be04934378e8bb2370ba67ea71e1916060f4c686b5513c7ddc539ed6b375c2f057927788a3f3facd009ba65441dc986eb21356237b9
+EBUILD hylafaxplus-7.0.3-r5.ebuild 4178 BLAKE2B 88f019915b77b4353544425e9fa4b249c522956f29c6d25809264c4f4882b995787d73bbbf21a4b1fb3a2d018d740cd489227e86e1021eb9054692e667e84276 SHA512 a4cc4d9ab8208426e48a718c3589ea718ca7b84cd825d4d94a95585ff6205819d20e7aac5c523e02617b9d1de9abf3c2f75e6a19c4134e7ddd19c7b9864772e2
+EBUILD hylafaxplus-7.0.3-r6.ebuild 4030 BLAKE2B 00b408d98dbd21f7b164f5aa06fcdaf64858ddfe4693f88e3ee0082536dcc2ef20dfb615152de1279473b20f372218f0e8801bb2fcedee475989c225868d727d SHA512 1461b0a27210c046da978dc1804d978969e7647e8c8713c707ad9a55f0dcc6a38b34053b09a30f0a3b01473e164bd00ffbd5cdc1d1dd327c3025facc2a66af2f
+EBUILD hylafaxplus-7.0.6-r1.ebuild 4056 BLAKE2B da6759284df5f71ad9e6d5510bf3ec219514ce262c8fcc921186f4e1ba65028b7054b76b0dbcad306834fab523f9195bbffd0575aa5638fbd891b4d8f8ba8d48 SHA512 82740233e327a002a9ac4c2ab9697149863522f91b7bc9e0f7d021e5f30b2430a773e963c029375a3c9bdc8caa6034c343dc28be1d86f7ab08b5d7663598397c
 MISC metadata.xml 497 BLAKE2B b3f400cee9f701675dfc8b5bd0a23d497b5f4d2e7211ba421b442782e90a1b60017d33ba482f614d0017f5abf2fa72e886ab445353eec72a9217c45aa23565ae SHA512 4b0b543bf8816e2ffff95334bf0cb64e022cc507f5ccc6b766dd183d272303d31cb43b4b6c4352991b1ceba8aaefc76276e64c5adda3caae9bff5872189deef3
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
index bf2154198c0c..b5e33be8f054 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	media-libs/tiff:0[jbig?]
 	!net-dialup/mgetty[fax]
 	>=sys-libs/zlib-1.1.4
-	virtual/awk
+	app-alternatives/awk
 	virtual/jpeg:0
 	virtual/mta
 	jbig? ( media-libs/jbigkit )
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
index 16fda5b580e5..a3b81cb42512 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	media-libs/tiff[jbig?]
 	media-libs/libjpeg-turbo:=
 	>=sys-libs/zlib-1.1.4
-	virtual/awk
+	app-alternatives/awk
 	virtual/libcrypt:=
 	virtual/mta
 	jbig? ( media-libs/jbigkit )
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
index f934beebed22..3a82ac03b413 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	media-libs/tiff[jbig?]
 	media-libs/libjpeg-turbo:=
 	>=sys-libs/zlib-1.1.4
-	virtual/awk
+	app-alternatives/awk
 	virtual/libcrypt:=
 	virtual/mta
 	jbig? ( media-libs/jbigkit )
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 0a54640e306f..5d631f6f3dca 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST nextcloud-client-3.5.4.tar.gz 15436558 BLAKE2B e95aac753e4fcc70093ba497022572d4ee2988ed943e09247a0ddec3b039d658e3f1f498c24f5b5a92c15bd50b14c7e5c71f420c35e8de4894c2f65d06563766 SHA512 7b8afe19acad7f7ca96184b0f925e0eb324605a11bc468ef5662e5a879cada16483b9185e12336471ca2a9debf2e00671d8245bdbae2f7be01af756b57225bae
 DIST nextcloud-client-3.6.1.tar.gz 15346135 BLAKE2B 116a2632ad1c653bb1dbf184c6156ebc469ed8c0bfe209282e8239d4113c46b761f4049daa6833d23d5179c0b2a3f9dd94f506e63c401775da419c92104a069f SHA512 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583
 DIST nextcloud-client-3.6.2.tar.gz 15406717 BLAKE2B 1408745e8adfd76507ffba63a20abfc34db155ef3d4f8cff1eb3736c8d1ede4cebc536cecf8f5a843ff0b22b1cf46ffd5e6cdf9c87b2e9960728e030f2f7ae66 SHA512 1baae103c08a981e86aee74550d31a195f639fef830d0a78213f7890b820ddf2cd39fa742b99c9222930a4ef9587acc820678c56527e98ca482689b3bffd14ff
-EBUILD nextcloud-client-3.5.4.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
 EBUILD nextcloud-client-3.6.1.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
 EBUILD nextcloud-client-3.6.2-r1.ebuild 2240 BLAKE2B 2ec5ef1aca91f808bcf621acc1f9685cfd3d78af53de542a13f272ce472fae8ac2e3862af07cd6a02a9a1e3be03d6edbf24ad72f9279b09b7820593863cad40f SHA512 029f0c30ff14659a2a3a41f7555936b97788c7b48f25e6e8d1f7e9049308a813528b01ab045b470082b5592f7ae691bcf9728ea720530f86793b4b5018a5d406
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
deleted file mode 100644
index d44483e6593b..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	|| ( gnome-base/librsvg media-gfx/inkscape )
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-qt/qttest:5
-		dev-util/cmocka
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_prepare() {
-	# We do not package libcloudproviders
-	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
-
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/shmux/Manifest b/net-misc/shmux/Manifest
index f6d7b1a68dc3..c643fc70ef09 100644
--- a/net-misc/shmux/Manifest
+++ b/net-misc/shmux/Manifest
@@ -1,4 +1,4 @@
 AUX shmux-1.0.3-tinfo.patch 532 BLAKE2B 47e60a565b660417527e198b7eaabccb4e220d57c06005622e094a0afa3b69e9b1d8ff0a7413e74844974de4d6cb5561d472c7f63b12838caf7b1ed4897dcb61 SHA512 5d3de39d37375c90e699dd2bef9cc02f182f01259e351909107cb033ddbba2a238d783c2b2f3b523288471a92f3a6e69b128e3dc44a1f4bfd5dfa9f52cba3613
 DIST shmux-1.0.3.tgz 116613 BLAKE2B 3d46edf3633e7d91a7fdb65e578c4541b2de35c885f1f449bdf347d3e3107ae014e6771e54b11f996a2783b303950f6ca66b46c3ef98586b932dc2fe4cb2f9ed SHA512 fb1dbb9701913fb97fb82914b9ae277703aec48cafdf74bcaa4a194ba242b62aff34e004507d6931475f320f89d62ed465360c0bc5cf2ff45abe7482b3127197
-EBUILD shmux-1.0.3.ebuild 680 BLAKE2B 5f7844ab8d56be35fa27bf26f6deff26a15920c475b5a1b46b31e39351591f3d4516f1a8cd87935267ae82b24e538673534fb12de095e16f1e80b7cbc2cd40d2 SHA512 5fd616cc50cb07293c6f3aa348e2b7bfba22356120f41dcc8c72cff2df9f801012150242a15099668a2c9448992ed6c32cb2e849933f0b31f285e75675d9c099
+EBUILD shmux-1.0.3.ebuild 689 BLAKE2B 6ca177c785f678f80458f376234491c40c03f9a3d25b995bfa5e91ad4821560947cb8e5b3f4a0d7ad1ac54aa2916fca9eb523c0619cebaef2874246357b11dc2 SHA512 2e619f43753d700992a17f55c960e9a6608a090fc18d0d1b02cd14807f6de1bfdb507d1235d2fd0faab26580e853c5a5d01b9ee280ef949a44e159e07e034f15
 MISC metadata.xml 747 BLAKE2B 12d77e1acf5d36a3a8b88d4f53bd51ce77bcd2ddea0a1ac49a3c93884b9bcbbcc5a62fda3b09fafcacb630a61554394172cf91bd35deee659722bbf70dc967ce SHA512 9b69246f06e1b66cdada8cb2b6f20be6a4b7312b7f492be103e967ee9df5fe711e6bfd2255b5b9fc8f38be93da4f258484305ff854a803932a044717ba9e3916
diff --git a/net-misc/shmux/shmux-1.0.3.ebuild b/net-misc/shmux/shmux-1.0.3.ebuild
index 226598b33b39..e1d72b0d9f1b 100644
--- a/net-misc/shmux/shmux-1.0.3.ebuild
+++ b/net-misc/shmux/shmux-1.0.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	virtual/awk"
+	app-alternatives/awk"
 
 PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
 
diff --git a/net-misc/tiers/Manifest b/net-misc/tiers/Manifest
index 13ffdf5096af..16787ef1a62f 100644
--- a/net-misc/tiers/Manifest
+++ b/net-misc/tiers/Manifest
@@ -2,5 +2,5 @@ AUX tiers-1.1-gcc43.patch 3170 BLAKE2B 58deb7b271f90d681a4560af610e5109bd2464628
 AUX tiers1.1-gccfixes.patch 5840 BLAKE2B 432bf2a8dd67b0a14af699e8a505e3dff93f439aeef31a23295a2dbf69abc6cdd6a411be7cd457cf611e0ed089b96e3f298c781b188be5a5adb33a0b2278159b SHA512 81913aa857d3251c358e91aa1644324399e60cf1bf7811ccc96d482ee4d56c5ba38138b882380f39d842e78f44d9d985465221b98283d2654bb8f4898552775e
 DIST tiers1.1.tar.gz 392532 BLAKE2B 0d729b48bb24feeb98b5584e15bf5ce572bc1c959830de97f8f601ff0cc38bdb3d39152e9644a5437b2cf4d29a5c43e8f2729666c8568227f2a3e5077919048c SHA512 b72a98aeeb3e1799536e1424e8f60bffcef59c61cc709232a670174c80d23fb4c3b60249c7ff2a33442b62b81a493b7ecef4bf0e950147fa8fe81bb9eabb9a08
 DIST tiers2ns-lan.awk 3258 BLAKE2B 5a6838cc332cdd617f17d01ae56494d12f43344cbb36c5e39766c4c0481a300607a7bab8922918de22d72661e92d51bca0645ea436c3b95958e448d1b42a6f25 SHA512 562204765e0e7c973e6d88c494e5aba9cd47d79c68309359cd232c34be6175f727411a64a6033a246a042987f1ad423008857eaf25c6254bd006c4a3ff4d083e
-EBUILD tiers-1.1.ebuild 1280 BLAKE2B 7a4f0477a24980f65664fb63c693dc3f012b7e467aa373d93230d8cf731474dc3044d38eed10d097fa0f371cd1044bb34fe748b63d4a068a217a01d7e9418b8b SHA512 405adf240436b9a429bcede1aaf7cad6a98be46f486cade3dafd7f1d76389d9cfa068f233371eb4b952d15b54b2f2f5b8585503d1ab9d75fc7334799d676dc0c
+EBUILD tiers-1.1.ebuild 1289 BLAKE2B c3e132ba29f279003b1d9279d3636fe2779bca9a40f4e4e990afde21c82a0db405dbae5838a94141351de569aaffc55d948a662287791da9773827f296281dde SHA512 a6a87803d9c792bb6f7fa90f5ec7be818e9a1bb3b716d5d9e544204c39404f9b5a4071469791400bb770319b017e98c7110e45626a9b0f8204ce0823deb4b9e5
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/tiers/tiers-1.1.ebuild b/net-misc/tiers/tiers-1.1.ebuild
index 5d489c5a5959..841db16c476f 100644
--- a/net-misc/tiers/tiers-1.1.ebuild
+++ b/net-misc/tiers/tiers-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="sci-visualization/gnuplot
-	virtual/awk"
+	app-alternatives/awk"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 99103cfa9ccb..f2bbbf665c69 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,3 @@
-DIST yt-dlp-2022.10.4.tar.gz 2427017 BLAKE2B b3dfde252217ef7ed9f5b99351e956a1f30bfe7bf545e28bb262db90dc9b9cb5e44af7259a815f84cd4e821c8ae93f6372e9a5108483208cd8dec403cf194790 SHA512 286e219057505e4de2bb8af6dc334b43b4e46e7b998d98437f78e9cfa82294e2ac17432c22f741ad101dfe05fa0d2dc0111904be51f32ab3a002bda7b17a86b7
 DIST yt-dlp-2022.11.11.tar.gz 2470530 BLAKE2B 0d453d08678cccffccd7e4639fd66d08bead30d0cfae6f5a09d46d2a79a03a24b84b7c27d28a1f4b3bb03fdb96b8f9734e7f9910d02b9cd4a04bacdc3ff2c705 SHA512 be29154746f4c499eb25489be45ea759bf83f7aeb086a2a0e90a2bee6936c0d9362b1cd7af5eebed4f01f84a3542a9d5fa5746b647c349cad2e26b45cf4a861b
-EBUILD yt-dlp-2022.10.4.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 EBUILD yt-dlp-2022.11.11.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild b/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild
deleted file mode 100644
index 705a62db9da4..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit bash-completion-r1 distutils-r1 optfeature wrapper
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# adjust requires for pycryptodome and optional dependencies (bug #828466)
-	sed -ri requirements.txt \
-		-e "s/^(pycryptodome)x/\1/" \
-		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
-}
-
-python_test() {
-	epytest -m 'not download'
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-
-	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
-}
-
-pkg_postinst() {
-	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
-	has_version media-video/atomicparsley || # allow fallback but don't advertise
-		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
-		elog 'as "youtube-dl". This is strictly for compatibility and it is'
-		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
-	fi
-}
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 000f26bf620d..2c29a019a691 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,3 +1,3 @@
 DIST ytfzf-2.5.2.tar.gz 3263326 BLAKE2B aa0e6b01ba90217df1e488cfbe74f44baadee0fa5f6e29f45ef79af9a0d9587ef394b345ddf6b8a86282f57f097c6728adccba2e444eda38d1746ae95438900f SHA512 aa87d2f3c50bfed3c49d363b23bdf17c6c5307116648f3042148d828d204cc9f1ce61888a82fade26e46dc46991cb2c8f559f5f9aa671d8bcf425d343fdff389
-EBUILD ytfzf-2.5.2.ebuild 1419 BLAKE2B 116e90deb0f8c9128b741e53e4449b8a45390e5a39ac05ebdd7c537a1e62afee1d9fb97422da569507af49217c1609fcf51db0d561d51d86821e2f6d6705b39b SHA512 c2a25a86d74ff9c8885c9595116219020a3c27fb393c33a465bad34e74f69aa3257cd031f8e87e40547eda440eef133041c8e1c83e64bf61b7dc0da8828b2fd3
+EBUILD ytfzf-2.5.2.ebuild 1428 BLAKE2B e2eddcee03517c5a01ceac852c4e4945f3da15d3fcb96f9fa028dafd4a0d52884e5b19e1ed0660ad49d4155b4171b88f731e16599ef26ff1f4c582ed77bb7992 SHA512 07d64edc61bb5ecd11ea4f88622da466999f353fb0b25cd86a3c9cd386739ec61e9f641ad082cb8113f4fd555a8e7d00347516f5153925173027ca6821ccff3a
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.5.2.ebuild b/net-misc/ytfzf/ytfzf-2.5.2.ebuild
index 05675648180c..5be910b165b7 100644
--- a/net-misc/ytfzf/ytfzf-2.5.2.ebuild
+++ b/net-misc/ytfzf/ytfzf-2.5.2.ebuild
@@ -17,7 +17,7 @@ IUSE="X minimal"
 RDEPEND="
 	app-misc/jq
 	net-misc/curl[ssl]
-	virtual/awk
+	app-alternatives/awk
 	!minimal? (
 		X? ( media-gfx/ueberzug )
 		app-shells/fzf
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 376aeef775fb..84f7813bb95a 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index b2535f6c37e8..3d8de57c5aed 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -262,8 +262,8 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wyz-0.2.0.crate 12926 BLAKE2B dd4de5ec403e57d8362a15efea78e5217164dfd6b22c16458ffff8722e8cd3f28b567a2b9b1bc2774d6c8ba153d37e350929e98b38c82d022f7890052da30e37 SHA512 3a16c3e81d3595ddf1e7816e698eb4d07c7455dec579fd5e97b5d8b77e626cda52f3cdaee71e234e5e500a7ac58b9d1d5f12b17264686f3f225d5e5b0d315de7
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
 DIST xdg-2.4.1.crate 14034 BLAKE2B 7fd98ef4e1534d13da125a78cb7425318f1f2f0c7e06a8c8045b2145c1696bf86daf820577aa9757af0deb11951315efd382091b1c73dd3853841388927c2b01 SHA512 23e69abbe79a0977900af37feb9f367a82d0ba4e69fc9421e356a5957920e316379355b1c6eeda1235feb3d028f738c41f520d28665f919e775b20240219e07e
-EBUILD newsboat-2.21-r1.ebuild 2743 BLAKE2B ab40560ff4959acc9d238fbba3d1958755ad93d477b6862f558bf6f28cd2e7ee1f01a3cd98012f2a69692a916b6be422792a7f6262d6c966bf92c75b0226a0c8 SHA512 5c5cf8fabe819e3845a6083ea19db350ab62bc6c4ef92e007bccceeb70de76df3e02bb34578a878b70b25daed330b44e976a2261eb7854cfe24b5dadb50ccbb0
-EBUILD newsboat-2.23-r1.ebuild 3183 BLAKE2B f316bf9971d77f716ef11155e040800d04563627e3e0f41b3f85a8950d00e71ad265d17e2acbb073f79e5f127c6502e1f7eb7d2b08753fdbf4bdaa9db97e9e5f SHA512 3d211311802d85ef12f22d4a2e871d8571110c1478eefb8f670690d0a8378dc2eb56de1c7477198097ef47355436f31d174587eda5a6c0e4ab5056790c803962
-EBUILD newsboat-2.28.ebuild 3142 BLAKE2B f1f06b0c2badaef71537aa6aa312bc184b66dc97129f832675b9477974b8a58abee81c345a718c806590038576dde3b4e7fe02e57d5ad6d0664c602d7cd16dc1 SHA512 d2ac8be3b09ef93e208857ec54964c6bb3ad4e163175a1860520e5271b0ccf6487175377abc7a50c709c9b379c1bf4265329545ebdad6aaa19a6a15d3efca180
-EBUILD newsboat-2.29.ebuild 3464 BLAKE2B fe6c5bbc1cbe8afdc9576fe66e302e02ab4075821b9c97c7069642912069bb5f109e8b5c380c016196b75490cb3d450c6e60d9430efc1949a89727924364af57 SHA512 6c9d4a231c59bf0b2e0fedb661d54716ee938732d9c83065ba4de017ea9249219355538234883c222f38f10249693ee7870213539050360b64afd4ad21bbb13d
+EBUILD newsboat-2.21-r1.ebuild 2752 BLAKE2B 43e535d445c7cf3d18fc95668e9e9594eca92b78321ee114ff44de9cd395b50e7c1766a17e25fe15e3941a9745ebe6b2ee5813dc9acce5ca72e16211e1b3f678 SHA512 c4b63190d34b92df5e81bbdda0b86d54d012f2d542b2a7b8bc4b9e113ea93cfa912abb1ca873f6e383ef6accf5705259c1d180a2ede12439d75c130ed40f9c9a
+EBUILD newsboat-2.23-r1.ebuild 3192 BLAKE2B c4d25df85e4b53f29438b7886006109d965c61bac0ccc6ea50b8cabebd97de337ba232ba94486d906a8d7f1d404f6dce7b859ea0a5583d2fd537891d5cc6617d SHA512 35c68505f16b7053d6d22b7c7bc0eb312dd7318ba258814d6d32871d7fb5b374c8010202f3b1d3951ab8ecbd804d416ad119e039fa6b8723cb96ca855b7be9e4
+EBUILD newsboat-2.28.ebuild 3151 BLAKE2B f4efbc5669324235acddc687c2a67c312e785f504c06d5bb85e56092da6be9e10ba5354bee7a3f01fb10a3e1f13b361b33e5f1a3874cd6d96d2cb08eead655ae SHA512 ad611e4c042b64edf54ecaaffde9642304828285ca3a909eabdc50c3e8e41a33f4a384230c5bba3532c2fd224be6bdbe5449c951c5b6fadfede618b16f972f8d
+EBUILD newsboat-2.29.ebuild 3473 BLAKE2B 1da763c4ab4e0700d05263acc9f1a2c7473d47cb0d8a2638129e02802ca8bd5519e344531e93412d40253f5e91f601a5466e2135b6124d0e2706b3301ddedd2d SHA512 0d8dd3213332404f02bc01f518f74570394e3fb5f6cff2f892d65fd2ab97f9c67132944a0cdd850ccaefa16278370a63f785151ef2870d1d2308f3b327338946
 MISC metadata.xml 216 BLAKE2B c9714f74012e29d5a3f7770a5b623ae993ec2a6a686c508a404848daf864860bb186d7560069566b02c347759adb0d34f7bf0fcc7379f98ccb6d74a414020957 SHA512 7aef523454f1b5c3110335a0ad5df861460f0eaa8df7601c6c511be4fc505eaf84480526789bc9dc82cdceb165bde3a8e7d49c2861d928df088d08007fd3306e
diff --git a/net-news/newsboat/newsboat-2.21-r1.ebuild b/net-news/newsboat/newsboat-2.21-r1.ebuild
index 397b0a78a39f..f7206ab358c4 100644
--- a/net-news/newsboat/newsboat-2.21-r1.ebuild
+++ b/net-news/newsboat/newsboat-2.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.3.1
@@ -113,7 +113,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	dev-ruby/asciidoctor
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	>=virtual/rust-1.42.0
 "
diff --git a/net-news/newsboat/newsboat-2.23-r1.ebuild b/net-news/newsboat/newsboat-2.23-r1.ebuild
index 9f76edd6c281..6806f84a7f99 100644
--- a/net-news/newsboat/newsboat-2.23-r1.ebuild
+++ b/net-news/newsboat/newsboat-2.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.3.1
@@ -139,7 +139,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	>=dev-ruby/asciidoctor-1.5.3
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	>=virtual/rust-1.46.0
 "
diff --git a/net-news/newsboat/newsboat-2.28.ebuild b/net-news/newsboat/newsboat-2.28.ebuild
index 1ed223043101..fe22560b8090 100644
--- a/net-news/newsboat/newsboat-2.28.ebuild
+++ b/net-news/newsboat/newsboat-2.28.ebuild
@@ -128,7 +128,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	>=dev-ruby/asciidoctor-1.5.3
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	>=virtual/rust-1.46.0
 "
diff --git a/net-news/newsboat/newsboat-2.29.ebuild b/net-news/newsboat/newsboat-2.29.ebuild
index 650a34326f55..833e5a160c7e 100644
--- a/net-news/newsboat/newsboat-2.29.ebuild
+++ b/net-news/newsboat/newsboat-2.29.ebuild
@@ -139,7 +139,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	>=dev-ruby/asciidoctor-1.5.3
-	virtual/awk
+	app-alternatives/awk
 	virtual/pkgconfig
 	>=virtual/rust-1.46.0
 "
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index c272f778be94..4c3edefaf95d 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/apsfilter/Manifest b/net-print/apsfilter/Manifest
index bc41603b8059..bd2c82610885 100644
--- a/net-print/apsfilter/Manifest
+++ b/net-print/apsfilter/Manifest
@@ -1,3 +1,3 @@
 DIST apsfilter-7.2.8.tar.bz2 310587 BLAKE2B aae44a7e79157d3ddf9ce56fe51ae90106eb952d536658efe0f19dfcbe5f0d5c7dd078e3bb5044433e250df6b9289a08a466d6e9fc77c91d540daf07a70bf197 SHA512 ca07e7eb620a95b08fb912e899520d5ff85613eb3d1f712e1d38a66cf5b84516dbb35e3e40ef75ac10d1e717cfc2f49930a0f0873fee451d495c8ae572072012
-EBUILD apsfilter-7.2.8-r1.ebuild 1211 BLAKE2B 54ca8fdeaf8438db0db91f30ba2fd390c23af65594199b8b8ded028c1ae9545109f220bfebd5e8bb65e1d591bdef7eb91bc7810e0929ded26df80e9e053882fd SHA512 e88cb423635985cd4e801a909eeb37a59f6256bdf485adddbe2b9d5efd6a010bbbd099f66fd74ee3275d1e9677696ba60514a052be92b2e99932743766a28031
+EBUILD apsfilter-7.2.8-r1.ebuild 1220 BLAKE2B 73a3e9eeae2aa1a85b75972b791719e425ad8c51648ff9bde7c257dc5150103c5e7da615fe00d2d543d7ca4d2e4a2093d482dc61c61bc90a6c3dff20d63c9839 SHA512 411ba4d7438a5b3a2629bd51e2b705ff01ec27d9b2e4fb7fab1469a575c5fc616792b5374f1f685619e12e0d0806e53f7286231bdc8489ed209ed222510976f3
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
index 4f7f15844cab..52cac18cbc7e 100644
--- a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ RDEPEND="
 	>=app-text/psutils-1.17
 	>=app-text/a2ps-4.13b-r4
 	net-print/cups
-	virtual/awk
+	app-alternatives/awk
 	virtual/imagemagick-tools
 	virtual/mta"
 DEPEND="${RDEPEND}"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 87c0fc092bbf..9c43fc73917b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 6e5b80dfe50c..9c619d92ff72 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -23,6 +23,7 @@ dev-lang/rust llvm_targets_X86
 app-emulation/wine-vanilla -abi_x86_64
 app-emulation/wine-staging -abi_x86_64
 app-emulation/wine-proton -abi_x86_64
+app-emulation/wine-gecko -abi_x86_64
 virtual/wine -abi_x86_64
 
 # Michał Górny <mgorny@gentoo.org> (2017-04-08)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index bb1c0370ebfe..7411beaa8416 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -85,7 +85,7 @@ net-misc/chrony html
 
 # Adam Feldman <NP-Hardass@gentoo.org> (2017-09-27)
 # patchset variants are not stable
-virtual/wine proton staging
+virtual/wine staging
 
 # Tim Harder <radhermit@gentoo.org> (2017-09-11)
 # Pulls in dev-ruby/asciidoctor which has too large of a ruby testing
diff --git a/profiles/arch/loong/package.mask b/profiles/arch/loong/package.mask
index 4f35eb30d9c8..7084783a52c6 100644
--- a/profiles/arch/loong/package.mask
+++ b/profiles/arch/loong/package.mask
@@ -1,7 +1,2 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-01)
-# Not buildable with latest gcc-13 snapshot, we're the only arch on gcc-13
-# right now. Bug 883719
-=sys-libs/timezone-data-2022g
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 549cbba17944..c8a2d1574ca6 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -7,6 +7,7 @@ app-emacs/sly
 dev-lisp/alexandria
 dev-ros/roslisp
 x11-wm/stumpwm
+x11-wm/stumpwm-contrib
 
 # Andrey Grozin <grozin@gentoo.org> (2022-12-01)
 # The upstream supports only glibc Linux systems
diff --git a/profiles/updates/4Q-2022 b/profiles/updates/4Q-2022
index 5bb9711a2443..656cb7d37e43 100644
--- a/profiles/updates/4Q-2022
+++ b/profiles/updates/4Q-2022
@@ -10,3 +10,4 @@ move dev-python/retworkx dev-python/rustworkx
 move dev-python/libsass dev-python/libsass-python
 move dev-lang/open-cobol dev-lang/gnucobol
 move dev-python/miniupnpc dev-python/python-miniupnpc
+move virtual/awk app-alternatives/awk
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 15a2dbaa86c1..2c842d85f36d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -759,14 +759,12 @@ app-i18n/ibus:gtk2 - Enable the GTK-2 input method module
 app-i18n/ibus:gtk3 - Enable the GTK-3 input method module
 app-i18n/ibus:gtk4 - Enable the GTK-4 input method module
 app-i18n/ibus:unicode - Enable support for Unicode choice
-app-i18n/ibus-chewing:gconf - Enable support for gnome-base/gconf
 app-i18n/ibus-handwrite:zinnia - Enable support for app-i18n/zinnia
 app-i18n/ibus-libpinyin:boost - Compile against dev-libs/boost libraries
 app-i18n/ibus-libpinyin:opencc - Enable support for app-i18n/opencc
 app-i18n/ibus-pinyin:boost - Enable support for dev-libs/boost
 app-i18n/ibus-sunpinyin:gui - Install graphical user interface tool (ibus-setup-sunpinyin)
 app-i18n/im-chooser:xfce - Enable support for XFCE panel
-app-i18n/imsettings:gconf - Enable support for gnome-base/gconf
 app-i18n/imsettings:xfconf - Enable support for xfce-base/xfconf
 app-i18n/librime:debug - Enable debugging (including logging of input of RIME input methods)
 app-i18n/mozc:fcitx4 - Enable support for app-i18n/fcitx 4
@@ -8999,7 +8997,6 @@ x11-terms/aterm:xgetdefault - Enable resources via X instead of aterm small vers
 x11-terms/gnome-terminal:gnome-shell - Integrate with gnome-base/gnome-shell search
 x11-terms/gnome-terminal:nautilus - Build gnome-base/nautilus extension
 x11-terms/guake:utempter - Include utmp management support via sys-libs/libutempter
-x11-terms/kitty:transfer - Enable transfer kitten using net-libs/librsync
 x11-terms/mlterm:brltty - Enable support for app-accessibility/brltty
 x11-terms/mlterm:fcitx - Enable support for app-i18n/fcitx
 x11-terms/mlterm:harfbuzz - Enable support for OpenType Layout (media-libs/harfbuzz)
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index ca0757274086..6e0acf9c3624 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index c1bb022ad371..d174b1acf53b 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,10 @@
+AUX 43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch 2232 BLAKE2B 3bc646e4e8403dc38d942c0f589ff9db44240216e420a2d0b184311e10d7286d1c4ccb042d8ab0482a6d59b75bd1e9dc5c66a92ee42250d699f01f6880a8087f SHA512 0f6d921f6fbd82e4a2a8f8072180cf6136d64530f66af7d85b9b5d7a8033469bb608d7982849d27e5574b41234ac9c815577a735e40a05e8e64fc9a797a4890d
 DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
 DIST gnome-maps-43.0.tar.xz 2330656 BLAKE2B 117a3558e29abe6a1bd29cf347b20a9e33f2b1cabd5310f28e387685e0bde96d1ce371c88616914f298e25ffbbc72b4d29e4fa721994b184e88289c6d0236ea0 SHA512 70966d6a092a67eb6a3a62627666376a71767d9296e00489a5aff281793425d9edd5e978deaf47bbd7d6b0ce37b53cf724b73487e101554c7984456661e193fc
 DIST gnome-maps-43.1.tar.xz 2329212 BLAKE2B 6597597dcf5b056a33670f502c3ab0b9658b6cac5e72896f5363034649ddf01fe9ae2a275dbd1a298b0dd1850b8a9c625fff02a15c998fd0e296f794aedf7b0e SHA512 f4eafdf6b81a23567d526ae51842e391c7b3e585967abb2b6a38ab1a361de77a69ebbf01939f3a328990fe3f623f4bd40a720f776c27af07acb27b2222b75a12
+DIST gnome-maps-43.2.tar.xz 2334324 BLAKE2B a8daacd9874e9b8d44ae6107b7cc1a0a4a168d579b4101e4da408c08e2509f7da782605b27d089331d3628584783f3fd1d43c26d3bc7b09325810dec7b9b1648 SHA512 dfd7eba5fc0cc38152753d2d3b5ba13cdc614b96fe3f8e6629dc6c56515108fc6f2469f32629ffaba97667b15da294d874653d9133dd13592738379d5fb91c78
 EBUILD gnome-maps-42.3-r3.ebuild 1571 BLAKE2B d89dd8060f01ab68fc9c33d84d1a4c320389f8a06621379bbc41dfcfbdfaedd018fbcd18c8de9204e08a8a732e5913f236ecce1050923fffca5bc69b1364983e SHA512 f2d232245df8b3cd350c448a2312e17eda7a509652124cf6b6aed4ebf9b4834a2478bfdcfc200060e5b0370e89b0ac7fb9c8cbf42b9688007937c65d56f59e5f
 EBUILD gnome-maps-43.0.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
 EBUILD gnome-maps-43.1.ebuild 1214 BLAKE2B dae6bf86bb7024b419cc575409378b28ef9b445f70237413e679d7ca0ef69a9e526590be6df9225f5720bcc69bf2da95f3b19401b365c9d047459eaca4acbe33 SHA512 d5cfd0d485e26d399ee291e5e9cdf8214bfd396268631e26c367be3ad5a052aba6bc7c36e725054e78c0bcd653467ea4b8db2d8fb54466712dce273f690d6205
+EBUILD gnome-maps-43.2.ebuild 1306 BLAKE2B c31d9b4ae6a46aab702ae772249e50f6974529b8d5917686bdc0c9d1af53a67f5842c29f0d4d61ffe339fdeec5129100daed1ad5eadada8e7447d019c3540a98 SHA512 19d23d4e470fe184b725df7ce0858c575948ed863d827bda6bceff5d1e9a767030ac36677624a54633f6a9bf29a70ed5bbbac26b9058f0f425f96cb846ce3a57
 MISC metadata.xml 351 BLAKE2B 720552be0df0a6687b1c65211e4532bcdf2f76a1dbc2cfedf801876006bdef781b6e7a3caab9f61a6d5a17fcb73caaa194bb54d356fd903c6ba3d8849c1e8ae5 SHA512 cb4a26c3d4dbcdc7e6ba7cd7136cddf8633002eab39741c4fe5d033bd3154d17d002d475c8f5370aae652ba1b34f952ce1401ea8d71d22ad4ea4aae364fe9645
diff --git a/sci-geosciences/gnome-maps/files/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch b/sci-geosciences/gnome-maps/files/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch
new file mode 100644
index 000000000000..95891953a30c
--- /dev/null
+++ b/sci-geosciences/gnome-maps/files/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch
@@ -0,0 +1,58 @@
+From bec3d2f26de1b3a8c8b7e603f6d6a46c853426fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
+Date: Fri, 28 Oct 2022 01:05:28 +0200
+Subject: [PATCH] tests/timeTest: Fix tests for time formats with different
+ kind of spaces
+
+Time.format does not warranty the character used for spaces, neither
+that it will not introduce preceding byte order marks. Solve it by
+comparing inclusion of the data and that it finishes with AM or PM.
+
+Closes #506
+---
+ tests/timeTest.js | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/tests/timeTest.js b/tests/timeTest.js
+index 96803f2f..d025e8e8 100644
+--- a/tests/timeTest.js
++++ b/tests/timeTest.js
+@@ -23,6 +23,11 @@ const JsUnit = imports.jsUnit;
+ 
+ import * as Time from './time.js';
+ 
++function compare12HourTime(format, hoursMinutes, AMPM) {
++    JsUnit.assertTrue(format.includes(hoursMinutes));
++    JsUnit.assertTrue(format.endsWith(AMPM));
++}
++
+ function formatTimeWithTZOffsetTest() {
+     // mock to always use 24 hour format
+     Time._setIs12HourFunction(() => { return false; });
+@@ -35,8 +40,8 @@ function formatTimeWithTZOffsetTest() {
+     // mock to always use 12 hour format
+     Time._setIs12HourFunction(() => { return true; });
+ 
+-    JsUnit.assertEquals('10:54 PM',
+-                        Time.formatTimeWithTZOffset(1607982864000, 3600000));
++    compare12HourTime(Time.formatTimeWithTZOffset(1607982864000, 3600000),
++                      '10:54', 'PM');
+ }
+ 
+ function formatTimeFromHoursAndMinsTest() {
+@@ -50,9 +55,9 @@ function formatTimeFromHoursAndMinsTest() {
+     // mock to always use 12 hour format
+     Time._setIs12HourFunction(() => { return true; });
+ 
+-    JsUnit.assertEquals('12:34 PM', Time.formatTimeFromHoursAndMins(12, 34));
+-    JsUnit.assertEquals('12:00 AM', Time.formatTimeFromHoursAndMins(24, 0));
+-    JsUnit.assertEquals('12:01 PM', Time.formatTimeFromHoursAndMins(12, 1));
++    compare12HourTime(Time.formatTimeFromHoursAndMins(12, 34), '12:34', 'PM');
++    compare12HourTime(Time.formatTimeFromHoursAndMins(24, 0), '12:00', 'AM');
++    compare12HourTime(Time.formatTimeFromHoursAndMins(12, 1), '12:01', 'PM');
+ }
+ 
+ formatTimeWithTZOffsetTest();
+-- 
+2.37.4
+
diff --git a/sci-geosciences/gnome-maps/gnome-maps-43.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-43.2.ebuild
new file mode 100644
index 000000000000..05e77806c2e9
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-43.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Pure introspection dependencies found by grepping imports in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/gjs-1.69.2
+	>=dev-libs/gobject-introspection-0.10.1:=
+	gui-libs/gtk:4[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libadwaita-1.0:1[introspection]
+	>=dev-libs/libgweather-4.2.0:4=[introspection]
+	>=sci-geosciences/geocode-glib-3.15.2:2[introspection]
+	>=media-libs/libshumate-1.0:1.0=[introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.9.1:1.0[introspection]
+
+	app-crypt/libsecret[introspection]
+	media-libs/graphene[introspection]
+	net-libs/libsoup:3.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch
+)
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 40d073a63109..3f5f13d3411d 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index e409e7e76bcb..8904892eed1a 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,7 +1,9 @@
 DIST geos-3.10.0.tar.bz2 6799370 BLAKE2B dd1490318fccda8ccaf5152f8521ab98ef5e4b143e12e861d02124421985a8b2c966bca6f966aa167fb60f703d25c132b8c7ee4d61e382a449bce5eb40d4cb89 SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e
 DIST geos-3.10.2.tar.bz2 6714655 BLAKE2B 1bc4f29a28b2b49faa9e1ea2aba7359d6dcb124136e0a2d2069508f7b95fae09e59ecb0acf3742d9261444055e85471cf45baba6e278c8b3501e91eacf3bb886 SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126
 DIST geos-3.11.0.tar.bz2 6727294 BLAKE2B 7d2cb7ae2dc6c5eb13836c16c8164402c1e964f98df95d5aaf9f6fd957ebcdbdefb43ae4fb17a5a671b6dfdb812bdacfdbfdfdea6e5bd44f135e3701a3cc914d SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189
+DIST geos-3.11.1.tar.bz2 6753232 BLAKE2B 376050ca3224e5220f69d82ff62d79ff7ea3d35d5fe90b7ab4e0cabcb4200b47d7569110538c201df9cb28da784f09f8207a9a8233ee002ab2ec87f5cf336ba1 SHA512 708500aba9b04208ee46a531d55ddf63a213dfaa2922dae937b524300b2b46c95143ed6cd3ff1414e9099f2be95e5df5a2e0b49df43acf93a9478215259f20d3
 EBUILD geos-3.10.0.ebuild 879 BLAKE2B 103ec4938698174502001266fbfc6cccdb1a446694785711897250850c7faab477079ad02d38eacb7481f68b05077437eb321a3baa4264d9c9b2d992ab0806a9 SHA512 addb684fdcffc270a27335e3de712bac43c38fbb579e9556e1e9b70f7cae8f00148e516766918079f21ba08ba1ec8a9cc74ffef24f783e1067a697d55b7bd1cf
 EBUILD geos-3.10.2.ebuild 879 BLAKE2B f29b0906dc9fee2174a155d7b2333ea8ec9dab858b31efe05f765856570a5bcf64af6ed835e305021f534f357e7174ccfbcc8f0cb638bea80b07313917bb6078 SHA512 e36a0039536a3b98c9b72024b39d0c9d989dfbfee3635225f9e665e7b100ee14ff7b1995f135a27a91db9b72a6fff5af30032d55266fb44cc71d743941b3a074
 EBUILD geos-3.11.0.ebuild 965 BLAKE2B 1d309b8b185f41c09a916d38647c287591e4aa541b3adc9c28d1632bfc9d8e80453e7c8b68e31ec4582a315d0d0c113491c4e24000ccdb76f378a8bf17086394 SHA512 b7324c7318f9634070c98104574be684f44fcb9327fb70548582d4ba3dcac269aa7fa07716f18f4d2aa144526dbd728e8aac83de3f8d0690c4f27482902209fe
+EBUILD geos-3.11.1.ebuild 971 BLAKE2B ae5417fe6a759720d95888b2aca295074123c697cd59e65f0119d69fe5f2fc7a7bb76a050d615bc63b926fccf1a51900f358ffdfd854820291e3059e08cc089b SHA512 a843f0d09f39d17f397db30e1801d338271071170db87bd7969eea0494bd654e04fc7c29dc786b7d2dae7e839c9ebfc5f516774ac475708442b6eabbb5a3b7ab
 MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452
diff --git a/sci-libs/geos/geos-3.11.1.ebuild b/sci-libs/geos/geos-3.11.1.ebuild
new file mode 100644
index 000000000000..dd84d4906b89
--- /dev/null
+++ b/sci-libs/geos/geos-3.11.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="https://libgeos.org/"
+SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+		-DUSE_CCACHE=OFF
+
+		# bug #709368
+		$(usex arm '-DDISABLE_GEOS_INLINE=ON' '')
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc ; then
+		HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. )
+		einstalldocs
+	fi
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 4f98b7b7fb9b..f92f6e07a0a6 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,16 +1,14 @@
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 DIST proj-8.2.1.tar.gz 5882136 BLAKE2B c4d80ee1bb1287e2539c9b5c5a5c6305fe8d2fc83526fd29507802b94351f51b016184c07a5e8c1bbf820252a6dfa5b4d55376e5d5566774e3e5e3154857dfa1 SHA512 c6164771fd492be5aa91d8dd2f2794a19b47431078f148356aa70dee96a4589ec5decbab9d8dd756a7bcb322ad94935750c22e0e7fb16e21c8f59ca474e7137e
-DIST proj-9.0.0.tar.gz 5242155 BLAKE2B dd0a2234d0a8dddc1303c4dbc73bf1d13be0248f712c20dfb67f4003ace2504f96498f769214198f62ba3bbddea00e25a9745fe23d265d8b911ea9170288c24f SHA512 ae1e65f03fba1e922a61f843b64cf4fde0ff015ef8c18bde0a10cb3e732c4d1b27d2c6b0179e8456338c552a760de22abf16e887fc92118288ffa394a9c6a000
-DIST proj-9.0.1.tar.gz 5264935 BLAKE2B 4957727fab9f6158e83025eed502bfc42f0c2fb4ca26ece34284f1b410d490c70ed414b7fc82a01753052acad93d592bb946aed83a2b2d985028554681d61b85 SHA512 9cb716a061315752a23405bd5bf879cdf63432493286ef828f442eea0bea872301be10f6e35a8e28ffe42cb6aafc039213e35be65ab692223a135b03422e3dab
 DIST proj-9.1.0.tar.gz 5299132 BLAKE2B 955b1f2492f47432d8df771fda495e87f977f6a6b4a0957effca0535ff4c3a8edf451028bd805800a2c0c6662e971e1073c35a863426b47f75817ef44e30d281 SHA512 cc23fbfaa16cd14f499ee5162bfe743ec9d738d0ba6358716320aa03e1a752da45fd6102fca1981c9b695934e7c358540be53d667c48dae922ac5511eea6824c
+DIST proj-9.1.1.tar.gz 5311995 BLAKE2B d51652f649ac97f419740e30facd86b04ee0872197d235aecc9d8fd50c18340bc7969a4a78c33f28753fc8b5556e7e8bdc47e0b6a9d9971e214575481cf25c0b SHA512 b9d19a999e063e465579eb86da3fd2aa32fd894f0d15ba178733bcbad92246b3b3ea1811a276cd556874e171a5ba7cfd678ce563c0b8626c6db9349a64c04726
 DIST proj-data-1.11.tar.gz 597743778 BLAKE2B d68a3a1154d560b724364a843e09ca5350a6a04ce30fb124788220d8e48eff3ab33f6061effec88e658067e0d430b5606f386d82bdcefa69551d9855db9ee476 SHA512 6c91b7ad81b9cf93330cb27f6632cc3e6d854ed4e84318520200d3fffe59c94e4061e2ebece220a143624ae5c4b672458379a546e75547544347cc28576b984f
+DIST proj-data-1.12.tar.gz 611423889 BLAKE2B 5376f041aae1a23668a0cae79f4deadff29aad80a1187f837cd5c62c21dc49738fc598c52825f5d8575cd135b55c188d9456b5da72adc6a507fa778f0cad6596 SHA512 788d7c3ad70dd7aab21824ff189dd0cddc28b7e64999f6a9953d7af95f9fabab7143b0f1c3bed19d5deb8f3e3a7be62723fc5fda778fcaefab0ab6d449db5def
 DIST proj-data-1.8.tar.gz 586765549 BLAKE2B a54287fa81e2055737c1956bf7f10246ccdd8d9af49fe7e8a01a6f2206c234d2827c4268d901d49bbbfff4caace220aa1867f0088442e4849f9d3cd57f4ca72d SHA512 884425c3bc09a39cb1b611264ccaa17940f4779f4e0d6023306f6b82622cdd0a2e5970a79018d499d323640acb72560789ef127ff4e0c712fa3679e5cfeb34bc
-DIST proj-data-1.9.tar.gz 589748963 BLAKE2B 53f9fa442d074127df11cf11f1be426438a334fb28fc47f4513acf985bb8c9f52678ba1e297baacf576b2082ce0371abb63747958c1fc233538efdf0d9fade57 SHA512 25607137a32c65e906d3f4e64f5e6b0fd5882faf0c4bf458116c582e6438df38cc36e9b6e67498b7d63dceb863f31b3890f04bdb19a1287e6d902a7193221711
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb788bb11e3302bcf38ae578a846416ef23094b9a32ca8be447ee4e3a0d865f66db7c97cb30499930c48237b0 SHA512 b854fcbb1879b5bc161a06f853a5705c32705539bc0a3572d8b9df38cb7707e201e075e148e48534768dbacd550ebfa3ab836dbb387fa15e630e86e740e87a33
 EBUILD proj-8.2.1.ebuild 1486 BLAKE2B 67bf1c6d3f0852c39c89c70b8c63f104ac2b395b5f5a11263955d60c12cb23d0426e009958af46228e5fc614e89daf432425f2ae44aa35d85509c049388c779b SHA512 318b2d8b027cf84c53246ac8c1c181d30deae0f93db8c3d589691809abaaa8a0d36786f2c9848c2ee3a3e7bb1e6f18da44a8ffcc29cf65c48b20d39010a4080f
-EBUILD proj-9.0.0.ebuild 1512 BLAKE2B 6a8e2546269eab8e2a18caf3ef0521d959497e3998376e027240a847bf22c4e882c888ee02f519f761aa8b57c650a659a765f9bd68e934f9f7c5f4b2caedc3ba SHA512 a2619ffc5229ca6b51f0f73e5449f73cc9860363fdf066734af8ee66211e9067e258de9bda21c4025a55e86e5ecd73a6e4aabc086b08683c74e5f60ae1f9c6e3
-EBUILD proj-9.0.1.ebuild 1512 BLAKE2B 6a8e2546269eab8e2a18caf3ef0521d959497e3998376e027240a847bf22c4e882c888ee02f519f761aa8b57c650a659a765f9bd68e934f9f7c5f4b2caedc3ba SHA512 a2619ffc5229ca6b51f0f73e5449f73cc9860363fdf066734af8ee66211e9067e258de9bda21c4025a55e86e5ecd73a6e4aabc086b08683c74e5f60ae1f9c6e3
 EBUILD proj-9.1.0.ebuild 1469 BLAKE2B 69ed19d5b4faa255d72d94382bbf1740515d1dfe9d8711abfd42cafe810338223ae87bde8a9e5fd96f31a5f0606a41d53f0d376759acf82a519fbc331f9cc087 SHA512 de460bbfb5b712b1a7b3eca0770946193ddf7eae100158f47c97e8e6c5f803e1ade83485f5969ced33c86488d3b3d778f483bb403eb0688aeb611232c6057952
+EBUILD proj-9.1.1.ebuild 1473 BLAKE2B 6c4fa6c1111898977cd7e2fb637a60b7c5f5c061e008bf0d23aa92447e238bc011c44277241901da5cdee8dc754f05e8126e766c550d61898dec2bb348465053 SHA512 f3479885b4485d5c5497d9e5ed96bf0f082296d40df2666a9deb96b6bddce09dc8daa4b6a9ce2e1b0609bb7f4dc06ccfd087fb35226e739e1331bc1c90646772
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-9.0.1.ebuild b/sci-libs/proj/proj-9.0.1.ebuild
deleted file mode 100644
index 8f75a4028225..000000000000
--- a/sci-libs/proj/proj-9.0.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.9.tar.gz"
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.org/"
-SRC_URI="https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}"
-
-LICENSE="MIT"
-# Changes on every major release
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="curl test +tiff"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${PROJ_DATA}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_CURL=$(usex curl)
-		-DBUILD_PROJSYNC=$(usex curl)
-		-DENABLE_TIFF=$(usex tiff)
-	)
-
-	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
-		# testprojinfo: Also related to map data?
-		-E "(proj_test_cpp_api|testprojinfo)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/proj/proj-9.0.0.ebuild b/sci-libs/proj/proj-9.1.1.ebuild
index 8f75a4028225..4d625f87c6a8 100644
--- a/sci-libs/proj/proj-9.0.0.ebuild
+++ b/sci-libs/proj/proj-9.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit cmake
 
 # Check https://proj.org/download.html for latest data tarball
-PROJ_DATA="proj-data-1.9.tar.gz"
+PROJ_DATA="proj-data-1.12.tar.gz"
 DESCRIPTION="PROJ coordinate transformation software"
 HOMEPAGE="https://proj.org/"
 SRC_URI="https://download.osgeo.org/proj/${P}.tar.gz
@@ -37,10 +37,9 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
 		-DBUILD_TESTING=$(usex test)
-		-DENABLE_CURL=$(usex curl)
 		-DBUILD_PROJSYNC=$(usex curl)
+		-DENABLE_CURL=$(usex curl)
 		-DENABLE_TIFF=$(usex tiff)
 	)
 
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index fe08b1d77f0b..8a4f691c21c1 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 588abeb8f510..dcfaf9207d04 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -9,6 +9,6 @@ DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B d9b4a8274a24aa35023eef7450bc431
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
 EBUILD grub-2.06-r3.ebuild 8292 BLAKE2B ebe5dd8e02d48d0bda4d3c12cb00f64aae6b5f59f548ac20ce6d1d3ebaf5ddf32e02e02c0ca3ff3f2788b650c252fbc0d229a9965de578877358f597e354519d SHA512 50e4cc94e3e9cb49e0e2814f094b032773ef949ae33f292263b55d2d801275bebac21f984e300a916ebe6e864b5e6e0cc1201db0e743e5ef5e82df626cbb9edc
-EBUILD grub-2.06-r4.ebuild 8293 BLAKE2B b4cc02a78902a10f9bcfd41269f1e3193454adebf84a0a43e680100b3183b22e354c9360a4b6b13960fa0eebe952e8b93b4fbfebe0c707c1cfa5d4ea889eeb22 SHA512 3f2a0bec6b5e6a035c63bedef477043706dd9a63c3ab5c69c992972b0286690577db94bef968aefdecbaba9f2cfff45e9d3af28bd6cf5c7ab8a97851d6da4e29
+EBUILD grub-2.06-r4.ebuild 8292 BLAKE2B a2d5189cab5f6f8e8eded669a2fc17e8e78611cad060def99d239a68722b247c02af3bf167358778c341467a1659eb6ada115ddc58c12c8ac941a95db7505bba SHA512 52ad54914e17ca62d425b0b8567a1f64fefc68d7d570a29bdb4a22eb303a2859e45f71d4471cec813ea02a3d1a15690994316501773bb555b5121dafbcb4ce99
 EBUILD grub-9999.ebuild 8130 BLAKE2B d18c0aabc0169068c3edfca6af8c4536fb6a999a63623fc305e695a960c010189f27337be4ee1391072473469860b32b3716fb4e34294503361d734c949a89f1 SHA512 011fa6aa320be9a69aa0dddb90dfd952c2b5b7e5280749b1b1625a690213b5294b88612131026b353eea5e5542978b49459657ffacf7db3acb2bd7da3d89187f
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild b/sys-boot/grub/grub-2.06-r4.ebuild
index 76f793378133..10638d064406 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 89371dcfde65..8f840c85d701 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index fa24ec650a03..8aa8b51583e9 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -60,10 +60,10 @@ DIST ceph-17.2.5.tar.gz 169004360 BLAKE2B b6d8df5f9b58de5e42fed5d16b1c82d2178297
 DIST ceph-xsimd-17.2.3.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-17.2.4.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-17.2.5.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-15.2.17-r1.ebuild 10762 BLAKE2B 74415a6be2add6b6d3c097543d8e06df00788e78df4a574db8bfced242c12ea6332637aa3e6917f83b21ef082621c009fd2dac4f5cfc3aa1b8772b121b47b915 SHA512 8d55fe2a01c54ad60aeaed4deae9e370a0908caad7b0e89bdb8252e672561f850b2dc77282ff08e739338539a3a0148b922c0b12c459d1c17a590a745463f9ab
-EBUILD ceph-16.2.10-r3.ebuild 12514 BLAKE2B b9c0c60de17ebeee1de3f88dac53d87d3e8e04a8df404ef53065f0d251444db2595daeeb09b068b88bb1c0deec810edc6e6a9229ce1a227e32f80595703592ed SHA512 416c4fed1086ad0692acb60c7a23f096df324d0e770d30999f5d71272151eb59eacab4094f69bdc9c377b10e7d6c19d0a40bb1e675eedf41e6f347f8b4463539
-EBUILD ceph-16.2.9-r3.ebuild 12582 BLAKE2B 4eda2859bd3168f9b56b3d2b0b79dfc42cbd17b5b4ffedc804699c0c5757993e7cb5ac4aa5e282ea39b8652f85d65d55d8aef7784b19b9039130e7bc152849db SHA512 599766259754ca1d9f9330dbc3efc0a8983f65882d65d62c6e7d0b59133f049fdf9f9e54b49ce78f051c29be04261a065931d869bdccb871e808b6ec3ebdc8c8
-EBUILD ceph-17.2.3-r4.ebuild 12662 BLAKE2B 819dff5fd91955d58685b2ab5ef5f121804375caa5ba986bc3c241dda171d3a2feea5f8e6aad0c317008940f49b20eb2de1fccce73a6edd93c92f4e5a8311b81 SHA512 3b19635e7a7686752689779e327bbde60235e5b20bb97a7d5b5c06787dbe3aec62b9d439f59f0010ec1c6921beac2940203daf3bb4f2649945f778932ae098bd
-EBUILD ceph-17.2.4-r1.ebuild 12639 BLAKE2B 19d33656e1bcf11acc0b5bbb29cacc0095b57e894414ef877c9b1d720762ee34785a117e3daf868237cafdf55d1f5435bce4099a29b0b5e46412e48ae55dc890 SHA512 b55a24bf945db8bed7899bd6f8004cb05f3e6b041e1377248001a7d9f5d71d3b778c7aea4f6ddcc80b3029cd7fed59ac0eb17f199f9c9c95d99ff89b3cd1fdd8
-EBUILD ceph-17.2.5-r1.ebuild 12916 BLAKE2B 0b7708c4a76f4a8421f16cf2d558f2dae7df722eb1637e6835eb5d8178818b6e191164a20b637fbef1ff69da971c9f5936d906398cbe66d5045262f19818be80 SHA512 2c5fd79189a54a22d145c75c69f4b3741e409165a92bfdaa61c5e65ef0a6e16c2b17da1721de236be1596702066f6bf443a1f4548f447f8fcff2cb1df941a094
+EBUILD ceph-15.2.17-r1.ebuild 10771 BLAKE2B 21b8af62a371a1c35f9306b0ed8b70f734edc17bb483b90a9bed75ea4d1c0ed72947c4e60e2f6bb06a68a1d7cf8f0803233c946af3b4d5c6d53dc1e8c3ead98e SHA512 1514a8be316d745c2b69000d495770103633e9bf06e53362efe0218bb1d7b412947ba346825a63ff611f0782495281e6d011ede839ab51b2323cc26b5cb80019
+EBUILD ceph-16.2.10-r3.ebuild 12523 BLAKE2B 1cef3c0b6bbae680aeacfb31fbb4ddcfde9d3ec7225c704d34b5fd99884986b88369be5aa4127c9cfc032d1a14821dafd4906a182bec790d2e1f9c0e1fa59639 SHA512 5aa52409732e5a09ef62a5b9b5acf8b674efdb77de24490128f4c8627ca632558b0ace453cb2a5598fce5962eee9b164b035e6e28f19e0d9cf821734db2e3f52
+EBUILD ceph-16.2.9-r3.ebuild 12591 BLAKE2B d94c75d5de77ba1e9e13f87e3242da837c40a7feeedfa26b3a2be3b474ad7682479fbb60d7d502da31cf0bf9553b0fa384b2809c7e238c913f847ab54829add0 SHA512 65614185b3476038ad8bc811267eb7c44d15626bc33a0313b7bc4a298a844c91c74624cddec7f6daa4b3c6bba86e5f26c48ab4e40e53edc2add16fed7c00d88e
+EBUILD ceph-17.2.3-r4.ebuild 12671 BLAKE2B d2df220d810cacd9149e984ceb603cf2c8056901a15fb30ade1833d55604978b98233652ccbe87944962679a72cdac9db6cf59c84dc85c75fc1afa1ade2d88ac SHA512 52fcbccc86ed3ec0cc62fb473fd4b593294556d464fb227741219c7c01e77f2f26aab71e7f27a23f8cf47e49e67b1e242ed0c3f3f791dbd069a0a771c7ea1667
+EBUILD ceph-17.2.4-r1.ebuild 12648 BLAKE2B 67df714080adfdc41124b5f882825c9f2bb540be20af5a314415b11b57dedd3b7ca4f6072f5b04fa26b5f025b2fb4795c42fd1e74f8dc38f338c1c93133fcbe9 SHA512 8a4564731fc11d6f7d4683d43246f2b75f1fde331a257343a326b976145e641978025e652a98a62fdbf783eab6fa33281b6120e9cd005906f9a934144b116c35
+EBUILD ceph-17.2.5-r1.ebuild 12925 BLAKE2B 1b4a3dc19e812212da201030de6fd93dd2c53faa0afb272d99f1c0f4cca835748f1cf841c843dd93e2cd62104861fb2cd449b98035392f776e5539ce287df04e SHA512 6855bf42cfa6c3d3b5a9c5f0960c52f00563809af34b300540870db33ceeb17a05a10ba6a51c16a883b334ee46d2512264a4833076ea861b436b5163c4229a47
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-15.2.17-r1.ebuild b/sys-cluster/ceph/ceph-15.2.17-r1.ebuild
index 4a2410087c9c..3b6a85973f2f 100644
--- a/sys-cluster/ceph/ceph-15.2.17-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.17-r1.ebuild
@@ -135,7 +135,7 @@ RDEPEND="${DEPEND}
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
 	sys-fs/lvm2[lvm]
-	virtual/awk
+	app-alternatives/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-16.2.10-r3.ebuild b/sys-cluster/ceph/ceph-16.2.10-r3.ebuild
index ba6d39c6971d..2baeafd7a648 100644
--- a/sys-cluster/ceph/ceph-16.2.10-r3.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.10-r3.ebuild
@@ -142,7 +142,7 @@ RDEPEND="
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
 	sys-fs/lvm2[lvm]
-	virtual/awk
+	app-alternatives/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-16.2.9-r3.ebuild b/sys-cluster/ceph/ceph-16.2.9-r3.ebuild
index ebff7345cd0c..f0a979f3d579 100644
--- a/sys-cluster/ceph/ceph-16.2.9-r3.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.9-r3.ebuild
@@ -142,7 +142,7 @@ RDEPEND="
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
 	sys-fs/lvm2[lvm]
-	virtual/awk
+	app-alternatives/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-17.2.3-r4.ebuild b/sys-cluster/ceph/ceph-17.2.3-r4.ebuild
index 86a86efbf5ce..c17190f53c53 100644
--- a/sys-cluster/ceph/ceph-17.2.3-r4.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.3-r4.ebuild
@@ -148,7 +148,7 @@ RDEPEND="
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
 	sys-fs/lvm2[lvm]
-	virtual/awk
+	app-alternatives/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-17.2.4-r1.ebuild b/sys-cluster/ceph/ceph-17.2.4-r1.ebuild
index ce98cc188fe4..81ee0e1b042d 100644
--- a/sys-cluster/ceph/ceph-17.2.4-r1.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND="
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
 	sys-fs/lvm2[lvm]
-	virtual/awk
+	app-alternatives/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-17.2.5-r1.ebuild b/sys-cluster/ceph/ceph-17.2.5-r1.ebuild
index c0441b3e9817..4b3d087b60f6 100644
--- a/sys-cluster/ceph/ceph-17.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.5-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND="
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
 	sys-fs/lvm2[lvm]
-	virtual/awk
+	app-alternatives/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index a6a3edb47023..455126a94727 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,5 +1,5 @@
 AUX vzctl-4.9.4-glibc225-2.patch 1196 BLAKE2B 4560cb8fc78163b0c397cbf89545aca9c7005f67d31eb41b6dcc2d6c0ab064298655d30eeb958e007320828d5ef7bd7bcb89e44e1b7f5b36c7d327f866f66d6f SHA512 70ec27c9067bdd7fa1e3e2aa32b32649aca8a2d357ffa583c29132d7339f52bbc19195fc9be304f977ee82d96978f3a51bc9cca23d124ce4946c48b6129bd714
 AUX vzctl-4.9.4-glibc225.patch 406 BLAKE2B abee2fcb861f755bd75840eb29ee4921c8580f18d5243cb9ac19bf4fe25e44474cb490d0f673e80a3bff8f17b8c93dd96c3b8b0e2e38dbda5721262b2f610d16 SHA512 db7778a15785e6d9d22d1102cb341647834b6b9eeb4fc26b6cbaa86af7317931d3571a2b7f03a3b419338e11427482dd831374144a67dda2f2f4fe11ff020f45
 DIST vzctl-4.9.4.tar.bz2 550370 BLAKE2B 173d6cfe93b15aef6cb1903a5d711e29190964479c146625a3f9d2ff872161c51b7632213a5f0d47d5a14ec34d7d80499c1bc17f11cfbb80318c26630c05fd71 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706
-EBUILD vzctl-4.9.4.ebuild 1995 BLAKE2B e8b3ca10f38102ebfca465e20febba768130cfa2f62c75e3c63d7e641c64eb58e896bfcc03c5523080a93b667b14ca16c3d7cd841c281623ba878f3e308323e6 SHA512 044b1a5eaa1e3fef173a37f09f41a66b15f13018cf4488ab006953fc6bd138113923fca444b1f7538656e9547575f2b2fc7860082cde3fd47ade0d71f9b08ec6
+EBUILD vzctl-4.9.4.ebuild 2004 BLAKE2B f2a24d6137c99fd8a57c46e7fb2e8c7789e2ebb687d5e086dcc789ca58f45e3463a4cee22a6b7e7e103ab802101d8b1457dd88fb38593674136137e264f77f77 SHA512 f598c0735dd00a7c107402147e4c8522d9522538860f4d51efb053c6adf27cc75a1058646cabe949a6d1c90dbdb8280b581fa7fc99daddc876e4dd7a0dc8de56
 MISC metadata.xml 477 BLAKE2B 6292b1317da3d2b3480f07ee1b4763caab61458fb554e1faeb781f3ed3010771f20d27087f47a84b67cef7f06caf6283ecb4b1903c76bd82bda902236948c51d SHA512 0b87d0c3ca82ebbf48da333992abd750ce470761ac3240fad5c1a7919918fc79f76abaae57f1950cbdc8637eaa32329cbd5e09c05f04a8071f8aba93cb0df36e
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index c81f292bc9d1..fc75cfa78c5f 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ RDEPEND="
 		net-misc/openssh
 		net-misc/rsync[xattr,acl]
 		net-misc/bridge-utils
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 DEPEND="${RDEPEND}"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 588168e05964..25a1bb560125 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index d2a9ddf6597b..ec2e19de512f 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.3-r2.ebuild 3577 BLAKE2B 94a9eedd77af2241bd4f84f5963920ad5184e20ab0cff9c143b04d22709a375ce52fe6e08b94b2928139dfa4557556f6b51fdfacaebef319e015cdc8e92d703b SHA512 a48ab830e8314a085670379d595841ee99c6dfbb42d3d83aaf41896852bc08330a6ac1296217feb61f0cdc0ce5ff44ceebf858bb1ad2a3ce4ac55114d4d57a40
-EBUILD clang-common-15.0.5.ebuild 3511 BLAKE2B 175d544478b34c93fb279a03fb193c280ca3fb0534a9c87aa72077a7ab0ab7ba8a4c90b26795f023c0c6edeff53b9155d00d7e6dd465a49852a3e31930a08700 SHA512 e4d5bb2b1d4498abbe1984baf69733a26d1e0f44224b74476ff93b6aa082b83e34ed08a50b62bde36dbc3d4ce1eaa30f81e47bc2725184fe23f9a707d035a00f
+EBUILD clang-common-15.0.5.ebuild 3509 BLAKE2B be227d48c3e032de6029d5030eca900d53d2cc0a3fd46323130449a99888f4ab5ccaf73aa14b461b5300ceca70b8c52281bd20a1f71357027f9adc8f638820f2 SHA512 bd511cea98bb9477abbb379bab1bdd2afd2c6f5c255be79792289e11f789322490ec45dbfb76e644179a2fcd2e7ea0314a4abedce111d4f35bc1c51548834e7b
 EBUILD clang-common-15.0.6.9999.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
 EBUILD clang-common-15.0.6.ebuild 3516 BLAKE2B 1f639aed65a0addf193b69bc4b27aec09382d726923fcab004b3a4dcf73f4cb8ef6d941385cab478cf9f374103c6dd26bc958d514d13a9c85ddf1c2dfefa9ba2 SHA512 3c3ce794aa2a755c662c68504e452a26c75acb7c14abaec3f11dd50e4e7df7bf2a9a72a6615f756d1360846a54e2bb670e95a395899633e7909070da15d7703d
 EBUILD clang-common-16.0.0.9999.ebuild 3569 BLAKE2B fa58a81a826ae45c5287dcd49ba78ad5a5da4cbcdf7f28def7d8691fef5d622ac3dfb116e21b642f143a541d8cb4cdd136056f3d488dc3d4d8fed6383ed55c04 SHA512 3032daff6a584f1b3490738c967e38f26d860841d606e649c394c18237de3cf71c4ae91ce33ac6ca8f8c991e670b750023c10210626f9cdf7e7e3961405885b7
diff --git a/sys-devel/clang-common/clang-common-15.0.5.ebuild b/sys-devel/clang-common/clang-common-15.0.5.ebuild
index 2a167a21b443..2fdf615be818 100644
--- a/sys-devel/clang-common/clang-common-15.0.5.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld llvm-libunwind
 	stricter
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 0a55d03b291c..885b0ca6c401 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,7 +1,7 @@
 EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.3.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
-EBUILD clang-runtime-15.0.5.ebuild 761 BLAKE2B f0b47f6ea5faf360ce050e991836a324c9174ddbcb1c1cad493880744aea07a85a2805d5d3614e03e4a0f8a0847db344f48a5c6766fbebbc69d64dbf42bb1c30 SHA512 d8274324b4c316d5f89ed418ba2d8e6f129000dadfd2e2135336e58171ab8dcac2e6a58fd38a3e7b3568c85006daa55c7b1bb013d92f1cd0e1488b99f086f183
+EBUILD clang-runtime-15.0.5.ebuild 759 BLAKE2B 199c187b5b1b72022e8a11ca375b77bc35f5284267c5a3d12d6884902bff6cb0ebb9936d4708d0d3381c907f2ea168f6fbabbe2d28c63fa041248955c1a743d6 SHA512 277e415b1750ff721363da57fddfa087db93bf3d66958121199e0d2bd3c3bd4e6aa72e35a9697bf4fbc2e919d91c3ffc48745a748ee9a04b1ea7debf0c8a4995
 EBUILD clang-runtime-15.0.6.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 EBUILD clang-runtime-15.0.6.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
 EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0
diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.5.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.5.ebuild
index 359b30510327..98591e0cd334 100644
--- a/sys-devel/clang-runtime/clang-runtime-15.0.5.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-15.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 9865fc6c6e01..673acf95010d 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -24,7 +24,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b
 EBUILD clang-15.0.3.ebuild 11818 BLAKE2B 0c440c4bfae4c39613afb186ca3ff325544b838803a03d6ae9d627a959505b42d5d30f6dd84751e38ff7097009a4e64b485362bcc8a0763ec450d42ed5c966b0 SHA512 8fcdfbe4fb3eb76c03f0fe5ce00f08553520b44fa3bd549445dc0b45dcfee49f6f0ef45797a79a30947b2670fa535766bebe86827c5ed653a64293cc22424b73
-EBUILD clang-15.0.5.ebuild 11819 BLAKE2B 05417b004c596e29a7c0d19c17db4c693f10b47e1b6b758b3074497237fa1e50ba9344b7496147c9ba9c0c198c0e5383654ca78e81e5a56f6d0187339306125d SHA512 eb853f3251df3865c14ae41ebda1a4ce5c6127733691136247a69023c393026dab1cab45b197184b1cc1b3c1198e3e9bfedb0b1e256dd4af076b79d00f221a0e
+EBUILD clang-15.0.5.ebuild 11817 BLAKE2B ecff04e7eb9100c0c71622e2b6494483904c43fd5eb5bca967735175379ddb425c6ef7351882294742d66ceffa52ba9a2004f0640bb085d61bdd568ed5b8302a SHA512 2d4433d2db20f15b76d8dbe0b6d8e875e0ab1c1ec1958ef51d2a7679dccd1b343d2ec0f79c500b5df1a51aa7b0abb9a607a0cd3944b7d1465c6cb2aaa830dca3
 EBUILD clang-15.0.6.9999.ebuild 11753 BLAKE2B ee5d7c5223f01c58267128213a5298c323ce83b4d4d864df69fd7452d8d5d481a441114734f5e315de3ddab390338d1bc0e3b1eb221a0b92f7bc2e25dde0ccc8 SHA512 ad6948948729c0ccbd44ae0a334731e48cfb5bd499883805628d44db8281ab06fbc8a5cffd9ee41ab6142039db5d107647a41e5c241d0d1f6f0dd09841e4f2b4
 EBUILD clang-15.0.6.ebuild 11824 BLAKE2B b4f8aa8452393d6c9e49655ae69c19f2ed83297562fb75f172dc4113216c0480a985d6a6c34644f8f84185802ab8706821435315755528c8cee4bdc12cd7094d SHA512 d5fab69868f017380d4062a05833329172e2db7489aea1a77ddf3d34d579a8a4b7bb16804a77eb25237be855894121b172eaa1afda1773dd60fee8890e244cb0
 EBUILD clang-16.0.0.9999.ebuild 11515 BLAKE2B 156b2afd89cbc773e18a50638f6a69a596ba603365d4c0f204d8ccc5f2dcf44237efb29b756ad6331a90d69caa3d6801c05ab22ccb45aa4edf4a10925adac9a0 SHA512 39811766ddd9ba0769e72bbd82755d409286acd544b7237ca68f2c8c8032e89018a1f006b3480b65dc6c8fad2f7f2e9fe616560940302e562bbd70f24957afa3
diff --git a/sys-devel/clang/clang-15.0.5.ebuild b/sys-devel/clang/clang-15.0.5.ebuild
index adbaf6f24e4f..e90165ee18ed 100644
--- a/sys-devel/clang/clang-15.0.5.ebuild
+++ b/sys-devel/clang/clang-15.0.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos"
 IUSE="debug doc +extra +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 27e36f03e9b9..2470a3a278b6 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,8 +1,6 @@
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20221006.tar.xz 71755692 BLAKE2B 0099821e5fcd5e1a069369a72f105607cb7f20fbef3d627a598d8c7a6439491e050533d6577b4f7953aabb52daf926ffc8eb9cecd8853833a14c90bd878e1ad9 SHA512 3fc1dceff31ec8a84babe31d88a312d9d3d30450ff0c42730b9a9fe45c0fc9509216fb95cd84df7477faebe2b9b7d8f7e269c9e76cecc05417dc6192e3b96c67
-DIST gcc-10-20221110.tar.xz 71760032 BLAKE2B 75f0f18c83021fb9ce5ed2501cefcda53463ee2256b6e594412020e8a27880f562880c5ae1e65a68b3da19e04de723fbaf8beee2fbbd5871eae5f4e05404b8de SHA512 3b836c26e4cf6896db3bd41d2140ac7b790fb9cd83a379dee832e4b38f92b56b88476bb86dbbece1bc3e2b348a912cbcaed0379f35994554a57689fb9b71f5d0
-DIST gcc-10-20221117.tar.xz 71762756 BLAKE2B d6b1d87d3b09dfe479f2fe21225d94f9f2aa310dba22b4f7f41a212e6d88378765dc2c244cf953394e5eabbd7e17f3d205b9933f7546023a875822120a2fbd83 SHA512 85ceff6524eb4f21e192a8213a75b127b911e01bfd4c9f1f7d1d6c8a6409608bccc009278152060213341b1c114f2330d54ad7b1d9bb7ed9213c1369ae434cef
 DIST gcc-10-20221124.tar.xz 71781080 BLAKE2B ec7f4f140102d25a7469f7931df7b87b4b91c1c94fc263ecd9cc9aca36d120e9f5e09776efefba1099abe5282eb1cc4ec8201bcdca3a13c7b1bbdd6b34ad994d SHA512 b7af71bb2dd594643393b3e4dea4e641dcfad6e5249b6ee05617f0648ef2609b707b18f12f3985b3d13cbee6af0f799d7377c28092420b251b34e93f910e686e
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
@@ -11,8 +9,6 @@ DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b
 DIST gcc-10.5.0-patches-0.tar.xz 16188 BLAKE2B 3fe3163c4960ff02eb792b2d00b9b20e1c2b44ad2d2e79661ffa0a5795b1bb631bce83c506f485765a7b971e6d391ebc1803c327f0d8d06e457610f5d6074c90 SHA512 fde1fec92df535416221827d48daf7d498f675da5697bc15bb4e17ccfedf6e6705dd28f57a3c9ebc8065b49328246fa5aa1fd90bd88bc27fe2b7b3e924f0df15
 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26
 DIST gcc-11-20221007.tar.xz 75790520 BLAKE2B de52f7fc5c7f5f82d9cbaeaa13b216e149a4aac8162188c628007c17ddb40aa838d19f2ca18216e8bfe5df2d21438f10c8e87298b53cbde4359f72c9cff87589 SHA512 b785236a00647041c9ea4552e5ea82a09e23a801b029773ba77bfc03675c530369ad0b5fc279330f3d8dd4b9b40aeaa9de84a39b6397f73984b7e2fdf8f0bad2
-DIST gcc-11-20221111.tar.xz 75802080 BLAKE2B 7e49eefb17f3905b587d6de489820dd6aa6a8315b665872a5acad9a35b5431ab459bad426acafad5e0f9634b1bcd39db05726662f7577d0f4fcd49e2944df455 SHA512 bd9fad5e8ca94b5e1c3855141418c5067d27cb9bfde624c0a0c32131f837507e5c896238636d9ac4b0447eb368d80522d1dc1a2ea6f7b2f8259c729b61a4e879
-DIST gcc-11-20221118.tar.xz 75811664 BLAKE2B 97cdbbe114a46f149c89da8190ccb7c98bf8888540459ac50432dd461178d36a5f203bb89a1205fb89a5a8d80c3518b6b05b882f0c29cd1a88e3ca3a6d1a59d2 SHA512 6634ae0929c41541696684dd2809f7fd6cb3428aecb32e149b9ed26aff487c8f3ec089865ccb015281dd814f064875282cb360963bdd90b2eff0db27897602a7
 DIST gcc-11-20221125.tar.xz 76248264 BLAKE2B c2fe15a14c77ce36f117d8d3bb78d38684e237db16db249134dd1e24d1455dfe7ca544fe22155b2c368dc6658b96d626af87d47478aaf94c216eb84b469e43e9 SHA512 3efbd7dc4cbf748d41369bff5bedb586a1c9397fa7fa56be7869e62bd567273b056aeec01a4191783bad737640e163489f1b368fcaac3155ae3ac8f7b33f478d
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
@@ -21,18 +17,13 @@ DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a8
 DIST gcc-11.4.0-patches-2.tar.xz 14224 BLAKE2B d3030c19a7bd8bd082fd39b35c3e80883ae541ab28232513ba60095fe81f5fe1fbdc54829a1556b2d278328033f6eb8a81e9ee268a6020b554388a60842b02e6 SHA512 60aa19f00fb29b7c8a68c73de274e24559dc896f551d47153ea511b202941caa950c0aff62ad28d057a8ed16f2aec2c06e681e7286d65ab3610b6948d7bb840a
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
 DIST gcc-12-20221008.tar.xz 79145884 BLAKE2B ff3d684d887e282c79fe95952a449ed5770d4bd74077553baf31c34dbd77177e680b19ac741c04aab26ac2c9bb2b89924f51f63e2f22b440decf2c65274a7640 SHA512 a35a6207e7f4375abca3ae57376c98b082846a88e83522c322d713e759367ceb2b3ad68488bed6f1645e47a106b0bbb2efbca6cb14b077672289acb4373e616f
-DIST gcc-12-20221112.tar.xz 79163888 BLAKE2B 996e72ea0aa592701d628b78a0b0637d4a0dad799aece4d6a5b84d6aefee983b153782cafa5a3f4580ddcb90d78bd89b27f7191fddbc6d778933642a917781d5 SHA512 3901c2c96f25884b6f329558bd044051ca6daa0bcaccd85a9bb1079a07bca08d782374b396b5c7e7d2e2da6595b9860507807d141c9cc86f504e7e288ce8da06
-DIST gcc-12-20221119.tar.xz 79163968 BLAKE2B 76eaf75958b332a21fcb185c045c994eee76caeae2abfc7d2a3656a0d0871c2ba346278e9c2c926b1d5f211798a106a983c3fe8a598d3c46384586a72369008b SHA512 9ce92bd2042f32d2a650f0e4f102202ff2f6b7592fdeeeabf0c1beb1b9b96312f9cb216b5d912e68bc8ff4c943be03a0fc200fcd00bc4fa210ee8e49e15c2a50
 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
-DIST gcc-13-20221030.tar.xz 80108908 BLAKE2B 53ea6d13e5cf747d6dae515db5c07ba53580218dc0e5c4ce9dad48ce8ab968bc0fc51309169d991ad701beab3cf1bc2c15438d38f69dd642edf6d1f186e381cf SHA512 036034a1fa7883f9f9c224a3b4cf0a8e369d06882bff17c40a38a275f14928f546686b093b50e6c01664b90ee81addf24b4a513bf072a72e0f59f7f890ff1cca
 DIST gcc-13-20221106.tar.xz 80001320 BLAKE2B 4a86b5aedf67725b577a69112ab241b22b3b0eed6c86e2d9ed06e5045a1de1c4bc6f2e7a281f1a034b9b227e5ef72954d17900369bed6015e064f303c89e6cf2 SHA512 bd3160d23bdebd0e423800736212e340eab0a71891d579145d85931fe8fa3c9e196a3422d70a98e17d1990759bf57b3e4eb08b25544db5e4fec8448d1a33ee20
-DIST gcc-13-20221120.tar.xz 80199576 BLAKE2B 7f7f19feabfcc57684141c540d4a95f6cff96d2f68824cdf9b1e8351058740d999a3865f5b5ad893bb34f59399980416a772e94fddbca813f12ec4339e0b9871 SHA512 5e4fce946a2c815e41e28120eb0fb8f1f6003f6c1ec9000baae2143f343bacb3aeb3b9034ccb67b18bd519ef98953305de7d643e1b25c4908de635491fae48d9
 DIST gcc-13-20221127.tar.xz 80684196 BLAKE2B 6c5bdb5f5f7c624d60a37113c09a1a97a44839849623d860af06dcf2883f7fafde286245aac6e06938ba25a3fd05588c77f73311d246ec08a22260874fb45112 SHA512 aedf3817200ce8a08afa0bd979a660de42d86aabf6c0a9028f5f34ba7d5f5b45bc4abaf35ecd62d1f8d4fac05e8a003ab7358e8a7114b8d0d63d61c1695da4c6
-DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
 DIST gcc-13.1.0-patches-2.tar.xz 9924 BLAKE2B 568f8b9e31974f4991bd922436373320118a6fe07b7e9fe0127952894bdebc5e8684f66e645a3a5684717c687e9bb6074508972b61a3eb692c6e5f23e46359cf SHA512 9fed795ce3aa423e223864b750e50419343bbb36f53e938a691f189e954acb3a4efec4aafe466bafb3556a04c78bf68d19e3e60ffd0a2be490ea821d98e92dc9
 DIST gcc-13.1.0-patches-3.tar.xz 10984 BLAKE2B b032049090732e39c94788f4014a463e82fe186ad9ca5ca7ec1d522dfc4499bd2c229bc3bed7ed1d4e1e5f196444037acdea8b865d62c164d6daf307f949e307 SHA512 940d5f1e7f8cb48e9e6d63b5cd31dc5e4bd1669c78b3adfa6b7c30d3f85d8de4f26c1db4e3727f3789b1d439d07d3eeb9a8120f45693da6c2e6d9ca27e264941
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
@@ -41,26 +32,18 @@ DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b72
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b496d6b7b7cebc0bf2b04395d14b74daa398ea2e2d916df4f6034357cfc740939e0fb346bbea71a8a09603fbb SHA512 8fd4642dd974006efe35f6d45ebfda66fe5dac0d4e2371804ede5d94e6e820b95cedac08c11de766c0c711bef7c55900cdaeaffe889691f7acd7470c32e7e3b4
 EBUILD gcc-10.4.1_p20221006.ebuild 1453 BLAKE2B 638b9b95bff53ae5e2a001d4b5c7ad44fcc8cf8830142c444e4d24e99c3402b486ee741d41027924fcd5b33c8182ac8cba4ddb8ccdbb3fcf295de5aa40a748b8 SHA512 5beacfa72aa919baa740a9916626a6e77935a4019bbf275fb1c40a639a9fb9dafd51dcfc86a39df3508886b290ae60c20293f538c21856e41b987396f669c458
-EBUILD gcc-10.4.1_p20221110.ebuild 1456 BLAKE2B 2c0db71c8f80d84ce17f694623942b59ae34a318f740b77fc84d82aff72f481300750ef318bef57eb46748d22a045e038d8982cf6a389cb3bd46aa4a0b33cc4b SHA512 e1f329b81fc4fc54f8fdbf2ceb7b45e1e582cddd82ebbd2be272c7ced8a3e7be8fae01b989697624b238e4f3a881d48143ab6e300eb320d80253f269e4d36ba7
-EBUILD gcc-10.4.1_p20221117.ebuild 1456 BLAKE2B 85a813eda1eb69abcd00094024769bdb1999ef3b59b69c443aa9a30556f5720148eb94b92f44b557374b2d5781acaf9b5ce7e1f9cfb14a58d23205e2f657c27f SHA512 28ed2aab1f545b2506a6729772f5e08d67816504edb2882633ff466900643849469b7f72b0432f457897042530b808c3cfe157c4e7464d632ac52d1c3b34a70e
 EBUILD gcc-10.4.1_p20221124.ebuild 1456 BLAKE2B 85a813eda1eb69abcd00094024769bdb1999ef3b59b69c443aa9a30556f5720148eb94b92f44b557374b2d5781acaf9b5ce7e1f9cfb14a58d23205e2f657c27f SHA512 28ed2aab1f545b2506a6729772f5e08d67816504edb2882633ff466900643849469b7f72b0432f457897042530b808c3cfe157c4e7464d632ac52d1c3b34a70e
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
 EBUILD gcc-11.3.1_p20221007.ebuild 1294 BLAKE2B b7ebe383beab66923f219509ca9afd6f4d77d4796041acee361644bcd874a86a6bb3c72a5418e669062af7b946646cea92ce8010546e26d09ceb9894e4f67d0a SHA512 13fc00a6381cdfdb5646ce8b405458d2d966fb5daef28ccadade709e1be4375698ab36dd9d97a0c25a8a257b1227076ec8112fdb3716699adc6fcace42240649
-EBUILD gcc-11.3.1_p20221111.ebuild 1297 BLAKE2B 866b91db54ce086190346a069776243f505aad03fe19d2beb80d1979000f70727d6288b6527f1789bf2fbeec3a033314ab53457eb1b076bb5986e6f648138d80 SHA512 bfc2320d5e28787e64e81efe9fb6c040e06c5f5891ccf330bdf62cbdee7c44922dfec05945c916884605835af4f664f7567e4367698736c87631e3e6182fa375
-EBUILD gcc-11.3.1_p20221118.ebuild 1297 BLAKE2B f3d59b1d083b63bda25302a810d2a889310a0bcdaf692092a6a9c869ec7435215277a5618742997d55154c6e07c3b1ac64fbd899840895edf436e00a28aaf87c SHA512 24a214d02520bc06309d1201bbeb804c86ef2228c2db717d964e57e9580b174211e5a21c2f91f8042c5f8fc0148528a9fbf094f8a074f7d3d2718c2531af5bff
 EBUILD gcc-11.3.1_p20221125.ebuild 1297 BLAKE2B f3d59b1d083b63bda25302a810d2a889310a0bcdaf692092a6a9c869ec7435215277a5618742997d55154c6e07c3b1ac64fbd899840895edf436e00a28aaf87c SHA512 24a214d02520bc06309d1201bbeb804c86ef2228c2db717d964e57e9580b174211e5a21c2f91f8042c5f8fc0148528a9fbf094f8a074f7d3d2718c2531af5bff
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20221008.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
-EBUILD gcc-12.2.1_p20221112.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
-EBUILD gcc-12.2.1_p20221119.ebuild 1437 BLAKE2B be29d238ca36333c711e627b74e5ff647115259acaa853afab9b21436ff2738bf7529a6290339a0fd6c9cb79a93ba9df553cff6f30f9ff67dea07ae8632accb2 SHA512 a93d611ec6e1dcb9563ea7664c5c2840ebccf90c5cade0ac5000e6922219a2c5e1c1a6912f44c35597feb0ee218e7103b848bcb7f3fe7289ea724955b58604e7
 EBUILD gcc-12.2.1_p20221126.ebuild 1437 BLAKE2B be29d238ca36333c711e627b74e5ff647115259acaa853afab9b21436ff2738bf7529a6290339a0fd6c9cb79a93ba9df553cff6f30f9ff67dea07ae8632accb2 SHA512 a93d611ec6e1dcb9563ea7664c5c2840ebccf90c5cade0ac5000e6922219a2c5e1c1a6912f44c35597feb0ee218e7103b848bcb7f3fe7289ea724955b58604e7
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
-EBUILD gcc-13.0.0_pre20221030.ebuild 1288 BLAKE2B a2281da17b96d44850dccf6a6420d66cf163a8f53ea755f1414911fcffd71b504273f3010b6a6c3cb796bf763d8da5b8fa64efb7e107b3e5a8bb1ab767704d05 SHA512 8108432caffabab640a472344adf5660a005436790d31f287f1e72109dd69b5831ea0f3e956a822439862da6a24b78daa7c4253fe51ce9b47457de3b83d80b5d
 EBUILD gcc-13.0.0_pre20221106.ebuild 1286 BLAKE2B 1fa413af207ba08862a47214e5a6942f7e99fba52761a7143ee6b187a1edc5bfed5fcab079ff09dfbc4eda035c6cc2fad67cecc86ca5d50e5ad0901236a6431e SHA512 fb9177511689f93651c4b3b4445226faff79366e7fe97d8255bddc0fca5fe84e2f34b2b5406e3d8089ccf3625b02b5aafd7ee2150f8c46b6b784c50d43a1e301
-EBUILD gcc-13.0.0_pre20221120.ebuild 1270 BLAKE2B f0f574079eb3e06d7ff67ad01e48f5016db85d5d30ef56bfbd4257ef2e6c7fb168a058ad8fa4270b0a03848978d52f41c211f12c85a67fa26dacff0f3caf3576 SHA512 d0b4caeb83fa7a2636b6df6a0dd54e8420e01f285728b4f5e89ea2f4d99f4dc373d2b9c17ea3b782bf3307f40c474d34c97213fc02aae9ce246ace7deddae000
-EBUILD gcc-13.0.0_pre20221127.ebuild 1270 BLAKE2B f0f574079eb3e06d7ff67ad01e48f5016db85d5d30ef56bfbd4257ef2e6c7fb168a058ad8fa4270b0a03848978d52f41c211f12c85a67fa26dacff0f3caf3576 SHA512 d0b4caeb83fa7a2636b6df6a0dd54e8420e01f285728b4f5e89ea2f4d99f4dc373d2b9c17ea3b782bf3307f40c474d34c97213fc02aae9ce246ace7deddae000
+EBUILD gcc-13.0.0_pre20221127.ebuild 1287 BLAKE2B c232b4a8ce9955849c4878c45ff6eaf9b7895ee3577a58aa3dcd745e191a3cb8b77e59f394f6f6185d291ac228f241a2ae9c023894d8a7666d906fdd938366ce SHA512 217d33d88272e90afcb1ccdbd005bf2ae87748f9bee6ce8e989f443648047d91544e3544184e7e2d605aaafbef160b21a1269b066109e1a4f0de1a209185fc7d
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
 EBUILD gcc-8.5.0-r1.ebuild 473 BLAKE2B 40d3b651d0aed62ceb1df973f1f7e2b6ce419df22da63e49d335fcd0bf7b349d1e7be40dc16e80fe143222d48ac6139d35bf47558d83c30aab4b25dba6fcf6cb SHA512 b88761a3495a1eab0de5321c9230c77cd621ae545d3be49a13273cfcd8e94cc21dbb062bfdebb64dc5bfe1ddd600ee8fb60df6fd7709a7be90915b7e99a8db29
 EBUILD gcc-9.5.0.ebuild 844 BLAKE2B 7bee440ddb624d5489ebaa9be899c530bdf7d9563453a9abf45e60d1f3ed66a78535cb9227e66e93524071fbca447786e2133ea316b5b2b55366e2599c587be6 SHA512 4b578a481eb06ff5b445bbd81cf18d4d63ec2d65230e33f95377f270b391bde02c2083a1b46b43838bd115be7d75c3957258f72fb5e7d89ba79185d08195b9ec
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221110.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221110.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20221110.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221117.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221117.ebuild
deleted file mode 100644
index 1fa3a3601536..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20221117.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="1"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221111.ebuild b/sys-devel/gcc/gcc-11.3.1_p20221111.ebuild
deleted file mode 100644
index 4c05022129f0..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20221111.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221118.ebuild b/sys-devel/gcc/gcc-11.3.1_p20221118.ebuild
deleted file mode 100644
index d6ead8b3a521..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20221118.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="3"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20221112.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221112.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20221112.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-MUSL_GCC_VER="12.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.2.1_p20221119.ebuild b/sys-devel/gcc/gcc-12.2.1_p20221119.ebuild
deleted file mode 100644
index 28a10fb471f5..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20221119.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-MUSL_GCC_VER="12.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.0.0_pre20221030.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20221030.ebuild
deleted file mode 100644
index 641ab05e8153..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20221030.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="xen0n"
-PATCH_VER="1"
-PATCH_GCC_VER="13.0.0"
-MUSL_GCC_VER="13.0.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	KEYWORDS="~loong"
-fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild
deleted file mode 100644
index 92deea80216e..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="soap"
-PATCH_VER="3"
-PATCH_GCC_VER="13.1.0"
-MUSL_GCC_VER="13.1.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-13.0.0_pre20221127.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20221127.ebuild
index 92deea80216e..9d34def24fa5 100644
--- a/sys-devel/gcc/gcc-13.0.0_pre20221127.ebuild
+++ b/sys-devel/gcc/gcc-13.0.0_pre20221127.ebuild
@@ -27,9 +27,10 @@ inherit toolchain
 EGIT_BRANCH=master
 
 # Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
 #	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
+	KEYWORDS="~loong"
+fi
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
 # If GCC is enabling CET by default, we need glibc to be built with support for it.
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 44528b4eafaf..d458af185807 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -5,8 +5,6 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d2
 DIST gdb-11.2.tar.xz 22039420 BLAKE2B 66ce7e12c99c33c8b4e6ababa673204aab525e72c90ba54cc34a5fd69948a09dc2a9ef2050764b2464544231b1d1a6431279c2877388551ca6fbf384a3f9b464 SHA512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127
 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
 EBUILD gdb-11.2.ebuild 7773 BLAKE2B 12bec31a73f4b9204183cae661a769130d5b8c925a4bec768106ef42fd485b2faab7cb55adbfda30f19f5d9d76386c2d21e64cde15baf45046caadc2ec0e15d2 SHA512 53b644e2cb5652e9393aa3064a6b895ee01f6231346bee1079cbb168595f624882f8f2df89ac9c549a3d80269f645fc77c8908d335a82f9350066cfd12d9f6a4
-EBUILD gdb-12.1-r1.ebuild 8182 BLAKE2B fa5f02ee9d8ca485ec0f3e3c8f59977669cf1bb4ac1317b44dcab292c1a394d826029199d78859206c2e3816af01d3fdcbf077c7bce67a9cd47c8e7e4818e752 SHA512 f2c12426f28e36183009f314ab7164512a6367b4c344f418d00c80279b0a348dacabc1ca6af4c971a4ea949273e9b9e96458a4850a362c1629aa6650f67a4825
-EBUILD gdb-12.1-r2.ebuild 8225 BLAKE2B 3bf43b7d87029a0ec4319c00a177e4df8b4d23a68862b0b1692481e9ed817947ddd9da32d281641772db270d8daee2674696a550be348cde4364d826fc7974a4 SHA512 bd17ae458284a1aca545e4cdb81f0243e942d010d01263bf223a2f542b150bf1ddff90fcb849f00cafad56412910b045d9562785fc64aa1c6819c3a34b420d46
-EBUILD gdb-12.1.ebuild 7708 BLAKE2B 13e0a83a1f30c21d973c8bdaa018406b7a60563fec76e73052ccb388308f88acbd613a3c0e115a02f2fa61ff1c2733d79203750e93c815ef85f5f75bd76b23b4 SHA512 3e9e0fd46b7680daf8c8a67200af8fcfb1d0422d372820e758d5a5e8bc0d674b7ae977e600446e2201d645be7e2a930a2165bcb6a09fce5113088aaa2f7bb2ca
+EBUILD gdb-12.1-r2.ebuild 8219 BLAKE2B e108df60c1ec3fc2944c9f09693525b0f560cb4796004e167d6f443dd447230b25d442a6f27c68cae5301cc3851466dbdcfc75b27373f47374e4df18f56970d6 SHA512 e45da493a7c40429c30b720a355224d20aafcb69c06bfd5839480da17bf4a350d378214cf2b0ff3903ec3dacd9a11eb512b5484c5af4da9c88fc579279905ce6
 EBUILD gdb-9999.ebuild 8182 BLAKE2B f086657508ce95f6689c6d92877bb1e6cba94d0dd19da5dfe752967db555b6faff3e659936e51138c3fa8ef504b242463f8b8551ae86d36af1843a1634d0f59c SHA512 fcdeab52ea6c6e17ac4be64a57c57a2b1c607dfebf066704e3556f467b369bb2ef59d32c0f1213aa8a54d3dd7b1498583eefe01efbd399fd1b24407d9cf93b91
 MISC metadata.xml 1103 BLAKE2B e63ea2e52649ac2f4ac21381cadb7cc76525792e99a4a6581535475480b6c45e654c8222b0b58585435d4c858cf3eef00dcaecf7edecae2b2fd336f1b56e6e56 SHA512 f7f1b4da71b18cb68a2f32aa6faae6251528047069071c9bee1be504267d0baf2cbac4fb928e0cbe9df100e3a681e2c3b6c7be14514a45a2f52d30364a8626f4
diff --git a/sys-devel/gdb/gdb-12.1-r1.ebuild b/sys-devel/gdb/gdb-12.1-r1.ebuild
deleted file mode 100644
index f75e337dc424..000000000000
--- a/sys-devel/gdb/gdb-12.1-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-	9999*)
-		# live git tree
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		SRC_URI=""
-		;;
-	*.*.50.2???????)
-		# weekly snapshots
-		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-		;;
-	*)
-		# Normal upstream release
-		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-		;;
-esac
-
-PATCH_VER=""
-PATCH_DEV=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
-
-IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# In fact, gdb's test suite needs some work to get passing.
-# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-# As of 11.2, on amd64: "# of unexpected failures    8600"
-# ia64 kernel crashes when gdb testsuite is running
-# in fact, gdb's test suite needs some work to get passing.
-# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-# As of 11.2, on amd64: "# of unexpected failures    8600"
-RESTRICT="
-	ia64? ( test )
-	!test? ( test )
-	test
-"
-
-RDEPEND="
-	dev-libs/mpfr:0=
-	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:0=
-	>=sys-libs/readline-7:0=
-	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
-	lzma? ( app-arch/xz-utils )
-	python? ( ${PYTHON_DEPS} )
-	guile? ( >=dev-scheme/guile-2.0 )
-	xml? ( dev-libs/expat )
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	virtual/yacc
-	nls? ( sys-devel/gettext )
-	source-highlight? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${P}-readline-8.2-build.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-
-	# Avoid using ancient termcap from host on Prefix systems
-	sed -i -e 's/termcap tinfow/tinfow/g' \
-		gdb/configure{.ac,} || die
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. bug #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		$(use_enable test unit-tests)
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# We need to set both configure options, --with-sysroot and --libdir,
-		# to fix cross build issues that happen when configuring gmp.
-		# We explicitly need --libdir. Having only --with-sysroot without
-		# --libdir would not fix the build issues.
-		# For some reason, it is not enough to set only --with-sysroot,
-		# also not enough to pass --with-gmp-xxx options.
-		--with-sysroot="${ESYSROOT}"
-		--libdir="${ESYSROOT}/usr/$(get_libdir)"
-	)
-
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	# gdbserver only works for native targets (CHOST==CTARGET).
-	# it also doesn't support all targets, so rather than duplicate
-	# the target list (which changes between versions), use the
-	# "auto" value when things are turned on, which is triggered
-	# whenever no --enable or --disable is given
-	if is_cross || use !server ; then
-		myconf+=( --disable-gdbserver )
-	fi
-
-	myconf+=(
-		--enable-64-bit-bfd
-		--disable-install-libbfd
-		--disable-install-libiberty
-		--enable-obsolete
-		# This only disables building in the readline subdir.
-		# For gdb itself, it'll use the system version.
-		--disable-readline
-		--with-system-readline
-		# This only disables building in the zlib subdir.
-		# For gdb itself, it'll use the system version.
-		--without-zlib
-		--with-system-zlib
-		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-		$(use_with xml expat)
-		$(use_with lzma)
-		$(use_enable nls)
-		$(use_enable source-highlight)
-		$(use multitarget && echo --enable-targets=all)
-		$(use_with python python "${EPYTHON}")
-		$(use_with xxhash)
-		$(use_with guile)
-	)
-
-	if use sparc-solaris || use x86-solaris ; then
-		# Disable largefile support
-		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
-		myconf+=( --disable-largefile )
-	fi
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	# ensure proper compiler is detected for Clang builds: bug #831202
-	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	find "${ED}"/usr -name libiberty.a -delete || die
-
-	# Delete translations that conflict with binutils-libs. bug #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/PROBLEMS
-	docinto sim
-	dodoc sim/{MAINTAINERS,README-HACKING}
-
-	if use server ; then
-		docinto gdbserver
-		dodoc gdbserver/README
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
-
-	if use python ; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# Portage doesn't unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb/gdb-12.1-r2.ebuild b/sys-devel/gdb/gdb-12.1-r2.ebuild
index 9da927c79e77..aace932f1148 100644
--- a/sys-devel/gdb/gdb-12.1-r2.ebuild
+++ b/sys-devel/gdb/gdb-12.1-r2.ebuild
@@ -47,7 +47,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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
 
 IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
diff --git a/sys-devel/gdb/gdb-12.1.ebuild b/sys-devel/gdb/gdb-12.1.ebuild
deleted file mode 100644
index 0accf1af301f..000000000000
--- a/sys-devel/gdb/gdb-12.1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-	9999*)
-		# live git tree
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		SRC_URI=""
-		;;
-	*.*.50.2???????)
-		# weekly snapshots
-		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-		;;
-	*)
-		# Normal upstream release
-		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-		;;
-esac
-
-PATCH_VER=""
-PATCH_DEV=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
-
-IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# In fact, gdb's test suite needs some work to get passing.
-# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-# As of 11.2, on amd64: "# of unexpected failures    8600"
-# ia64 kernel crashes when gdb testsuite is running
-# in fact, gdb's test suite needs some work to get passing.
-# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-# As of 11.2, on amd64: "# of unexpected failures    8600"
-RESTRICT="
-	ia64? ( test )
-	!test? ( test )
-	test
-"
-
-RDEPEND="
-	dev-libs/mpfr:0=
-	dev-libs/gmp:=
-	>=sys-libs/ncurses-5.2-r2:0=
-	>=sys-libs/readline-7:0=
-	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
-	lzma? ( app-arch/xz-utils )
-	python? ( ${PYTHON_DEPS} )
-	guile? ( >=dev-scheme/guile-2.0 )
-	xml? ( dev-libs/expat )
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	virtual/yacc
-	nls? ( sys-devel/gettext )
-	source-highlight? ( virtual/pkgconfig )
-	test? ( dev-util/dejagnu )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${P}-readline-8.2-build.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-
-	# Avoid using ancient termcap from host on Prefix systems
-	sed -i -e 's/termcap tinfow/tinfow/g' \
-		gdb/configure{.ac,} || die
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. bug #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-	)
-
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	# gdbserver only works for native targets (CHOST==CTARGET).
-	# it also doesn't support all targets, so rather than duplicate
-	# the target list (which changes between versions), use the
-	# "auto" value when things are turned on, which is triggered
-	# whenever no --enable or --disable is given
-	if is_cross || use !server ; then
-		myconf+=( --disable-gdbserver )
-	fi
-
-	myconf+=(
-		--enable-64-bit-bfd
-		--disable-install-libbfd
-		--disable-install-libiberty
-		--enable-obsolete
-		# This only disables building in the readline subdir.
-		# For gdb itself, it'll use the system version.
-		--disable-readline
-		--with-system-readline
-		# This only disables building in the zlib subdir.
-		# For gdb itself, it'll use the system version.
-		--without-zlib
-		--with-system-zlib
-		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-		$(use_with xml expat)
-		$(use_with lzma)
-		$(use_enable nls)
-		$(use_enable source-highlight)
-		$(use multitarget && echo --enable-targets=all)
-		$(use_with python python "${EPYTHON}")
-		$(use_with xxhash)
-		$(use_with guile)
-	)
-
-	if use sparc-solaris || use x86-solaris ; then
-		# Disable largefile support
-		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
-		myconf+=( --disable-largefile )
-	fi
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	# ensure proper compiler is detected for Clang builds: bug #831202
-	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	find "${ED}"/usr -name libiberty.a -delete || die
-
-	# Delete translations that conflict with binutils-libs. bug #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
-
-	docinto gdb
-	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-		gdb/NEWS gdb/PROBLEMS
-	docinto sim
-	dodoc sim/{MAINTAINERS,README-HACKING}
-
-	if use server ; then
-		docinto gdbserver
-		dodoc gdbserver/README
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
-
-	if use python ; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# Portage doesn't unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index cdfd9ac23952..5512abc9a5d4 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B bc67645d251f5c2883a32cd57ebcedefdf4fe8853c709139cc9ca11299e5f28d8b000eba622521cb5aba19ffe36189cf682e921386d2731538b05308f7c67257 SHA512 d933299ffeecdaea55e37a085c181322fc9d1d0f2e69e2c5f064b6db43c11bc152203908444b66423adbd299eeb13a1f6a0863b7ea359734fe919efd96bec639
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B ba5b56979e55cdcc340294289ad31bcd1f331e4f93a4e76c185eb4a662abeaae0b54af59fd39d9a93d06410d20b0dc5c2600dcfd8d35260b152b2ceb7a3b56a9 SHA512 b3973f16c1973763e523c065016bce46e743c76bfa257d623af86b9231b0732e1b67b695fe6d9deb2ed6534cd8eb37de9de46ab46d3789aa2634bc54e7197657
 EBUILD lld-15.0.3.ebuild 2094 BLAKE2B 0346f444a9e76604151593a73bfb1c1d966baeffeee2874e21edb07119e1e8b40c11faeba13af65d1e266c57f29fc0b54e629b9e49160f410f74a6bbf22b2ba9 SHA512 96928bf4aca009b52b7e6fc7cf16b1c99f2eb70ffbb4555785b459c39d12dec0a67fc8029dfab9255241aaae67fe2e3aaf8d5dcd47419723da556735afb36cf1
-EBUILD lld-15.0.5.ebuild 2096 BLAKE2B b93c904025a6cc09346aa7f45082caf148a6f8e069f71cc536a10fabb2c42cdfe1c8d80b4da901af71195b269f464f4227edc82f2e7a2a5da3cb9169ed1444ea SHA512 2fded657cb30b960b926af5accde41828edbc804acb946ec3c154d5fc3a12dd9c6e55c95ff2f5d333f0cc9abd7377ade31f748d43f640a89c1fc85a6eff6fce6
+EBUILD lld-15.0.5.ebuild 2094 BLAKE2B 0346f444a9e76604151593a73bfb1c1d966baeffeee2874e21edb07119e1e8b40c11faeba13af65d1e266c57f29fc0b54e629b9e49160f410f74a6bbf22b2ba9 SHA512 96928bf4aca009b52b7e6fc7cf16b1c99f2eb70ffbb4555785b459c39d12dec0a67fc8029dfab9255241aaae67fe2e3aaf8d5dcd47419723da556735afb36cf1
 EBUILD lld-15.0.6.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73979ab1ebdc4b76e98cc2415d2062783e46cc53b0cb6c21f2471df57f6f6209715d26e5baee01f20431a31c17b04 SHA512 8a4bab6ea39ff8bf25762658e6b1bf2df6523659049240390e9517c30a716b83823948b42b7aad22979e0a60b7dea2d6a5309938fb1810d07bc1566a2d903698
 EBUILD lld-15.0.6.ebuild 2099 BLAKE2B 5938071d1cd45bf62a0258851a844dac9d402d07902c25de92954f65ab281481a1112cac50be27d1a5ab0f335b73aeed0f095d299d49e67bfd6fe3aac0fa1cf1 SHA512 a1d7cff5d06714f488b741d09bb21d6e10dded8635d85792791cd23eb560e3b4ae7e59eb525f521b560c8eeae1a5845401d94a326fc52fb0f177d29abb9476b8
 EBUILD lld-16.0.0.9999.ebuild 2029 BLAKE2B 11f5ed949a1bee56186364445e5a64a64b7e4b51c10664cab20dfed1f22e3809ac10a474e1cf0991f38b1d0f47cee8dfbf601af5500480d928a8f186925b1db5 SHA512 7a92f13d78403f0e44781392446e63dd4cbab564872f5156fa53ba7b04eae6ddcb0f7c809e45080dff92bcaf6d1eff1ee8e6dd4991d51c1d6dc0a0c724f7b304
diff --git a/sys-devel/lld/lld-15.0.5.ebuild b/sys-devel/lld/lld-15.0.5.ebuild
index 96c663d24126..65ca265fda97 100644
--- a/sys-devel/lld/lld-15.0.5.ebuild
+++ b/sys-devel/lld/lld-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 841da2f145fd..f0df80340ef1 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD llvm-common-13.0.1.ebuild 607 BLAKE2B 01e55167e8a1a1568105090883f42c0c56c496eaa3ae179d1e44acd1d2f59977a6ce0d4d9c5bbbec38df5afc5cce7aff77a38c1618d415f431c4a413ea90bbf1 SHA512 4a5370e4e43bc5268ab32bcf4ae328890aeeab293da8fe74f3b52504ce57e5adc36de5240ff91e54a35f1f48840df7d821fd94600b1193c676c55590379bb8fe
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.3.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
-EBUILD llvm-common-15.0.5.ebuild 603 BLAKE2B 1d1b42a7c000525fc72ba61387bb67aa815f813a995267108ac1be17103dbd8d841f336db3fe8844fa7f36e3284a2e66c7cd5e27dbb443f2201b068a89102b64 SHA512 2990a9491821bc612f80c5cb0e58c41fa0cdf6ba2909070dd40c513dbb5a2e9225ca49842bfb89314677f9b038421cf7f581fff569c4640eb248abcb63e4daa8
+EBUILD llvm-common-15.0.5.ebuild 601 BLAKE2B e5a531d1e1eb3661b733929eaecb7fcd3dff95e45446d9e2e43c014f448e9f6e63eb094129eb4868a5bc7971ff765407ec6ba105701dcd74b54bc7444717fa62 SHA512 12f1fa449c775231a09b565e0042746add141c16925cf460527a1ca1201281563911e00217793a64dd808bf5c20c4f3bee9a38f11b937804470c19b03fed0ac5
 EBUILD llvm-common-15.0.6.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-15.0.6.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
diff --git a/sys-devel/llvm-common/llvm-common-15.0.5.ebuild b/sys-devel/llvm-common/llvm-common-15.0.5.ebuild
index a11a54afda28..a7f475d5e06b 100644
--- a/sys-devel/llvm-common/llvm-common-15.0.5.ebuild
+++ b/sys-devel/llvm-common/llvm-common-15.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	!sys-devel/llvm:0
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index a283976b880d..465abb7685e1 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -23,7 +23,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD llvm-13.0.1.ebuild 12006 BLAKE2B 06535b1c0f568959b526a1e198361a8db46bea1ec37bf694438b0c0721741f61b340460d383f0693bcc45a27004c2ae6342c5fb97a2f276e9f7b2a160dbf90f1 SHA512 9c3f6c38f672bb1d8edba76e689fc567c797fa8d2410d7924b6121527e85709bf66f8ef5f475f9d0632b06b4da211c3ba6a9825c92fb6914b76bb06e93f19a5c
 EBUILD llvm-14.0.6-r2.ebuild 12381 BLAKE2B 736afa7fbf7321ce4370e892075e716e6efb23981b4e9d235d60784c7548c6b62590527753e2752f80b4a4eafc04096fbd6ec5b8efbba88de08f322262361eda SHA512 1c800cea06768c48fe7c0944e4b4c9227f11ffbf9605ca52e487646385eeeaab5acca8aaba0e66b21b2939505533f562fe40ac5b23533adf0e42898e163a9620
 EBUILD llvm-15.0.3.ebuild 12537 BLAKE2B dc235a62a560996459f33b6e8384de3631baa36d37ce600931f7c006904e3bd73cadf82edcb7dda352b830c49be474d5dc15e09ade7222829460797cb0e7b09d SHA512 c72386e944d069309c863fb7685a8cca19bb141866f03ec78846bb7f6840995224cc0a6cce14f387167f1c1eca7877a5b362a7160300b5732e845e63efc4a87e
-EBUILD llvm-15.0.5.ebuild 12538 BLAKE2B 79782385364a4daa48499742b9e602a99c00694cabd9fd724fcc194eda01971dac9b2f68a6b7d70f487ef74dd8cc8906cf0ea36a426d7c55072d93300d5e0ba9 SHA512 1385b0aa512c5b6aae00c6578af56045731771eb9f3b2f9eff1f6d5922bbacc1fc5810e4dc9f91617aa0643cdb0439f1486db2b20053e762a4d2819ca785236a
+EBUILD llvm-15.0.5.ebuild 12536 BLAKE2B 857d7c1fbf7ed1963aff58933f8370c4f8d927c123be5b23943e7330f4b28057904caec9991043411e76a63926282fbd907aa112fbd8adf7f352c5a2434e3206 SHA512 3b054ea539972bdb8757fb6c63c2a6ed5d3bd4ca6236d2670483dd67d6158edb6d03bce390f5ed88bfff121de9b354146f5dd34f13f7ce1e39c281a7951c2d02
 EBUILD llvm-15.0.6.9999.ebuild 12457 BLAKE2B 52496ac8ef1cb0d61f1f7c6dc5b3db0a0778d841ad67c983c140b0c7858125bd34bdbab31fd1862e5b6c6eca4554764dd1dd2422268ef485c6ee8ecf8fcf3c57 SHA512 0e4e356633dc5d9660e0d440f74ef709ebf88919cec1cb2f317c3744000e8db25e0036be3404a01dd8817ff8e77c64f95c38a27c8cd8e9445e7f037a0a8a5f7b
 EBUILD llvm-15.0.6.ebuild 12543 BLAKE2B 9dfa279e68956c4374ed3f7da1b0b025681adb074a79319b2b3df6b2ee273b7c29ba96a4f9262e8ed506e8edbbc1f7254359b519dac6111a819ea69bc278bd34 SHA512 7210feff1719c0c16c87239ab5ce4bb08f0e862d3e5bc67695f823c067c4cee625ed15250335e747e8d2de8eb3619334e701b856d591e53274f5b1c5c077809d
 EBUILD llvm-16.0.0.9999.ebuild 12584 BLAKE2B 54adab5484a93dcea378220dbeea3cc461be770e5a6484bfae3c5bef0866ebb42c1c3996244a02789fa76ecd7fd9dcb81b6c186389cba34b6be584af47a4f98d SHA512 cb1d3a09c4d3745b18a718e3d497f72b563726db4badeaf24a87972c3ac8be5021a00be98ec1f49cac33ac0e4915386e2c62c614c37665d0d7109bed510a7cba
diff --git a/sys-devel/llvm/llvm-15.0.5.ebuild b/sys-devel/llvm/llvm-15.0.5.ebuild
index d3f216465e7a..86b72d9c66b4 100644
--- a/sys-devel/llvm/llvm-15.0.5.ebuild
+++ b/sys-devel/llvm/llvm-15.0.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
 	xml z3 zstd
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 52ee1e258f84..f9817217be9d 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index fee5580fff16..84cabb6428a5 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -4,7 +4,10 @@ DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1
 DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786 SHA512 224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94
 DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46 SHA512 75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3 SHA512 a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
-EBUILD zfs-kmod-2.1.5-r1.ebuild 5580 BLAKE2B aa39c05aefd62f464322515d88ad98c084afcc024c4f5744feafabe1ad3723f701ab37f8d533c564b175b59b09fd0f369c55434a26aa7a8713750d10b850ed6b SHA512 d9e6e7ea21c87d12fd29372eda8d0fd2f6f85c1949278c253762de3cae816f2b145ee374e9835a8938f015ca9dce72e9ae9762012aa3e5bcdf012b1d59f1bed6
-EBUILD zfs-kmod-2.1.6.ebuild 5479 BLAKE2B c7952dfa617b1d8fc6d1705730f220ec36c09d557db27f5747672b3e2efe704216087c8b4ad773515318068a0a9fd54e1b1bd26271db25a943134cf33f79c216 SHA512 f24bb931adf0acbfd825caf404511ea0ce7d95212c0bdc65dd72bc900fabda003562a4701951ab1a7b52d4f802616d239c523457044d01a19a828838ca4c32d3
-EBUILD zfs-kmod-9999.ebuild 5225 BLAKE2B 0b6c54b2421e5e06ee98b85e93f5cb29a5b7ff98aed1a8b76956671646024d567a26f4e306e89eabf2683eb171a95ab892db9294a948c7bff499958ea47bbf9e SHA512 2d4d876c9da7435fc6a791a73f4b3d2f24d44395dafebca39edd3b92af248e69a7d44a89028649f52feb8d199b2771ce6711a5238ed567f5bf7e43a2deef3ecb
+DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
+DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
+EBUILD zfs-kmod-2.1.5-r1.ebuild 5589 BLAKE2B af311875852b88a403852c40cc2caaf505ff5eabc4fa95a30e92f8509fe5bc0e7d51c829bc0ac931837be1cdf2f614133ab1b59d9cf3b7a17cd782dd7a9fbc18 SHA512 975cc02ccac60b30db4b6ea7d70397d0612e2610ae08b8c8b5205290a606a833923148e2291766d5c03e884d87e9c8fd96378f2f07285848190f1942aff74432
+EBUILD zfs-kmod-2.1.6.ebuild 5488 BLAKE2B b8e0b564c994d5034da2e376e3fef5560df68303b7dbe36a301f9de463757560d41f374f970813cba09fb59907b37a2ac6fd7f9bdbca5f9b17392bf3e7c3ef8b SHA512 4c6064ef3dd45abb7a0af4f06f65e5787962f5021d5d633270cb50585fff58ba50c63b13593248428d04c07da30c8353a6d63d6fd383749fff4f665ac48d2392
+EBUILD zfs-kmod-2.1.7.ebuild 5486 BLAKE2B 868c40b68975985de91c41bac5df5ba82c618ae7f63d82ba4ff2694dfaad63b6b9c16c513a0606439a14f3bc02ba0c11d34559b140226e9960509d54d195b208 SHA512 ac2b8c78c986a8a38163df62a71cc2e4f36a957299dedde38b1bba962d8cc197e3da4f8d57338bc95c7c4cdaa84ca114d680b76b7210aab2d09dc8d67db101a9
+EBUILD zfs-kmod-9999.ebuild 5240 BLAKE2B 06699e035d43037703e7a336fbd2b1f1ef03840f04ddf80a15c3c2419970b556174a0e09feafc9f3f2932269999c0b84571c67286948212505ea833a61126782 SHA512 734c3b8c596596ca748e97cf474a1623fd64db20e0d469270a46cb0290376aebb04f73bc31aafd2b7b665ec2dda90a4d589fa3d92588be73d14e6879f0e0b843
 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
index 56c94fb50e46..71bd00382b65 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}"
 
 BDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 # we want dist-kernel block in BDEPEND because of portage resolver.
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
index 61ce8c8c8c75..e561949719a9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.6.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}"
 
 BDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 # we want dist-kernel block in BDEPEND because of portage resolver.
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
new file mode 100644
index 000000000000..2f23be8f7d39
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+	S="${WORKDIR}/zfs-${PV%_rc?}"
+	ZFS_KERNEL_COMPAT="6.0"
+
+	# increments minor eg 5.14 -> 5.15, and still supports override.
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	app-alternatives/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+="
+		verify-sig? ( sec-keys/openpgp-keys-openzfs )
+		dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
+	"
+fi
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.6-fgrep.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+	if [[ ${PV} != "9999" ]]; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+
+	fi
+
+	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/zfs-${MY_PV}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set module revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	use custom-cflags || strip-flags
+
+	filter-ldflags -Wl,*
+
+	# Set CROSS_COMPILE in the environment.
+	# This allows the user to override it via make.conf or via a local Makefile.
+	# https://bugs.gentoo.org/811600
+	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+	local myconf=(
+		HOSTCC="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	myemakeargs=(
+		HOSTCC="$(tc-getBUILD_CC)"
+		V=1
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	myemakeargs+=(
+		DEPMOD=:
+		# INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
+		DESTDIR="${D}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		set_arch_to_pkgmgr
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use x86 || use arm; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	if has_version sys-boot/grub; then
+		ewarn "This version of OpenZFS includes support for new feature flags"
+		ewarn "that are incompatible with previous versions. GRUB2 support for"
+		ewarn "/boot with the new feature flags is not yet available."
+		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+		ewarn "Any new pools will be created with the new feature flags by default"
+		ewarn "and will not be compatible with older versions of OpenZFS. To"
+		ewarn "create a newpool that is backward compatible wih GRUB2, use "
+		ewarn
+		ewarn "zpool create -o compatibility=grub2 ..."
+		ewarn
+		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
+	fi
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 8edf8733327b..b2fa04c9966a 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
 
@@ -21,12 +21,12 @@ else
 	S="${WORKDIR}/zfs-${PV%_rc?}"
 	ZFS_KERNEL_COMPAT="6.0"
 
-	#  increments minor eg 5.14 -> 5.15, and still supports override.
+	# increments minor eg 5.14 -> 5.15, and still supports override.
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
 	fi
 fi
 
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}"
 
 BDEPEND="
 	dev-lang/perl
-	virtual/awk
+	app-alternatives/awk
 "
 
 # we want dist-kernel block in BDEPEND because of portage resolver.
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index ffdbe86aea1f..3e65c8f77fef 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -8,7 +8,10 @@ DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1
 DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786 SHA512 224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94
 DIST zfs-2.1.6.tar.gz 34951282 BLAKE2B 615fe7a2128af77c6c855ea52b6503a78f0c992ea845b02875ac19aa9dd155c5d4110b668da91c463f96a54767ab92e67e5303572337352484c055c0a0ff9e46 SHA512 75639e4cecb281fe73a6e6bd116693f6609ace9b358385450297d175087b10938c2f489a08c657cf0a64250a8db995cbd19abc808a8523cb4c5344b3f76668d6
 DIST zfs-2.1.6.tar.gz.asc 836 BLAKE2B d85a79f8824a92c4d0a9682646f79c14871ebe27764289dc87cd9b0a773b7295538780401e70c492a9e4e7097ff2b3e459f7e0a7fdce2e2a59d3f467c41d88b3 SHA512 a83fcc00a8b35f1a1f9b94097d453019333a5351a3d78656dbd9ef732655ee817ccc88068c5ba11b5ff4a285e02250aee4169cc1450025edf547a2329fca7e15
-EBUILD zfs-2.1.5-r6.ebuild 9454 BLAKE2B 15f19ae3739796159bd70beccda1bbeeb3cfa1044bb55dd1dc29dce6c210acc6442f77ea9bddd7f8ae7c204ae8755af7127fdcadbe3a9fc5ad91a3162d571965 SHA512 f2233c3120ad0468765bedae231c4ab57a1884c00dd3d7c79d4ca0a692ec45ffea5a2eccb6975713887434a4e8649a275c9378887a73fa0ca356fc858e8189be
-EBUILD zfs-2.1.6.ebuild 9208 BLAKE2B d6f3d2336c24dd838edf4cc291a6036aa37a9fb0ba8706b5ab63c1f2bce3d061c2813a712e06b05106aeed5e4997bc843529d1cc87c5676c4b9735be406e027c SHA512 82fca89fb25d0f0e4536694e4230e1d02f50627a54d7932203eb3527b8d5f67ec19259a71f415254d1daa0e97dc6089c2febb51b39205fd692784b06ca87910b
-EBUILD zfs-9999.ebuild 8860 BLAKE2B f866be6f204ad6dba9afc1d5e696731af97aedcd5800a76c9e9ca0f8fc148fd9f4506ff9bd1af30f56df106a8da2375c90e276af980f4519c309f3583f9e38eb SHA512 a34498a45d1d42f4e8baac011c45c993693b37382aa6f7c41ca5f814415d5e992be7f051a72ed2499cfe9840b54b58edd4ad778a8906834ea26565d9a81b5115
+DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
+DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
+EBUILD zfs-2.1.5-r6.ebuild 9472 BLAKE2B 4a32822462e28f5287636ff20027f0ede74bba5bb8e3a0cae9d5d1c5c87ca27afb0ad09ad48c9bd4355e4f502fdad6c41020c056226010154f1d9972a62fe5fd SHA512 7155a9f5e2dd3846e8da81f7267a735822d4fdc3c6fbfdd2759a6397c28042e4321cbc2c13d1df38d9d69bcf4ce2c64f2fd946e08eee5231cd212b63972ac47d
+EBUILD zfs-2.1.6.ebuild 9226 BLAKE2B 4006858ddca53a4557b64b15b97534112f7e6046903281a8469abd4a3c5cb4bd740fdf17e728739b92812a5e6c2b739ff954ff693bc72afa4764bd4c9807fcb3 SHA512 65a84504afcf29c80587ff130ada4840ac244c4bb2189ae3ea4137602add1f17f6023c55b3f39fab7fae81e40d0f442a298ad44fc07a8292ae27abd679a678ae
+EBUILD zfs-2.1.7.ebuild 9226 BLAKE2B c2799f2e526aefa013ff9ca57ef88f9a6b16c79b4cb0b7016711b8a0a4697b678c120ce9e01c0739ada30044fd6ed63470d297b878a12517bb28b5a592b88e3e SHA512 59a380b5bc48cd90521329678e175ed960deca0fde6b6ab7967e183e04ba9477735bebeefc3a3f9a14a8aa4aed37284a5d88658222875c856871fa1a6e994c50
+EBUILD zfs-9999.ebuild 8885 BLAKE2B a4fc2460820726fd75f5bad5c842953147cbb1eb685641dfa7dde983c433d553d502c0777d0b38b4e79761f6d7304164c462b04ea2346aaaf46fe6dd4ff934dc SHA512 91bf1425db022c8a38665cd6e0936e0b6e4faee25ee99a51fd339f9cee9fdaf4b793b32dd24881f240591c9ee98855811f301b286eb8ba67cd179f4d66817fc6
 MISC metadata.xml 2205 BLAKE2B 82e20a6f5906b8cbbc6eb6e9520cf4e4213ce9cba2b056df5d5db0d4deaa4a20822a88e26286446d105326a8f61c807047a0e1e64494faac48d8ed5708807c02 SHA512 222981f945e98ddef646c593cbc8889f3526af4901c28ab5775ba760ca7d3aff3129b2699e8b7337b59fd33cbba388915cb5b2dc09674432c606f41ff27dbd9b
diff --git a/sys-fs/zfs/zfs-2.1.5-r6.ebuild b/sys-fs/zfs/zfs-2.1.5-r6.ebuild
index b641b3d163ea..dbfd77a25323 100644
--- a/sys-fs/zfs/zfs-2.1.5-r6.ebuild
+++ b/sys-fs/zfs/zfs-2.1.5-r6.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 	)
 "
 
-BDEPEND="virtual/awk
+BDEPEND="app-alternatives/awk
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	python? (
@@ -70,7 +70,7 @@ RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
-	virtual/awk
+	app-alternatives/awk
 	dist-kernel? ( virtual/dist-kernel:= )
 	rootfs? (
 		app-arch/cpio
diff --git a/sys-fs/zfs/zfs-2.1.6.ebuild b/sys-fs/zfs/zfs-2.1.6.ebuild
index ae3f9d431093..7f711822cf48 100644
--- a/sys-fs/zfs/zfs-2.1.6.ebuild
+++ b/sys-fs/zfs/zfs-2.1.6.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 	)
 "
 
-BDEPEND="virtual/awk
+BDEPEND="app-alternatives/awk
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	python? (
@@ -69,7 +69,7 @@ RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
-	virtual/awk
+	app-alternatives/awk
 	dist-kernel? ( virtual/dist-kernel:= )
 	rootfs? (
 		app-arch/cpio
diff --git a/sys-fs/zfs/zfs-2.1.7.ebuild b/sys-fs/zfs/zfs-2.1.7.ebuild
new file mode 100644
index 000000000000..5a8695deb4c4
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.7.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite"
+
+DEPEND="
+	net-libs/libtirpc:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="app-alternatives/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		|| (
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/distlib[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	app-alternatives/awk
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+	)
+	test-suite? (
+		app-shells/ksh
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	# bug #854333
+	"${FILESDIR}"/2.1.5-r2-dracut-non-root.patch
+
+	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+
+	# bug #857228
+	"${FILESDIR}"/2.1.5-dracut-mount.patch
+
+	"${FILESDIR}"/2.1.6-fgrep.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+libsoversion_check() {
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
+}
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	# All the same issue:
+	# Segfaults w/ GCC 12 and 'zfs send'
+	# bug #856373
+	# https://github.com/openzfs/zfs/issues/13620
+	# https://github.com/openzfs/zfs/issues/13605
+	append-flags -fno-tree-vectorize
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
+		--with-vendor=gentoo
+		# Building zfs-mount-generator.c on musl breaks as strndupa
+		# isn't available. But systemd doesn't support musl anyway, so
+		# just disable building it.
+		$(use_enable !elibc_musl systemd)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
+			einfo "You should add zfs-load-key to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 8e77d0480577..cc2bf2afec68 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8..10} )
@@ -24,7 +24,7 @@ else
 	S="${WORKDIR}/${P%_rc?}"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
 	fi
 fi
 
@@ -48,7 +48,7 @@ DEPEND="
 	)
 "
 
-BDEPEND="virtual/awk
+BDEPEND="app-alternatives/awk
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	python? (
@@ -69,7 +69,7 @@ RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
-	virtual/awk
+	app-alternatives/awk
 	dist-kernel? ( virtual/dist-kernel:= )
 	rootfs? (
 		app-arch/cpio
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index eb768c8c7967..e79a62125856 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index d8078b033c20..abca9fd9f5fe 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -76,7 +76,7 @@ EBUILD gentoo-kernel-bin-5.15.79.ebuild 3001 BLAKE2B 3e2b4c31bac5dfb2ac7b6e3a62a
 EBUILD gentoo-kernel-bin-5.15.80.ebuild 3001 BLAKE2B 0096c9f9fffb94e14ca10ae4345f71412ab83156bd863bc5483925d663b710d9b9abc4921fb16349213634031f44611c0928ddeded0ab20a5dd9a9a29ce476c2 SHA512 7e15b1dfbceeae333257f63daaa84cd3a6f1f6c5f402283e226cebaafcdb6e6e870459e514e50300162708ad59a3de02683d6676862cfae331e5224219450ebc
 EBUILD gentoo-kernel-bin-5.4.223.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
 EBUILD gentoo-kernel-bin-5.4.224.ebuild 3003 BLAKE2B 1f0a5c41743dd23f46541394f5afa07a6cbb1c212f0fd8ef0a04ee69133fedd983513683c8668cf04e100d91907f994df1e2b132dfb13e6f9d610f52ab5afd8c SHA512 8e0a773951040347aa49a20ae9f8b3df4b6cf3cddbb01e31ce7dc256f6ebcddeae63413b9114f568ea96cac023d2f5af627b0a0360fa1037cdb011df52ae2233
-EBUILD gentoo-kernel-bin-5.4.225.ebuild 3001 BLAKE2B f3c007fde7b800a56319d823c00609768369f2cc46f554685e3b173007ec5d13478dcd1b0f9156a5e1c005cf5f310383fbe68aca2dfc663149dac6fd19ab62ee SHA512 d871f47cf01f99f438a43c7c323e5bd6bd58224cc7743adbd49390917d64420905991acf9f11c203e1cb908cfcd3480a50c6de8cb9c3acddf449087beee53d7a
+EBUILD gentoo-kernel-bin-5.4.225.ebuild 3000 BLAKE2B 43a4e8c7a2cc7bb32b5a115682a0919048348bec3be614daea82d75da13f5aa097bbca1699c3bc871a6be3303ec695a936d98457c0f991390a400474c637dca0 SHA512 6028fb556061934b723c4a9e442c12ce838e06c8771c3de6d2995c4c3480c6241ee76bd00de24831eeea177cb83fdc96a1c079bd084cb0aba69f31c27802eb01
 EBUILD gentoo-kernel-bin-6.0.10.ebuild 3003 BLAKE2B 8378e8fc136de7923ecd44e58e0e1b694ac72ce5090e4ee86e4c086ecd923f58898e925f4ef3c5ed40918dc10cea348d53614d10e7e10aa58764d0d4df2e50f2 SHA512 80c0f1d10d1a85c2677d683178936e8c1bae08801d841cd7e2c79120f7517b464550c2c634de031428041c59ee3d8a5c96e28dcca386bb28303231288cb97a1a
 EBUILD gentoo-kernel-bin-6.0.9.ebuild 3001 BLAKE2B 3b5aa02aa443eef9a46de3e941cf7de000bd1b3c34e25bf9e4fdb5b323610ae18d80375c0af03b60f968f99d631c731a63dc892700a8766ab10faf68c668eba4 SHA512 a9e447068cf28255d13666c1d75e59408ff503f924c5580dc8fb538265eb059609427e40a99119d7d1b162a420f1051adf8ea53609bfa5a81f38ec5cbb79e852
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.225.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.225.ebuild
index 7c8a2dc9f78e..cd05d9770868 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.225.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.225.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d25d38c562e2..5c39a19b0efe 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -50,7 +50,7 @@ EBUILD gentoo-kernel-5.15.79.ebuild 3597 BLAKE2B a5d52517df75a431de25136b3834811
 EBUILD gentoo-kernel-5.15.80.ebuild 3597 BLAKE2B 201679bf2b2fc0941164345508f4a00383d6dc6b1a7fb4cf783b64446ec14f752ab39e0432589cc2cdfd1f0e5b2f5e3ba58e3e023942287e0e4e9513d3c64da5 SHA512 0a3d96e12d7efe32fd12872b86d1bf3b412db173f98ecfc498813d6bc87b81f64e6613228f2604516b9c845a5d6a0493e1212d13326802ef2d6222fcf3f05180
 EBUILD gentoo-kernel-5.4.223.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
 EBUILD gentoo-kernel-5.4.224.ebuild 2803 BLAKE2B b7562ff0061430bc6bc4978000cf3910f77d677262c29b1049d7cc9945f97319fcdc590a718ada8b6d51e7f84e2ba4956b37e770b4a6f933845889f32fe70d8e SHA512 3c00eea38ddeb1a18b6e1a57e0b6043835817e64635fec81928590f7833102265ba4db2c5783e218a284cbfdc7061a9e43da2ebc7fb34e3c5c0378a18ce41d81
-EBUILD gentoo-kernel-5.4.225.ebuild 2801 BLAKE2B 1f82196e7965c4b275aeee534babe43c2fe72830cc672efb4cb5bda9128fcad5cffba66d02ec553e697df3cc97ea914c335e2dbf3e5224890f34a42fb1203069 SHA512 5cc1661d455555d76587bee168502a377cb7457a963e97eb9e2791d63c8340f81ec7eb00ed726a70975241de7e58851fcecdc5ea024c0c12137bb60c6e3b08fa
+EBUILD gentoo-kernel-5.4.225.ebuild 2800 BLAKE2B db205acbc909c6a47172f3151c4c6aa0efb1f6491e2ccd27e3c961001bc4f7fc4950f6d1ce6738bc711c26ad91a00d19ee118242e108f8fcac080f343ff5d402 SHA512 78892313b8054b840fd4111f2d41e736c8816dfd876b7cc3bfc566a0bd661fb1533cf9e49c319ac5d293e299603a84fcbe7730feed2cc30b1bb238ca7ba531ec
 EBUILD gentoo-kernel-6.0.10.ebuild 3858 BLAKE2B 6431c930908b4ee1ac63c6a792a9f227122ca5822d4cfa76825c6b2b0ce2e22daabf3e29d885ab5cc0cd8cd56f49df82fe20fcb0bd38ca274ddcedadf5420db5 SHA512 edda364adf40995b1ba2ac3b158aba4216e859ec1d09ed0d593092d3d4986f06ee3bd3f13356a0397ce0bef555b494e6202bed857f3be03d65039e330f3e6277
 EBUILD gentoo-kernel-6.0.9.ebuild 3856 BLAKE2B 48a2e0b820e22cf8e12dd4b4b7ebb454c414f5077c6f9d5df417dacd915309ebb88becb225abd84fd2141e8b72435ad8411b1bb4766a97727073345abf94e860 SHA512 05e23e285445816dd8e23d5879f6a51e5640af55fac1d38129ac6dcad290b96b179fadc8e87a170d8c2a54969ec3ce05544607048a579604aa0d74b4589f93da
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225.ebuild
index 4bc4b1d739a1..ad32c9ec9ae7 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.225.ebuild
@@ -40,7 +40,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6eb9a905c49c..49ae702e29fc 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index a981c59bdffe..89d914f3de2d 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -18,7 +18,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 4e8a715cd19dd39087fe7d6cad9e30a7e130c69bde12ea382fc748cc152099607c23b75915c644785820ded954eaba31779f7c58b63a71255f9c6b610afcee7d SHA512 f5a680a5de09feecde1a3038ab185cc3b321eb2dc15b5841cd58863323fd6da727307c44127d2af5077ce2b17744ee5d3f8a17dd3bceea71b1dec2a13555dd66
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B 010ce621c56c1568eaddeb6f4af6e680f2596106768e3b40bffd3c221df20b565c565793ff14a46b2a96b080a696a9217be0f547c2e85430e9031bd86adc2b90 SHA512 d68b96a7458c8b0d1946523a7c1b20e413de38b7f53bd87b8729103935cdb9ad8fc38863138ba36ffc8da57e0ddcf591c7deeb23fba0d76003adea978b262e37
 EBUILD compiler-rt-sanitizers-15.0.3.ebuild 6433 BLAKE2B 25dfdd2696b3c861dce89b740c12a382e6eae2a726d6302b7d2ccb609721be4add79169e129a917a88e8396f90112b2ec96e77eb7e1f64f4e65395d54f964dc0 SHA512 8418f40cd19e862ecf69475aeb26aface57f1e548de75760f474d4e03d52d6df3926f7a68eb11460d369b1465580c01c7e47c59b8b3d08571b60f454e5cab46a
-EBUILD compiler-rt-sanitizers-15.0.5.ebuild 6435 BLAKE2B 8eefc1b84ea2e9ecd3b04a76c44c567405c5bc9a2d3128ad2c752a4fbf3e9bc1a33dae0e8706ad78da1e5819ce82104e2b1d735b2e3dda3cdf7ace48fa9138b8 SHA512 463025be093954be1b1ce004026dca1b8f87ed963003ad9b8e7519f331022016b63951b573519fa465205eee7f3ad60357a1e0c6e94c5775ccca91158845b74a
+EBUILD compiler-rt-sanitizers-15.0.5.ebuild 6433 BLAKE2B 25dfdd2696b3c861dce89b740c12a382e6eae2a726d6302b7d2ccb609721be4add79169e129a917a88e8396f90112b2ec96e77eb7e1f64f4e65395d54f964dc0 SHA512 8418f40cd19e862ecf69475aeb26aface57f1e548de75760f474d4e03d52d6df3926f7a68eb11460d369b1465580c01c7e47c59b8b3d08571b60f454e5cab46a
 EBUILD compiler-rt-sanitizers-15.0.6.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a
 EBUILD compiler-rt-sanitizers-15.0.6.ebuild 6438 BLAKE2B 365a74be34dd43bb83e1eb3be7e643899baea439b56fca5b497ca3e92e001343de9a03d592b956c279d4994c805a5d975601f5f7750c8d099e2d446ed7e8b2eb SHA512 7a3836f239bf8053a07b38e112056506e3e3da363874fcb70d7a74bc72bea6a0298f08e97f3a73b5d3c1c4af57fdb692567fdff7775e5bcdff01eabfd2f962cb
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6269 BLAKE2B fa0c69cb34fe3847ed49df42eb83862d28201a169c65111bb6f75828ac508074cce056a81982357ceed395e7c9d1f75492b96ab7a9f7744328fcdb16062694cb SHA512 5447ada2b2064b1c8c1a62379554a39956f2b1e91a8bc0698f714ed5e0a3038b7c95a76c888e565cf4a59ad3f38a38db80beede8c12882f6b79705c347f8a272
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.5.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.5.ebuild
index ee2289a531b4..8760ff0bf9b6 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.5.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index cb48ea371722..44f1dcc2d7be 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -18,7 +18,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 83202517f413772d355aa49b5a3bd8b7000c86f6538da1a5ae96de5e84bc7536d0e639b530d1f504dc68b769565504434cc80d25426207b19283b9bc41df3388 SHA512 fe5329aee6c29d408c67af9e9891205fcdf313676780b948975f94ddce31b3f54e68cc041233c81b3005ff94f7685dcc09044f3634760d90e8c18c61f63651c3
 EBUILD compiler-rt-14.0.6-r1.ebuild 4247 BLAKE2B 42673c116b115622e192ae5629e27113dbdb596b7c3f785e7b0fcd40e6d8f26e177081eaa35d5746e5911c2411a62029dbeab55dbe8079b27737561ff175eed3 SHA512 e1a26e59f31edb97d5866ac83610518e81b0a301cad4b0ef917df64abfdacbe69af354860f608980332d4011095e9d5ddbb86fa77926656ee6a881d02f46ae89
 EBUILD compiler-rt-15.0.3.ebuild 4259 BLAKE2B b14a1d7d6d7d6ba021074ca6c22d6a0db1a61d2d9b16d7391a5321832f67237514d002cb269ea0cfcced8fe6992db96551c87fdf3e15975798c73283fcf92964 SHA512 43dd2e1f6687c6ab7a640ee68994f449aba5229e9e29d54f34afa5be006b2cc0a1768997be705ccf93209f2ec970ef9f47b61f364f5218baf5e0a8116b8855e4
-EBUILD compiler-rt-15.0.5.ebuild 4261 BLAKE2B 67401c0bb347525876f30e6a3ef64c13ea78842ccc080ef663bca3e36920c16ddbff5b5044d9bc0d809536ff9256ce71c3d91b8d659827bdd6a071688da5e92a SHA512 36027520aba00370ddc7a714b1c735a2fb3a1d248a58afc260222b9aba1523b4db42cc25812db53b405c40ecebfa2494a6f5604efeaa75bd646815d8283d6734
+EBUILD compiler-rt-15.0.5.ebuild 4259 BLAKE2B b14a1d7d6d7d6ba021074ca6c22d6a0db1a61d2d9b16d7391a5321832f67237514d002cb269ea0cfcced8fe6992db96551c87fdf3e15975798c73283fcf92964 SHA512 43dd2e1f6687c6ab7a640ee68994f449aba5229e9e29d54f34afa5be006b2cc0a1768997be705ccf93209f2ec970ef9f47b61f364f5218baf5e0a8116b8855e4
 EBUILD compiler-rt-15.0.6.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-15.0.6.ebuild 4264 BLAKE2B 7411477bbdf896d3cd8bd112b0aaf0fc92b21813b2808474571f90eb1b2bdcd1e617b6262267c3adb90c9993c7f0e5d326aac1430440873cbb2be1644499c156 SHA512 0dd3a2e968a4698bff0d617b710046e824fc219ce33998012cdf0bb62c56e2ff159122e39c0203a042e59c5f7f693dae8ea5dcccd4115871e0bd8b54f01469e0
 EBUILD compiler-rt-16.0.0.9999.ebuild 4185 BLAKE2B 5fd8276217f6965247d77d953d37989833e11a5a08ebd11180dc12ea3745c89b2c90b016abd52ca7b0823f1ff198468aac8ad30bd4f1c8728e5028ca6d7a83b5 SHA512 d36c26715308dd2fee7aea19ca522a65356889eaf21ebd88dc83eead883b7b5d35864cb958fa97bd84c99cd178d39170308a4c411f188a5ee4801501f198d9a3
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.5.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.5.ebuild
index 39150a1ba043..a3c9dd9d2e1e 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.5.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index cafefa516530..c4b8afb3a376 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -38,13 +38,13 @@ DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda8
 DIST locale-gen-2.22.tar.gz 7971 BLAKE2B 2dc66fa69bf51799d0c34459b654fba6998b80a7e322e9b670036c967e269ad921f50195e6e34c4a83c1f0bad191fd5aa3f37defb82271b73acbca07b7e49d08 SHA512 9798b10dbbc792345a7b7a121dec5f4bba9839a8aec010f01a09f3402fd5bf2376f79e03a6a19bc357010db780037a8811c381136ce19be1f1370374906dff38
 EBUILD glibc-2.19-r2.ebuild 38458 BLAKE2B acb190786e154b458d3fb2e7fecb682f04d7baa24b5c2efcec28f35c471ea541348e03619db4034166b77fa01fde6e66ec4abfeab14465431953b3ea80b6a6d0 SHA512 9050221773c87a17a037f8be64f22e57dc90289db79a9bdfae212801e0a9cb4ea1efebadf9275939ee2e90ed331521c061265152ff8520b2d0b5a8fe0cb48b39
 EBUILD glibc-2.31-r7.ebuild 44526 BLAKE2B d718ec5e28b0a6dcb77bab3813cd3084db5569f29c3db6c9a292654547acdb3493e9a7efd358b50a2279505938f2e79d5ae068bf7b547ea5607592358b27f90e SHA512 d7997aebd378d396e9cfd1073d619a1460ac62facc8a6ede60bd31920dff00aad3e60d1d8b854eb231efe210ab46a2609ed8117a8b1c7907e608a35cb991a3c5
-EBUILD glibc-2.32-r8.ebuild 44857 BLAKE2B d41468b9ca278945dc54ccc9b9ba7f61ac2d3d95febea6ed98dc9bf7e31072fb76760af9b0883d2bbbde87f34d39569d77d41e4b3100670caf59e35e081e06b8 SHA512 813b3e7be08562736814eec65241969eb660a9ee905ea7307fd6df5e12d271e73a0ba4a62d20273a06fb1450a7505fd66932a9e8a2863690f02b7b9574a556fc
-EBUILD glibc-2.33-r14.ebuild 48617 BLAKE2B bd3d13ab2419162e08cb204e279b1d570d5e6239bf860188e9ce5c4167efb3637e1292e31df94b1118254157ba2f05017758fbf577575954b75ec9ac53cfeac0 SHA512 b14238e6f88010570c3d4de6d2672bc4ba5c66f5c59a5a03e0ac0a827893f781d1a02c720c80755dd9dcae3958575f74c3a36f676b96371754986e1327e918b9
-EBUILD glibc-2.34-r14.ebuild 49608 BLAKE2B 387023eb99a184e90ae50a09375e9858307f458c4d48b487d50d83bbe571b0b186eeea1ce8a71bc1f243e4220b04eaf7426b75182157655fe44d31bbb60b4e6d SHA512 578c2f6599045b34410dc0905e35263325bb28fd73b6f5c8d487b432e966088b189e24fd16a1055efdf93128c5343db88b1adc514659f878aaefe2426ced56dc
-EBUILD glibc-2.35-r10.ebuild 50157 BLAKE2B dc920c979618e1d30028afffc2b0c895bcdcdbc039e6674557aaea875744fa954c34e13f04925e95449683d64bd476879ed6674ce8b6cd5797d5131d57b8b3fb SHA512 c748dff0ffdeaecdabc37c60422f1c01d7a9d893f260c0d72806df251e0036e74f60c9e8d88273d1e9afd00efc4637db7a31c96ca43228a99723cf48afc4d372
-EBUILD glibc-2.35-r11.ebuild 50150 BLAKE2B 1b9a4cb79323fe6712a39b0d47e9582b51063ada98161a336736496e5d0b2870f4bcbcef78c048fcf9b5cb81aaa924b1f2e05ab06326012c3c5d5400a674eb83 SHA512 e19f2ef6a301a2e9dba0faded4f00a86903eb8ac6c6a9edc00a173fde8bd8a72f2ee36122f15e5fe315a312e15c5092514045239749f2351df2988c28629affd
-EBUILD glibc-2.35-r8.ebuild 49639 BLAKE2B 4cc331274b2b17b57e594a42e73ddbdd1691077e9568b32490852bf10a39788cda466a6fdb64e07890ff5d0291a6f7841e0f5ff2724fbc6d77d2e8c5bb86fd89 SHA512 dda73c9736d0d35f50db6f03c35de07a70fae4ae6cfb232e78f87c22247e67c916748080cdfd3f2117ef8b324938ddffaf7484c6a54ba06e00e157225bfa72e0
-EBUILD glibc-2.36-r5.ebuild 50750 BLAKE2B 6054571c3fd8723c6451f4fa1176475222f8e73c3250dbac91fd0f302f95100fe87f2852f18256732dcaffd1370f5e0b917bd84addbaf3a7a7eed7024f1f2e49 SHA512 de7150bf8080f8942e209e7c4dbd9ce2579ba52d9525b9cff72dd3a47b3be5ad365e63ae05a8571a335c0e8ae2f9a0d65c25bf0153a2a431761ea3136e7012d7
-EBUILD glibc-2.36-r6.ebuild 50757 BLAKE2B 8b39157e6065a18f0467371f737a07e4ebb6ebb0281aabd639ebca638d8f963aaf96a392835c7b3903c49268c785521ae3f98ab887527f01a0b3ffff8cb020e1 SHA512 976df75684523490ba1fda2e0766fd2bb1e459f4d895b51db9b7985396b5793ef7daa5cb742c4c44618f4a0ab4dca9d0fa982a9b3880e3fd2acc588ecd75c5b3
-EBUILD glibc-9999.ebuild 50758 BLAKE2B 6d0615192be2ab9183a966cca3aabbb4969e9362125aa69f3e4ebde9d5e5c942ac8b5faa8b7bae96ac24e4eeb1400bffd66771343983c929df8f337dcb24e3a5 SHA512 3ca0d9b4a2887ca81477d67250f9d8a07d837cfe5fe653d2a122678179c7f1081c885be4a254602ef74999f19a7ff486febc40ce1ba52b2dcec69ca69726c02d
+EBUILD glibc-2.32-r8.ebuild 44884 BLAKE2B 6ee147d9e2071d4b54c73e3bae265e652d8eac0ecfe718b49c92464eb791aee3dacd2b0974ffc27969f5e92957f84720eeff47f9de64e2dd712e731673361fe2 SHA512 d55bb2867e5cf31a81ab0527c34b3a4e82524b095ae413248a1ce3d10cb2846411991bdce998f5c8a8b50bc122a3b40685b3ffb06c3a7ae64f19db494791e66b
+EBUILD glibc-2.33-r14.ebuild 48644 BLAKE2B 932572c89d0e854c21057dea0769fde9c1b6b1f56000f50d2f73ccbe82052f3cafcdf81853f6c83fc3aa5b6497dff9798ed19d89f06989f315c39f8093b27801 SHA512 de9c13ca97e0f1cd15a6825716fffef81f5215109be672ebccaa7942798852d699e668f810f8beadcf6d6fdebce3fd9865cdf07e0a37922fecefdb05b795a905
+EBUILD glibc-2.34-r14.ebuild 49635 BLAKE2B 4a720612afde9fc59de116cf5389d415fdeab5ab392a0f18c17d962d138e2044875a550bf119ca1c2237c33fb2af8a891af99779fad97f40ecfab172b3066908 SHA512 6e978addbceb1fca96c42d9d6aeabc11cd2c2a9e3a207580ad2692c1411ed96d70a01b3831417110efbb257ed2995b9f486150530419f5b53745420106e03e72
+EBUILD glibc-2.35-r10.ebuild 50184 BLAKE2B 67df58bcf5eedd3043ba583a45f8986fa0796dbadcca7644142da094d23937c57fd6cc184a04167855de834ad0ae7c71b78337979f24544e966617e2afb49e29 SHA512 da470b0f910be0daf12b32b1dbf0cb4f770c9c35a1f26a7d44101393b1426917fe40ad31aedbc3b3c1ecf8b35d32597d3bb9567034309e9eb8ba52227d6c771f
+EBUILD glibc-2.35-r11.ebuild 50177 BLAKE2B 1506275c86f596389699c5ba393309222d34d4411133ef253f7b68669ffa609c92a2121cf3404be10a1aa6fce69f3a820655730772cede5ea27eba22232f80e0 SHA512 4edaaed02b80ba77dc5f57db4d5c0933eb5ffd48ce21e77f1ac4ee8e3b23082b6adbaa3e38bea92332da69ebbe1a6a830982cc11129bafb2f1510fccb225381f
+EBUILD glibc-2.35-r8.ebuild 49666 BLAKE2B 8a3843d44e8907c60beb0c90d6592f9f5ebba917c9a6e9060ace70638f1832d1a82a89fcf08ce9deeb3da5e41d3fd8d653d27e919b860dfb8046acb22cdffaf3 SHA512 74cb07ae771fcae5b1780219de02fe569deaa5380f98ee3f64f25bf57ed49cfaec06bb3c51c46042392b02fa4d76d6f0f852ec84276012eb5630dfff15f491b5
+EBUILD glibc-2.36-r5.ebuild 50777 BLAKE2B 6ddcdb1db08c071057b605da5a5d78aede895e75667d4c013e07f76c2a8ab2796de1a57b968bd75cd740f518e05a827e198727d06dd6c695ff24a9c524a6037f SHA512 b7a71bdf0f73fd28f5a8bd53fe22b38f00c9f4760ca9661bcf0025d89314e39e64943891ed38007a2a9e34f50fbf0b542a75b1bb7cf6cb1cfc19ebdcc2fae0eb
+EBUILD glibc-2.36-r6.ebuild 50784 BLAKE2B 56520b8f4426e30fbaab321aeb89e5b86b8121513faab4a187adbf018b164d789045f8abc2bdbf72febebdc7698d7670334fbc925ffd9de7ea8fdf7dfa4ef1d4 SHA512 14c3c3dc9f3cc8495aad079bf2bdb6e20afa2991785c1dd1e44d7f151ff7cd810434e631afe251b0bcb213dff05c0b53261c1c4577cfe0d523078b5b91d37068
+EBUILD glibc-9999.ebuild 50785 BLAKE2B dbae5a699012092cf52364979de1dd4121f36f6e2b78b4991354d1a871ce89d4496b47e2fafc0c9d805db00f5346675487c0a9a1bac1342bab0d26103bd2c26b SHA512 e898414d2ffdd4d2337255f23633a64f77508ed3199f5a9612225e7cded28e9b9611f0947697eb3e9e9f74314fa85c5e339832b8990dd53bfd1c95aac623ac51
 MISC metadata.xml 2072 BLAKE2B 441d10ce8368fa7b569ab9f29a2936ffd024534841bff3596f2dca05a5413e408a9ee6109fbc0fc6cb5d254b802b85241ff2f94da1f6d5dcb63b224930933e89 SHA512 26c8e9535e5c08ba86078084f25b6e4d3973ba1e004fb2bd3552c76deb383f53ad5fdb40ca071819be56d6fc3f7d5ef2ab6a76861fa7f94428ed06d681073985
diff --git a/sys-libs/glibc/glibc-2.32-r8.ebuild b/sys-libs/glibc/glibc-2.32-r8.ebuild
index 361d004c77da..33fc0dde436f 100644
--- a/sys-libs/glibc/glibc-2.32-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r8.ebuild
@@ -101,7 +101,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -119,14 +119,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 "
 
diff --git a/sys-libs/glibc/glibc-2.33-r14.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild
index 98877549d384..38c7540d4619 100644
--- a/sys-libs/glibc/glibc-2.33-r14.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r14.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -126,14 +126,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-1.3.1
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.34-r14.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild
index 454796952613..1bab66057eb2 100644
--- a/sys-libs/glibc/glibc-2.34-r14.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r14.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -126,14 +126,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.35-r10.ebuild b/sys-libs/glibc/glibc-2.35-r10.ebuild
index bf55284796ae..f56ed3b86043 100644
--- a/sys-libs/glibc/glibc-2.35-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r10.ebuild
@@ -110,7 +110,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -127,14 +127,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.35-r11.ebuild b/sys-libs/glibc/glibc-2.35-r11.ebuild
index 706610c41650..f76bf59f7d8f 100644
--- a/sys-libs/glibc/glibc-2.35-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r11.ebuild
@@ -110,7 +110,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -127,14 +127,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.35-r8.ebuild b/sys-libs/glibc/glibc-2.35-r8.ebuild
index 4c73a826a4a7..475fa00a70f2 100644
--- a/sys-libs/glibc/glibc-2.35-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r8.ebuild
@@ -110,7 +110,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -127,14 +127,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.36-r5.ebuild b/sys-libs/glibc/glibc-2.36-r5.ebuild
index 43585018c0f8..2145a40f5a4a 100644
--- a/sys-libs/glibc/glibc-2.36-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r5.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -126,14 +126,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-2.36-r6.ebuild b/sys-libs/glibc/glibc-2.36-r6.ebuild
index 5e0284176696..931064fe449e 100644
--- a/sys-libs/glibc/glibc-2.36-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r6.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -126,14 +126,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 68bafd8c3c33..f35acd536613 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
 	!compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 COMMON_DEPEND="
@@ -126,14 +126,14 @@ DEPEND="${COMMON_DEPEND}
 	compile-locales? (
 		app-arch/gzip
 		sys-apps/grep
-		virtual/awk
+		app-alternatives/awk
 	)
 	test? ( >=net-dns/libidn2-2.3.0 )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-arch/gzip
 	sys-apps/grep
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/gentoo-functions
 	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	!<net-misc/openssh-8.1_p1-r2
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 496d1d24e6a4..01c14851796e 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,3 +1,5 @@
+DIST gwenhywfar-5.10.1.tar.gz 2687042 BLAKE2B 78fb776a605761f309060affef4e84e526ba789039f48f1e68e107d5002c508e19c9c2c2c0b3a8aba39c6c32543816914b504a6212219cfeeb4f0f04b0354f45 SHA512 11781bec2dd1c4156b609574283179278b8070d604a792aeddf92c8f9b873b3ac09273a8558b9adba567af8d016ea10914d2a149f4b6813798b5800e34e29aa5
 DIST gwenhywfar-5.4.1.tar.gz 2373780 BLAKE2B bc2666145d958c5ab9c5600be65bcdd4a2ea6e35f3bd83a5ba9a2380dcc8788e91038733c49c1c16ff00d27eea999a0c0f4a02a70f30180d54a1541dbb951131 SHA512 78ec815374410bb3ebbbcc5c18120b47bbc2460aa8a620fae068f3c6aaeb16351139fe0e28e8dc7037ffb9eaa449011d2483dde3c99ecd0fed7bb2c9f97f89a0
+EBUILD gwenhywfar-5.10.1.ebuild 1711 BLAKE2B 95c9b61508582488afe127ffdcb35e3405a6b3e935ad5b7f4f183ac067ad9b9b72358806a35b99ea144b20cf0bdcead72b68bc7dea5a7b1f48d6cee90fb69cc2 SHA512 48de2dd76f79ffaf22f471dfa9ba496b55f123bac8873d868f478e8abb3699b2bbb084aa6beaf9cdaa6003177cffbca3b620bad8011c5e2e13c5c949f3e19bc5
 EBUILD gwenhywfar-5.4.1-r1.ebuild 1753 BLAKE2B 45cf247e76ee9ff50191ed1b4974a7b65a3f2b38940e899a21bb6be40cd5621f2b7e4deef336b45681efa3121262c33ea99e40b5b55762a54de7a57e5fbb7f3e SHA512 2460644583e71ef16e104681a149d446966d7c86201778d4830374db9f7bf84de75edf0db3a68e4439915e88f67c4c9821f0044e22e4f5d079bd8b7c650fa5f6
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild
new file mode 100644
index 000000000000..ab910b95aef6
--- /dev/null
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+
+DESCRIPTION="Multi-platform helper library for other libraries"
+HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/465/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/79" # correspond with libgwenhywfar.so version
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug doc gtk qt5 test"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-libs/libxml2:2
+	dev-libs/openssl:0=
+	net-libs/gnutls:=
+	virtual/libiconv
+	virtual/libintl
+	virtual/opengl
+	gtk? ( x11-libs/gtk+:3 )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+"
+RDEPEND="
+	${DEPEND}
+	gtk? ( !<app-office/gnucash-3.7[aqbanking] )
+"
+
+# broken upstream, reported but got no reply
+RESTRICT+=" test"
+
+src_configure() {
+	local myeconfargs=(
+		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
+		--with-libxml2-code=yes
+		$(use_enable debug)
+		$(use_enable doc full-doc)
+	)
+	use qt5 && myeconfargs+=(
+		--with-qt5-moc="$(qt5_get_bindir)/moc"
+		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
+	)
+
+	local guis=()
+	use gtk && guis+=( gtk3 )
+	use qt5 && guis+=( qt5 )
+	econf "${myeconfargs[@]}" "--with-guis=${guis[*]}"
+}
+
+src_compile() {
+	emake
+	use doc && emake srcdoc
+}
+
+src_install() {
+	default
+	use doc && emake DESTDIR="${D}" install-srcdoc
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index cb1790ec182e..b71011cc1dbc 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,3 +1,5 @@
 DIST libchipcard-5.1.5rc2.tar.gz 877820 BLAKE2B dfe82e3d6aea26e95e5f69298ea17ad4bb9a1d106cca02a9fc23f5aa5ea338471ae5628248350e01571f4819567da2a0f5a3699d56d8f02ed58971d6ac715abe SHA512 5e86068bd688f72e04073dbd076f21646a6b75d2a7a73c25bba4396e8657c4df28cf5cfb61eef7b243186f8313cea1262e415f2acad5348fa5179b46d7f96ed1
+DIST libchipcard-5.1.6.tar.gz 874865 BLAKE2B 995dec0ce1dd9a5c4eb1173c114a19292d5c9a96f44c0ad969390ab489a6ac4e9001596995eb06db98a4bee2fa8b2310b844efd2e1b18fe1138be00398e60bd3 SHA512 a6e22f2a92203529a8b35387b6d8a3de0ce16a8d845b6ebee53bc151fcaa7626a61f63e71480cd85c01c9c5975a17632be8ba2d71a604f7ec2eab9d40b9ddfd5
 EBUILD libchipcard-5.1.5_rc2.ebuild 1132 BLAKE2B e595dd4da537ef86caf96d889cbdecdf29f3643c8ee1a81552306645d0708f564e04f6372325014c55643c913fe4bf6b1e4152c23d94a95382511544445b3b33 SHA512 7ce8ce7a4fadab689a2cb424a44012ba2bf0109002f1651bf6335d9a47718a6896bbe6ff41c5479b6231c58b334168ae2e1b2c717b1214489fd2bb07b79a3ee2
+EBUILD libchipcard-5.1.6.ebuild 1089 BLAKE2B 02b8d7b091eec0704f47d7d055eb79313abf1c404c2856cb3f8655dd40ef130f2ca02e1682ee8a831e1e8f87d89e5ae31faa996559261a273fc9b0cfa3ca19d8 SHA512 477c1238a5e573e0220903bbdc621546406f0ac224d848684477d6687571254a4276c5f84bdfc457671e20ebd80fa10eec19fd5a02834f3317fa4c71d1ce477a
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-libs/libchipcard/libchipcard-5.1.6.ebuild b/sys-libs/libchipcard/libchipcard-5.1.6.ebuild
new file mode 100644
index 000000000000..a8aa14efc76f
--- /dev/null
+++ b/sys-libs/libchipcard/libchipcard-5.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library for accessing chip cards via chip card readers (terminals)"
+HOMEPAGE="https://www.aquamaniac.de/rdm/projects/libchipcard"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/382/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	>=sys-apps/pcsc-lite-1.6.2
+	>=sys-libs/gwenhywfar-4.99.22_rc6:=
+	sys-libs/zlib
+	virtual/libintl
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO doc/{CERTIFICATES,CONFIG,IPCCOMMANDS} )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-docpath=/usr/share/doc/"${PF}"/apidoc
+		$(use_enable doc full-doc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	if use examples; then
+		docinto tutorials
+		dodoc tutorials/*.{c,h,xml} tutorials/README
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 3cd48e541680..037dbda6b021 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -14,7 +14,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 71b0f62e35538d718d99e3d43447f98752933868d999bf831969a6940d3a817452789c2044e9ca3bb4d5d1f0c2976fc276c4d10cb018c44e0cc6109095d9c6d6 SHA512 a12023fa135a7945e8088b34421f575cab32bb8ac53f1aeaa61bcf2a7b9fe045a6e21efba168056ef47b165ef3100e382100f910c84dee972017de6355d2e9c0
 EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B 203e04f4e2603ec0b8e3cd672ca2458c971e4ec3c1d24ea65f85db143561d349d9b7e4b4a58f7c57f5c0caa519e5a79f99f0a76c404aeba47b0bcc683adcb572 SHA512 c1a353dd558c68d439ab66e089e26993e66f1729f7879912413531bbd89318338649dccde1f84a32784de380997d2611d6b7cf86841feb47c3c0c8d67bfe28df
 EBUILD libcxx-15.0.3.ebuild 5281 BLAKE2B 416897d7d127c49d4c16c1c6f6f46efcc261c999fc875c4f59c006bb66b1b3932d367ae11b7ecc677133507b2e8db970d9fe88daf6e2f819b87e8d69c29d82dc SHA512 a9e357a6336b39c2079086de15bfc56da24cf38fbd7dce65eb2a0bde24ff56bb361cb03df819164179d793e21ad8800d80cb77a6f6872ed434a90c14b4030687
-EBUILD libcxx-15.0.5.ebuild 5283 BLAKE2B cd1bcaf6f1d3447b21f7d18fede1255054d75c25c0c61ab35103b5581aa20fc5f2ca0bb9c6f0a1fe368f294214a04f6113a573e3205eb7d4c2ec930d73e387a7 SHA512 15ea5650d598a47c38651e01d97757c5440b0068fe1fc09508bd90b3fede73244a3d04dc4509a079979173b15f85187b4b80477946733816615c9b2dd8d23733
+EBUILD libcxx-15.0.5.ebuild 5281 BLAKE2B 416897d7d127c49d4c16c1c6f6f46efcc261c999fc875c4f59c006bb66b1b3932d367ae11b7ecc677133507b2e8db970d9fe88daf6e2f819b87e8d69c29d82dc SHA512 a9e357a6336b39c2079086de15bfc56da24cf38fbd7dce65eb2a0bde24ff56bb361cb03df819164179d793e21ad8800d80cb77a6f6872ed434a90c14b4030687
 EBUILD libcxx-15.0.6.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-15.0.6.ebuild 5286 BLAKE2B 6de2e2e79fdaa428d3b8a3aa667168cd99725c718e1ddfbd2cb4e2d07d263a6a0a5af17f57d3c91e914c2c15183592c643de4fa8fff7df6ffb3674d7f811bc9d SHA512 e17d1c1777dff3c4f7a3608ddcb6194b652cebd2f99f4a93a87041c6d2a1d58840f823c1befc7d262ec2d7f9cb5d097d0b542faddbf509cd16965ecc78a9462e
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
diff --git a/sys-libs/libcxx/libcxx-15.0.5.ebuild b/sys-libs/libcxx/libcxx-15.0.5.ebuild
index 2cad4114eeaf..62eab2d1524f 100644
--- a/sys-libs/libcxx/libcxx-15.0.5.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
 IUSE="+clang +libcxxabi static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index cfefda011fe4..6019f0849025 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD libcxxabi-13.0.1.ebuild 3468 BLAKE2B 0da66a538e0efab041fa5f56c31a116c9274bec95aa18f10b5759d6347e3e864922207cba0ddc6821eadad4243c247b01869d34f42e34c213f410896f5ac5b8f SHA512 2eaf47c438cae3b024eb64cecedf2643ff2ecbd35610d5cff6fb2f06847af766ff105d4923dfaf2f4d014944f2ef3ac54edd5f7c83e31d49c071ac57f56cd38f
 EBUILD libcxxabi-14.0.6.ebuild 3384 BLAKE2B c7091fc3a025d186909465ea46508b4cc22bfd5bd5156ed7b007c04e5fdb8c80565274ba085ffd5f8bbba2b9182ab3cff0e0c042346f4a04184b0cfd6e5a5d48 SHA512 92f71c9fd82a430c7bb6ecae347b6dff5739c825194731d877dc55f4be302cafeeac66cc2e24b6aa7f0a248af950305628b6ecbf2f6ffc70dce86b6723b75d27
 EBUILD libcxxabi-15.0.3.ebuild 2909 BLAKE2B 653771bab6c9056095f905d4462471d998a0991ca7034470bf178540b16f2cb845ad50dbb46e2c88355214950d765bd14cdde85afe4cdf790e099491df514c6a SHA512 ecd8c372af0572c9bdb74699ee834d961dca3b8c3209172549f310c0a38c4649642497d01afa1e23f42c85df486fbffb9433d89b105f3d38dd48d71289d9735f
-EBUILD libcxxabi-15.0.5.ebuild 2911 BLAKE2B a9581fc56b5c7478797add1b06dd65a3700ce0eb67248aeb13076e56d790c42d0d3ea979ed40341ec69ab1db62c2c476303b3a96b3795b8dff494e80ccde1a09 SHA512 621682373678fe5d52fb873c4975afd5b7ea25a2a3fc7482be06ea443eb6a45a4953988e4ad69dd099a346bae8b8cf43983c8521677e7b02925156d23231a7b9
+EBUILD libcxxabi-15.0.5.ebuild 2909 BLAKE2B 653771bab6c9056095f905d4462471d998a0991ca7034470bf178540b16f2cb845ad50dbb46e2c88355214950d765bd14cdde85afe4cdf790e099491df514c6a SHA512 ecd8c372af0572c9bdb74699ee834d961dca3b8c3209172549f310c0a38c4649642497d01afa1e23f42c85df486fbffb9433d89b105f3d38dd48d71289d9735f
 EBUILD libcxxabi-15.0.6.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-15.0.6.ebuild 2914 BLAKE2B ebfb1baccb81d321dca037a620e0b87f5203b1e1a3da68bb8ff7276e23dc435d0effbfa8b8684adf3e41d15d576c6019153ec49ae21ff158b41f4ab9e601fda0 SHA512 822f1e85e15a58fa7d096983aef9cb2b881faf276ac6f133b836c16d783cba3e9950f5976b103ce4bb0ed3c7dfd1409fd3c88bdcd81fda822e7b4a0e2b973956
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.5.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.5.ebuild
index 636c0c52999a..9f31ec74d34c 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.5.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
 IUSE="+clang static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 86cd2f2dafe7..3ad8ebac5f2e 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -14,7 +14,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 46ed471cb355b70f78b59faeffbcc5148d47a3b971818c831e7b155f4f0973238fdbfb5f2fa91913fef93e01beed45f42b1158af92e56cd8445c4a8157508bb7 SHA512 13f150c5223689e4d98e16cafa11e44164b177eb68d3df213582b85c5194e7f736143b49b2075f4178689efcfa8320e2b1faf34242c09dbfcda923b443d42741
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B 23460d17ef5b7e107d8be1bd1c37028d69fda2e151e7d8f7f0c6d23dc00336f5a503a4e8e692b4203f3e4219fde6f96f9d30d4c7fed0348066f8c603636cc39b SHA512 aa9e9985a1941fe5c33b998d81bfdd838dbe965d5c82e20e366d2cf7a08db24feb2f3f7633740bea45a3685049d1593df6465b8c785b9a87c197402f559b26ca
 EBUILD libomp-15.0.3.ebuild 3400 BLAKE2B 4e953541edede2f6a71b037853830db5ee78e7fdba08a4bedd4f4ab926c5d5c253c4e128625913038cf189862a9231f0dc2187feb95f65c893fd361be948f3ea SHA512 3ca5754ffba8fc6c0c5cc8e871853254b788d188063a751850b3941d6b969461f991951fa40ad6ae3ef86133e65d9bef63d06c0d4f8986ca7e8361bafc1c9e29
-EBUILD libomp-15.0.5.ebuild 3402 BLAKE2B f5d41c34ea7ca2cf88b63d2ae2e41ce1149c447c23989527f0f711768bcfff8b2f6e6a42f26e7f208debc06d8cf684ce7fbb8c8f27bbdb0a32a8f8c6955a554d SHA512 1b11f738e9242601727b5e7a074b1f1485b104dc593be111699d9b3f9ae3135ac68cbfc640f64f0d7647571dcf10bd36d21d857eb147dc281a241d2e20ce9d61
+EBUILD libomp-15.0.5.ebuild 3400 BLAKE2B 4e953541edede2f6a71b037853830db5ee78e7fdba08a4bedd4f4ab926c5d5c253c4e128625913038cf189862a9231f0dc2187feb95f65c893fd361be948f3ea SHA512 3ca5754ffba8fc6c0c5cc8e871853254b788d188063a751850b3941d6b969461f991951fa40ad6ae3ef86133e65d9bef63d06c0d4f8986ca7e8361bafc1c9e29
 EBUILD libomp-15.0.6.9999.ebuild 3339 BLAKE2B 4fb077e0f5195f1c2fef3691aba3e8b674d340df9f3d1de8c9962a03267662bcf55a43af75db6e3ab5121de6c129c7f7514c127ec27c3b940cb2fbbf619788d4 SHA512 49aa1cb488a8e428892dd3b74a82462206e9c11e139b5b9b8e2edca496279c274f81ece0dcb9e71eea43c4e6f99ca4aacd5bdc48e4595743b7f98e7a1f7ae3d9
 EBUILD libomp-15.0.6.ebuild 3405 BLAKE2B e794e2ff98eb12991f899b50750624fa08f6b20dcde51e1be56f3f2c4a0a0e70fc157079fe14147334535b7f8388a704d6b4dd858e94be1368596bd2d333698a SHA512 a89c79b76a3ca6459c50d68949ef73d20e774b54e79dc49644512c58a757a7a5afbbd2ab003302662cf7598199748a4f55afbb3a9803dbf279c3fd82b1edccc8
 EBUILD libomp-16.0.0.9999.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
diff --git a/sys-libs/libomp/libomp-15.0.5.ebuild b/sys-libs/libomp/libomp-15.0.5.ebuild
index 763ae9b90df0..bdaae63af18f 100644
--- a/sys-libs/libomp/libomp-15.0.5.ebuild
+++ b/sys-libs/libomp/libomp-15.0.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 IUSE="
 	debug hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 7338c15004ea..3e110378e6d2 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -13,7 +13,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD llvm-libunwind-13.0.1-r1.ebuild 3772 BLAKE2B 8da1185d1b1c71fe4a84cf068847cdf86f210c181e5f745b3ed05635b8f2824ac7aab931a8066cf199c93553fe4a3a0915972f854af1e09b1a2411f66fee834d SHA512 736810a5a52be3271854a50b476874986618e79fb24022ae3188c68759b31b75071083db9a5c9ab8f9439edff3cf7df2e4a20a847ad330984796ed747eb1cd4f
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B eba3be4b7bafe6a69329f7f565cf33fe3315949dd3e0a007079e1fb040bc746c9beec20c763c9c10fdc7eb7cd8cfc14053138594dd47db13df51dc3972365639 SHA512 83dbd99c4825aeb0aaeb3910af22717637a1be1ced85972381ea091183ca6ba128900511b26dedfafb4ac492d80ba3cd0982051fd71f5e72375af7e160da1f9b
 EBUILD llvm-libunwind-15.0.3.ebuild 3032 BLAKE2B e9cdfc38c7a89f7ffb82c051e827f744c404db5a4bd738c2ee978e65bd96ae1afef0c7be9f51a87cf7d1860280aed90fbc0d248c332383ef9eedb4b308eb2f8b SHA512 c2fa624f80073140a765c809184c351a41883f2b1bd0b999c5c4796e0317627a56df68a61c2457c98fc119e167f77b1d9eb4dc1fb996c7ad5b1bb1c94bd25088
-EBUILD llvm-libunwind-15.0.5.ebuild 3034 BLAKE2B fee9abec97c1e76f5373f7e8fd4707aed66bdbdf794a9d75bea8b40295f8c75e20a27c881b5e306dd66a563315377f3ff3e342bd3fdec96090f857289aceb05e SHA512 988c4c9cfa331b7bd7750ce459d799d0f01e00b8b295f8ff9c9561fa6ea7bb24790d1d1ae009940b76dcdc9418746a96653c29325d9208f423361c81ea2dda4b
+EBUILD llvm-libunwind-15.0.5.ebuild 3032 BLAKE2B e9cdfc38c7a89f7ffb82c051e827f744c404db5a4bd738c2ee978e65bd96ae1afef0c7be9f51a87cf7d1860280aed90fbc0d248c332383ef9eedb4b308eb2f8b SHA512 c2fa624f80073140a765c809184c351a41883f2b1bd0b999c5c4796e0317627a56df68a61c2457c98fc119e167f77b1d9eb4dc1fb996c7ad5b1bb1c94bd25088
 EBUILD llvm-libunwind-15.0.6.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
 EBUILD llvm-libunwind-15.0.6.ebuild 3038 BLAKE2B 13e59cb5fb42def342fc97b79a9ef44f5c87870b8e393e23c954ca187ca6cc5e0b797546a7e51d9381c1ca9c5608a8ddc32879a5bda8af681426c52a2b71624e SHA512 b3fd2851bb69f5ce9f4ecf813ec9667186d85e97f7e0c1f9db4c0fb8b0ffbdd7866065ac1a855be4592b5ca795623caf4aaf27fae344bc3024efcea5d71b5584
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.5.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.5.ebuild
index e97c72765a0c..575ffe6b4eb2 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.5.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="+clang debug static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index a6e68211e116..8406c750e733 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,9 +1,10 @@
 AUX timezone-data-2022f-musl.patch 6278 BLAKE2B 3d05353a3c93766e36c2e54be39ecbd44e499b9455ae896182f39de8cdbb9e96714631b38705f9845ef00cabc38fdeaeffec0b6fd7815d422749027f7076387a SHA512 9c861038af92866627071cef20745fe0dc169046cbb04922838c194ca5e4f3a4cd151b7628838d927318a23d88a21127988a5a71b14cc81c1f515bd3d61751bf
+AUX timezone-data-2022g-c23.patch 8221 BLAKE2B cb410a463fc411b1dd4d322e07a7e26067d088eeb405c8d198a0062b81ebb55413d8bd2623b8982c0e2510deb367865d288b778bb3c192c8cc6ac14815503ed1 SHA512 9ba487e1b87e3c9214bfc0c491a96d56ab0193145efb951e7d7e13f1466f0f4be0d60b74fc10862fd1e97436a08fa5830b5a3919726cf3b06224037e6fcdf71a
 DIST tzcode2022f.tar.gz 284816 BLAKE2B 3bfcc25323edbdd41aadcbb5c8b0d9179a809a87b22afc9dda88a53c6daab742778956af7aa30722429d34601fb2ad3c4222c48497e0a429926cd05b79b9acfb SHA512 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b
 DIST tzcode2022g.tar.gz 287901 BLAKE2B b67bb2020913c57cc6bc68d231c53ba645b95305256065e2645bce3b0d71adfaea865ed9bf40f1ec3b4a73aad7e6c48f5ecd0895de6e2d69bed6113d6b579e26 SHA512 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a
 DIST tzdata2022f.tar.gz 436352 BLAKE2B 8081972005ac84034957bb85013b373df67937c3f811e33c44fad7ecee0f504b946766fdb1f525d0512b9a8d8e727ee3d8d44640ff55bed3fcd1f3fb3c464c17 SHA512 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6
 DIST tzdata2022g.tar.gz 439731 BLAKE2B 582b79cc2317d27f3883042cbca25801397d9e2808ad8d3a340017d635372ef20316ce646a25a43b0ea5d4024841b54925ecc4510613295c39c28647989645cb SHA512 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65
 EBUILD timezone-data-2022f-r1.ebuild 5404 BLAKE2B 79f29b58dd33dc80b5a9307f39c4cb8797d37b5e4281e5bd6b0f566744932f06f196ecbaa1349f63eb5bc965a8363a4807ac07e263b034b0d3a8c11838c6b978 SHA512 e3da2dffffbec3cb0bc6e0a866ea274a7a247285d8a269941bad131cc46ee157ce545c5bf76343b681317e6ab85ebf32ca5dbdf904787ad270a3daefbc14ba67
 EBUILD timezone-data-2022f.ebuild 5360 BLAKE2B b5de4f3fa1dd5597588b77417beb804b93993d541e518257c67e48c82891dad4a9fe23b991d817267ffd2ae61680818e2d8879ef3d0e5c799a35e36b663302a0 SHA512 c0053d962645131ebebe8d8053c2f7f1a80bbb3842a18e60b3ef8a563a377e0d5a4153335d6135f969207c90ab85ef17e122f209b27cab27769ed29e2a5265bf
-EBUILD timezone-data-2022g.ebuild 5368 BLAKE2B 4e442e464552356b906d9df9de0e685c293a3b01003131332c6084955d833e400397b47ddeef9b225dd41566169e2e4ce26abda933b7e78507a006f6e2a59ac1 SHA512 404691c964f8735e2764643518e36925442f2b041731d4935cc13b4b377823d275c1753af2b55d9a9667d14b97f182a2a7d48c35e1ba5cbb91a02a33532ccece
+EBUILD timezone-data-2022g.ebuild 5411 BLAKE2B b2a93fe1d4253b75970a3e2a058ab33517e2e3ea87684fe12451dd11b1e220d419dc7d1523615fe097fe54b91a4c4339189b35ac0e3f3e208da01ebc785952aa SHA512 1260cd05c1c83d1b31e08230c4fef605d3294dd5ba3f4cf21e9ad25c246c1b9dffc001846fb4ec5790519f9b046e29d743786eab9ad742f794dc22da665c4fe4
 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2
diff --git a/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch b/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch
new file mode 100644
index 000000000000..2665841e5aa5
--- /dev/null
+++ b/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch
@@ -0,0 +1,279 @@
+https://github.com/eggert/tz/commit/9cfe9507fcc22cd4a0c4da486ea1c7f0de6b075f
+but minus the NEWS changes
+
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 1 Dec 2022 10:28:04 -0800
+Subject: [PATCH] Fix C23-related conformance bug
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Houge Langley for ‘gcc -std=gnu99’ in:
+https://bugs.gentoo.org/show_bug.cgi?id=883719
+* NEWS: Mention this.
+* date.c, localtime.c, private.h, zdump.c, zic.c:
+Use ATTRIBUTE_* at the start of function declarations,
+not later (such as after the keyword ‘static’).
+This is required for strict conformance to C23.
+--- a/date.c
++++ b/date.c
+@@ -42,7 +42,7 @@ static void		display(const char *, time_t);
+ static void		dogmt(void);
+ static void		errensure(void);
+ static void		timeout(FILE *, const char *, const struct tm *);
+-static ATTRIBUTE_NORETURN void usage(void);
++ATTRIBUTE_NORETURN static void usage(void);
+ 
+ int
+ main(const int argc, char *argv[])
+--- a/localtime.c
++++ b/localtime.c
+@@ -843,7 +843,7 @@ is_digit(char c)
+ ** Return a pointer to that character.
+ */
+ 
+-static ATTRIBUTE_REPRODUCIBLE const char *
++ATTRIBUTE_REPRODUCIBLE static const char *
+ getzname(register const char *strp)
+ {
+ 	register char	c;
+@@ -864,7 +864,7 @@ getzname(register const char *strp)
+ ** We don't do any checking here; checking is done later in common-case code.
+ */
+ 
+-static ATTRIBUTE_REPRODUCIBLE const char *
++ATTRIBUTE_REPRODUCIBLE static const char *
+ getqzname(register const char *strp, const int delim)
+ {
+ 	register int	c;
+--- a/private.h
++++ b/private.h
+@@ -646,7 +646,7 @@ DEPRECATED_IN_C23 char *asctime(struct tm const *);
+ char *asctime_r(struct tm const *restrict, char *restrict);
+ DEPRECATED_IN_C23 char *ctime(time_t const *);
+ char *ctime_r(time_t const *, char *);
+-double difftime(time_t, time_t) ATTRIBUTE_UNSEQUENCED;
++ATTRIBUTE_UNSEQUENCED double difftime(time_t, time_t);
+ size_t strftime(char *restrict, size_t, char const *restrict,
+ 		struct tm const *restrict);
+ # if HAVE_STRFTIME_L
+@@ -765,10 +765,10 @@ timezone_t tzalloc(char const *);
+ void tzfree(timezone_t);
+ # if STD_INSPIRED
+ #  if TZ_TIME_T || !defined posix2time_z
+-time_t posix2time_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE;
++ATTRIBUTE_REPRODUCIBLE time_t posix2time_z(timezone_t, time_t);
+ #  endif
+ #  if TZ_TIME_T || !defined time2posix_z
+-time_t time2posix_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE;
++ATTRIBUTE_REPRODUCIBLE time_t time2posix_z(timezone_t, time_t);
+ #  endif
+ # endif
+ #endif
+--- a/zdump.c
++++ b/zdump.c
+@@ -89,7 +89,7 @@ static bool	warned;
+ static bool	errout;
+ 
+ static char const *abbr(struct tm const *);
+-static intmax_t	delta(struct tm *, struct tm *) ATTRIBUTE_REPRODUCIBLE;
++ATTRIBUTE_REPRODUCIBLE static intmax_t delta(struct tm *, struct tm *);
+ static void dumptime(struct tm const *);
+ static time_t hunt(timezone_t, time_t, time_t, bool);
+ static void show(timezone_t, char *, time_t, bool);
+@@ -97,7 +97,7 @@ static void showextrema(timezone_t, char *, time_t, struct tm *, time_t);
+ static void showtrans(char const *, struct tm const *, time_t, char const *,
+ 		      char const *);
+ static const char *tformat(void);
+-static time_t yeartot(intmax_t) ATTRIBUTE_REPRODUCIBLE;
++ATTRIBUTE_REPRODUCIBLE static time_t yeartot(intmax_t);
+ 
+ /* Is C an ASCII digit?  */
+ static bool
+@@ -125,7 +125,7 @@ is_alpha(char a)
+ 	}
+ }
+ 
+-static ATTRIBUTE_NORETURN void
++ATTRIBUTE_NORETURN static void
+ size_overflow(void)
+ {
+   fprintf(stderr, _("%s: size overflow\n"), progname);
+@@ -134,7 +134,7 @@ size_overflow(void)
+ 
+ /* Return A + B, exiting if the result would overflow either ptrdiff_t
+    or size_t.  */
+-static ATTRIBUTE_REPRODUCIBLE ptrdiff_t
++ATTRIBUTE_REPRODUCIBLE static ptrdiff_t
+ sumsize(size_t a, size_t b)
+ {
+ #ifdef ckd_add
+@@ -151,7 +151,7 @@ sumsize(size_t a, size_t b)
+ 
+ /* Return a pointer to a newly allocated buffer of size SIZE, exiting
+    on failure.  SIZE should be nonzero.  */
+-static void * ATTRIBUTE_MALLOC
++ATTRIBUTE_MALLOC static void *
+ xmalloc(size_t size)
+ {
+   void *p = malloc(size);
+@@ -916,7 +916,7 @@ showextrema(timezone_t tz, char *zone, time_t lo, struct tm *lotmp, time_t hi)
+ # include <stdarg.h>
+ 
+ /* A substitute for snprintf that is good enough for zdump.  */
+-static int ATTRIBUTE_FORMAT((printf, 3, 4))
++ATTRIBUTE_FORMAT((printf, 3, 4)) static int
+ my_snprintf(char *s, size_t size, char const *format, ...)
+ {
+   int n;
+--- a/zic.c
++++ b/zic.c
+@@ -459,20 +459,20 @@ static char		roll[TZ_MAX_LEAPS];
+ ** Memory allocation.
+ */
+ 
+-static ATTRIBUTE_NORETURN void
++ATTRIBUTE_NORETURN static void
+ memory_exhausted(const char *msg)
+ {
+ 	fprintf(stderr, _("%s: Memory exhausted: %s\n"), progname, msg);
+ 	exit(EXIT_FAILURE);
+ }
+ 
+-static ATTRIBUTE_NORETURN void
++ATTRIBUTE_NORETURN static void
+ size_overflow(void)
+ {
+   memory_exhausted(_("size overflow"));
+ }
+ 
+-static ATTRIBUTE_REPRODUCIBLE ptrdiff_t
++ATTRIBUTE_REPRODUCIBLE static ptrdiff_t
+ size_sum(size_t a, size_t b)
+ {
+ #ifdef ckd_add
+@@ -487,7 +487,7 @@ size_sum(size_t a, size_t b)
+   size_overflow();
+ }
+ 
+-static ATTRIBUTE_REPRODUCIBLE ptrdiff_t
++ATTRIBUTE_REPRODUCIBLE static ptrdiff_t
+ size_product(ptrdiff_t nitems, ptrdiff_t itemsize)
+ {
+ #ifdef ckd_mul
+@@ -502,7 +502,7 @@ size_product(ptrdiff_t nitems, ptrdiff_t itemsize)
+   size_overflow();
+ }
+ 
+-static ATTRIBUTE_REPRODUCIBLE ptrdiff_t
++ATTRIBUTE_REPRODUCIBLE static ptrdiff_t
+ align_to(ptrdiff_t size, ptrdiff_t alignment)
+ {
+   ptrdiff_t lo_bits = alignment - 1, sum = size_sum(size, lo_bits);
+@@ -526,7 +526,7 @@ memcheck(void *ptr)
+ 	return ptr;
+ }
+ 
+-static void * ATTRIBUTE_MALLOC
++ATTRIBUTE_MALLOC static void *
+ emalloc(size_t size)
+ {
+   return memcheck(malloc(size));
+@@ -538,7 +538,7 @@ erealloc(void *ptr, size_t size)
+   return memcheck(realloc(ptr, size));
+ }
+ 
+-static char * ATTRIBUTE_MALLOC
++ATTRIBUTE_MALLOC static char *
+ estrdup(char const *str)
+ {
+   return memcheck(strdup(str));
+@@ -608,7 +608,7 @@ eat(int fnum, lineno num)
+ 	eats(fnum, num, 0, -1);
+ }
+ 
+-static void ATTRIBUTE_FORMAT((printf, 1, 0))
++ATTRIBUTE_FORMAT((printf, 1, 0)) static void
+ verror(const char *const string, va_list args)
+ {
+ 	/*
+@@ -626,7 +626,7 @@ verror(const char *const string, va_list args)
+ 	fprintf(stderr, "\n");
+ }
+ 
+-static void ATTRIBUTE_FORMAT((printf, 1, 2))
++ATTRIBUTE_FORMAT((printf, 1, 2)) static void
+ error(const char *const string, ...)
+ {
+ 	va_list args;
+@@ -636,7 +636,7 @@ error(const char *const string, ...)
+ 	errors = true;
+ }
+ 
+-static void ATTRIBUTE_FORMAT((printf, 1, 2))
++ATTRIBUTE_FORMAT((printf, 1, 2)) static void
+ warning(const char *const string, ...)
+ {
+ 	va_list args;
+@@ -666,7 +666,7 @@ close_file(FILE *stream, char const *dir, char const *name,
+   }
+ }
+ 
+-static ATTRIBUTE_NORETURN void
++ATTRIBUTE_NORETURN static void
+ usage(FILE *stream, int status)
+ {
+   fprintf(stream,
+@@ -3597,7 +3597,7 @@ lowerit(char a)
+ }
+ 
+ /* case-insensitive equality */
+-static ATTRIBUTE_REPRODUCIBLE bool
++ATTRIBUTE_REPRODUCIBLE static bool
+ ciequal(register const char *ap, register const char *bp)
+ {
+ 	while (lowerit(*ap) == lowerit(*bp++))
+@@ -3606,7 +3606,7 @@ ciequal(register const char *ap, register const char *bp)
+ 	return false;
+ }
+ 
+-static ATTRIBUTE_REPRODUCIBLE bool
++ATTRIBUTE_REPRODUCIBLE static bool
+ itsabbr(register const char *abbr, register const char *word)
+ {
+ 	if (lowerit(*abbr) != lowerit(*word))
+@@ -3622,7 +3622,7 @@ itsabbr(register const char *abbr, register const char *word)
+ 
+ /* Return true if ABBR is an initial prefix of WORD, ignoring ASCII case.  */
+ 
+-static ATTRIBUTE_REPRODUCIBLE bool
++ATTRIBUTE_REPRODUCIBLE static bool
+ ciprefix(char const *abbr, char const *word)
+ {
+   do
+@@ -3725,14 +3725,14 @@ getfields(char *cp, char **array, int arrayelts)
+ 	return nsubs;
+ }
+ 
+-static ATTRIBUTE_NORETURN void
++ATTRIBUTE_NORETURN static void
+ time_overflow(void)
+ {
+   error(_("time overflow"));
+   exit(EXIT_FAILURE);
+ }
+ 
+-static ATTRIBUTE_REPRODUCIBLE zic_t
++ATTRIBUTE_REPRODUCIBLE static zic_t
+ oadd(zic_t t1, zic_t t2)
+ {
+ #ifdef ckd_add
+@@ -3746,7 +3746,7 @@ oadd(zic_t t1, zic_t t2)
+   time_overflow();
+ }
+ 
+-static ATTRIBUTE_REPRODUCIBLE zic_t
++ATTRIBUTE_REPRODUCIBLE static zic_t
+ tadd(zic_t t1, zic_t t2)
+ {
+ #ifdef ckd_add
diff --git a/sys-libs/timezone-data/timezone-data-2022g.ebuild b/sys-libs/timezone-data/timezone-data-2022g.ebuild
index 190c46867d53..4ef50b87e84f 100644
--- a/sys-libs/timezone-data/timezone-data-2022g.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2022g.ebuild
@@ -23,6 +23,10 @@ RDEPEND="
 	!sys-libs/glibc[vanilla(+)]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-c23.patch
+)
+
 src_unpack() {
 	mkdir "${S}" && cd "${S}" || die
 	default
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 2a667a2d6af5..582d216cb1cc 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/powermgmt-base/Manifest b/sys-power/powermgmt-base/Manifest
index de91c462362f..6dbe826ca366 100644
--- a/sys-power/powermgmt-base/Manifest
+++ b/sys-power/powermgmt-base/Manifest
@@ -1,3 +1,3 @@
 DIST powermgmt-base_1.31.tar.gz 10015 BLAKE2B 7beb933598b7885a996d9410ede2df92f280e6ff6c5e318223db7fb181e13a78e962ef9d2184e951c102d940f85a19f725c62af260c3d182469933ac82d3f99a SHA512 deae8b227e079a73fdd3f9a6be83bdc76400d457c17d3a0881ace1fddc8785ee401beddbafad93dbf3a09b5effe5ca7c998eae69a0740a083a9e8a65c2f0af40
-EBUILD powermgmt-base-1.31-r2.ebuild 915 BLAKE2B e5161c2fc4238dc7c884d2def18eb4c33aa1144c2b2a92c13dec2281e6452f9717a16006ae312e6e20974a1546f9c4af07968838363d2a2df9f7f554dbd8452b SHA512 e442d526a048383bbc23fc074a66eb3b6293e2772738fb0b136fb5a179ddc720e522e3cca9bb6e031c8f39397eb74f6caf086f149af546a1666f7250a96d61d6
+EBUILD powermgmt-base-1.31-r2.ebuild 924 BLAKE2B ccc97c4ebb245a915f6f85b9cf923e8205e54af841ed98b1e1b595e5c6c3a8b7c3273d3caabe62184e4d4634f4de7527523e52ac80c3b2512b7d453e56210ebc SHA512 e31ddf0e462c2e4ae913c7099b338654b464667b87126d3c321f114746664a4bf831b6b14d15c43c6dd364ee595ddf603d1f4446e334ccf6ac34a339304c7603
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild b/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild
index cac5e37fe874..77382b668c01 100644
--- a/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild
+++ b/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
 
 RDEPEND="
-	virtual/awk
+	app-alternatives/awk
 	sys-apps/grep
 	sys-apps/kmod[tools]"
 DEPEND="${RDEPEND}"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index ac373009d835..3f1b78c152aa 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/awk/Manifest b/virtual/awk/Manifest
deleted file mode 100644
index 0bd88e8ddee6..000000000000
--- a/virtual/awk/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD awk-1.ebuild 479 BLAKE2B f360ae4fdceb0e175a1b7131f16ef9bdec0c1b05c9dd09b03503b0ca6bf211bf7d69171926de34b8de13b40628378a2a6e4f754cc1fa7d5d32bac536a8b513f6 SHA512 09a3abc076371c5643731e7c53570f3bea1960f695286c3d19e44bce8fb7cb2803993c86ed163b694a134f6ae14706f7afc0fa36fb9ccaede2e832feac6c3ec3
-MISC metadata.xml 396 BLAKE2B 24edab34c7cb56547a1a0b7435300933946ecc1e5c3756ff58cf5f8e4a807907bb58bb61b4e96ba714b3ae227172a7147a287a4c01d304b7dfc4a5f0cfb4c99f SHA512 863bf6ffb43c8405b85a91a0e6a84b79df8fb4c17594016e8c2151e9ba5980eff92f07c8eaf6a37732c3961b943e3090299972f25616a1c9a2781a38d0c42fe0
diff --git a/virtual/awk/metadata.xml b/virtual/awk/metadata.xml
deleted file mode 100644
index 38ea143badef..000000000000
--- a/virtual/awk/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index ee32ef4233b6..c8bfc9b54cba 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -6,7 +6,7 @@ EBUILD dist-kernel-5.15.79.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8
 EBUILD dist-kernel-5.15.80.ebuild 401 BLAKE2B 92f219b14ed8bc9cae4faba90c287b29984eaef3f2a97d3d7fa3c64da830c73ba26fedb0277f79c7aca75f39156a397c72a7f7886fb4be8058da3735949f017c SHA512 3afaee4239fa0104341fb2bd0c056064c4b50c6964f7e2cf850761a24a75da5f31845a7652d0a7d20aa9cdd549a262035ccbc62ffc29aaac5ef14582a0e2b25f
 EBUILD dist-kernel-5.4.223.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.224.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
-EBUILD dist-kernel-5.4.225.ebuild 390 BLAKE2B 79e21b57baf5bf1d4c150c7d9047c32aaaca7932c0083309656112801b09fd2fadf464589c8d90e78498f9c71838195f2ea6662dc58992e129e2e729b1650c2b SHA512 0598b3e03ecb37b6cb908fd8b982b80aeff83b1e696627921702ee2819b904f2aa577fd984ffddd59ec089f58b929d964893010ea88a6d8aed59220f3d701d25
+EBUILD dist-kernel-5.4.225.ebuild 389 BLAKE2B 88c4857b97c2e3f8ffc7b571d8757d16528320673ae8a0dd8063ca349e8ca8515bfffd4207c625a680e8b9620dfcb85b308dcc1328c0858ed9586744ae7b4720 SHA512 3c9cc51ae4397e895a2f1529662073d7e33dd1ccb412d5e6cf031a2976ed27b1cb3c3bb9d3f1cc96a0668b9d0ec100ab53e757fc7382767f49fca42775fa8749
 EBUILD dist-kernel-6.0.10.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-6.0.9.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.4.225.ebuild b/virtual/dist-kernel/dist-kernel-5.4.225.ebuild
index c19536df3a44..83923c26c31e 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.225.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.225.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 2cd205621186..93b0a5750d14 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index ce03f71bffaf..ae1e8ee92d96 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -5,5 +5,5 @@ DIST modsecurity-2.9.5.tar.gz 4315037 BLAKE2B f6e607f344038c74fbbacbba6bbeb5953a
 DIST modsecurity-2.9.6.tar.gz 4316582 BLAKE2B f344f8630218c401a3b0eb0de9f5f23d9d1f9f65bf5c4cff2d8d0ea3ebd27cf0202ce2199b1c6d923237ee49a3b151cce46a8de3563fa743cf119c8c25270af3 SHA512 54b3316950094b3951fcfdd82bbacd34dfa8f5500b9a772d3296f411711bad0dcad51068b25cb2c196fdc4b2e1095d54701370d25180c0c68cf0913bd7d4ea03
 EBUILD mod_security-2.9.5-r1.ebuild 2936 BLAKE2B d56fab859bc895277502a55215ed73b6ee2e42a3a259b2ced63121e791661746ed4935911e20e069e1090b73584f4fcbfd00d34f646fdfe64840bdb85326d159 SHA512 9f2b70bff4dbc2d1b6d04546ada68bb7295416a3f41ccfef6056e0db10c1dbbd2b4722f20596cf75ccbee62c270696973ed2a9a236255e97e07a7a67c559a003
 EBUILD mod_security-2.9.5.ebuild 2918 BLAKE2B 8d83eb1f0ff8b009e04134bfd0b87e1aa8b09cd0f244945bb74a884a8659f59e645888280f66aec86c6fc1c02e8e0c3dc8478ae67ba115a4682fab13dbdaec85 SHA512 6decbeaa979a16892ac5f0a0701aa896ee3ddc1b55c679fb0a03b817d298f35ec74f2102a96c400456c929d0a1e52598b726275afa6450a071bfffbbe0ed8430
-EBUILD mod_security-2.9.6.ebuild 2933 BLAKE2B 18612151353a716e469cc982d4ce0c6fbf3343e4654282843513d2640d0335ff4a6a414e0fcda4ba55fb85da79119820abffff516a239eecd1d31f1aa43e41be SHA512 c6e11f85c1db643247957414039fa9e693d65cfd2555871d2a0f5907139114809260d960d559f158c809ad721a5ad60244644f0bb9c887a2480ac47bdcf68756
+EBUILD mod_security-2.9.6.ebuild 2931 BLAKE2B 08a8f6a93e70d500a6bb42be6e716bd1aaed9e5f79111fc37c6c99aea90db46ae87bd84b476ed0b4c823bdcaa904314420efcdb2bcfd987d21fd9f1c7f0e6816 SHA512 6cd1ba268e27d0b2e41118a71a3ff7c3a611515109ed5431764684ab6eb03fe1644a2ef46d59904ab4d3f3331d9a49a779e0f15b549c0c75c071d72a504197a9
 MISC metadata.xml 1010 BLAKE2B d8c9d6cb841ebd546aa9ac5c6e5078f846b31f8c499e69bef93777c512cc180068064b5d5c6a65c4cce179b3a5946cf3a6572ae10a2eaf6d25c6e1ac81b964f4 SHA512 0b06a417e39afc6326940eff1ed4da2aaed091b1fe01eabb58c62e5131ae7a4c922ca118799f26c91325187022052a34cd3c7979719e50b1a8837ab23468b13d
diff --git a/www-apache/mod_security/mod_security-2.9.6.ebuild b/www-apache/mod_security/mod_security-2.9.6.ebuild
index b268a75af0c6..7855dcafcbd0 100644
--- a/www-apache/mod_security/mod_security-2.9.6.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/SpiderLabs/ModSecurity/releases/download/v${PV}/${MY
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fuzzyhash geoip jit json lua mlogc"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 4a74ebba5f86..aab39dcf4e57 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,6 +1,4 @@
 AUX 80_mod_security-crs.conf 289 BLAKE2B 441b2f4d46e62ff24886b94dc933b08de8693ad7198cc855a8b0c322ba045e6409b7d3b7b2e2fdc0bd412ee9fdd3761987d59f405de5a84d5e8c96d2dd14ab76 SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc
-DIST modsecurity-crs-3.3.2.tar.gz 290450 BLAKE2B 2935b781af44a206eec881a2c06669db91da98a4d74936299651a77417a2eeaf6d4ab9a1566c08fc4bfb2a60d0b38e71d746d726578ce220b59c9c9cbd800190 SHA512 a5d96fb949da82120a1c4cda4dcf804b06aaae71f25cded5ee998d2c4e766ae2de88e42cd52fc9d63e204415e829af27d80614e58b55509e7bd7ffc20a26cfba
 DIST modsecurity-crs-3.3.4.tar.gz 301112 BLAKE2B 0df4b70c5ecc1852fe3cde74783494636c530cc8a2b8ddc0269da25703521532ee3ed6ba1e572b854fe6912f31d2ed1fe4c917b13dc22b37763dbe73ef8c7b72 SHA512 a8b8b210054a9a4e3f8e45a5a9428110bb4075e40430e3fc16f4717e363af141265b1fb5c173ff96abeff0ac61ef5eef667a4b9cb703f8edc15e48deb3342827
-EBUILD modsecurity-crs-3.3.2.ebuild 864 BLAKE2B e4e27d9568b68fca964da7e72a8a3508a74f349d2a706a2828fc076324285da2debc3d086960ced40d24b0a1d7bb39ed040e20530916d3496f83204345ecc2eb SHA512 e195c92405f68c839d4d3b82b4951d9b19db5d5cc09d798ae66c94f7d684a0bd68c61380af21f03dd105bb09840f0d15e560cfa08b291587f54d201bddf55a61
-EBUILD modsecurity-crs-3.3.4.ebuild 1061 BLAKE2B 178504371814129253a1e3487a4be879128f1854a111969246714ef039ce1f3122294b3f5edac28225f5af222a2408c3c860c50638422dba810d8eb2f35f6784 SHA512 f544409bcec7866b525b4ed83ca47a93a065b012e944bc8515195f364c6c759ee69693f8886654661eadcfb41a49f8cbe9b830f2174efaec4852015fee46be2c
+EBUILD modsecurity-crs-3.3.4.ebuild 1059 BLAKE2B df001f20eecdcafb5f5fd12bbaaa37ba304659c31322d8b00856ac571af11611c67441e19f3c897856ef13bfa9b7cf945e371ab7dff0e36f0353adfbb287fff9 SHA512 b2c33f63d218d6e0b0fd5074d2195d5a15c738e28a32764b11b9eaa3167292755e047863ded83880afa2e321e9a7bd3f9b180976265cc8c2a3c863095e3d2a84
 MISC metadata.xml 254 BLAKE2B 1d5f172b57a97b9a944fc05ce672b09fa81d2468756786518e06e809bffe571e7296fd1dd3988833af4dfbf85d14ad5cfd89fc337562f044422d30cb87740169 SHA512 817d5613af5a0a1e9a2aadcc5319fef2c0c36fa979c2c514e7b938eeebb2a4d83cc2ec478f4f26fef937847b2ffebd5671dbe5aa7b4c43122efd629f57b17d16
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild
deleted file mode 100644
index a16ae9fa633f..000000000000
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="OWASP ModSecurity Core Rule Set"
-HOMEPAGE="https://coreruleset.org/"
-SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=www-apache/mod_security-2.9.1"
-
-S="${WORKDIR}/coreruleset-${PV}"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r rules
-
-	dodoc CHANGES CONTRIBUTORS.md KNOWN_BUGS README.md crs-setup.conf.example
-
-	# I don't think it's worth pulling in apache-module.eclass just for
-	# this path...
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}/80_mod_security-crs.conf"
-}
-
-pkg_postinst() {
-	einfo "The CRS configuration file has been installed to:"
-	einfo "  ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf"
-}
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild
index 9782d5529222..867ab1147f42 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/coreruleset-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+apache2"
 
 RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2e4eb34507df..1a8fc69025b9 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 82774d370c54..54bbee61f296 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,10 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-23.0.10.tar.bz2 141026523 BLAKE2B 52e2962c1bd8075a64b10e792b18f7e18688c4a1227ef71cfbc85fe743a924ead8a78c3ed95396c37c3c85fa9a848eb3017d0c818294bbad35d679cc0844b0a5 SHA512 be4cfcd728db5c492da68c5aad29caab926673ad623ef3050c8f193d58164aaea04679f63e01eaf59652f0f6d8237c64fb38e66a08fd35e0e43b10f2b67b4d64
 DIST nextcloud-23.0.11.tar.bz2 141705816 BLAKE2B fa1232ab9263e6964ceb1cd45941187db1af331cb1e4f0f149e5638f6813a7b19b838f64eec234dc2e8c7182b4aeb2d8abb61051d0ddb314ec04198f80c44a3d SHA512 094abe8eabe6746cea616db95739513c3832f8e823931abfd7dc83b8e8ecf49c4444fe478727e79b17bca5b16990cd0c95211476180e0382f45e07e5b51b6f49
 DIST nextcloud-24.0.6.tar.bz2 123902888 BLAKE2B 145d3b3c9527ac950f12a88cd02085c566d3d8e224d7ec099bcb9e519c3d2854954b23ea27ee62ff2ae3032d3788bb494b38ef1fc26bc9cf3991e0fd864120d0 SHA512 15c45f8ae4ee9e03c35f8aef6549b9fe92984dac4345406bbc95eec9099912f10a9ad8a7b73c001cc96294d2d136259acc4003d6610c47254ca5cac9d701343d
 DIST nextcloud-24.0.7.tar.bz2 124233139 BLAKE2B 991668bf897984da0f0034f954d0077779159acc6b27447603decc79bb79d6457f98cf8324e18f2ab3dda76cbbde63bc43d3ee2f1ff918d227c8256d8f3e8789 SHA512 77c1999b52ab87779908619ec8845887c9da32f90d9eb1e639d07c3899519235a18d973a35a8bfbfe9f896c7b7705cc91d571558700550857f741f98a85a52ef
-DIST nextcloud-25.0.0.tar.bz2 144109342 BLAKE2B a339f5bf01255cccdbb9941d360e091a34149e6d3a365497344911c8f156cd7b272ed657fe48720054c448c3e52fafec37dbe0cd69be42f424479d35dd90e547 SHA512 6f7a7a4e7b613df7b246bf9a582a15598d40a96023bdde1d8e3fff1b5888588d9c957f58ea813470696edc7c1ad5e8d1721d5eaa3d9c91549ca8acc411a8211e
 DIST nextcloud-25.0.1.tar.bz2 146695370 BLAKE2B 01d9482301fa50e2b938cbe164310d0e3db3a791944e78ef2d7016ecd3e214907d53b589abc51c550263e636c114ee37dd027ebf3d164493c53775a10f102a61 SHA512 7fd401ffe01e5b1d568e4f66cdc5972d5e3c0b82f147a04330da9fe5ab1f2ddf152943e28f152fb635e8bca8d83a95a5a269a1f34fa189cef4a3c9dbe4e8c89b
-EBUILD nextcloud-23.0.10.ebuild 1088 BLAKE2B 83dea08b95d1f947bda224a9a5cf2d42956344956b461f6ba533cb37dae1b4a63e39855d616605f5e7c4744b9ae57d3c5a825935ff318c1f0b31d65d22954987 SHA512 efb61bed84b86d9c86fe3e5a7a354535cc61295e2bb8486836b5f51cbef8994f6e1146e537c182266b6482e2e6729417d65ad02152cfc8b20b2e1d9953dc8227
 EBUILD nextcloud-23.0.11.ebuild 1088 BLAKE2B 83dea08b95d1f947bda224a9a5cf2d42956344956b461f6ba533cb37dae1b4a63e39855d616605f5e7c4744b9ae57d3c5a825935ff318c1f0b31d65d22954987 SHA512 efb61bed84b86d9c86fe3e5a7a354535cc61295e2bb8486836b5f51cbef8994f6e1146e537c182266b6482e2e6729417d65ad02152cfc8b20b2e1d9953dc8227
 EBUILD nextcloud-24.0.6.ebuild 1086 BLAKE2B ba714c8023bbc3d2036069e54b982a0f575cb6cd04bc6a9bd80caa20ad877ac0cb744859f47d384af5befd07b12e6c3959db644a2e8ef25150cc822a8e4c7065 SHA512 ecfe7f0af35b603bc87977bc6e0889d7e14861304edfde9f4ad0308ffccd4c2a1f7e59603675b0a49781be68b2e16747e49c41c7aecbe7ca3b443bccacab6f38
 EBUILD nextcloud-24.0.7.ebuild 1088 BLAKE2B 7962cd29c375d2ec2dff7669ee1f7e78be6147df08150437dd6afcaf90805269a0111aad4e1a54e4b9884acfb26366e9944bde0c4811db0462198220e9d82339 SHA512 2c16f73f666ba666908750fb360323d005da3210207396c1eda30b062d6fd094722a5a651eb710d99dbbcfe16642266ca27ebebcd36f14f70d6824e03c2baf16
-EBUILD nextcloud-25.0.0.ebuild 1088 BLAKE2B 7962cd29c375d2ec2dff7669ee1f7e78be6147df08150437dd6afcaf90805269a0111aad4e1a54e4b9884acfb26366e9944bde0c4811db0462198220e9d82339 SHA512 2c16f73f666ba666908750fb360323d005da3210207396c1eda30b062d6fd094722a5a651eb710d99dbbcfe16642266ca27ebebcd36f14f70d6824e03c2baf16
 EBUILD nextcloud-25.0.1.ebuild 1088 BLAKE2B 7962cd29c375d2ec2dff7669ee1f7e78be6147df08150437dd6afcaf90805269a0111aad4e1a54e4b9884acfb26366e9944bde0c4811db0462198220e9d82339 SHA512 2c16f73f666ba666908750fb360323d005da3210207396c1eda30b062d6fd094722a5a651eb710d99dbbcfe16642266ca27ebebcd36f14f70d6824e03c2baf16
 MISC metadata.xml 533 BLAKE2B bbbb5b440e2d38d6882451584a997c4b21b2afcb8e8da8c8dd9fcaf00fdae0a3643413d3619401faa3875f93cdbd1a090db308b72d315711e859405757d4df7f SHA512 a18ee96f8aae2ed8c66faa777a303bb45eb27c49c25ff56e5f01ef4a4f9df03ef0581ad92084e37683ece26b1c25c1a9ec843d1219964954d19c2bcfbe3f4a0a
diff --git a/www-apps/nextcloud/nextcloud-23.0.10.ebuild b/www-apps/nextcloud/nextcloud-23.0.10.ebuild
deleted file mode 100644
index ae0486c3b736..000000000000
--- a/www-apps/nextcloud/nextcloud-23.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8.1[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-25.0.0.ebuild b/www-apps/nextcloud/nextcloud-25.0.0.ebuild
deleted file mode 100644
index e35dd132e50a..000000000000
--- a/www-apps/nextcloud/nextcloud-25.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index a54f386ff884..9728e83777e4 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index b23c19860ee3..aab01249152c 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,5 +1,5 @@
 DIST bdftopcf-1.1.1.tar.xz 142716 BLAKE2B bef730ac65c0234ce027965d18b9e6e2bcfb8ebbd9e84a5a80d3cfc782a2f4b4124a833097867912592fc4a2accf3c067500a6b9c1f99383041a2df042df9ca6 SHA512 257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
 EBUILD bdftopcf-1.1-r1.ebuild 396 BLAKE2B ce09228426902ecf0345999518ad885f67a17b858e080699f8f6f1202f210e14d6cf0d4de569db535f339ffaed13e7cb10be004b78435ba311accf264a38a1f7 SHA512 485a56998546fb42b9d905736f77fa53f19a5f3527fa0748fcc8eb7ac3f6255e9282e7a2f3e8e2ca0224c826dbb0b68ea6c7c9cbcf1b5c3a8a7ab10919927fbc
-EBUILD bdftopcf-1.1.1.ebuild 473 BLAKE2B 1e5062c486f5681f016e4d3b3bbb9dba4083a6eac575da654272bc29e4b3a998e4545b462439011c7ba3747cdb3c01029511ec6df0d0f075e393aeced9e0176c SHA512 b318565d5e9b9d8dce7a3afea1c29a27e30a156b750d4de60ecc717312ceaed5e5d05e8faaf1184549b45ac31b67ee68ef31f45ded5d5f2253d360ef92265397
+EBUILD bdftopcf-1.1.1.ebuild 472 BLAKE2B c19896a9e3fe86cdb43126b5ab9c512d8f80ad311741146002da0ff7daa78057806515ef393a20c717fea941c7d77173d4a1e97967248084102eba7c9a331a8b SHA512 cf3d75d085fdfddecefec926461ff7bc83a8c1475523a23bb854b396f9cda7822e4d596bf0381d1ca169acf142ee37d7b639c78bd3658e322ced2feabdf4aa0c
 MISC metadata.xml 340 BLAKE2B 2e0a214bb6e8a4a625ab5222d9c8a2a8724dfc846447f0515657fc9a1f9548b4212b12f021a26e0eb1f4ac0abce71ed131ce697882c83ae8128ae9de8ec39287 SHA512 1dacbc8993cc6b005ce5f0d26f0a6d7d08bbb629f25a2358a80607c84c5368856f63949f068747415128d1a880199d22636bc00184fa11d6aafe711cc2e505b8
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
index e4961b1492bb..e0561d1c92fe 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X.Org bdftopcf application"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/util/${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"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index 6640854b3024..1bc1c3eef4f4 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,5 +1,5 @@
 DIST fslsfonts-1.0.5.tar.bz2 125650 BLAKE2B df08689dc452d07e895a93d5e755b3820b21c1df997b5269835ac04ac81beb09d98ebdcf7030d3e6c7ae288b3e7388b136a8b7b58f95ce3958e12923bab50620 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2
 DIST fslsfonts-1.0.6.tar.xz 123484 BLAKE2B af894405cad7351574c546bd3055dad9483b091eb2d9296e69167c1939d235cb8e539abf96b5c36c05a988b88e3cb70a20191bbdb7d9eec95534bd7b2fb68d6a SHA512 1181a8e6cc820410d1deac98b3e5097506e4168c6515307b6b9aaf705cb57193a009cb331a51d46ce68e9548712f122b5c942d5a1bc1e01bdd191b7b1beab09e
 EBUILD fslsfonts-1.0.5-r1.ebuild 301 BLAKE2B c5b4fa40580a60c7ce374069f070925150fb9e9632f294c81bc6840b5d146037efdb3c035c74445930f77a460314e3533a55d1fa7646764081be137dc76c80ab SHA512 eac96bf8e6653d2bd932d88aefe5e356ce1767b1713c019246ee96bea1149c1d70c69cb51ac65db994f15424000e2667091c93ec030588778e318bee8a61e0a7
-EBUILD fslsfonts-1.0.6.ebuild 326 BLAKE2B 87aa58a9eb75251e50f3a7e4e5855e5d746692a7d5e3063b4deeffb510a41d45362f9ef76137ec7a8812be6a296cac9443411ac73a699d85037d34b71b4a984b SHA512 8d752362a35968fd1dbb19a5a35b0f913aca17fcaa29ace9d3cd1b356fd3df52d34d9f902fc966c6c0a2541c1f078d2e523c8b43d29e6cd8c7aedae0e167977a
+EBUILD fslsfonts-1.0.6.ebuild 325 BLAKE2B edc99a774940aa8fe67434fc977ad2892a1ee8db5c16ec7caf06c68c571f65520fc06c6d4548cbbacd93ad3c57e43f8683aaddc7b42aec8fdf429dbab135d250 SHA512 9598997edfabe1b12479c04d2c235a7f97dd22b5f7897a17cf95cc43218f9cadbfc2079fd1bc312be50be7caffcdb26929fc9ee19a3cfc2ad93d1fc422cadb46
 MISC metadata.xml 340 BLAKE2B 458367aba4b0a63c95da034806307a960cdb987ab8772e4f7eff50344a2977bf83ffd9662d64aa1c43a2aadbfba51532dab1726468ee97ab26205ae6149b44f3 SHA512 a5c5fc1a50e0edfc9a0e56ceda4929fdaf9b938ae5a404b3f650370b359cc645193a667e26e926be0bc1de793d7ca4e2072f1e460641517a0aecf2fb181b8fa8
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
index 7303f87189f6..70ec0a4df17a 100644
--- a/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="list fonts served by X font server"
 
-KEYWORDS="~amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
 
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index 7663afcc9b33..b9bd04778749 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,5 +1,5 @@
 DIST fstobdf-1.0.6.tar.bz2 127170 BLAKE2B 89ed63541386d9f46ef839fb78be1cbfae4b51d824781325e33566a027a5a44671cdae84ec6ed81eb23b6a89f6868726b35781f2626a407753129ffd4c0af86f SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f
 DIST fstobdf-1.0.7.tar.xz 122432 BLAKE2B a7d736a16fb8e7992c46ca2d74ac1897c0e2171d18f56837812f903db7035da5b8aa811ef7be8845717ee5c558bc88434e5f74a848d2d31c91bba5fb507e4ce7 SHA512 b303cc2060e8ccaa139e855a7d377d28877158efa1087eeeebf9f30f7c9962764eceab5c4044b4b508890413cf38546da9b26756dd27a142b806dcd6fdb6ba59
 EBUILD fstobdf-1.0.6.ebuild 298 BLAKE2B 5ffbf7a947e8c8e6ce7aa3e7e1a72bc5b192ecca5681fc8d34859b6a10f978ab2206ac95225bf4168bd1f4c944c6cbfbda268327dd33da32fbce77fac7cf51df SHA512 4f3b43276bc32c423d119a4525c7445725f3a07355339e24f95c68f65e404d96e414b6e2c66ae1b30885799d38b760432b0f6afa494a97c4d043e41669a0b7b6
-EBUILD fstobdf-1.0.7.ebuild 345 BLAKE2B 14762ca7da69f5b7b82a884d3ca9648641236e03cf99c332619abb312f8ced93df504c7b902b175b6f54e0669ee8a1bfcb533126cc21c72bb08246558e45f6f8 SHA512 b2bbc192c8ab704a5f39e73fed94c9ca70910dda7f4f0508d91d62f13b6ee84f8829078af12db3cd74d9270344c20f242fa74a3987133dd619cbc6b92d8f09bd
+EBUILD fstobdf-1.0.7.ebuild 344 BLAKE2B 6b2a623015c3c0663216c106da3a8c0e97dc222f948351dc6d14fcf2680116c0ea4e06910f56adf01d3c49f8006c5c59c2153ccad9b3b07cffcf766c74973e0b SHA512 1c070e043400a1fd0d46bcdeac38080cea8d5e9db4d023779a1703cfd53ba3c812f998baf49e0f69dcedee8bea3bd68b817cab5afc441df7d96e8326417bdb15
 MISC metadata.xml 338 BLAKE2B 35d24ced4c0ed7e1232e0fe4ebe8c8156c9e0bc9243e8e65c6e301a37c5d99b72bdcd9e7d743372af7c213bab42aa31e30a261d742fb86de9c17a17e9fdce527 SHA512 de461c750d88627357aaae23e3b1bee9dea65397c418f79d0e3256942945790584852c777a8056a544b00b760e42023f621e667168dd25409e9354e2e083a6ed
diff --git a/x11-apps/fstobdf/fstobdf-1.0.7.ebuild b/x11-apps/fstobdf/fstobdf-1.0.7.ebuild
index 61271d239ad6..9473822da683 100644
--- a/x11-apps/fstobdf/fstobdf-1.0.7.ebuild
+++ b/x11-apps/fstobdf/fstobdf-1.0.7.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="~amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index d300188136db..853b38c47f3b 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,5 +1,5 @@
 DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
 DIST ico-1.0.6.tar.xz 130032 BLAKE2B 21ee058ee22493832499fdbac327e51a10c468e47eb6f9dd6f5a3ec26af1533295bc16c0d7b212af49e85ba079a42813acd4e3ba8864c9ead0e7a31c062af724 SHA512 0ada451b8026ea10d1a5633f847b7bf833292e4cd01e3f1079d82c91fd142c06c6c4005b7146900ee34ac7acc8fd981db37ada9052dff49c2cfce995b9146c8c
 EBUILD ico-1.0.5.ebuild 301 BLAKE2B f82eb2b8b3c0214a8287eeaae5b0f2e7d026254287395929a6ce6cfdf6599510d59ab6f4b69cc7651272fde31f1804df1d7ed9e5221c10152d52b903c503b5fd SHA512 9cd528c4ec19e012fea9e4fa61eef12494a73cfd8d75f8dc23c5f47da921cc26e471d0d1d1dec7f1cc16f84e6c0399ddaf1068e45aacf7d95aa3936f8de6e508
-EBUILD ico-1.0.6.ebuild 349 BLAKE2B 6c87e67e59d90dc3518c66187590d1e572364bc1c85f383771de05f9fc46ef327505eec7be55c1dd772491d6519a59eea1a8f4b6fc49aafd3c25e2b91135cf80 SHA512 2ce77c559399c1c476f67afa6d62b323ef2fedb7aedc9eb1425a87191e26c1c99a0ad462004b178bf3b0d6c3b49874a458c1d74cfa90ed7d1fb596cb60916cc9
+EBUILD ico-1.0.6.ebuild 348 BLAKE2B 126f448c93f89f3261e0b21d9d551ba923bc3e49770b1311316fb776f0b9c3deccb02a5a3aad7a83b28dd45aed25c231192cf2d7b19406806e0d25c8892d0fe3 SHA512 2ef419d062235e3f89a04937ba29d193504afaafc73766ce758b168a9b5feb867ca87c8d6ff9702b536422fb2853fb22678039efafa501085c591f2e945933d3
 MISC metadata.xml 334 BLAKE2B 5c7174321960a48b75488e5aea0d5efac55063be3e219c2006bd3a9489379beba8d49cca34531baf80f7a01703fe932f1ac86e2ad07b5897e4ae01deee4f20c2 SHA512 8b13420f7d36d24a9d34db6253534e5a3f26c2962182576507e48e88be6507545359638f649900e7db42b2beed94f2ca8506b051cf2ae472a82f38c28d1421b3
diff --git a/x11-apps/ico/ico-1.0.6.ebuild b/x11-apps/ico/ico-1.0.6.ebuild
index 8b17c02711ea..4a360e501073 100644
--- a/x11-apps/ico/ico-1.0.6.ebuild
+++ b/x11-apps/ico/ico-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="animate an icosahedron or other polyhedron"
 
-KEYWORDS="~amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 632dfc033f51..8dde95e32908 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -1,5 +1,5 @@
 DIST oclock-1.0.4.tar.bz2 132835 BLAKE2B 8547aeb06ac33917d44f318ffaa38bd899b78176e4ecd0e4446706cdcb3fe30933b4a63cc465601268d8d868e90d498c0fc6a27f8c0feb304fb7ca1f44492d4d SHA512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7
 DIST oclock-1.0.5.tar.xz 126404 BLAKE2B 50bb5e1db1b2d268f1937e4cf9452208c5c1c72d6deeb08ceb7a639b43f7754b643827f757c168c8d9c81a30576b44b11f571fe4f3ac37a99eda01ce1f07d5fb SHA512 a87e89afdb25a91c36077e030b05c3907ddc063c6bdc0715a01bfc16edef8730b3b5a0347399ef4c8b2a13e70e068cba9ec5fe8d411f08548c0aa790a1873aff
 EBUILD oclock-1.0.4.ebuild 369 BLAKE2B 5eb189f12b5c763910228b34a3d3b8889285575fbef9708d9257775bda35f289499c59d4ffd742505175c84a8e87fa9a8d1e4f698a92a7bcb41390c54e74ef49 SHA512 c0895a5212451aac1d3f408323033077edb3b02fd984a08ff54b7fa69ce4dce50ed37dbbe031bfd84a9ca56859661e14db8cbcaa1fb90c2b23c9594f1d48235b
-EBUILD oclock-1.0.5.ebuild 417 BLAKE2B 1e0d4dbc490928ffad0436aae7f61c61a0fbca33da6c2ddee2365ebba1df9d910b2faa15bd19709802d51fadabb7e7b7f6fe4db0d276eda5447783d528fa4723 SHA512 bdbc27d3c38058457b0f5cbf1e402770ba23ca44a9781162a4fc9124a841fd00699a9525d4d541c04cc9ac73200c028b44fe1fd4ab8598954f6cbed2835cd4a3
+EBUILD oclock-1.0.5.ebuild 416 BLAKE2B 414a5fa0024d9d131cf38c190597d5f215d402322683967c304c676994967dc2f91bb4ff5339aae85592a41182f9533a9dd3f4a78d8c2ff8083feb47ebea0c70 SHA512 c7e79824cf3beafe53eeaa6401846dabb472dc048ccdc658e05c44879a6e1a97e70093210b6d90ebecd7b124ab9d140805caca7080c1078f717f96feb308acf9
 MISC metadata.xml 337 BLAKE2B 1100cd4cba6d169fed0fc11e972b52e8c4582cf92a6505cc3aca1a5f077be6f5aceb15b3f3bdae463b724bf9c96a4fec7ec8e73e3df7734ee55790e62258b351 SHA512 555191541442af37fb67f2c2454fc318d3b63bde0d957234262425debf1297040f4b252209b0cace3594812e6158d4a27a62d00c02714c56b5f3a234d7d01ec2
diff --git a/x11-apps/oclock/oclock-1.0.5.ebuild b/x11-apps/oclock/oclock-1.0.5.ebuild
index 774c0644923d..77acb4305108 100644
--- a/x11-apps/oclock/oclock-1.0.5.ebuild
+++ b/x11-apps/oclock/oclock-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="round X clock"
 
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 8a219ca3d7b7..daf74a5bb3b9 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,5 +1,5 @@
 DIST rgb-1.0.6.tar.bz2 139225 BLAKE2B 25e20d0be23a46d869869e47169d86dd50a99bc65551bf83800119c7f9cd242f41d5ecdb611467eaf9aeba909cebbfab8f578e0a5dc63380482f324124064bb4 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
 DIST rgb-1.1.0.tar.xz 132824 BLAKE2B 117ce69f384066285aef900a135918d58bb7fe27e5c0dc494bb82a9cfbe889f87f856da3a5a04223858e097405593b66aa1e9c9482d075f6a2c40aa9b1268022 SHA512 640888d64b2d328fff4a1652ba1299436e348bc3cbc90710d79c635acfa7f2fce0018adb818123b41ca008197ff1cbf87aab60501de36c163bed2d80d8556008
 EBUILD rgb-1.0.6-r1.ebuild 448 BLAKE2B f93871844f4493cfb4566fcd3115f4ccf3b4c6767d8c1d6f997b5e390c758b319c316d4fd7bc347d99bdb982d0a762dbb38e438b7e0a302b6ea7e8c23a9b6d3b SHA512 dd5226c5aad6a665f2023c79488507c4f594eb494be0829cd6b960dfb37aa51254ed0ba367c660b5a733b7801600fab69aa42606d7bcca3c06242f6e6d1014db
-EBUILD rgb-1.1.0.ebuild 475 BLAKE2B ff87e5bff826421da6d9eef2a1369550a78d29d4fddc02bb12ea1b6ce152b26eeb2dc0a81b1d74acf3b8b6a125abf5b907d12b4fa10f162b1b5ce38e131bc06c SHA512 36e993f593c5ed96ab1cd6465bb77d08373db44b50cf041b930d57a878164b432f71c8d9bb618c3500f0f9561123935c8c24089663941887710bc53512ec7d11
+EBUILD rgb-1.1.0.ebuild 474 BLAKE2B cf21920e1dfccac8130aff31e02b3502acb81f9d7385c274d7620b67fcd1df8c6889045b8635ce666588b3e09034eeb1208e5ad771549b658964ea128e756e54 SHA512 450d23e4db969429cc6ab4bb18c2e61aa82a038c915c55791a87bfe840e71cd84239235912e4b515fd1c0acad626256b15b2508558fd2597829cf7ee21050c8d
 MISC metadata.xml 334 BLAKE2B 68a0b63d285bd840a4e3e0c0f01705d8adda0e16a4920e6591e60628e57897185d7a5b57959d02bea0ea24f92ee92a4f9b20d4394c0a187799cbf23d25210d97 SHA512 b8de5eb177f9002f75e2843cb0cb99e24fcefd5705f32c9a365c9111cd6559572689627ff30a0e004a1c27077cc1b856f4b44f116134c815e9b747398467339b
diff --git a/x11-apps/rgb/rgb-1.1.0.ebuild b/x11-apps/rgb/rgb-1.1.0.ebuild
index 2827ab85d60f..649729b5046e 100644
--- a/x11-apps/rgb/rgb-1.1.0.ebuild
+++ b/x11-apps/rgb/rgb-1.1.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 BDEPEND="x11-misc/util-macros"
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index ca7617ca87cf..2e0728475181 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,5 +1,5 @@
 DIST sessreg-1.1.2.tar.bz2 137612 BLAKE2B 0fe6484b83255bc2b917645ea841ad43b927131a8ef3fa9a47e7864984259140579c462c8d03645928ffd4667e7c46f36c5eb1aa35ce916ab65126c55f6bdde1 SHA512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c
 DIST sessreg-1.1.3.tar.xz 131184 BLAKE2B 9da6b8c44db96edb5151856edffe37691004c1df0ae5bc7c32becb78595f8ff907291f090a708acb5bdf49dffc866385298a9de00df0e31533f61cbaa5296719 SHA512 bc1e83afc598ac5b4c6ab0861799b6c8727c123ee662c1fb9cbdd9ee926973b7a00cc62e32f6b4e462c0da3516f8b824337d9cf17587ebabd3f4753502641a60
 EBUILD sessreg-1.1.2.ebuild 342 BLAKE2B 18dd410d61579aae559212f87da1df1eab6341a4ec58ef5dbeeecb156cd8b5c39e6cf47436572ddc14b45dabdecee230b51f829c90af05275899aa023ca7881a SHA512 adbb2682970e45f0051a0e0b1c4e1f79e6af1df46a14e023f9ae742e6fd80f8d8d7c334382ecf4b8e0fc77842a112eae12384ff03253e0c6e6fb865daf8209de
-EBUILD sessreg-1.1.3.ebuild 361 BLAKE2B de934d6968cf3f2d4d0e632d8e2cdaf481cba2c25ec83dcda8fdc776d096ed82fd4abeca254c74335d5a73e77cab0e83e9cef69aa7f199c63ff0846e0150831f SHA512 04a52f72f159cc44255ccac8b73e08e04722e6fa2fd194b3da178bd92680abc7518fefe1d2a38f16cb52567712517187e51da1254a74b728b2081c0c7e8ceb1a
+EBUILD sessreg-1.1.3.ebuild 360 BLAKE2B 4fb5505c2c818bb8060ffbfd082c398f7993af38c63ffc8040e8aeb3ea1842d44cfc6326d8bb6f5011f31ac9a567a877b19e74d06f03b0f31e1bd97dfb3e0efb SHA512 a4defabf4181de02dfa87034049d8352842622dec81674156cdaf8f0af06a1049a7cbddbe7e7cc74af29acb35fba22e1d37a2a6e18d0fdcd029ba21de1a62021
 MISC metadata.xml 338 BLAKE2B e25dd0f7e3bbffd2051258e976e618fd2b23dac5617e5623cbf3dc65dea14e2c92691ec4e4b82e9edc9b4ecef097255a94cd9ab822f59b29249d5f01fa16b913 SHA512 662e6497348739394cff1b169d96c777a0a247d041f04eac5180fafb04c790fff97fa5f8f5a460b213e4f280665e9bc9d9a6bc38e2e80d08da26bbc8a2f9ea8d
diff --git a/x11-apps/sessreg/sessreg-1.1.3.ebuild b/x11-apps/sessreg/sessreg-1.1.3.ebuild
index 57144cc15745..361b363af1b2 100644
--- a/x11-apps/sessreg/sessreg-1.1.3.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index fb35a9e89076..acaeabb82557 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,5 +1,5 @@
 DIST showfont-1.0.5.tar.bz2 125618 BLAKE2B dd3f97e3f2dff934f1cff4bfda0f8a06be3b8549b8572f3a163dbc638fa753eb14b65e8b11e19a56e687a306f3602f99b91fc458c22543d5622f870e518b77cd SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd
 DIST showfont-1.0.6.tar.xz 121588 BLAKE2B 963040ca15db4e990aab19616a4b5cca5a9454ca9df57a7bf92f3adf44eed08e14182a98697f6a135b1ed509e6fa15826044af43541bbcbc9434fa25db0a363d SHA512 21a318519492f4ba46a8bcb3590097fc5f96fe01fdb557257ae56bae813671952a2aad6c0df8cd69659e06708571c398e6d97969224cf692e22c8a35c8e6c363
 EBUILD showfont-1.0.5.ebuild 273 BLAKE2B 9635b9757eabeec523ed1ed75e5078e23691024b1c1dc9b611d5a6d213166b88de625f6ec4f4e9601fa2b946bff9086e483dd5faef83eb7638f03966b0db287d SHA512 d153546ba7c0eafefd5fdaaebc79559e9612548e34db414aa1e0d657597b35ec1ee5f035752dde35d3671690ed90b9dffb75976941ff1bed020b33276810d6b1
-EBUILD showfont-1.0.6.ebuild 321 BLAKE2B db0a964591aae7768041404740bd92c4475286a63baf2b7aca9275897881e6cc221d04a4f86125abe48abf80e10866fafcaaeaac9e06b64b72f8a7f1bbdf7e91 SHA512 d1543d9303423f152520d8bc0461ca49e497a04e60602fb57d091ee2b72b1e40f976fa66791d0955586bf4fadd0c33ec4f040e2dc9d04e6b3828d5575ada040d
+EBUILD showfont-1.0.6.ebuild 320 BLAKE2B 35a7bfe5b2696f6cf0288c0a582fcf0df4e6d0ed328d4e00a260a7958da9055cb29b7796adf2cc54402d2bfefd27a81dda7de1e280ca105a5d40b8f45340a6dd SHA512 cd8eeac36ac15c973cf4d006336571062e8959c9679bc606ee143eaf836262e58a1524319e042cdbfccf05c5fe9c059a3c3fec689b29b87b0739ec5e901a3fc4
 MISC metadata.xml 339 BLAKE2B ccdf2af178e2b17d9ec110e4aa32cf7c8da303266ba94b8443baaccf4fa18cda7a618c8658cbdf30cf26c4305a458cd7619786846105bc812890720dac91c837 SHA512 638081d732d89aa286cb6254d44c5b7d86b05e6f59c3b312f6fe8fc3900175bd035797e32e1b49052cd11e25e83ab8320f1cc2ce5f473cf24bd6b82d30010be7
diff --git a/x11-apps/showfont/showfont-1.0.6.ebuild b/x11-apps/showfont/showfont-1.0.6.ebuild
index e14cfed5debc..30df1c7a2b3d 100644
--- a/x11-apps/showfont/showfont-1.0.6.ebuild
+++ b/x11-apps/showfont/showfont-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="font dumper for X font server"
 
-KEYWORDS="~amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 sparc ~x86"
 
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index f28906d92124..cb2bf9cbb900 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,5 +1,5 @@
 DIST smproxy-1.0.6.tar.bz2 132046 BLAKE2B b1eeba52730da79ed9f374636631c0400df997b2c5ab5ce18f1644ea6de7c55ba2914978d0b8b88f0cc455a0b5a65513fd7e29d2a374e7464fed14e007f8cf96 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7
 DIST smproxy-1.0.7.tar.xz 129044 BLAKE2B dd1736d972d079487bd45f77272523c2772a7aad612ffe719aa9c190df112ec68a372e2b7e673263f246be57f199ec288f5077faad8b6a3936cbbf7fa5b9b433 SHA512 cd6a6933b74f76ae65fb16504e57871724bc1102eae1d02e801e99c3fe73fe44e27f87cef3fbf9f75f369d18197b53bb677d637d94cc8185b55acae0cbd44f21
 EBUILD smproxy-1.0.6-r1.ebuild 336 BLAKE2B ebd5110cb97ccef35627ba0b855cb2d906525608daa0a070b68aa521f00c8cf76eef6f6ff4635acdf89cea926e8dd0fcb7818673ded6798d9855995087f959a9 SHA512 de2ad44843f626b5998b53b1c77ef99683b29d74a2563c4e7a05d4699817d00160968d658dd5c8a89c7371f9800599266e6ca19c89c84f49c976a44737a97e91
-EBUILD smproxy-1.0.7.ebuild 395 BLAKE2B 19784a7df357a5abc80b9f673fa1fef9e4b625ab14685a91c43d7c93f8b34795f1571563403c2c64aedbdb5fdcd20e7b6e5313fa65ba440d73dc0078308743e1 SHA512 b38ee8564f2902fa8bdda402d3f3631d750c09cfc441a8a1ca5cf00fb92c6b1b27de3811e9be1cccce9dabbbbe36ab63b6f9f1db9a53e211b414f861234a1e4a
+EBUILD smproxy-1.0.7.ebuild 394 BLAKE2B 5fc1ed7e8964bedd6ad7d486fae6ed8a3abf93f7333ebd4ff80a6dc55c213bb919321bbe5d61ffd1c4440390fb81be71ee191fbc79461d77b7e041210ec60fa3 SHA512 90e2f6f1aa97e9febfa53ae8650f5a5563bdf21637a381cb55e05123720b37c70f98b002144855ac64ac06a0169e624b9d71484c8f40fa6f442c80657580de5f
 MISC metadata.xml 338 BLAKE2B 0745dbd18fe715122bbf07d279e42eff3928b296ac64e2977228ca4d1604e53e562e9417f4005f90461ef005fa8680b5dda2e8e58d77b8e9f56b292a358cbd3a SHA512 afa160655b2ac6bf64937275e35e9a6c4b289ab005c39871225e7e581826507ec3a5dbfbd7022e2062235193d336f1278139a749b75d4b64a9e11d5eede99ceb
diff --git a/x11-apps/smproxy/smproxy-1.0.7.ebuild b/x11-apps/smproxy/smproxy-1.0.7.ebuild
index b2ef7e44e19b..c963e6c8d387 100644
--- a/x11-apps/smproxy/smproxy-1.0.7.ebuild
+++ b/x11-apps/smproxy/smproxy-1.0.7.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Session Manager Proxy"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	x11-libs/libSM
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index 266f8decb3bb..ec8ed273e6e2 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -1,5 +1,5 @@
 DIST viewres-1.0.6.tar.bz2 135200 BLAKE2B 96677c7c02e56be5da7f8f9d492f22cca5c6ea83a783725fd9fd86381b00062f3b83cbdb88c4030d9f0a52ccb8f06978232adb8e5f0002db06abcb7ff6d35ac9 SHA512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff
 DIST viewres-1.0.7.tar.xz 128608 BLAKE2B 95a994cdbfa0943c76298df8c2d7e0fc2aab8cf7c1c31cc76538ab7a9f5a22ff1bb515c8f8c9ebfdfcc490600696bd5184029182edf52d3af311cf4a4825624d SHA512 75878faee001163891adf8472c79b31273f794e23dd775c80b33acdd1ce76df708eb27a49c20f79b7101ad676e1d50d9c857c2e2e0930c6209eeb7af8a11397c
 EBUILD viewres-1.0.6.ebuild 361 BLAKE2B 2c6ba35641dc4d54116cff5452c2dc845ca69920aeb23b0fa0e2bb39aec7d73b575037851b67dd9ef33216c350ad8451c0602d6f677e88aef08aadbe4c08a752 SHA512 42269351eac7360477b2ac320a4ea5f6aec999f6f4c82035b6e2e174f292c6905fb7e0dbc7e44fb707ac0decf7ca12c8dbbf71b46692412fc8b064b7e1da5fcf
-EBUILD viewres-1.0.7.ebuild 380 BLAKE2B 6dffe3f9961f237991eee7049fa52a1063e0eaf0a5e996c0f30885aaf9db63232d5911fc24ffe8dad13e43977480b93adefac8618f9ce2da92c0615768ae4fc2 SHA512 c694825188396a0fd01ca4dcde7b7b552f43508ba223f65bd177ee72355af9d4f514f18303eab4c28ad96ebe01ec0a351b56d12dbae35615e4a11a216b1e3267
+EBUILD viewres-1.0.7.ebuild 379 BLAKE2B c5b0b16b9d7fa56a7dbf3402dcd431ae05fcc52a4bdd6b18f2a375a8b07c0e7a02a9f27146d102e5fb41236e8a2f0022466c0679f2cd24eb7a5ab575b480dbde SHA512 f684ea4123b7e2126a11c79cdd5e32ac9df89c1fac99e4eb081fab88f1e1a19d4a5423252a50963f3695ef2c1cb7796182f22b99975205ca8f3fc9bed3ba3977
 MISC metadata.xml 338 BLAKE2B 48e179eff46c263194c44cb537af6b6df0331aaa617be04e5197a0031bdcd22df2f3959f46039990d7afcff2777a2a32def7079edf536e6bae5afa11e27c0fb3 SHA512 de9c770f9ad6e65d52c45c7a69693a7ffdd9d9f5264d32dd3cb98422c9478b710b91f17b074822fb918e4519122cd041606197b92723acef08ee444d9868e9d6
diff --git a/x11-apps/viewres/viewres-1.0.7.ebuild b/x11-apps/viewres/viewres-1.0.7.ebuild
index 3cd6ce6c1227..0a98d2105800 100644
--- a/x11-apps/viewres/viewres-1.0.7.ebuild
+++ b/x11-apps/viewres/viewres-1.0.7.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="graphical class browser for Xt"
 
-KEYWORDS="~amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index 26709f734e87..8872320c9ffe 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,5 +1,5 @@
 DIST x11perf-1.6.1.tar.bz2 189446 BLAKE2B 2a36bea5e1c9a414d9a1ce798e4f0481aeab86522c5924fb7520c0bc917b832f3e4c63c70a5430cd3fd92cac4374691a64db4542180e0917a0617bae7f783a6f SHA512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b
 DIST x11perf-1.6.2.tar.xz 173800 BLAKE2B daccac808d62b8b3d423c34faa00e41e4e259ac7bf7a1f6d337602d60c31b63db1b332f2b0eca368c3b2fb91486882e8a90ee8d1aaa20a0e10a747eae5faa34c SHA512 5be9e601071a42d103adbab5f30c1900a3779a5b2c06c709df99a85487c9790d36b835d43f5c6d74cc7d950cc3ad06927210d7b1f58939cfd0b4a6f3e5e32112
 EBUILD x11perf-1.6.1.ebuild 420 BLAKE2B 95e84c67ff78ce3e8fd08d0b40aafbaf29e380e57298898000e2e1308040178ef993801ad9777fd7bc8cf9d324dce91e29513fbb0a47a2231dec46fc06e29f29 SHA512 e0a76ffc2c21e03e447cb0e27a3069d3ae4982afa32ec739cfba779f41ab08981d878c1ec72c96ca2fbed4e66e911b85d164a4eb23106e812fed9f8dc69107f7
-EBUILD x11perf-1.6.2.ebuild 489 BLAKE2B 339ed82625ecaeee1c9bed5291a991f650215481865bf7e49475bedb9c7bff3bb726c87ad001cdcb67d5c4a2581d566c99a424f288e15a901c2b9afad30e2700 SHA512 fe8c609605800ce90b26099fe1570fdd649afce3fcff4a1ea095abf83533c48a61928f55978698f894c52a0f4d00139b6844618f3259e18bdc7b4ec2ad4c6178
+EBUILD x11perf-1.6.2.ebuild 488 BLAKE2B af2c285c35a957a011b27c7e6f1816bc8d2638e697e546378539e55d12a1e3cb8feb9594b669e79583a5cdb75a590fba2a1bf01375f961fd8c85e3545d021aaa SHA512 344ac3decfdeca73e62261e8bd011f19c2df38a6b3022a7fa42241e2ecf2e727222810a33e0126d066f9dd2cb0755f74a55f8aa9fdb089e72921e58f529fb905
 MISC metadata.xml 338 BLAKE2B 62d4735813b8ae204a544bc5abb18554b0622568be416752d0c63800344c9afdc22aac562bcc9f5a3f174a93ace3773c972cd0a9980a478afaef60399d843f09 SHA512 557400e93681a240b176ff5ede69df4720d4845da0ec55b547e294ec3775b0bb33eb0a05007d1b528d41742cacfd2aee65d835b4a5484fd49041d211a3b40c39
diff --git a/x11-apps/x11perf/x11perf-1.6.2.ebuild b/x11-apps/x11perf/x11perf-1.6.2.ebuild
index a09353303770..436eeb73dbd5 100644
--- a/x11-apps/x11perf/x11perf-1.6.2.ebuild
+++ b/x11-apps/x11perf/x11perf-1.6.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 DESCRIPTION="X rendering operation stress test utility"
 SRC_URI="https://xorg.freedesktop.org/archive/individual/test/${P}.tar.xz"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
index 9b315253725d..33a325cefaf4 100644
--- a/x11-apps/xditview/Manifest
+++ b/x11-apps/xditview/Manifest
@@ -1,5 +1,5 @@
 DIST xditview-1.0.5.tar.bz2 151313 BLAKE2B 53d96b874230dde6f4f13a7a61420e1b9da86fea18e49e7084212353d9de64aab30bda6bc790282127af961db66873d6fafec1f6c7a986776c30eaad260ad98f SHA512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d
 DIST xditview-1.0.6.tar.xz 143848 BLAKE2B bf832e17631a12f58ad194b1ddcf7a63a31e04f005ce883798f892284c8ad64ae40f15f5c1d781179333ce212e989de9b45cc53881079818e5c2f0b6087e3b5c SHA512 249769d27980e9a69ac8f056f329dfa514f3ab6267d6ed69814c5695f315d2a7021c560a0e26fdd2568290a071793d7f2eafdd92f9981ed556047deb244ebf5a
 EBUILD xditview-1.0.5.ebuild 330 BLAKE2B f5301dbaef435197d301b261e0150cb23d98bcc5b19317fc4479a96a5a125601a6bdc81cdab95e6cb6b44a3b1e1b29a30a1d9610db9cbfd7f68113bef9dde9e5 SHA512 a5b0490ae1bf34cded726c847e4ecb873cd17c696c26a3ee2e59bab40d9b7cbae53e50ac81433e071a9f1b5309638117a6a09420491ee2e1d98c7e71e794bb7d
-EBUILD xditview-1.0.6.ebuild 371 BLAKE2B c02def12940ca044079bfdba9f8898f7c7588b4a5858071e4dc52534008f1ba3f09a6f53e4084d507c775d4b8664acdda660a7e8661069930709ca325add98a7 SHA512 49c02b0a90717bda4bcc925f2bf2b0f2d64f2f92761e1b9a9ebad97ee0e4ec2ae1636b0555cb5d14426bf6e81fa86db77d8bf61bf4cb52408e2eea6493c30b59
+EBUILD xditview-1.0.6.ebuild 370 BLAKE2B 824314b25a04e5cd4946b0248149ddd95afaddc071a26263c98aa57c69cbb1a3b40a1505fe9191adbdc10b7d328bad8f44368563a861296f4d5e548913945ff6 SHA512 2f890c7e5562c3cd595e609b01600dcd4076c8f7a723bcd8ea628bdc2b2d52d85250f7daf69e82cb6d68c74080c39f6cd3ff9d0e1d9fb966de216806cbe45cbb
 MISC metadata.xml 339 BLAKE2B 20bb995c62d6ae40b62505bdffd3c58cea8ee7ff77cab23fd8b17f05fc40fde108afe9c27218bfbfc214c2cbbabf9ec3f849082895ec6e6b60deaf0658930be3 SHA512 680956394474d91911730ddd716df4f3a4e005c689c9a75c0504faa77bb193bcdba492ea2ac3ea86c53de676bf40734f5787da0ebc5e710d62553edcc7220955
diff --git a/x11-apps/xditview/xditview-1.0.6.ebuild b/x11-apps/xditview/xditview-1.0.6.ebuild
index 3a5b98f2fa48..69437dfbbcc2 100644
--- a/x11-apps/xditview/xditview-1.0.6.ebuild
+++ b/x11-apps/xditview/xditview-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="display ditroff output"
-KEYWORDS="~amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index e114db7f664f..ddac1c6ddce9 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,5 +1,5 @@
 DIST xgc-1.0.5.tar.bz2 188307 BLAKE2B 8e3906ee07898c1382c692d3ccb7541de40be55dbc88c0ed40ab3e78a638c6e475bf38f3a34d626507d34270208cc59cb7bdf727869c9907a00fca6280b5b39e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314
 DIST xgc-1.0.6.tar.xz 177228 BLAKE2B 3277463250f472ac3dcecbd4a723d59a5485c7ddd8df585ec2c80dd94e63ac1c462644cd57a15065c398c725bf558e0e948796dc0ae44ff65dd49b750fb391be SHA512 f449b9b2d313aeba1fe9bf33fef90291776403f1fdf4afc507c4b973045c97fc8ded65ddec4f8c58727e7e4c7c4ad6a65ae79581eb4bdfe9c79a5f909dbc0a1f
 EBUILD xgc-1.0.5.ebuild 284 BLAKE2B 9900bb11a8031b0d264101b94c471a687ac80e2cfb076dfb2240282ff2e75683260a538850b208d13b4d5ec31abba3bc560bdb5b987c6ac811953441ed9ce2c5 SHA512 20480f920022099036d88aef0503348674dd3343958c1a0e6d843ef697a90d580b5cc0f7b0b898c3da34e9b4712bf56585f08ff87319da288a2b653bf45f3449
-EBUILD xgc-1.0.6.ebuild 331 BLAKE2B 6e3932d2473e6fc7ba03e6897f6d5ce58fbd219f9fb8de134a61b7a32e61c720f9268b8e0f4e1befece7f30ba5f7b2fcfc894990408dafad96df40ee6261e731 SHA512 ce47400b11482550f07943a4b1d0543add5048dd126a60b8b65bbfbdcb868c2ac50887d8a74f0ac6c14622a4cea5478e69114f542df9e20825b86f6612bce045
+EBUILD xgc-1.0.6.ebuild 330 BLAKE2B 994d70da73071d3531d527f3e819eb4409823775275c0fc719182dd385881817978897e3b61dc3d6d5b6abcd6ae544210d876344dea6188e9950a75d7d7a285d SHA512 3a7160939953af548a86bb3cb646e59782b53e6bbc72b686bda896415d34ebd5c3ba92755a02f88fe717ff0547079dc02316acac4d5dfbdf90cb664f452e973a
 MISC metadata.xml 334 BLAKE2B 8227ce2611baa3baf275bd4235d3201758bc24834511e3641845c692241630f69b3da64258030a25c67f124b683d49668f8595d9b53f4644e6f3610d8a0572f1 SHA512 a7016e57975ad009d45ad6de0edffa558f737f7ae3ba13a587f5e8fe569b8bafec874a9376339b0336906b6e6fdbfd7bf225c879749891cf57097742ff6f8eea
diff --git a/x11-apps/xgc/xgc-1.0.6.ebuild b/x11-apps/xgc/xgc-1.0.6.ebuild
index 2dab93a88db8..47641202fd90 100644
--- a/x11-apps/xgc/xgc-1.0.6.ebuild
+++ b/x11-apps/xgc/xgc-1.0.6.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X graphics demo"
 
-KEYWORDS="~amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc ~x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xisxwayland/Manifest b/x11-apps/xisxwayland/Manifest
index 147fd4c558a3..0110a45b6822 100644
--- a/x11-apps/xisxwayland/Manifest
+++ b/x11-apps/xisxwayland/Manifest
@@ -1,6 +1,6 @@
 DIST xisxwayland-1.tar.xz 4168 BLAKE2B a8e4a658427f5b03e3d05b25772c4f136c13be47a68619a6beab3db72a70e836e495fcbc8a19d5f9347f3336a1dc9b353f483fb75e47ebfdbb9b8409e63444f0 SHA512 9514442313cff4df0c71fed445ba0e3fe52f3c84ebbec81725a590f68cc42ea01ac96b23736a0108fe206da3aee48434c5c30d1c58905bfc75db35205c288bca
 DIST xisxwayland-2.tar.xz 5220 BLAKE2B 47bd626ad2cbeb5b0e114a4f603858c82f4f870f16de038bcadd3010f90e140fb8a3b0531e4102da7527c49bcc6bae6039aa6b42c6182da80467d5a3f040b817 SHA512 b89e19c85a5cd7e62a52e22772f80f03bfea069e31412ca11ac38174c4a2994be559e9d5fb49e6d1921b3f1b06ee71b50ede48990a1e7804a96207b08fc7827f
 EBUILD xisxwayland-1.ebuild 657 BLAKE2B 65944553932a15bf773973fabe34c678792a16e9a2fc34dc30bb2badedbbffb125ec608c64c25c276ad907187e324e609d328ae4bf7a46e99746450c6888d984 SHA512 0ee7a3b984ce49d10bb3c5c4df0a1f7c4f53f9aa9a38149f36d4684baefba0e96533b1158b05abf88939faab6b4011b71836298f88ffc223b01a00dac16055ba
-EBUILD xisxwayland-2.ebuild 662 BLAKE2B 635fcfe4558cb05792fc914001592ea832245db9e5d1edb540160ca07cdd6a31b282f04b92d42e0bb633112cdfccccecb78424ddd20fc1af21443a064a84abcd SHA512 59b4d65e59ac2476d165837473c1f467c94ac4ea30e142f788ec071c83240832a806e065b479d7a3ca79f0f1fd25a17988fd6f9695e36a478192a534f2385a7e
+EBUILD xisxwayland-2.ebuild 661 BLAKE2B 1990f4d4c829ffb120c0e9569aeba483b7219f995510435e937916d239c0d8f1ce0cf36269aeb435c86827c1bd018672f9c5363ac3222be30d0999388857aff5 SHA512 cad417e156f38b595593ca102e77e5908d96e3b7434e14aa0de6d7e9055f6acd878ee89ed8b3204ebacf46aab52a34fef0b0c6f082771a0810e5ff93b890b924
 EBUILD xisxwayland-9999.ebuild 662 BLAKE2B 635fcfe4558cb05792fc914001592ea832245db9e5d1edb540160ca07cdd6a31b282f04b92d42e0bb633112cdfccccecb78424ddd20fc1af21443a064a84abcd SHA512 59b4d65e59ac2476d165837473c1f467c94ac4ea30e142f788ec071c83240832a806e065b479d7a3ca79f0f1fd25a17988fd6f9695e36a478192a534f2385a7e
 MISC metadata.xml 342 BLAKE2B 22542ce434659a09b234891625d25ab44fb54fb27fc81950a9682ae3250c9b2826c6387460111227f8295ebfe5207a8f7ccb60b80ad79e96c47bfe5ae132170f SHA512 401c20493181e036e7117caa4562c0cf8075b17e1ee384b5e5d6d22a301d6e901fd0936a2cd1f52b50b79e2932f80ceb1a9fd47fc6ede220ce37c9bb2d50aeec
diff --git a/x11-apps/xisxwayland/xisxwayland-2.ebuild b/x11-apps/xisxwayland/xisxwayland-2.ebuild
index c7f9d5034c09..c82f6bbc37cd 100644
--- a/x11-apps/xisxwayland/xisxwayland-2.ebuild
+++ b/x11-apps/xisxwayland/xisxwayland-2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/app/xisxwayland"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~loong"
+	KEYWORDS="amd64 ~loong"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/app/${P}.tar.xz"
 fi
 
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
index 9f4ca91a690a..0d9de3975631 100644
--- a/x11-apps/xkbprint/Manifest
+++ b/x11-apps/xkbprint/Manifest
@@ -1,5 +1,5 @@
 DIST xkbprint-1.0.5.tar.bz2 166856 BLAKE2B 99d375e88a871ff440ebed587b01961a6e2fa196a28c267dbaa6cdd10bacdc99767f12032411eb8448e8a2f7c6792c2f7b6f428d208a9263f94b4c959d2a0431 SHA512 ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f
 DIST xkbprint-1.0.6.tar.xz 156920 BLAKE2B 88a62e3138e0d68df4cdd335f82734037649acbd951ef5997382216f7472560b2ad6e4cd0790e4260baba9864754b54b4a7cb9c42444f44caffef92aae392b40 SHA512 a1c2401b2a2ef4c6bd2efc18923ecb176adcf38b6c5dfdce25f22f1f5ab21e25f494b25dac25b1765fb9a0f6acc24d191cd41b9a098a9e3c6eaf9a9df490be29
 EBUILD xkbprint-1.0.5.ebuild 341 BLAKE2B d21d39d6cb05f4222f80473f010164e340487e80e9defe0f4dea30b20a2165aebdfc4ab19f44321b041f5f73b367bb0c2608848d0ada83763e767b28fd52d864 SHA512 6b40b3b2baf05a46f74c6920af5dfbe3d4e5346fe40e6294b9894812942d135e3e9b3b6e1a6b0c6d5b06b10ca0650c0875f07deec3cbfc5992e7bf3e7d691393
-EBUILD xkbprint-1.0.6.ebuild 362 BLAKE2B 8619d54db63f0cc50ede6f00c81b957f7bf05d975c5be9ba1c774d9ea313a491b8bb2e9ae60507d0230c4588ea89c5f37b2983a308aa5eed74feeeb3156426a9 SHA512 d202b5e57e2a660d6cd4624ad4d3ec193f2ee2f7daad5a7ea95529116d5a3ba6edaec4b399eb6566183e09efc5ddc2a77025987cb5be7955101eca40f736eb05
+EBUILD xkbprint-1.0.6.ebuild 361 BLAKE2B 1fa6124807a1b7ec6fa425cd1b237766122a8e57c7d9f67a096895b864731c297d788ec7ef9fe28de1ef0efe9750b4bf850a309939f9fefcc4fb8d967d6a6223 SHA512 41532bb0e81da8a5eb0c779da68b2c9a8ea6b06dad3688474fe1c63e6a6cf02fafab2a77e064d68fbcfbb3ecbc733c46937dbdd2e92da8be212747735c045a66
 MISC metadata.xml 339 BLAKE2B b4471ac13275ceb75150f72b824061f25431023c0b782e6390cc2e714c9d642cb5e758adab4efc23b650f165d606e39c4516945e8ac404d95c9e7487d67f931f SHA512 fea33866702190c4f038e6f46ad52e0ca07bf92d910204a2aa847c188e6a5aaebf8c73bb1ccde195382fd6d08852a103ef16027225faee81d48e8705a17d1e4a
diff --git a/x11-apps/xkbprint/xkbprint-1.0.6.ebuild b/x11-apps/xkbprint/xkbprint-1.0.6.ebuild
index eded22cfc9a2..eb39a131e9e6 100644
--- a/x11-apps/xkbprint/xkbprint-1.0.6.ebuild
+++ b/x11-apps/xkbprint/xkbprint-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Print an XKB keyboard description"
-KEYWORDS="~amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 943df07351d7..d6f7e8fe064b 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,5 +1,5 @@
 DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
 DIST xsetroot-1.1.3.tar.xz 123200 BLAKE2B 807c927c8c055877ad83af7559d897daa34f86a9ff70250997cc933065bb24ecb88fac01a62edb59a9c497630dbe351eccedb1f324668153dad67bcb461dd7a9 SHA512 f333d1bfd92bb943044da36331ae2cf68a811c8f3891719d9ebc1749e2dd0c67068f86face0794c3c4ae584c4dd189bad4998dccb38fe1ac37a8921e5713e7c0
 EBUILD xsetroot-1.1.2-r1.ebuild 420 BLAKE2B e0f7615fafa6b7a153fe6a94dd934ecce2249c67cc4271f34baaab721588aafdf1be1390b94f08ae5e645002ed8ef0e4196aed55c65b1cab3ab0b74b6067c2a9 SHA512 56c121de543e73c04717306607233a6a717970725cd6d62a9fd758528094b3b7bebe9a46e1f1491aae5dac3cacc840762cc4201a4fb1e664574527023f678d9a
-EBUILD xsetroot-1.1.3.ebuild 447 BLAKE2B 5a89c46f0aef78014c15c75fde0ec983bb7e548e60bd3ff53d86bed2b486632f7902f895b4251f79d609f057d16b4e240839e749ad18cd45cf96811755a5873c SHA512 a26552d7740b0cf3f71c7366e8fcbfe0efe51581e9c317dea322d36e97f0d02a7f8ed8fc668ba0eaf6217c65dadf9a565ff68442413385f034be780cc672a653
+EBUILD xsetroot-1.1.3.ebuild 446 BLAKE2B e0e582e2eb938f93996b7670b80cde4a64c6d7f2b5a46cc71d98609dc3b724bb4fca27c971be50f6954b7f25e3b71b616b725e5fc585f2dd91984aa88f65d2ce SHA512 dfabaa2e175788cfe9d9edc0b9ce3ef215aa3c0c37234e9650d23fc5df9d89a356787a9443184be7d8ff53c884b2a5b988883229aba1430fa2677b125770aefe
 MISC metadata.xml 339 BLAKE2B 56f6030268da9a408d503b75be7f6bec93ecacc5900cdc3effdfd456c2dcad9f6f5942830694c52aa82cb0e6784818d83ee067600b191cc37a7edac3786a92f3 SHA512 abf3560395a5de920a6dad35390023cdd5f98c63aa0efc3faad2322a63428c9c82623b50cff01b0f33b68ceed63816c894d7ef5a48a0c71191a9011354e91100
diff --git a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild b/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
index b94fd1cebc69..1f25d8f49fe2 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xsetroot application"
 
-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"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index e1c0840d4df3..a4b48e44ea45 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index c54071264c61..8d5ad64dd1c0 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,6 @@
 DIST xorgproto-2022.1.tar.gz 1107316 BLAKE2B b7c60d77978f95b62208c5c5974c7310a9b6197c8b14218ba319eb44660f20c5eb33ef106beccae16f79a0530a20bd38b6aa2de81329c4b48a2da285ab903c31 SHA512 e34404eb9f7edfebdecbf38c66491fbca91929c59b5762d3266b2808cdae3f4e65589001d29bf5374effc56173a5467f5a107bf4fe05acae69839b841e83f72c
 DIST xorgproto-2022.2.tar.xz 757080 BLAKE2B 0fee7910fced83548780fd1c7bfd214c932c7c5064c6ebd40ac9285d071837056b9eca24dadb53a572a05768f8762c4dd81ac58fcf6b43028f557ed56a98f7f9 SHA512 8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9
 EBUILD xorg-proto-2022.1.ebuild 1185 BLAKE2B 7b495eaa17baf2c49837b6113a5a304549269e7a424e7878925831b982f4e092358e6524181ffa6058e80b5dced4624b3d7a084700ba48430def4ad01d6d719b SHA512 5a81ee8c4a7af16ddf9bf5b84247487f7b78a9eb31d97369c9b2640a1e5f3f572dee40cbc12fc92372be638106e517a2d57159120e21cb51bb96e5dd43aac907
-EBUILD xorg-proto-2022.2.ebuild 1187 BLAKE2B 246b1f7c4c48fe3114b3296a637d1fc3c331c12190813555b92d47723b32f1e194cf6569a8e1d6891e2d41d3ece41d2f68cc410649130fe2052bda6070612566 SHA512 eda1de551debe46e6e39fff641a6c2c84085671a69950d44f653f29caf916fb9d2e08c46fc00495acf25d200e1e7f66c62ede65338de6a40f191f7821e449430
+EBUILD xorg-proto-2022.2.ebuild 1186 BLAKE2B 46ff3360418f53ec66c4e81db237bd888cb69f9fe4885d4d004764c0e25431f8f1526b7071348160f83c35d12482b1af74b83173895259313b7558d88daa12a7 SHA512 3e962ed67b1ed232e5ddc28f0ebf6fc967d29e1d56dfacd01f457bc10f061121a09d928e99e27d138f6f4207b042d71364fb5be78d11de11ff80f0e1c08f9c06
 EBUILD xorg-proto-9999.ebuild 1204 BLAKE2B a0a87857280db4120afdbf323969ae6b1b62a8d2a351f785384e31cb7164b8893a7d69874893b685a04ec57facb35b040ba710796ade194032bf4bb72f785ce8 SHA512 de7d5b0e82334295d2be5fadbbc04311705ca6df160b3b3fc198e5e22f212d7eb3093b94b64ffe10943d441e5ce7892875f131e32413e4b70c235e28add37d76
 MISC metadata.xml 342 BLAKE2B 86fa6d992d56d65a60c04ece61c97dcdd3cb0807dd7d895d907d83fe78427df05b15b5924d7b96a38164003e11a7de78470829c72238acfa35473d2f536b5363 SHA512 03783fc18d1dc17283ec540947907d98ecae2c6cb4350701d1976350aa39e1784d91e698fbb0d672d9be50c53ad9aa8e3d0e14ddc24d495654768709d8675826
diff --git a/x11-base/xorg-proto/xorg-proto-2022.2.ebuild b/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
index 604d1cd47fb6..268b0907225e 100644
--- a/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2022.2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-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 ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 0701d6f9135b..ad211ce7c1bb 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -5,6 +5,6 @@ DIST xwayland-22.1.4.tar.xz 1273552 BLAKE2B c492968f335ebd5b194d91729476047760b8
 DIST xwayland-22.1.5.tar.xz 1273444 BLAKE2B a6773f2b9655d0651a0a686f5e1fa41bdeaba998dc3e42c2c24dcc262d2affdb055c7ab0cf32b94ba11c82cbfe91bfcf10eb651f678feda95fccb55cc21d2e4f SHA512 806219692be297419777ad5343158f72473a691f7c8be4468fac185a3bc5e3b6811755de3133c12f3694480e51529ac3fa409b22640a80a233925716fec24c06
 EBUILD xwayland-22.1.3.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
 EBUILD xwayland-22.1.4.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
-EBUILD xwayland-22.1.5.ebuild 2150 BLAKE2B 74e91481b5f60733ed75d0943141252f6ab84a307f225997c7e8a7c97ccbcd867fca601a74c98b75da50f76ef9bc6c5a0211139cc5c45ab9de28f0f40878f4c8 SHA512 4fabed4140157c3a16302eb94415438c7f1c3d654b49757d59afee28d2a63eeaf75e5575092afef9b1a519c5b4a593caa9f72a4cefaea880c3a8f8cf0cf9b408
+EBUILD xwayland-22.1.5.ebuild 2149 BLAKE2B 9aa258d76064882776678157bfe04831fd956a785c1f7e38fb3fa380b86902e587518d18c6703140d05b7dfc7a1ecab371b20588a0b660e1690ca0229eba64e3 SHA512 f71dfca9053fb9be1567dcedcfb9f9cf0c28e76ac26a0b706a91126d2a4ac74a51d8068584f2096966ee49e41d3411e8860028d753d1190c8ee1fe0d2154517a
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.5.ebuild b/x11-base/xwayland/xwayland-22.1.5.ebuild
index 55357ded3efc..a8b48c055f61 100644
--- a/x11-base/xwayland/xwayland-22.1.5.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.5.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-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index df7bb428b968..25300c3ea14a 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 0cde16506e8a..80f2bcab0c93 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -18,7 +18,6 @@ DIST NVIDIA-Linux-aarch64-510.108.03.run 211471630 BLAKE2B 4177e12907bb577d96734
 DIST NVIDIA-Linux-aarch64-510.85.02.run 211430737 BLAKE2B 80dbdae485a70c118bb4d6393fce80a0ac0392e38b959685428407b48786d543ec1651b5a38984c5218730e1766e4fb890a0afaa28a981a097cadaf516d9d135 SHA512 54faa9b68425dd046f42180560aaedf4805a7b9c5cfbb80b3729ed6eb61faf3ef619cce8fe0b2af30b810a1aa43279b0435decbdd5c35434a5aafc08b3354547
 DIST NVIDIA-Linux-aarch64-515.65.01.run 220195966 BLAKE2B f83292c15e1f2baf3e6d6460e4aa59a24e87787d5e5ed68e13bc2321b080582eb54392ca396406f35680d1f713926fd268617a13a1b0c7d9302aa6feb91bc9a0 SHA512 31ec7ba727bf14263eeadc3880bd8f2aaa0fe8c144aa216bb8af06a154dd1aa5f4a787fe386b20f5d739a49c80435bca5f6deba3010c593e1e54ecd29b4ab1b0
 DIST NVIDIA-Linux-aarch64-515.86.01.run 221097882 BLAKE2B f8562f9ef1d29451792e00f5489ae7bf63d1a9c5a13354f119667e5572f473abe14a82383c7f61251213ef16463c064059316c7da09a5d61207823b17a7183bf SHA512 43161f86143b1558d1f558acf4a060f53f538ea20e6235f76be24916fe4a9c374869645c7abf39eba66f1c2ca35f5d2b04f199bd1341b7ee6c1fdc879cb3ef96
-DIST NVIDIA-Linux-aarch64-520.56.06.run 254864237 BLAKE2B a788bc48370401a7ad83d786830aad1be98b3587569c991515cbafef4b259e3bc4b8f90742125a86176030ef653e2b24e6d6bf8b0b8d064930b79ad16827a328 SHA512 d5839b5eed8b699ecc53133d8694c184e42ae23e8d365fb7c70fe680c54941e25d0ee0afa076ce9c417ddceb1f41b6a1884a13f32636983b83107701676bd784
 DIST NVIDIA-Linux-aarch64-525.60.11.run 261636786 BLAKE2B 1149a55e346e4fe122ba742b3c138c1896a6f151681e738a00dafca707c126d00ab3bf8104d4c138b995031addb1f58f8bf1ec19edbb634536497e33d2693711 SHA512 3ef51518771421279cc2125fbef73d8d93a9d70d75b3d74452c2d456ab228e0a4c2ff5eb93e93b3bd68e8d1698da02d5236a34bafec35c86260bbd45cf3a7db6
 DIST NVIDIA-Linux-x86-390.154.run 49362860 BLAKE2B 083d9dd234a37ec39a703ef7e0eb6ec165c24d2fcb5e92ca987c33df643d0604319eb65ef152c861acacd5a41858ab6b82c45c2c8ff270efc62b07727666daae SHA512 5064ae135d099a4b8b81cf4d29f0cc0dcbcd93f13cadb0378f5e20eefad47522bdab42c9130f22ac8a22a4bef22365321cb35dc53b0ba35374e2bedd44e5a5c2
 DIST NVIDIA-Linux-x86-390.157.run 49417041 BLAKE2B 435b5e0e60468cc74b41cc5d9b5bb0105d29c11a2d408457835212a96519c9334ecf19278b36749d3ff7f498f5b0ae45a2efae2d428703dac21245c62f1efebe SHA512 dae9ac2c12f9ad90f7441e00e01a984147c577892421911d7f67f6a31e616ac1cb7d434bc9c7f58fbd9b8ae909521b5bece607a63c79588c0bb9d99c6bad5fb0
@@ -31,11 +30,9 @@ DIST NVIDIA-Linux-x86_64-510.85.02.run 329836795 BLAKE2B f9f56a2498d223ee5a27b78
 DIST NVIDIA-Linux-x86_64-515.49.25.run 362202449 BLAKE2B 6ca62c747d62e3518e5d2f9926b41e7b0e297523d7f10164ad66c98328b710590932e1cfbf95322914c454cb38395a0f14ea3a881c6b91389db09782e21f9a23 SHA512 3d727d602919eb5569397c09a9dfe42f33d4f2f12c76c106638fe7c5fbe05b671cdb4d2946174cec730e5bb8d2d2a16a8afd622ab981d99475f72aa4f6239a2b
 DIST NVIDIA-Linux-x86_64-515.65.01.run 364182561 BLAKE2B 552084a5347c0388f5cb0a6eecf41fb3d401356cbbbe957569e3eb0a4ca03b3db0dea0f7f6a37a6b66cf6d5377677ee57a6df73668002a13efd8140b153fcf03 SHA512 5221a4ac071eb39a37a841f19cfe4983286dc35e918956b40604404ef36c122612475df7b9a391a9a70bd60f44e598c8a0e5ec54ccc3e90d51f01e1b2fbe5e33
 DIST NVIDIA-Linux-x86_64-515.86.01.run 363743089 BLAKE2B aa03a0f059da99fa549cd9d672cef0194f2b22b349470d80ce626b3f4afb89b1f130b451735f92f5a66dfec02735bd6395053be609668371991837e3be4026cb SHA512 9a31e14afc017e847f1208577f597c490adb63c256d6dff1a9eae56b65cf85374a604516b0be9da7a43e9af93b3c5aec47b2ffefd6b4050a4b7e55f348cf4e7b
-DIST NVIDIA-Linux-x86_64-520.56.06.run 406178736 BLAKE2B 9c30a769b9662deef9e5bdd74e26c166a3d0fcf54481b86bf811d20ebb73efa6385b28fe5ecbc35900f74ef2293503e9d84e64d6c4401aa0335de98550a1e193 SHA512 ac5a98964e1b7435a0919d313080e53c0453ca3a817ed1ed1693a0164f286973d93f4130428a3737a4871f512c686d72e2606038f533d016d6b9c2873eaa1f8a
 DIST NVIDIA-Linux-x86_64-525.60.11.run 413889779 BLAKE2B 2e8f1dfdf3765f8764e245282b76780d405dadb23b66b118b8c48dd694477df79d370a5bbceef2ee93dd97191c354fd1263bbe787d6702a91495ad4f1082c114 SHA512 b31e8fe04f69815bbf9a11884f30a95f3566f6bddb5aa46f2758821685474df5e1a57c3698f9f0357f9eb42a3e2c54e171eb8337d960cea7511d58fba2d95c13
 DIST NVIDIA-kernel-module-source-515.65.01.tar.xz 7510104 BLAKE2B 806f895d2de136427702c21ae231ba0e304850b07f2f43f3f2f1ba7b0115b7c9bb36435ad53ade6c778ab74af976c4613427644c1c03e3a9df9ddcb6f79de0fc SHA512 2975a498d7dbeace6feae5611b27be640e05fedf5faa257abde839756f508bae238de59a3277fb3326a51c048d9478b19d9ef7968061aaac9f1f588851bdf983
 DIST NVIDIA-kernel-module-source-515.86.01.tar.xz 7504412 BLAKE2B 20b1b9eb6e2fbc7adfa0b78c6acc88c9da8346888c3d1f1ec01a6c1252feccfc104e338605bfaf7617f0b78c7d0de05b32577394714be3575aa67b37c0e843ca SHA512 075fb8b9c3f43f21f51035460a9bc306b11214eb029e950a5bfbc283dc1d3403210ae303148442d31b2c5bf618923bd1762ab5a91234d005f50177fc02fa8ba4
-DIST NVIDIA-kernel-module-source-520.56.06.tar.xz 8555040 BLAKE2B 6c651cb10ee56dbd76e893447ec4b3e73fe95c80118a637a1a25358686df98476f99bb3913d7cc290608837afb9accf611d6154018aeeec373ba44642aed19a1 SHA512 496b350304487e77a040e1a29d12d16b945a09e39cb302197a8c089a0365c37d34453e8dd527b3ef293103cdf7d1dfced551b8eaf61e26e0c831fd837adc5239
 DIST NVIDIA-kernel-module-source-525.60.11.tar.xz 10013356 BLAKE2B a1b8149a0a045e47db91ec9e4f80700aed39d38e305c0cd6fd6158cb59fb44910077109a40072741a871685ec58a50dbf1506c836f85cd393a5a9368554207da SHA512 b460214d393af863dce8e9ae34b95337d22e7ab9665898faffb471310a9e340667addf44af6029db09721b5286a6ee4852caa56b7fb26ba4877df23d8e9a2f80
 DIST nvidia-installer-390.154.tar.bz2 150301 BLAKE2B c9c91b19455823e42ccb9c9c49761f38bd3f85ddfe2fb4c159fe37f10a1d66f5b7b02d66b403881d863c905f86f1ecc1ac7393f051f1b7bee764ab1e15638218 SHA512 56ef5b845cd92a235473e868f81d6f94a1dc685e8bd113cc63be43d68a00f8f4eb74e239a2fec623a4ba89dd5c3690d5f97d06d71ca093570a05bd88757224fd
 DIST nvidia-installer-390.157.tar.bz2 150323 BLAKE2B 8058ca87a6dea956d564af9f7eab9b1fc82b1f2382bd5cb2f6d97cbe2e19292533522d5f8f2eacbeb16520372715fcb72f8f9b0998962af5d4e75522c8d74524 SHA512 93a7ece648602157496c8e27a88864ede341a100f5328a4c1a25faf8f0b94d252060e5e2f71d0c302fd0566c10773c30b76b3b5f431d8039b71c90a7969f7d7e
@@ -45,7 +42,6 @@ DIST nvidia-installer-510.108.03.tar.bz2 144494 BLAKE2B de7c3f5c50350318a3e95bfb
 DIST nvidia-installer-510.85.02.tar.bz2 144326 BLAKE2B 08ee6fd80d8d22f8d644362bd292debfb0a47bd7592301daebd4e19675fca21af5e040d364dafd25a2d2c93f841495160fce7de0262322472c9b1c3ba2441711 SHA512 ff0ecc09441354c705a28621c0a8661b07c23f0ed0f25f1dcb995066c1fdfd486a5c7164d626316ff253f1c50264a2b46b970bf40c75fc6369e9e6698eb2e489
 DIST nvidia-installer-515.65.01.tar.bz2 144675 BLAKE2B 19e5b67c6972ba8435b215a20c8bcd62dd8c1e9a6ae6eac3209f7d9116397f32c43a8f5d8dd8d6d63ac4c6348c610daedde2908b7fd80a8d03ef2c7246b8b9b2 SHA512 0784249253d5e69eabb8c948ad1648d23f59c8c5c4021b5274af2d640de37b5a8b8a55e6ab979cefc2271162bdfce42fd8cbf4640c3c20f5171a032c8b4c44c0
 DIST nvidia-installer-515.86.01.tar.bz2 144637 BLAKE2B 840e2258224e0d19dfe092bc8e8d5986ff771a9fbacfc6c682c513e2757072b68252ebbe4ec8a491997db80f3e1c6879b9dc8f93134caf6f0e6ea3360253fbd9 SHA512 3f55ab79283f1730b5cf5898d9df97a78b8d86f0ac124af9e31c7a960f4a82e46bc262fc0cd8ae9c29c3bab65e2be1ca3565d0a470017a153fa58f61241b34b2
-DIST nvidia-installer-520.56.06.tar.bz2 147557 BLAKE2B 2b44e57eb4eba862863ac1208a24a023fbc642b0cd701080cd59ae5ab9f0d05a20c5bbb163813ff66f724c7a0cfcdba62fd47fe2fc179b52740ee8a7da655909 SHA512 4995b500d93ff962cd0115dd5858fb61c04478a522b3fc92e28f2b1522ebfc22f8680512b03bc6b2ffd2c786c2bda0553af625d2f82222ee6c5b3f88c664a945
 DIST nvidia-installer-525.60.11.tar.bz2 147770 BLAKE2B 43422873cc894a3b083d8f1ad9dbdaa7bb4e2b0e83c563d223c0b2fadf84a95cc2f5805eb60766233c87d05b1dfb56c36c8d6a8fa84f3aa5a3676508e5a67abe SHA512 effb97a5bdc80c014c9174195d80c75948a99faedcb70747d16f9f77766e0d218bfb59ccff216e4332fa9926c9d965e6d24821ccd14b13595880c3434cece992
 DIST nvidia-modprobe-390.154.tar.bz2 35315 BLAKE2B 02d9f11345ceb13e073d4f43401e95d04dc4eb54fdb7eb8966b60450accf103a403c2d101be6a0548ae59bce7412fe491becf707b17c6a3dd50bb2eef864feff SHA512 09b5119ace0a48cc6fea92ed220a702a5033e7205d39bb111e49eb84f7b0fe193f8c3870da9f7df6816ea4c8cb91c2c776f54f448e423fbf8dfa7d3a7f96411b
 DIST nvidia-modprobe-390.157.tar.bz2 35306 BLAKE2B 80d202b39c2f95ec0f909712c2e101483af50124092c32efb33bd98ff58ddfb97b737ff07f1ddc941f688c1b4c26a15f392566d522e18506771f10422fcd571c SHA512 109bbe24a3758b568ea65fe1e9d78f69fae6108ec0497b796c885a3912825fe04ffd7389a3e22987f1a10a2926bf6eaa384faabc59478aa3ee244dd3ac91c6d3
@@ -55,7 +51,6 @@ DIST nvidia-modprobe-510.108.03.tar.bz2 39055 BLAKE2B c195f55a60eb058b2da704d2ae
 DIST nvidia-modprobe-510.85.02.tar.bz2 39061 BLAKE2B 5ee7e1f3199cf9cd1041d86b7048d0a063adab6d1a027b0937feeec8c3785fe222eb6fc151c23d855ec3db06db522d60ea9d4d962925bf80d2c90e76a519c181 SHA512 936647ae493d6a2a94ac1a99f7f6bfae0e5e5a27fd55b616937bfc568d2b768dcddd13cabace876f860329d7afb95a547f43e8b9cece5b7524a93111bc01b632
 DIST nvidia-modprobe-515.65.01.tar.bz2 39122 BLAKE2B 3184c3478170b7a9758123e3aed68ce5318a92ed055e6a5fb4cdee8c4e00885da0d22dfbb7b453dcb45b596f709fadfaf13e736b4d2fbc0547d0d802d6dab7b2 SHA512 20360282a5f59cc2e7c25bbb87220c2c4d5d2f3c458147f59a689f7f37b2ce59308ba4306a9ab2be5af592e277bf754205fd8c9d53f7eb85454bdc0636a2f33e
 DIST nvidia-modprobe-515.86.01.tar.bz2 39100 BLAKE2B 00157bc2cc78c58389772dd92c0e389420b93068c673153be32ae385efd50071ed9986c3bfe0d9242a539536c1cd3fd9c502ed7d00523aa653c7a9085a6333bb SHA512 14c82274bc87da0b4f2f8d3a53d02ea55fb003a32ed10a2259598db86655cccbf39fa6bded836cf2bb667c2eb842ae0ccfcf39fe32ee78ff291827673d02634c
-DIST nvidia-modprobe-520.56.06.tar.bz2 39820 BLAKE2B c21639b62a359c0796d0034d076cce0c739657e410f12997c8f16fb3658687bb0627fafc79a30c0e199a29f713195f3f2ac9629e5b565c5126f892526d97c024 SHA512 dacbd3be47277b17c4fc8aebc36baa78811f5a828fac7c6615a25f614e4a01b660b749e3548fabb3524fe67f1bf515293c65ab3e837fe4be8cc7deedc03f3465
 DIST nvidia-modprobe-525.60.11.tar.bz2 39987 BLAKE2B af7e3119e0b9af32bed30c097f2a9bf55f9e53795a251ca237d8c1cc6d6f07e6d0db41ea996a7410f3c76a89c16dc50e4798d2c0b7bd6e9a89a5532fd84d2849 SHA512 e6f6353ffc3e39f005c8c732bf8694b168ed96ab70df333622aa2f9f4715dd8cc1b3d8b2fdc1bd1fa704128d491c911fd2cd479d18572ab28d690297f19b2a3e
 DIST nvidia-persistenced-390.154.tar.bz2 48669 BLAKE2B 13739d3b32d7f5fddebc599d024968cd6fc2cd516da80bc2f0f4c61be01c622f13274157cce2997a051dafc19375c997927c0042c3fdbfecb4d0634463dfccd6 SHA512 efd6f15b9f4b91ab3c41d55138da48198889f3ee58b20b5e12cf0e47bb736cf559b69c679060563612a33c41b6187aec83052a1edf155438ed4935821aa2cf41
 DIST nvidia-persistenced-390.157.tar.bz2 48654 BLAKE2B 2cf6c92da90acff55e8c180a06b0c6a29d48be9fd8ca3c541202fd14f0697220fba6b66452942aa7ae7cc8821f5c5eb9fa8f7a31d2248624e5f9141d83a176b8 SHA512 70f0707ed6f2b877e69ef90cf782f66cbc9d2071db53ca09ceb7b89427b0fe176708517340621fa251539b7d481b238adeeb60261674eed74de1f62db6dbb72e
@@ -65,7 +60,6 @@ DIST nvidia-persistenced-510.108.03.tar.bz2 47222 BLAKE2B bed22370ff15df7097e927
 DIST nvidia-persistenced-510.85.02.tar.bz2 47116 BLAKE2B 21fd8f0673fc7970a27395b2d227737184c35a1928215231e01f1a0f8f901e5f1556163dedc1d3941a4661910aed71d7184d06e8d54d412f6c1595a52d401250 SHA512 217f5bdf396b7b00ffccbb12f50113f183d8d44ae44278447d5b3515ffc1216821a833cc14cd963492e54b8d40340281f91dcc0520d1097455db52a5a6cc3bf7
 DIST nvidia-persistenced-515.65.01.tar.bz2 47160 BLAKE2B 841efe6670228fc7dca061e50e1d3ae5f281bf38eeacb95be2ea3c66f4fbcb7447ceea803fe1b80a7a4e7a5130698ea442e72fc8875a8043541a32cc80080f0a SHA512 7328303ac0ae62f2f7f5bdf4747d4820dd9f0174702d58cae0e701213346c1bd86cbcc51647d635ba501b1fb4e4cfbcd7b39e46e12b0b626c189666aaef6d2c4
 DIST nvidia-persistenced-515.86.01.tar.bz2 47153 BLAKE2B a7d213790895876453d34580f563ee0aee98ee145fdd8e7bdb726f91298da0f16a4101922a908d367af3ffd6ce1418128f7c5dc0a1e2789143832dc1b96ffc35 SHA512 ffe735178b3b5a0430bae8678b5f7fca407a0389de7f57a1789f67d3b4087cf7c638e6ded8a1cf7ef3ca642d0f889d9f2795fa0e18291101ef1b2a9e3bc4a174
-DIST nvidia-persistenced-520.56.06.tar.bz2 47913 BLAKE2B e3dfb7eabe6b7fd2a05ca9e7986deef5e9ee80f1521cb4dfff49c8764612d6c43b6c7bee74e1f7c585c0420241d4eba9401505ed59d8cdfad9150bce81904914 SHA512 44c8dc25aa9ccd444f0e1be2cbd9e4b89e103d4f26333f57e12ea6fb913e37282547d4d8ead6768cd0d61e079b6bc1197c6fe6f3e472d9ee5b54b1649ee28a4d
 DIST nvidia-persistenced-525.60.11.tar.bz2 48053 BLAKE2B d0c8dbea492e8ca4ae4b1deaefebea5e73685ac1e4180b9415ec1214fe65bd3ebe360ebbf298c4b1ebac90ead3fc30c79c3e0073375dfcac39ab2e42a44fc3db SHA512 39f33e369884421a5776b88d8e0cced590c37edb987971bd0223f675ce5c8c2b8b4ad0d1c1d2eca03238eb6b0a70dc381a0cc90a52282e064245039005c7cc95
 DIST nvidia-settings-390.154.tar.bz2 1109136 BLAKE2B c351d6c950f037b06e8da1c5a481ed0a0951cae14878a1cac32ad58c29a301f1d9ac291f23873a57c7cb4b9ca93709d946adf8f91c937410d5f997696ca74729 SHA512 95321bffb6e6af7971ee0705a73ee3388cdb84dfd32e799d63c5b36e5c3ddd45de4091349d35c6af279a9aa6fea30b0ec0cb19b940e5b356768c580d8488d2df
 DIST nvidia-settings-390.157.tar.bz2 1108938 BLAKE2B d9ec1ab5d7f157d74627272adf752a671dd17e2ede02069437b6180b927fe315b15cc6416d584ab2f038b76fe01e5b64514a834f24d88ac16676e55205fdecdd SHA512 b16699009bf56a1ff3b623a528c58061c4f5a2c5c4a373756a07bcd667743a1df7c733a572d2d0baa835a904ac2fda8a5c85890dcc00c3a0f223e0467aea902d
@@ -75,7 +69,6 @@ DIST nvidia-settings-510.108.03.tar.bz2 1075907 BLAKE2B 537d38bd6a5fdca0182af9a7
 DIST nvidia-settings-510.85.02.tar.bz2 1075516 BLAKE2B dc69ca3340a55736a1a5134146632e3cb97bdf324f5d323e002d379b5e36f31fbd59d2ca51fe22e19e5c9ac50726f3c0bfab193e01a8b6667cec53780afa265c SHA512 48adfc6d753400bc3563ba4810d30a0fb2087d98e98303ca6fe17eaf4fd00bb5c0ce07650fd2978864b658be5bb9dc3abd226fcc1f4aa9909ba09b9d3d2ddbff
 DIST nvidia-settings-515.65.01.tar.bz2 1079461 BLAKE2B 95fccb9121ea1844c6f37024054d3a7cae73c93f6578714f15c84173b3dbb21dd6f23c1cbce744d7deedbd9f3d2a9bf80a4d057928ec59402bcbdf718e65de3c SHA512 ae3a127c28b5857a3dfec291e2a7f2ce7c6f1ece82890bdfa2f6f9d5506cc092b771e93d093621c4861ca7983d05741b0146a4f243f3b921447f287c88a839cc
 DIST nvidia-settings-515.86.01.tar.bz2 1080128 BLAKE2B eed02cf9b73fc12c1d862df71d7fe9a4e4e8486831d1940c6e5187b751abe02deb0ebc495d251ffcd401f8ce78b16077d5cd9272c0f472d8c6465a958bf66c85 SHA512 d2c50bf587f53336a1d80ae88b382ef04e8c9ef24893f8ec901934eebb1358038ed67ac7501d98257c486a0fe2e818edd91832b3f989311c061d7a8b85818229
-DIST nvidia-settings-520.56.06.tar.bz2 1082773 BLAKE2B 125aa4aaa654200d658e448096329dded41d2af2437197e27b8d057f4d6e679eb396628079037e09c4e7698aab37e4c2bd0ca197e5874f7cd54e7afd06afa8fa SHA512 1a470c0aed735ba550dd993eb898baa7299d07ceb4297039067ba1c64b993c812fb958a71c290a6fa0938e17baf9b6f01f983f214539dad0eef14cbb6439f87e
 DIST nvidia-settings-525.60.11.tar.bz2 1086096 BLAKE2B 5abdfe9adb27b6056522ea25660a4751c13c8cbeec1a1a5d8b8eafca81cd71de7228184a52f88aba305409f4953a1fa02249a421c7f8b3dab826744ec2dac61c SHA512 c4151269e8eb2644ba8ad5f81f134152b4efa1ed7f5c40844a0163bab74093f4c02853665018cf2b73ac6d93aa0a4b8f55801cafcd271087f8ebb0a6c7bde146
 DIST nvidia-xconfig-390.154.tar.bz2 107145 BLAKE2B 8e221f182af0f7d7af3bc11acd4991ee0edd8f8a328545c0b7cfe37454b9ae02ea8d86f70c589446ed9e2e7f70fd0af05e8a1e965b854e61a97b67536b0007d3 SHA512 2e593ee519600e40b80d3c176ef3a1383a1ff51ba0ccce9c19b9d6ed6d122daa06769e992d4b8c0c64721011d84d5066a63932c34e55ec958802b61869f95350
 DIST nvidia-xconfig-390.157.tar.bz2 107399 BLAKE2B 0cbb3b1ba508ddc3ba4a161c290b31bf7a67f67880bdbd01171a962c5fa97ca945b1ef17932403f8589309380743f1da632c728d8accb6d4e56dbd895e7486bb SHA512 50b390811c9bf091b14add41f886925b17496b41006b7d3981d2398caa65cf5db8a579c8cebed78278384bf3acc629befb07b54339c61abcc75852c0dcb8b8ca
@@ -85,18 +78,16 @@ DIST nvidia-xconfig-510.108.03.tar.bz2 109729 BLAKE2B 48378155d57f9b4a2b58b044da
 DIST nvidia-xconfig-510.85.02.tar.bz2 109790 BLAKE2B 09313f0f423c52c81550e8d94b82b88961bdab702bfa2086ffe148b517f82cdaada0ef5e2e5074c6bef174d64661ced63b4c52108c021e7cdadcb7b55cf8f6dc SHA512 5b9a0055643c9368689fd5d0fd47ddfb6352d903913271a577f8b0a8f92e0ce9700287c512269e91285ea9f385dcb4ed9c33410d5244234be7a7f34242df9bab
 DIST nvidia-xconfig-515.65.01.tar.bz2 109681 BLAKE2B b41b3ec377c79af6906a47c826d9930cc5ea6e85e8404e6882f3bc03cfccfa03d8ef7c280453ab29edb208173aeb576d33df00f92c225a86bc3cb571b352cdbc SHA512 6f0752e32af6772e85bd2799ea2d895bd5b5faee4c1b6813eb839e75af43d07ef09be6606e7dfc40491e07c25333e9c4145465f97dc0338053e8be1c19220bf9
 DIST nvidia-xconfig-515.86.01.tar.bz2 109747 BLAKE2B d6253f9d052be5aaa1a2be82bf4a36c971aae8b6e9f61e4ff5f27ec415d945bab8289678d6a2495ff7521c66478421090a452ceb19d87803de4290aeb7f69bba SHA512 f4e66f23d9227671158ee0b99b1ccc44f25dc6a910d3b00332d135fb94f21b67f581804b53a40945a652777c898e20069962721931c7b58d2c33d38925da5e35
-DIST nvidia-xconfig-520.56.06.tar.bz2 110304 BLAKE2B 31888ae4eb675e3e877150120b2fb02be9560e6abd885799d87b94bcce5b784d6640c3018c8db5ea3c9645e0907312956c7d6bdd2317cdf79fb758dc9ba0957f SHA512 9bcf55f13ad99571e2ad605704f8297b529f32e4f1bebe1a3eccf648c6559e1b6e2867e9f406cf34f0e4d240ddc12559e7dfaa790e700d1b3f5a7582bcffb27c
 DIST nvidia-xconfig-525.60.11.tar.bz2 110561 BLAKE2B fd11b007dd7d27e82614ba98c44fc023e0d25bd1c9232645249a202d96de68ca63407886b29eb9a7e7f31c16f466ce59c491e4d0526d59bf1e6157297b8187cb SHA512 8080ebad3c58380dedbf7b7312d64b804c19b67f201840b3d9e4bf911a458d561fec7256030a6b0eacdd5cd1ec7e6cfbb4754b2e31b29d616c3e11caf3a8a531
 DIST open-gpu-kernel-modules-515.49.25.tar.gz 7418303 BLAKE2B 8d520dfbb2669a1b2c7ec959106579a1fe2051906a9e6d2d5188ca5ea94753032fd7e70d96495e20a3efae4f871f25921e01046fa52811d6be6998ec456189a6 SHA512 32657af1fdede0adf5e5ccbc24b9d85121b4ea2952786963ff0a42ac130ceec8c3df627b8211f92a25fd9640fa7be20835860db91bd6148fee516ad80a7a831d
 EBUILD nvidia-drivers-390.154.ebuild 17254 BLAKE2B 20b9af69d569093975dde36f553dcfc832a1ee3a4c03a3ab9f2d3e135bafd6b913bcdc33bf5fb7b5afde0fdba155814f642124226b228886df4245d306ff2112 SHA512 23efdb80f08f36f308ec7089a8de996f63b150385332cca9d6115455196b67f865ab42ab1e3284670a0f202200ca113c9ecdaea3df2eb8d22295a311515fee19
-EBUILD nvidia-drivers-390.157.ebuild 17255 BLAKE2B 080589a14ee87c30b9ddc45c1a7516b2728623ebd98efa5bc57ef506924c5d6def91032062b27e3c269cd0adfcb3b21570c45c2a071313398c12ee8558cc51d1 SHA512 7405f682cc88076798b290f53eee43b0ff467e0f5bba5e2619acb4120731a9ec0ca7af7c79c8588797cad678e70135a4c712060b10e5ada51c232dfd3c206377
+EBUILD nvidia-drivers-390.157.ebuild 17253 BLAKE2B c6181fef274ed36491daf761530467691c8979a1ec50f647731764edc7e834e4e5441c4d0f3e66c3530c416ed4f1176216064144ab1147296518ec9bfdfc48cc SHA512 9502dfe535eb6ad66ce3b50b927460d62dc75b8b52734ae9d0b9a66fd77b65fdab760f25c4a16a52010f6624991b6f94c279d3f0f0296e8830a9d8f544ebab92
 EBUILD nvidia-drivers-470.141.03.ebuild 17925 BLAKE2B 3bb9e2b78c50ab6de9df03034e4bf3a31526264e0e6a7b499c665850543cc8673e41970934c531870ab745f0f784ce5b7a20a3d141499a4ee1755dfbee06b178 SHA512 40d424a75a6c371b74219e004549135ec44247a424b42a3514acdfd143c06142de8f031d37dd216e159c627aec9664e09638d218e72611d83ca6c80334cb8b45
-EBUILD nvidia-drivers-470.161.03.ebuild 17925 BLAKE2B ca7a44791d90f13f8de058b4730871fa86a177503f0a28b465727859a517213c65a12631681c048aa06b5d24b0682e825e02025eb551c50a0871e6227c07ce86 SHA512 90db6d9b5dc826cefa23090b0d25f6bc226ebd602c11512017fc06da1c5cbccd9e6f2545000865b0c8c28c5c2bb7b3ecbde4d006f8329418e63c3b922d40e695
-EBUILD nvidia-drivers-510.108.03.ebuild 18255 BLAKE2B 895d8f4dde3219098397e4155e25ee85f058292c91064ed3ea1ec062c5206be4bb3c297dfdd4004c1ddd49297afe3155001bb65954021372883f3613f3d85202 SHA512 ac81977955afc55fc2020cda2e1b82ec273962982ca0fe959a9ed041058b44f5f8df87684b5dd59856d5499627d29e701cf6045c3c060f3a043369ec413e49d1
+EBUILD nvidia-drivers-470.161.03.ebuild 17924 BLAKE2B 9273efcaa3910680449c99d92613eb1df0cc8dac7a701e529966a475ba58d8a83c4ad8d56d45eeb73606c9d8ea5852883ef27882d1e736d6e7ab753bf476862f SHA512 349c5440bdb3b4785c3bb966c5ffaf1c1d553c233dbaccbbf51b5f7f2dc3e9f6dbe4e01f8b6ec841d4c10279da20faff238e046f68e850a6cf578f93841762ab
+EBUILD nvidia-drivers-510.108.03.ebuild 18254 BLAKE2B cc54f60fc2d285db85e59cb6a7923c9c0720407bc31dafe14db91411c9d8b6e77bfa18209a7fe5fe51c5505799607c932d6d48cff407c02c8669d4c24ab78190 SHA512 e6fca9d5eef8a356dd89ff3b0eff8c8ddb9a7234a1443fccfc4a12bc2acb20811722a058af42a74ed019211631e41032610c6dc04d56b565d176b8d9168eda17
 EBUILD nvidia-drivers-510.85.02.ebuild 18255 BLAKE2B ee758578a1205cbce7acf618664a434a69371697cb66e92bb68a4c5c7d6793f7362130860f00bd65652457b3c77052f49e6e9be32d84e8574510037725eb10ca SHA512 7f29f5783e56903994b6f90dd1e42a2ba974d9435b6f4e230c75abb9c1e95f440bc6010a7e773d80ad7520fa324c64b73a3c20d12d5dc5018466dae0e150289a
 EBUILD nvidia-drivers-515.49.25.ebuild 20037 BLAKE2B 08067dbca6a33bb0f8170cc61635a9e21e5f01bcd88be63af5a573c12e8d2c32ab1e0b3847a04f94bee0ef7a79ddd3a08fcefbd07377bca0f289ea3cd7da5223 SHA512 463f2745235a662473a72726aeaab231aeba6acd7beb71a6f41ac9ca1254fd41ce3fe540a0abe53bc1a283633f19d7e0f9b29538e5d8ca6c88e33195d339a8d8
 EBUILD nvidia-drivers-515.65.01.ebuild 20283 BLAKE2B 10bfc16b664fdeda8ebae4276440ea13ba4bb01df59ef48e980f87c4e3ef1d543c3e3bccaa08e99e8fbe3386eab31df94b19a843b4c24f6360bcdf92f18a2221 SHA512 76c9000cbe761ebf9ad5c631e566646c7b41b203dc0dd3945c7c91c0f1af53db14122d76456abad9c9206dbeecc1358c667f97343916d5daf48540636ddf4c01
-EBUILD nvidia-drivers-515.86.01.ebuild 20038 BLAKE2B 95dd285409dfb2d710d60b5e2b58af08ff7a5623773860272048042c2d689b58350ee32796463b17549410796b26e5e36dd967d112175c94ec87d3b774a59734 SHA512 a1ab002ab3ad65e8c127719176db5820d1e389e6bfad3c9cca9bc28852082e467a88d23b20984ee7bf8e457957679840e2bc57ad9b35f6d83b7574428d002d0e
-EBUILD nvidia-drivers-520.56.06.ebuild 20038 BLAKE2B 95dd285409dfb2d710d60b5e2b58af08ff7a5623773860272048042c2d689b58350ee32796463b17549410796b26e5e36dd967d112175c94ec87d3b774a59734 SHA512 a1ab002ab3ad65e8c127719176db5820d1e389e6bfad3c9cca9bc28852082e467a88d23b20984ee7bf8e457957679840e2bc57ad9b35f6d83b7574428d002d0e
+EBUILD nvidia-drivers-515.86.01.ebuild 20037 BLAKE2B db18eb213f25135fbd521bc333a34121f1ac5e41d35893d6b6c715c0df802bdef5c15c5668a78fc8ddc2cc029e7ec75c5606789995c0b76f09064d09d003857f SHA512 42eb3e41a9e6c3e1bc770440204fb122a10ba179fd93794d5840d14f98fa3e12c572ef17f725a807161d012c1e72bac64fc427dfb725d06559beff52f994952d
 EBUILD nvidia-drivers-525.60.11.ebuild 19834 BLAKE2B fbf641c82939d4a078c81e0606ae5e83ddf458f9b6fcf3427e74d5ea1f14b8673ce8d3330e78e3c948c86f678245c632225bbdb305a40f2dfc8eee3ba3dbda69 SHA512 a2f4be8d11710a66da92bf3f94ac24c80a099f45b6bfe6c5b3570006ac67fe5c0ea985b244818d10d19b2e0c35e1d9ae6f28e51b8e25fb4a3cb71f78b41ab0d6
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 5b54ff180e73..d55e27f401d0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools"
 
 COMMON_DEPEND="
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
index 0c0101d2d3fc..06f3143e8f67 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools wayland"
 
 COMMON_DEPEND="
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild
index 92ef2d3747cb..020000408836 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.108.03.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools wayland"
 
 COMMON_DEPEND="
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild
index 8a8499af5655..f7afb1ab947e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 
 LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
 SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 ~arm64"
 IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
 REQUIRED_USE="kernel-open? ( driver )"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-520.56.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-520.56.06.ebuild
deleted file mode 100644
index 8a8499af5655..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-520.56.06.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MODULES_OPTIONAL_USE="driver"
-inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker user-info
-
-NV_KERNEL_MAX="6.0"
-NV_URI="https://download.nvidia.com/XFree86/"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/download/index.aspx"
-SRC_URI="
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
-	arm64? ( ${NV_URI}Linux-aarch64/${PV}/NVIDIA-Linux-aarch64-${PV}.run )
-	$(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
-		nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})
-	${NV_URI}NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-${PV}.tar.xz"
-# nvidia-installer is unused but here for GPL-2's "distribute sources"
-S="${WORKDIR}"
-
-LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT ZLIB curl openssl"
-SLOT="0/${PV%%.*}"
-KEYWORDS="-* ~amd64 ~arm64"
-IUSE="+X abi_x86_32 abi_x86_64 +driver kernel-open persistenced +static-libs +tools wayland"
-REQUIRED_USE="kernel-open? ( driver )"
-
-COMMON_DEPEND="
-	acct-group/video
-	sys-libs/glibc
-	X? ( x11-libs/libpciaccess )
-	persistenced? (
-		acct-user/nvpd
-		net-libs/libtirpc:=
-	)
-	tools? (
-		>=app-accessibility/at-spi2-core-2.46:2
-		dev-libs/glib:2
-		dev-libs/jansson:=
-		media-libs/harfbuzz:=
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/pango
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	X? (
-		media-libs/libglvnd[X,abi_x86_32(-)?]
-		x11-libs/libX11[abi_x86_32(-)?]
-		x11-libs/libXext[abi_x86_32(-)?]
-	)
-	wayland? (
-		gui-libs/egl-gbm
-		>=gui-libs/egl-wayland-1.1.10
-		media-libs/libglvnd
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	static-libs? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	tools? (
-		media-libs/libglvnd
-		sys-apps/dbus
-		x11-base/xorg-proto
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libvdpau
-	)"
-BDEPEND="
-	sys-devel/m4
-	virtual/pkgconfig"
-
-QA_PREBUILT="lib/firmware/* opt/bin/* usr/lib*"
-
-PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
-	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
-	"${FILESDIR}"/nvidia-settings-390.144-desktop.patch
-	"${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
-	"${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
-)
-
-pkg_setup() {
-	use driver || return
-
-	local CONFIG_CHECK="
-		PROC_FS
-		~DRM_KMS_HELPER
-		~SYSVIPC
-		~!LOCKDEP
-		~!SLUB_DEBUG_ON
-		~!X86_KERNEL_IBT
-		!DEBUG_MUTEXES"
-	local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but needed for Xorg auto-detection
-	of drivers (no custom config), and for wayland / nvidia-drm.modeset=1.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
-	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
-	If run into problems, either unset or pass ibt=off to the kernel.
-	https://github.com/NVIDIA/open-gpu-kernel-modules/issues/256"
-
-	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
-
-	use kernel-open && CONFIG_CHECK+=" MMU_NOTIFIER" #843827
-	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but needed to build with USE=kernel-open.
-	Cannot be directly selected in the kernel's menuconfig, and may need
-	selection of another option that requires it such as CONFIG_KVM."
-
-	MODULE_NAMES="
-		nvidia(video:kernel)
-		nvidia-drm(video:kernel)
-		nvidia-modeset(video:kernel)
-		nvidia-peermem(video:kernel)
-		nvidia-uvm(video:kernel)"
-	use kernel-open &&
-		MODULE_NAMES=${MODULE_NAMES//:kernel/:kernel-module-source:kernel-module-source/kernel-open}
-
-	linux-mod_pkg_setup
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# do some extra checks manually as it gets messy to handle builtin-only
-	# and some other conditional checks through CONFIG_CHECK
-	# TODO?: maybe move other custom checks here for uniformity
-	local warn=()
-
-	if linux_chkconfig_builtin DRM_NOUVEAU; then
-		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
-		warn+=(
-			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
-			"    modules (can be safely kept as a module (=m) instead)."
-		)
-	fi
-
-	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
-		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
-		# configs (bug #840439), but without Fedora's kernel patch to
-		# workaround this issue (which is unlikely to work for us anyway)
-		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
-		warn+=(
-			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
-			"    (i.e. blanks when X/wayland starts, and tty loses display)."
-			"    For prebuilt kernels, unfortunately no known good workarounds."
-		)
-	fi
-
-	if ! linux_chkconfig_present FB_EFI &&
-		! linux_chkconfig_present FB_SIMPLE &&
-		! linux_chkconfig_present FB_VESA
-	then
-		# nvidia-drivers does not handle the tty (beside mode restoration) but,
-		# given few options are viable, try to warn if all missing
-		warn+=(
-			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
-			"    needed to get a display for the tty console. In most cases, it is"
-			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
-			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
-			"    or not using the tty may be able to safely ignore this warning."
-		)
-	fi
-
-	if kernel_is -ge 5 18 13; then
-		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341
-		if linux_chkconfig_present FB_SIMPLE; then
-			warn+=(
-				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI"
-				"    as it is currently known broken with >=kernel-5.18.13 + NVIDIA."
-				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
-			)
-		fi
-
-		if linux_chkconfig_present SYSFB_SIMPLEFB &&
-			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
-		then
-			warn+=(
-				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
-				"    from providing a working tty console display (ignore if unused)."
-			)
-		fi
-	fi
-
-	(( ${#warn[@]} )) &&
-		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
-
-	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
-	BUILD_TARGETS="modules"
-
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: clang-built kernel detected, using clang for modules (experimental)"
-		ewarn "Can use KERNEL_CC and KERNEL_LD environment variables to override if needed."
-
-		tc-is-clang || : "${KERNEL_CC:=${CHOST}-clang}"
-		if linux_chkconfig_present LD_IS_LLD; then
-			: "${KERNEL_LD:=ld.lld}"
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-	BUILD_PARAMS+=' ${KERNEL_CC:+CC="${KERNEL_CC}"} ${KERNEL_LD:+LD="${KERNEL_LD}"}'
-
-	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
-		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
-		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
-		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
-		ewarn "(Gentoo will not accept patches for this)."
-		ewarn
-		ewarn "Do _not_ file a bug report if run into issues."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# make patches usable across versions
-	rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
-	rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
-	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
-	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
-	mv NVIDIA-kernel-module-source-${PV} kernel-module-source || die
-
-	eapply --directory=kernel-module-source/kernel-open \
-		-p2 "${FILESDIR}"/nvidia-drivers-470.141.03-clang15.patch
-
-	default
-
-	# prevent detection of incomplete kernel DRM support (bug #603818)
-	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
-		-i kernel{,-module-source/kernel-open}/conftest.sh || die
-
-	# adjust service files
-	sed 's/__USER__/nvpd/' \
-		nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
-		> "${T}"/nvidia-persistenced.service || die
-	use !amd64 || sed -i "s|/usr|${EPREFIX}/opt|" systemd/system/nvidia-powerd.service || die
-
-	# enable nvidia-drm.modeset=1 by default with USE=wayland
-	cp "${FILESDIR}"/nvidia-470.conf "${T}"/nvidia.conf || die
-	use !wayland || sed -i '/^#.*modeset=1$/s/^#//' "${T}"/nvidia.conf || die
-
-	# makefile attempts to install wayland library even if not built
-	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
-		nvidia-settings/src/Makefile || die
-
-	# temporary option, nvidia will remove in the future
-	use !kernel-open ||
-		sed -i '/blacklist/a\
-\
-# Enable using kernel-open with workstation GPUs (experimental)\
-options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
-}
-
-src_compile() {
-	tc-export AR CC CXX LD OBJCOPY OBJDUMP
-
-	NV_ARGS=(
-		PREFIX="${EPREFIX}"/usr
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_LD="$(tc-getBUILD_LD)"
-		NV_USE_BUNDLED_LIBJANSSON=0
-		NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
-		WAYLAND_AVAILABLE=$(usex wayland 1 0)
-		XNVCTRL_CFLAGS=-fPIC #840389
-	)
-
-	if use driver; then
-		if linux_chkconfig_present GCC_PLUGINS; then
-			mkdir "${T}"/plugin-test || die
-			echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || die
-			:> "${T}"/plugin-test/test.c || die
-			if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" ARCH="$(tc-arch-kernel)" \
-				HOSTCC="$(tc-getBUILD_CC)" M="${T}"/plugin-test 2>&1) \
-				=~ "error: incompatible gcc/plugin version" ]]
-			then
-				ewarn "Warning: detected kernel was built with different gcc/plugin versions,"
-				ewarn "you may need to 'make clean' and rebuild your kernel with the current"
-				ewarn "gcc version (or re-emerge for distribution kernels, including kernel-bin)."
-			fi
-		fi
-
-		linux-mod_src_compile
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe
-	use persistenced && emake "${NV_ARGS[@]}" -C nvidia-persistenced
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
-
-	if use tools; then
-		# cflags: avoid noisy logs, only use here and set first to let override
-		# ldflags: abi currently needed if LD=ld.lld
-		CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
-			RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
-			emake "${NV_ARGS[@]}" -C nvidia-settings
-	elif use static-libs; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings/src out/libXNVCtrl.a
-	fi
-}
-
-src_install() {
-	local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
-
-	NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
-
-	local -A paths=(
-		[APPLICATION_PROFILE]=/usr/share/nvidia
-		[CUDA_ICD]=/etc/OpenCL/vendors
-		[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
-		[FIRMWARE]=/lib/firmware/nvidia/${PV}
-		[GBM_BACKEND_LIB_SYMLINK]=/usr/${libdir}/gbm
-		[GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
-		[VULKAN_ICD_JSON]=/usr/share/vulkan
-		[WINE_LIB]=/usr/${libdir}/nvidia/wine
-		[XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
-
-		[GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
-		[GLX_MODULE_SYMLINK]=/usr/${libdir}/xorg/modules
-		[XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
-	)
-
-	local skip_files=(
-		# nvidia_icd/layers(vulkan): skip with -X too as it uses libGLX_nvidia
-		$(usev !X "
-			libGLX_nvidia libglxserver_nvidia
-			nvidia_icd.json nvidia_layers.json")
-		$(usev !wayland libnvidia-vulkan-producer)
-		libGLX_indirect # non-glvnd unused fallback
-		libnvidia-{gtk,wayland-client} nvidia-{settings,xconfig} # from source
-		libnvidia-egl-gbm 15_nvidia_gbm # gui-libs/egl-gbm
-		libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
-	)
-	local skip_modules=(
-		$(usev !X "nvfbc vdpau xdriver")
-		$(usev !driver gsp)
-		installer nvpd # handled separately / built from source
-	)
-	local skip_types=(
-		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
-		OPENCL_WRAPPER.\* # virtual/opencl
-		DOCUMENTATION DOT_DESKTOP .\*_SRC DKMS_CONF SYSTEMD_UNIT # handled separately / unused
-	)
-
-	local DOCS=(
-		README.txt NVIDIA_Changelog supported-gpus/supported-gpus.json
-		nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
-	)
-	local HTML_DOCS=( html/. )
-	einstalldocs
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Trusted users should be in the 'video' group to use NVIDIA devices.
-You can add yourself by using: gpasswd -a my-user video\
-$(usev driver "
-
-Like all out-of-tree kernel modules, it is necessary to rebuild
-${PN} after upgrading or rebuilding the Linux kernel
-by for example running \`emerge @module-rebuild\`. Alternatively,
-if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
-this can be automated by setting USE=dist-kernel globally.
-
-Loaded kernel modules also must not mismatch with the installed
-${PN} version (excluding -r revision), meaning should
-ensure \`eselect kernel list\` points to the kernel that will be
-booted before building and preferably reboot after upgrading
-${PN} (the ebuild will emit a warning if mismatching).
-
-See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
-$(use amd64 && usev !abi_x86_32 "
-
-Note that without USE=abi_x86_32 on ${PN}, 32bit applications
-(typically using wine / steam) will not be able to use GPU acceleration.")
-
-For general information on using ${PN}, please see:
-https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
-	readme.gentoo_create_doc
-
-	if use driver; then
-		linux-mod_src_install
-
-		insinto /etc/modprobe.d
-		doins "${T}"/nvidia.conf
-
-		# used for gpu verification with binpkgs (not kept, see pkg_preinst)
-		insinto /usr/share/nvidia
-		doins supported-gpus/supported-gpus.json
-	fi
-
-	emake "${NV_ARGS[@]}" -C nvidia-modprobe install
-	fowners :video /usr/bin/nvidia-modprobe #505092
-	fperms 4710 /usr/bin/nvidia-modprobe
-
-	if use persistenced; then
-		emake "${NV_ARGS[@]}" -C nvidia-persistenced install
-		newconfd "${FILESDIR}"/nvidia-persistenced.confd nvidia-persistenced
-		newinitd "${FILESDIR}"/nvidia-persistenced.initd nvidia-persistenced
-		systemd_dounit "${T}"/nvidia-persistenced.service
-	fi
-
-	if use tools; then
-		emake "${NV_ARGS[@]}" -C nvidia-settings install
-
-		doicon nvidia-settings/doc/nvidia-settings.png
-		domenu nvidia-settings/doc/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	if use static-libs; then
-		dolib.a nvidia-settings/src/out/libXNVCtrl.a
-
-		insinto /usr/include/NVCtrl
-		doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
-	fi
-
-	use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
-
-	# mimic nvidia-installer by reading .manifest to install files
-	# 0:file 1:perms 2:type 3+:subtype/arguments -:module
-	local m into
-	while IFS=' ' read -ra m; do
-		! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
-			[[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] ||
-			[[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
-			has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
-
-		case ${m[2]} in
-			MANPAGE)
-				gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
-				continue
-			;;
-			GBM_BACKEND_LIB_SYMLINK) m[4]=../${m[4]};; # missing ../
-			VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so to vdpau/
-		esac
-
-		if [[ -v paths[${m[2]}] ]]; then
-			into=${paths[${m[2]}]}
-		elif [[ ${m[2]} =~ _BINARY$ ]]; then
-			into=/opt/bin
-		elif [[ ${m[3]} == COMPAT32 ]]; then
-			use abi_x86_32 || continue
-			into=/usr/${libdir32}
-		elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
-			into=/usr/${libdir}
-		else
-			die "No known installation path for ${m[0]}"
-		fi
-		[[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
-		[[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
-
-		if [[ ${m[2]} =~ _SYMLINK$ ]]; then
-			[[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
-			dosym ${m[4]} ${into}/${m[0]}
-			continue
-		fi
-		[[ ${m[0]} =~ ^libnvidia-ngx.so|^libnvidia-egl-gbm.so ]] &&
-			dosym ${m[0]} ${into}/${m[0]%.so*}.so.1 # soname not in .manifest
-
-		printf -v m[1] %o $((m[1] | 0200)) # 444->644
-		insopts -m${m[1]}
-		insinto ${into}
-		doins ${m[0]}
-	done < .manifest || die
-
-	# MODULE:installer non-skipped extras
-	: "$(systemd_get_sleepdir)"
-	exeinto "${_#"${EPREFIX}"}"
-	doexe systemd/system-sleep/nvidia
-	dobin systemd/nvidia-sleep.sh
-	systemd_dounit systemd/system/nvidia-{hibernate,resume,suspend}.service
-
-	dobin nvidia-bug-report.sh
-
-	# MODULE:powerd extras
-	if use amd64; then
-		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
-	fi
-
-	# symlink non-versioned so nvidia-settings can use it even if misdetected
-	dosym nvidia-application-profiles-${PV}-key-documentation \
-		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
-}
-
-pkg_preinst() {
-	has_version "${CATEGORY}/${PN}[wayland]" && NV_HAD_WAYLAND=
-
-	use driver || return
-	linux-mod_pkg_preinst
-
-	# set video group id based on live system (bug #491414)
-	local g=$(egetent group video | cut -d: -f3)
-	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
-	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
-
-	# try to find driver mismatches using temporary supported-gpus.json
-	for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
-		g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
-			"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
-		if [[ ${g} ]]; then
-			g=$((${g##*\"}+1))
-			if ver_test -ge ${g}; then
-				NV_LEGACY_MASK=">=${CATEGORY}/${PN}-${g}"
-				break
-			fi
-		fi
-	done
-	rm "${ED}"/usr/share/nvidia/supported-gpus.json || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	readme.gentoo_print_elog
-
-	if [[ -r /proc/driver/nvidia/version &&
-		$(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
-		ewarn "Currently loaded NVIDIA modules do not match the newly installed"
-		ewarn "libraries and may prevent launching GPU-accelerated applications."
-		use driver && ewarn "The easiest way to fix this is usually to reboot."
-	fi
-
-	if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
-		ewarn "Detected that the current kernel command line is using 'slub_debug=',"
-		ewarn "this may lead to system instability/freezes with this version of"
-		ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
-	fi
-
-	if [[ -v NV_LEGACY_MASK ]]; then
-		ewarn
-		ewarn "***WARNING***"
-		ewarn
-		ewarn "You are installing a version of ${PN} known not to work"
-		ewarn "with a GPU of the current system. If unwanted, add the mask:"
-		if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
-			ewarn "  echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
-		else
-			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
-		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
-	fi
-
-	if use kernel-open; then
-		ewarn
-		ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
-		ewarn "and only usable with Turing / Ampere and later GPUs, aka GTX 1650+."
-		ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
-		ewarn
-		ewarn "Many features are not yet implemented in the drivers and limitations are"
-		ewarn "to be expected. Please do not report non-build/packaging bugs to Gentoo."
-		ewarn "Switch back to USE=-kernel-open to restore functionality if needed for now."
-	fi
-
-	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then
-		elog
-		elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
-		elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
-		elog "experimental but is required for wayland."
-		elog
-		elog "If you experience issues, either disable wayland or edit nvidia.conf."
-		elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
-	fi
-}
diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index dd4c7b99c9ec..749b8b9ec3d1 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -1,6 +1,6 @@
 DIST xf86-input-vmmouse-13.1.0.tar.bz2 319188 BLAKE2B dddcee47a0d667555ba8a85a4a86c9f922a68ff716f836ac38bb0dbc643011debfbbd2d2054bb8df2f04cc94f2da95cfff7b0ccfb30879e07ca571a9b3aa840a SHA512 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
 DIST xf86-input-vmmouse-13.2.0.tar.xz 284684 BLAKE2B a63caa3959b47ee4b43dd4e90e7b68706fc39da2d4018965112218c372b4107cbbcebb19fae8fea05a7c95c86a4a793b414ff6cd49e1391fbce04341b7a9eb9c SHA512 26a01347a679db058abdc7cbd9a363bb4fccd1a727dc18e279d15b8a0dce71f67af5ff54df28b908391da8d2fc311d8c1813f26dcded4e9a2668db7b55ca5687
 EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 567 BLAKE2B 452739edaf39b5794a4d4eb301d09b033f1dea53b0d2ff6068d6be063983df7dd94d570ff1ea9308024c3694ea356824c94d7c03c7d6a6156e2ae46e56b72a6f SHA512 dc8f159983ef6ae0ba06152a52fedb5ee53608d80b42d48f26edfecc1e1aa6f20edd68702538080c4d309f7a6bdaa399944b86c40aa099ee98315639b628ae61
-EBUILD xf86-input-vmmouse-13.2.0.ebuild 593 BLAKE2B 64a02d4e9db97de1e8f7d819f36ca27bf14aa0a0bfbff291c533d8063dbcd62fe85a86617dab20ab1e1964fc01dc4fa039543261695d144327515cd4654352c2 SHA512 0a028ecb0fa7f3863a46d98fea5dd19fd9728c66dadeb7803e3bb0b2ef50a39d08563fad23fd7ac189c85ac8bdac58ef6b556688ee002a7d98de991528422f5c
+EBUILD xf86-input-vmmouse-13.2.0.ebuild 592 BLAKE2B 6cf68b7b6c69e404c4bf814d1d388a99dd2bbbd3c5875aa7aa404a53d44f110a32493c5128c717316067a7d61800b4d68eaaae096dcb9401549eea31007f548b SHA512 c147d2dd41c210c4893bb43818eedf1f4bf20b3a96ffe293fe1145205ab1cac46f3aba6d93d415aeaa7c03bbac71f9c5bfd40d7cca156c3dd583cbdb782f95df
 EBUILD xf86-input-vmmouse-9999.ebuild 569 BLAKE2B d10e2679e2991969744610ddce72d11b667496c4c6416e42ffe238d33f3b8f5f8a44f3005f309a78dfd20cab89bddaefd82c8fd8d24d5a69585463905f050fc9 SHA512 d636fae99cfa1e4c2015215bee24188d0f4043a865fe037b7cd416290650fc150a765bc551691bdec98e900d4ea221e4acd57c326123e8ab50ab1695fad0a856
 MISC metadata.xml 352 BLAKE2B 4d53cab0dd8b53840a59e6f6d2ecfbc56d7759346c3daec4d0c4b1c3ff36d2442aa2e08b9e051a356142e2cffc1acc5bd70264a96223699d0080496f64b70405 SHA512 917fa2af528fc5c6081bb63e8c142cbc907c210e9bef41a48c3152604e6ed8aeb4cf9f3b6cbe416cccdb73dcb660e70444f93d7784594d9024d3752a512a1ee7
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
index 401559b5c2d6..ae823b5c11b8 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
@@ -7,7 +7,7 @@ inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="x11-base/xorg-proto"
 
diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
index e837ccbdf8ee..ab7fbff198e9 100644
--- a/x11-drivers/xf86-input-void/Manifest
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-void-1.4.1.tar.bz2 271597 BLAKE2B c78d829dfc9aed788fc2e527f796c697546dfa9687189f5f36043fb017515307303d1bc419458e909107fdb30f6f534e9086e86708d4b8bf2447ed941d223011 SHA512 3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a
 DIST xf86-input-void-1.4.2.tar.xz 257888 BLAKE2B 864ef551c09af5a9726094d3ce7e1a0d948e0a06d23784270a43e81c4b8904b3bb1abb0e1d9efa59d9c445dcc2be7515c45d956c2e669e2e0d7ccad23c10f30b SHA512 f266494bd0ab62d2e20048d5557cb4724cc704be06b7f04f55970aad070887ca8940341c4a4929bb48a46b4d040e03c4d09ce3ae85b94ce23c70faf28486005d
 EBUILD xf86-input-void-1.4.1.ebuild 324 BLAKE2B b9c5f0ada2c4fbdc5a3db207b5b35d966b2c5fcda697a44650890bff87ff0c67a45c5af2f0ad0e1303da31881ddc156053463170fb6dacd60f121bcd13123eac SHA512 32bb6adad975b983b0c953f14b515b6e7d9644f08a5127cfbb28f276b2a04766aa3cf69b745ea705814c8ad78c5beb5a7764f9f80e936d03e1f5b3ac5dd0f8de
-EBUILD xf86-input-void-1.4.2.ebuild 352 BLAKE2B 198228a2d88ec1aace2c864da5c0c63a52f2530bc3e58d64a9a80958793959b1e19a0436ef2651fc158ac767832ce4a2099c09f0347d17394f04a3b405f9460b SHA512 97c0529f390e69fbde09b0b260991fe15ac4b136f5d65dda86a1a936309daa70d5fe23b5587f2c70f3431b282d1f3e8318487d4b452ef959226f570e57d3d603
+EBUILD xf86-input-void-1.4.2.ebuild 351 BLAKE2B 0196b8dc6c6ea3a62f2197c78d46f65b392c21aa286a86070496e1b40f2bdf4e73f1c399ca7d209e34f3e2eda5f2d1db5125dec33209208c8a18f330251d83c2 SHA512 c38e485374a5cfd0ab75151d9e489bb62868fa6d065dce03f522253673190266cda0f6e4ffb9c9044634360179f4071e9912e405819a1e6938091c080fbe6d4f
 MISC metadata.xml 349 BLAKE2B dc72b7a2d45385cafd33536becbd94b8b46e74a3d3120a9041c771552c79e02cfc33ac511faff1915750470ffa13225fe886805e8dc17c92990b426e74f1639c SHA512 b58b32e319f3e1c523cffd920398c5effbdac8dc115d04f62d3ffbab2eca90adbcccecdaf6011c2ef325397a92cfc4547868a3f8a7aa81404b8129f9f1e44f48
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
index d4892aabcb95..6790b43a3bd6 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="null input driver"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6be09273c6ac..e9eabd194a82 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index 9b9429ff1f2a..3feda0005c90 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,5 +1,5 @@
 DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
 DIST libFS-1.0.9.tar.xz 287416 BLAKE2B b4425ab4ce1c9e4e0c283419231e2966f462a6c9225ff8bd056b5ec41c7a6a96e35bd2edd47ce6bfad87040c6042f19619f32f8f045262da5609af5c55b03fe4 SHA512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8
 EBUILD libFS-1.0.8.ebuild 393 BLAKE2B c626c506df5346d77d67f4f86644e9b3e98cfac0bae7721e1156f38ce9e84fca65a707760ef6f69d2c8192baa9bb5acd70119879f139acf26b15d40fa2d73018 SHA512 809f22b13acc18d2a296b2462b9530e64979dcb19639740df7343abf5963b472a344927b860a2ccdcd74d86c259b388737ca25f20ec882e9d21b60c02d0dcb08
-EBUILD libFS-1.0.9.ebuild 403 BLAKE2B 46d35f7d5f12829872df9ab201b8594bbd4bf921fe6c9bb1ea205963a2344965438ed5a02fc8b7b9160420f91327a8b1a332095ab2ed32a0431b81d5902ddbd3 SHA512 c35f80680d6eb3eb4b9230c11e7a054b6312dbbc6ac30ce97c2b5468c03b0d0d752d030d0d27b019efaf5a153d8f396846742ac84f944e9e81bdb1d258aa727a
+EBUILD libFS-1.0.9.ebuild 402 BLAKE2B e7adc5dfddf66ee2c52c32882a66192d8e746e8a10bdd319a17f4df842f2b48bb488bffbe78a9e15e29f6f57a701047e4900793e8d7385947d1dd3a17315b328 SHA512 891a72cad9e32ce955154474903c4830b46f2792d85a4fcb64f07a0eab95f9d54bba090ba483cc925fdc18d2263c917bc8a286324765151d6d0c278bbe34460d
 MISC metadata.xml 336 BLAKE2B 63758b2250f1678012f938bfb7826c03e447991e3aba5c233e16df68dbaae033b1f14d77833c85238efe0eedd90314f5e8b2e1cfcac824bd5a034e7e575f244f SHA512 f2b85263c274822c779720160b79a4c243896f7169c9aa88181ed805c3f5808cd48aec07eeb0e2faedfb1b3ef467846243e2cfec925e8eeafb58f6d228a3aac1
diff --git a/x11-libs/libFS/libFS-1.0.9.ebuild b/x11-libs/libFS/libFS-1.0.9.ebuild
index 841946a94dd8..96e77c0bebf5 100644
--- a/x11-libs/libFS/libFS-1.0.9.ebuild
+++ b/x11-libs/libFS/libFS-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
 
 DEPEND="
 	x11-base/xorg-proto
diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest
index 91a87e10187d..21f9611b593d 100644
--- a/x11-libs/libXau/Manifest
+++ b/x11-libs/libXau/Manifest
@@ -1,5 +1,5 @@
 DIST libXau-1.0.10.tar.xz 271724 BLAKE2B 391296f1a59ab6cf93323bbd6e297c88ace6bc769eaed1d9ed3047ac8ab49498c7e9022708597e071da342fc3581de37f347d1049dce9c80c3191a89e2f147c1 SHA512 e56a862a7bbccb108c9683eeb8b643d2587a121dd96982e1e7edc5bd0b676302d244bfaa750afc7fb2ad31df8b825095d779b6e2ab2c76f94e47095d90071ebb
 DIST libXau-1.0.9.tar.bz2 322650 BLAKE2B 0bc9eb01b99f13a8f978edd7ff63d76f89071ac27f1cd946f9ebc96165a892e7ba7cdcdc52f73e8ed6d5b3d672f8a29a24582195fe14d1d24730a797a592cdd3 SHA512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562
-EBUILD libXau-1.0.10.ebuild 486 BLAKE2B d3c96251ad3ea06d08de4b5dd899024c489d9e759437b5f0bbb1973b14c78e8d15e360e6263cc2ce23eeaf7043253ac1f1432ab1224d8fa4187534cfcaf7c73d SHA512 c50efd21b3455791bee03c57b21fa03b5283a2d7ce4d126a99f32d84e856c6804f28b96951a73ec743241492305540a32e1fe1668cdbbeb3bef37f7283946cc7
+EBUILD libXau-1.0.10.ebuild 485 BLAKE2B ad8f5ebd873f871ec96cd9ca4fafb6144a5d07c556d3064c442be20694e0fff633dfec7ae2249cfe80b56bce8abb24c4391c0de66033e5aa0726f5df50beeb74 SHA512 c76c90d2c9e654efa8627e0630fa1f9ce60b20595ff10119f882f7444fb3faf5dc5b3675c8b36ea9cece24603fc93942f1834fc71c2462aa897a30463dcdbb32
 EBUILD libXau-1.0.9-r1.ebuild 459 BLAKE2B 93aee0f1328b9bf949277e691222d056b04de66629524356f708b7fbaf1de0ab4e43b0cce11598a9eae63bb38292c192c1b6c32360ffb0299ad35cebf4bc7f5b SHA512 0a517b4aaeb3336b921efcb2e87d0d25384e2f81cd38e84b6a03833aff32cbb4786593a016aebed6987a86fbdd4beb79c2a23d98b12c1805018fe3e133221330
 MISC metadata.xml 337 BLAKE2B bccad5dd3ea84c6ca278438b94fbfc3e94b65b1808a5004c71c10023c774528084e5afd9e17bc852d2e0b8cc966539d02985ba4485e05e92c7b404277250e50c SHA512 8c81a02a3f99267055e0d044a99b3add40e6737236718e1d5cca35b21b417295a4eae9405c6becd7b42792bb1e387c44bf9c3c31f163f8414da265ff21f41904
diff --git a/x11-libs/libXau/libXau-1.0.10.ebuild b/x11-libs/libXau/libXau-1.0.10.ebuild
index c3cb7784787e..05c87c02f24f 100644
--- a/x11-libs/libXau/libXau-1.0.10.ebuild
+++ b/x11-libs/libXau/libXau-1.0.10.ebuild
@@ -10,6 +10,6 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 1ce3053c2557..f270a67619d3 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,5 +1,5 @@
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
 DIST libXaw3d-1.6.4.tar.xz 482168 BLAKE2B a1e2e66ef4c5d102523080beae903b21b9b6bd0a5e4bd1e685bbfc4e1eaa3dc594f65f357d027f93808fd34d7e05ed8631fe33b6849760fc1fcc919c8b85d526 SHA512 388e905871a823d0f87fbc29e9ea2de95ac13ccaf50e031a01602d8d388d61bcf1823b4ded8c1a06bdce382e8ddcbc1b0182ccef00cde8064b09176163283dba
 EBUILD libXaw3d-1.6.3.ebuild 750 BLAKE2B 7a8d9a02b2c52b10569a52feba27dfe5588e926909ba33eef4731c42ff56022a21c032eba453206265e1c775657e16b37806b1d577d37289a9c709a73a44ed6f SHA512 521184b4bd534dafd548ca5685a3db71b582d7b0f02c9598dd037d1c9350f8c66bf876f30b8566184d5e9235816d2e6dcb79b1a00caea51717cbe80b5024aeeb
-EBUILD libXaw3d-1.6.4.ebuild 756 BLAKE2B 42fba687de76813be131950e8f38f9b2214fcd0d103477e53985d1856c4dac28e0c08f1f8f31f2f801e14ef96d1fe7ba2410acb8a4fb30473dc4b4c4c7e35d38 SHA512 fa4e3f653e17dca0a2e2620451bb3402371e43c5c17777587853296983b9c283c5bd1871560b8c6be42ad9cd9c1403c6f1558dbd0e21a1c51cf902dc3deb541f
+EBUILD libXaw3d-1.6.4.ebuild 755 BLAKE2B d9d51c22988d5b846bc558dc8ea45ffdf4a8b0eb9daac2ff423d3fe9551cfc7505974db2baff9098cd51b17f6b507c5bcc0d3f70a8b344d73dfdee2e0efa82e7 SHA512 c01e96b95f8952d3c29a7af49d3b3b6b403318dd5134e84bef65ccd100992f69c0b3f04aa62eaa68d499ec289948214b08b3724d9761fbca327dbe1499e2a0f4
 MISC metadata.xml 339 BLAKE2B 60635a05848869d4aba7783f45cb02a672045a8a9b1bed933f1587ecd0ab81aa32ecc63e8a6742b4eee50a14c3e32b17b6bf14b3797e5f11e0dd74a8b582b4bf SHA512 1ed17cca85445b70786acfd900c7a75eb765001e7218e576356ef76d3e9e6399df3a45413f4650e555d2404d0c9e5f0f20f814c1bc1d08e1e8138aedbacfe50d
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild
index 1cadb0efb772..f3d3365ade7b 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="xpm"
 
 RDEPEND="
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index f9b1af442b69..e653734b34b2 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,5 +1,5 @@
 DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
 DIST libXext-1.3.5.tar.xz 340108 BLAKE2B 0041ef38ba363ff82105f4e626851d2ef7db35804ca80de84e5ed99d97b4f5dd9877b9a43f8690d9040fadc7ee075fca640752bcdde4f7be0e220c1a5e0058e8 SHA512 fd9805982dabfb14b1526c0cb71f94508003fa3fcd60560d387465afd891c1dca61927ae86278436d53f4b840cacd1f412071fdc3dce1d6f730610a9c163d59b
 EBUILD libXext-1.3.4.ebuild 660 BLAKE2B c2baba213eb3773be896f83953b9d05b24509c83fda354732da0cbf3e7a3deea73038f2e65e948ed4b9a506918ba715d84f4fe78c9acefef5b611165ed6e0922 SHA512 94d9f6e467e971741d8eaae4ad2987cf559e9db0977076fc98f07c9d30bb23602dbec3f552d3ac47054d10a8e25d55353be5eadaf7e3a9aaaa26c2a5a0cacf92
-EBUILD libXext-1.3.5.ebuild 685 BLAKE2B 0031b4863ed23bcfb9d0f3d456d53632e66fd6c6c1a8f6890d3ff77b81bcd7e11f1eb26a86261fab4112caeffa662f8169acf2cd64be11b3e9b9af26016d21ff SHA512 a4f51db66ccfa681e3c108d17cb4ee1dd66de5ced20ddbcdae4c89390ad7068604a0b4eecfa81cd7f9120ead46310ae0694d41df994f6805caff00e16ec41e0d
+EBUILD libXext-1.3.5.ebuild 684 BLAKE2B 90640db13c3a8b02d8a890e7363423d848043edf1f26a11a8377c57c7bc3dbf4df35584a5265ec678f1ebd1fe1bd6e829222df9b837844b7fcbe948833486bb3 SHA512 7421dbc8971b0a0908df1ce07a2b6c1911aa3e37d0fedad294ccc6c74b82b03052c55467699e1af1229efe7c0b89360e3941d1bb81a325c8e1d624f0150179e1
 MISC metadata.xml 338 BLAKE2B e957bc4dbc63892fdac35dbe1488c4e18f696adb7710ca4b0892f29043219dc12270fee2cd9a40e409ecc4ad9b5d6b738292a194a28e2a9b4c92cf8a4c3b32e1 SHA512 9b7112ebcf1981913c9596c1a5e05a4623833f2f4f2cd936b9ff0c277cddeec49aec35c4a44cb2aed4d737213d7ea0b363f64a8ffe44feae2623500def047ccc
diff --git a/x11-libs/libXext/libXext-1.3.5.ebuild b/x11-libs/libXext/libXext-1.3.5.ebuild
index 663be480af82..71abf3dd5afd 100644
--- a/x11-libs/libXext/libXext-1.3.5.ebuild
+++ b/x11-libs/libXext/libXext-1.3.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index b272f94085bf..b9484b353bfc 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,5 +1,5 @@
 DIST libXfont2-2.0.5.tar.bz2 524868 BLAKE2B 0b26d4c93452bcb3f5c740ac8984b9873a8241405d270e2d3fa5f440be820db417c9eff59c7a1a8c175513e40df70ada9c037d45c3a9ae2ccf62eb12f81c1d8f SHA512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa
 DIST libXfont2-2.0.6.tar.xz 446848 BLAKE2B 77e1fd0af5dae4f7d7cec5b9cbd20414df2c66699270ae46f81f6d21f6725b56bb0df9cea504a7a930084a4a759d7dcc3e204ab6c94dfcf0ff0006289f09a68d SHA512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd
 EBUILD libXfont2-2.0.5.ebuild 826 BLAKE2B adba9366e26d8dc9746e31fe2a19dc9792df1acfa39b413e70bd1f5defecde31458243242efb16d60942d38344d1c039fa76ac1de40fd53fa8270c591b787449 SHA512 43c63a4f5fa23892a214393a97164729e8e07c62a1203ccd191073e2b36121180464869d84488ac7a21648f23f85fee6f58087d21faeb09dfa198588e2a1dace
-EBUILD libXfont2-2.0.6.ebuild 843 BLAKE2B f01666b2736e21b3d0b149ea32f16e7ac52a620c07565f93bd3ea8ee0b5681fdc318dee87e2931db1c2555035f10cba0630cef9cb5cb8657d6374e6a7c1c3cdf SHA512 5246b39af590ef3b8f7cbd3e7bf010c59e46989259cff32784d8de572ccddc11050eefb0c937ebe55fdd216cc201bdacb53bd2ba0bd45d42d92e4d86e2a83b40
+EBUILD libXfont2-2.0.6.ebuild 842 BLAKE2B 6e3665ff65353866aefcd8004322f3e29b01208aff85be7fe94620e1b0af5aceb32e0dc6c535529878f5b71cfed84eea5d07d9e15207f772968209a02ff5cdbc SHA512 58e86bf128f5e69e1cfd9fbaffb4163644f09fe41b0ebeecea35a1bcbe815156f9bffe325b2a2d51160302064ffc40f816a0528c11f7f609cc4f10103f2ab9d0
 MISC metadata.xml 574 BLAKE2B 7dd74ab652b5e72d852ab5e826d9025c8a81d1eb475d7b936e87f5baf9a726275475cf1e016816165c4a12b124b3fa238b84093c29115b98fcfd196181a4ed11 SHA512 788a597733e4defd54b0a4667b9b83a04991b3519442d2cb180ca1eb775c76c3936be572820d84b1c8db568b59d1288cc03e362a68ccd1e544042acc8b7af550
diff --git a/x11-libs/libXfont2/libXfont2-2.0.6.ebuild b/x11-libs/libXfont2/libXfont2-2.0.6.ebuild
index 99ba63b9178f..a16e7f7fc1a8 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.6.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.6.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xfont library"
 
-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"
 IUSE="bzip2 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 801b23ffd956..b6e8879e6ae4 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,5 +1,5 @@
 DIST libXft-2.3.4.tar.bz2 359088 BLAKE2B 37f8522ad744e99ae8372f4292017eed1f2c2a84169497441c3c12696cbb7b3cf33e04864b50433e46f8723cc6c6006226c743a0d491a3784baf3f21ea062399 SHA512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51
 DIST libXft-2.3.6.tar.xz 304252 BLAKE2B 8a27bbbc2c8e8c89789ff5694da180dddc3c0dfb344fd5da33e311d093f1b3eee74caa357a48cbe81cf40c5acc1e42f6e91aadb6868e42782c288bf97e1bda33 SHA512 732f8c635fcac6010012ba8c10c23d2dd6ec79b0f096d6bcc9b7e36d2ca0817387faa7ee5bb6f43cff02adc68e4234c1b8f95021ebc548f61c492e0b76836d90
 EBUILD libXft-2.3.4.ebuild 718 BLAKE2B 043ca86642ccd0914675ea0a01a8976c4e872987192fdf126a5f0ef2673385befe419cea7ad344f7dcdb208aec8a809c3cd18366fb50417788e215ca85a01090 SHA512 6dc48a7c440655f0e383a92f758b12615aa953ed8b169c648eb377bb96cb7c747ce668832dd97c38c668af53045c0804989196f7bd350a032924844df26f2c8f
-EBUILD libXft-2.3.6.ebuild 745 BLAKE2B d4a0370b495c5fc49714b3d4e8308a5d0776e476fe2ca560152f034a6101dfb2ed6d4ab53fa378c1a42fe0e9540c19ee1f0ad60b69cde225a2ee311ac5dd61bf SHA512 ea4a97b73d5e6e8437c9a2283551ed42a0fce57112ef1b203f41e26627417aa7e519219501896f4c1fb7d4f747d5917f99cf7ae29bce5feb3dcfdfcb82855103
+EBUILD libXft-2.3.6.ebuild 744 BLAKE2B 8f67917f3b7ee6b3e604734716a39d92cee89bfd318fb84eb8b18459d435253536d2286edbc54296e061fcf684165769c31ecbe615759bb877efbbd8c927bb90 SHA512 6c1a4ae3b2de964d15137d5a3f0fddff2cd3968fb2eed2462ce1cc90d2a5173c1e6c1d81369137879492b7af51cbb1836f730d8b06ffb74a8f88b917d4c97028
 MISC metadata.xml 337 BLAKE2B fdbaff607a3822084f5c65042d10c95df36c061790f13afef59f55a6a5d324f9781ea39e2d0510292eabdd8e1c1088e4f0b960bcd68c5debab2b6b0df5303528 SHA512 aae7659a8f73d6e6722fff3ad19f61ad545e5a3b0c1512823812e0e0bef046ed7d7aad39446c9fb08d0de4d9570922ef4c4cd9b8ea474de3c3ac04d62a3d1db3
diff --git a/x11-libs/libXft/libXft-2.3.6.ebuild b/x11-libs/libXft/libXft-2.3.6.ebuild
index 8e57f16266b3..08e03115610f 100644
--- a/x11-libs/libXft/libXft-2.3.6.ebuild
+++ b/x11-libs/libXft/libXft-2.3.6.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xft library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 34088fb3d191..a6e37f30125e 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,5 +1,5 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
 DIST libXinerama-1.1.5.tar.xz 260272 BLAKE2B fd51aad9c9d42634a246130a8ae0a155e34b67a2225b5f5a30b2bcebed0a9a98f19646625e9e423f0a9318a1358ad5251eb27a20eeb60eabc9ccd330ebdeba92 SHA512 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7
 EBUILD libXinerama-1.1.4-r1.ebuild 514 BLAKE2B d56e83a301b856fdffd5fa24116e3da2905e20738eff786f8111bc87a904081812b6064183b0d252702617d5df8320b1a6d42969ab0fcc4acd3ab079f8408bdc SHA512 2803c88a66a8879dd349bbe8983377ab490145298339b4d89d360bfc2aa7bdb250760b90bfab692022cdd86a384fc59226422594ca94ce8c5fa658f339486440
-EBUILD libXinerama-1.1.5.ebuild 543 BLAKE2B 2b1a065639ae84fe29e5dd2faca2b2522286b5324081aa73b6e1af6a2699c0c3a58f8700ebb155370cea349349169ae5275d7a193e6094df76e7184575cc63e5 SHA512 c2b75c52af4d58b3e0bb2e629fe9a106821717a69530c716251c0f76450f79662bc6155acd41f79f3b245dc8d16a88ccc53f463cb72a33023d5fac2b305f4e9c
+EBUILD libXinerama-1.1.5.ebuild 542 BLAKE2B 68e821a0285a1a17d8a90529d8394b8d4b2e2c82ca895e029b16f372f91410c00f7a0838cccde15cac1dbbcab067d81eeb188815f95579e939d51a10fbca49d6 SHA512 3d2f2b88254b25f6cac8bfea53a0abf028b06adedef8b120b704be0f8a1095439c7e09558a4aeff33fef21b74109d94ee1ffd1a63c584a59e96b233dc9f709e6
 MISC metadata.xml 342 BLAKE2B 6c24aaa27568e06b0d2a5a8ad74449acf8f858010376f684a670a4fa183b9ad55bafe99f68930f9431e689719299437f5d725f116d32d2dabc85c7614bf63405 SHA512 7e4811d37aa49ed0bc020f677e73a292e43ad0db7efd2027cde9839bc6ca77eba21b1a80575accdc0938dc85fd779f22a7dc15ad5c059f36ee10c273ff88a559
diff --git a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
index ce96893498ea..664efeedacdb 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 5ac4b7cd27e2..97201223b83e 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,5 +1,5 @@
 DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
 DIST libXmu-1.1.4.tar.xz 349264 BLAKE2B fe78cd3f529402394c19842b31b2451da2b16dc768b5aac1d157feea0af06b04dbe2be879d17c7ccff08630c0bdab0abbb853bc5672340f55da0cd1412db9df6 SHA512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1
 EBUILD libXmu-1.1.3.ebuild 770 BLAKE2B b5ac9331167dfd10ed20674cec210b87bbf603ab6048baf9f47635a581b545137fed0f7183d1057e13b9d33230c0787fb7d2ac2f3b2a6e80b37f12ef891c49a2 SHA512 a1c7a3b8583c3b9a4bcb57642990cc355c881a84fce80eda0bebe9e5801c5d39da0bdcd2928f2c20c6dd9ee1807cee065e3857f1dbc3f22d4b21d9687c629a94
-EBUILD libXmu-1.1.4.ebuild 764 BLAKE2B 3f6b725be3f1341ca187f36cf7c04c9d537993c46d66592a79b4d81ab519dc09c35ed29213ecb94f274c8ad95a3647c2a6064683ada60c0a8da7ce9f403018a5 SHA512 2995ff6a761b064aad5cdb7ed667e9804082d21f3298dcd28a637e69bba5f317ccc7ea5dc2355985fc424af704274ea5b29d1356f56c482b79ee4827a3dd9c99
+EBUILD libXmu-1.1.4.ebuild 763 BLAKE2B baffdca6cc819cda9b8e613700193bcf682635c2985011801dd69974f1d4f3461bb0d3faea0a34b41c09e6717e3b074667c1138f2f7d00831128fd57cae58a2d SHA512 d2caadb12e9d26b47531dc222d676ed3e42ef2feccac12946309f6a8b5c1d57deb338c89573d66f7cfda264ba1bf46be9a6a15292623f2ebc1a76544bebcff53
 MISC metadata.xml 337 BLAKE2B b3db98afa249caf8d23a610701683c053a774b136ba51d685c87c3630710500bf1926bc93b7c793cf57e0041aee5219f25ec0ce8d0cef5e1387000853c62d272 SHA512 ffccc841608e1f4aaebb2a4bf72fae9f6893268b2497686f0b3037c2cea6b8e11555d6576cb3684d44735ef117e80bb1fcb32d758471e0d92df8257fd3dbc705
diff --git a/x11-libs/libXmu/libXmu-1.1.4.ebuild b/x11-libs/libXmu/libXmu-1.1.4.ebuild
index 0fd0e40764e1..cffa51a991f3 100644
--- a/x11-libs/libXmu/libXmu-1.1.4.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index 1f84e882cc0e..f07931c39fc3 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -2,5 +2,5 @@ AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cff
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
 DIST libXpresent-1.0.1.tar.xz 257136 BLAKE2B 22c66f595f8f42ed8a7bcf60c4ae5689e590e443d9e99785fc8747dabe7aa20031f303c72950c8fdd64b347776f84d17156d539cb83900d60a11dae3b6c21df8 SHA512 a4551f49a68f4487eb70dc5b50b7f745fbc8b6842cfa60422afe3834af41c504a37bcfddb4e7e9ee084b250df256034290776c8eb7d8838e392eb626fff55d25
 EBUILD libXpresent-1.0.0-r1.ebuild 613 BLAKE2B b5bd0e821c72f5ef6a08e4e20f623dbe3e3e6f15a6f5cc388fe198c1baef04a83c7360c62c46b3d5175521989f127de0a3bbde4662d080f579a175d6bfd92ece SHA512 2c83556a69460223df78b019a9002e60edf3050b023c2e90fb16708e392db9efb81459e9f3d08e83884a873024d435ee3e63e643d12af85186ac258797f4581e
-EBUILD libXpresent-1.0.1.ebuild 577 BLAKE2B b70d9d659689e21b16d63cfbceb3e8d9233c6e90c5ebb9e0dde849154ec3333f69699de03b1333e161b9d1040617943f4239dd837710232d7d1bbcf0ac1be7b1 SHA512 423e2e7102314087053a7610c9f59e3b790da5dccda125fd5cf26d2eb8ddf4df1d178efec67cd7ff11e457a7255a9751ccc3b2cfc58e90ba56a7ee905916fec4
+EBUILD libXpresent-1.0.1.ebuild 576 BLAKE2B 0a0ffd9d225a1a82c351197533b65aa1461cc81bbff25fb4fa87841886f29fa3f9a4b0d0d3fc4a1e95d1db2f5abb92a8542dc00f2e5136f570133b8d5f4bac82 SHA512 f26ff16a2358bd8af0fe0650222e7c5a6e8b01524c843305702eb86c4ed14b859a828561b7e7ed325b881d96fda1401d105c9d2efcf5d8b1db76d3781a244296
 MISC metadata.xml 342 BLAKE2B af23e78e091dbf21e4c15d30aefa5af059e6ad211e296efd62d3718c8dc4131fa64a9175a9c915b860ade14d1a42cf4ab13f23cb3125980b5003ec1d4f4eb4a7 SHA512 03f60a6bdd8101b5b89c4784a654aff54be725d9479e9cf25426e0ddd67ea7d3b564d5893cfa9bfd80a8d561ce348247759284db197bc50d6a6e9da771466bc7
diff --git a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
index 1aee1f5202f4..91b60c1c4a82 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
index ed642411c3ff..09a725857ca6 100644
--- a/x11-libs/libXrender/Manifest
+++ b/x11-libs/libXrender/Manifest
@@ -1,5 +1,5 @@
 DIST libXrender-0.9.10.tar.bz2 308318 BLAKE2B c9e250e16118a4878e7439fdb37549596abfd6a17f50e4e88242579fc285d0ef5b0c8d5d0fb592c7dbcd6e77c5fb284e6644e4edf9b12118cbfc0f179e274313 SHA512 16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe
 DIST libXrender-0.9.11.tar.xz 302900 BLAKE2B b603118a02bc0bd64a98ac9820e6fd46a0613441b630d10aa8955c3a5e364c283f3d7323f7cd64e6c3a4c599409ae9d7c847751edc3250946342008abb66a015 SHA512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de
 EBUILD libXrender-0.9.10-r2.ebuild 492 BLAKE2B 4d6168dbe0f0b42c8648c54dc17a984f11bd73681f03f84086def1cbbfafd86f548883a1b82a82432d04cb71dde7dc5a54948c70f9df6365a42aee12afd3998e SHA512 b320b7b5eaacc83ad59224f088e0d1aca8249adef7927baf169cfe3931482ae4b8c3af2504245b228477aa2647166e4aad57456e04806ff16fe2d1a2b46e6774
-EBUILD libXrender-0.9.11.ebuild 521 BLAKE2B 87db80b4ee899fcb667ef25ed4123710c50b7f773e1c91de2777d4fef924b1bd105e232b5777b3d12840adbf6e9f9b5bb7f17581b720927798e1d15594ecea52 SHA512 2ca9a8ea2dfd43d43cb7d3d11be74d69880ccfa069f3e32419f7a152a772ed11ddd95776dce8ed8c2b2f874f351e651874f459ca97c6406224d62e875b61fca0
+EBUILD libXrender-0.9.11.ebuild 520 BLAKE2B 1aef5b8a4c1b79df816b5baa9732367febaa89e40ab1885350ef729fab70b938124dfd6c79fdf7ca3334ce08461eafe9289e3a943f32fedf5a4a85a8f0c15038 SHA512 aa898726554bd498a0db8294da2717a9878acfcf97fc462801502e79c312c29af8010b92841089b71685e1f1251527de7a93480bd82e48ee98290b7f4dd99318
 MISC metadata.xml 341 BLAKE2B 02c79694315c5ca33c90a8854cbf506addc7b69a68fe066f99a45c3fbe7764ebc69c03808215e056c2bd0f7b0261ec173d02a623e8c91c3a090b9ae77a1c83a8 SHA512 158a1a560ef016f8fd5c85a6dc65fae5ce9e960f65be43913a58a4218b2f24ef4cd925a490140f8463b206fb50d5c18243c9dc0ea56b0639f5ad9e5fbc0cb31c
diff --git a/x11-libs/libXrender/libXrender-0.9.11.ebuild b/x11-libs/libXrender/libXrender-0.9.11.ebuild
index 0eb1281cbd3a..ec360869ca6d 100644
--- a/x11-libs/libXrender/libXrender-0.9.11.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.11.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xrender library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
index 3e9c1724f171..cf83b3284954 100644
--- a/x11-libs/libXtst/Manifest
+++ b/x11-libs/libXtst/Manifest
@@ -1,5 +1,5 @@
 DIST libXtst-1.2.3.tar.bz2 321819 BLAKE2B 92a75d6ea9000fa7736093ce479d275c57a4a5bf849df2d6afae9478a53a07ba395013ba6676c2ea7dcb6a1f34475967ed6508b7c304b887f83ec44a611b8e6c SHA512 6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765
 DIST libXtst-1.2.4.tar.xz 287636 BLAKE2B 6c3e6154f221530158b8275ee638934c633f2e812333df0093a01663c416ded0b6be509578cca78d51c6b540ab17379e1e0503bf296abe3112f1afeda12e4af9 SHA512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d
 EBUILD libXtst-1.2.3-r2.ebuild 627 BLAKE2B e353486f424db1cb32ee99f072cf715d093a675d462d90e4052ecad45c8ff03e2ef34a4836f1c38c957b281cdda22621cd7fda1b988e98bf63742c969ce6af66 SHA512 5a1a8ba0b1f0fbf1bdea9d50c4c2ac4dadacfa90d60307aa6de383954aa5ae5a067b58e7c8d6107eaa97dc94dc89a762bb67fbc2942831a208b2a0fdfce8474a
-EBUILD libXtst-1.2.4.ebuild 654 BLAKE2B 80971541dc66419bc9432aa4a7a0e09f4e461db4b42308ee84609ab71571250ba3817d7cecefb8eb5cc989d44d20881700819060d952b0d733c16f64ea4175af SHA512 266dfcc9fc4e7c6ae843ccb0aefc0b40d2e9c079f48e8ea1d7fb88261d2d40dbda79cf5de0583994b6ee189b6e39a890f73bbea9efc98931a2657ce6ab6bff3a
+EBUILD libXtst-1.2.4.ebuild 653 BLAKE2B 345e9fae7af5d00bc7739024560292d5ebad9d0a4b1b2b738a0d6398241d4652e041d627ce0dbadfbd7039eb89c968dfef7bcfeea9b18e01849860d3f43ddb28 SHA512 64dd458c725b734d0b4c163f90e1114e3aba4c0d0f0b673456905c9b604643d183551ed9ea0738651d752c303ba9a3368e1b586d621adc165a066a528f262863
 MISC metadata.xml 338 BLAKE2B 87a7a857c72d92a698c6ca2b9d6274b3a03edda1e5b4b84cb66f6c581f1ac428a7ad912c7c63ecc2554bda3c84fcaeeff108504237562499452934ef6ae4cf49 SHA512 6957dbdc6e6fe3186ff4ef7979cbf1f237ee942c1c6b3534b2833db2a799e765c244f1d6531f20d97011cb8901939dffc43e34d8f22ce4d977730fcff51f3e23
diff --git a/x11-libs/libXtst/libXtst-1.2.4.ebuild b/x11-libs/libXtst/libXtst-1.2.4.ebuild
index 21d4d04f46ad..4307ef5e6142 100644
--- a/x11-libs/libXtst/libXtst-1.2.4.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index c929e59191ce..cb7b7e5982e2 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,5 +1,5 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
 DIST libXxf86vm-1.1.5.tar.xz 265384 BLAKE2B 4e94267ad815cf47ec558959ca122d89b5f8b54ead2b2cb93dc3ef7f9bc694b515978a0b2301bb8e48d32bc768595b50cd8cb71e7a65c65a752699b80c2c079b SHA512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6
 EBUILD libXxf86vm-1.1.4-r2.ebuild 523 BLAKE2B 882d2297b0583b91984abec38afb1bdc324b3297d8efb9880558a83dcf97e4081d94e1b1f06339e41ff87345be06cc4b8edcc60aea85e86bc62bcc5f074496ac SHA512 b868dd8bcc9aa94298572190eb6bf6d9e4d3623fdb661a96d15da81381b88172c35f31e8b7e81c9dea6f6eaa0e5dbbb4a4a9031c94602a9736357689436667d9
-EBUILD libXxf86vm-1.1.5.ebuild 552 BLAKE2B 08b02e5a217ff78c6a2016e3ebaecc914aafce6054c7fa381f2075f48fef0d6bac6f35d60301813ad1c13461eb5e33ff0f84015ebbf5e82fea77715a0834fc46 SHA512 50079f768c3c1731531995d6af237cd9562d6049c7931df89f5d279604f791ad6b90a231ca51fd13b90b1c3759ed90bb15f60b63c2d03ee0f82f462a2539188d
+EBUILD libXxf86vm-1.1.5.ebuild 551 BLAKE2B 0b1c1964238f83e44a0f7778b95ff79c80ac0ac4f12108a70d993c873df1775896ecf34b92969d2f5d380527146b892e2d74818683f168f6e24fe0cee661ce3c SHA512 2ca3df04caae920ad03c6ee84c888a8be0d326069a05a85cb3f44386adfa2dc0404aaee74cf9bc584233438f09beb78f4c185911d6d9cbb032807a1d76fe6d86
 MISC metadata.xml 341 BLAKE2B 0fde03018f6bd9fe5ab8a01f13387fce7e15707acbb3bc7fec3c9f444f0b374a4b388f786f5b0b1bf8cc84a5cbbd4655a4980a716a7d47db7ee9bf3347e9898a SHA512 34043e9c37357b1a6a1ac66f2c159e3393ed6c4ac0e3ffabf5ccbe48c85d7ee62e98c7d6a022685bf6b2f30a8886e386f402f4fbbdafca7343c828ca316bdc12
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
index b213d6302def..12365de2791b 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 3bd7a4bc00fd..50c0ff1e1414 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -3,6 +3,6 @@ DIST libdrm-2.4.113.tar.xz 457064 BLAKE2B 30dab032f047a4bd3646b53c64c118d02855ee
 DIST libdrm-2.4.114.tar.xz 471664 BLAKE2B d44d51311d2d33dd77f467c508448ac26e1561720535215eac5f834545eae2dd0a8842465bd78b8441cdf5f0931e9b51e000a4bdddd9b07a099ee6e88c99daee SHA512 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644
 EBUILD libdrm-2.4.112.ebuild 1946 BLAKE2B 331f6d44600bdeb4a397e6f7fe630d481eb02658279e391cb237e2e1bb5856c7ff87e4910ce65d9e6281abe76c402c0bc24c84dc22d53f7ac092f269d1d12d9f SHA512 f1e10b879303377ec4060565865a8b3cd342a26b49c4aabf28dacca835ae8baaa818783b40d5f6bce1db9afc7cf495484bf7e9c36d41990eebac70a2a7dbdc3d
 EBUILD libdrm-2.4.113.ebuild 2043 BLAKE2B cfdef7c119fc261d57730dc157fcf05aedb81e36cf98ba78ddfe368ae74aec136da38dd910b321955fefd7bfd6dd7bc18e5d6b732ad1583370fad2d35efb3fbd SHA512 caf7a1667a174ef2fa6855cc174dd3c4e4627c9c024239e2a7130bea5aeae84a90cffdaad19438898e5e58a3413613c3261b3bdb901aecb576fb0fa1b505967f
-EBUILD libdrm-2.4.114.ebuild 2037 BLAKE2B 141b085be2d43c503442d44431dd858aec39e0760b0e245fb41e25aafb31398ae62fe279681ac5233be80c5d7c11c78f931d127bf5ab13d578dc1ff1d25dfbff SHA512 5a116df9035a600d054f710b7f676d7802a9adc61500a815495d2d1ecfd8a3b0535678826ae77bf6263025e79acfc500902542594a09c79d8cbc2a101b15f9cb
+EBUILD libdrm-2.4.114.ebuild 2036 BLAKE2B cc4f661d05a47ee9f1e1dc3b153e8f934057898be990038849c888bb43b94e08520efc58805f9b9b1d642da55ec6d0ae06264d0bad9bf860ea04c85aa6fc994e SHA512 d653eb757d90fc4f9e3cf92fb997a1913f97f912f427be907a948ff7436492368b054bb92e42b481231868272ca399df13afc75e825bfc7e965542650965727d
 EBUILD libdrm-9999.ebuild 2043 BLAKE2B cfdef7c119fc261d57730dc157fcf05aedb81e36cf98ba78ddfe368ae74aec136da38dd910b321955fefd7bfd6dd7bc18e5d6b732ad1583370fad2d35efb3fbd SHA512 caf7a1667a174ef2fa6855cc174dd3c4e4627c9c024239e2a7130bea5aeae84a90cffdaad19438898e5e58a3413613c3261b3bdb901aecb576fb0fa1b505967f
 MISC metadata.xml 413 BLAKE2B ffe1394ed3fb669c1ee0c1c0ebee429a80aac7dd3a3086316703784f991ef3a6e663c3c29a828bc75f53e9a35abd8bf84421dcde0765cb6f9ef7c473c4f2a7b5 SHA512 e5e802e47f115161f521ddaf0fda3196a43454f8d741de176676a1adce61dbf7db001491d79a466ab8b9e67f4b61e3803f0ce1a2c5f14ab84d51f746bee3e6ee
diff --git a/x11-libs/libdrm/libdrm-2.4.114.ebuild b/x11-libs/libdrm/libdrm-2.4.114.ebuild
index ad85cea5b56f..e0e16f301a86 100644
--- a/x11-libs/libdrm/libdrm-2.4.114.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.114.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	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"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index fcb3cb5cccad..7224506b3bcb 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +1,5 @@
 DIST libfontenc-1.1.4.tar.bz2 320492 BLAKE2B 34da17e220789f5078e870329390c0e3ee665598db3432ef5a33e78d1db4b12460c7467bcbcc1dad67e9f6ade0173f9fad915a2fbbee51f0be23feedc242e7bd SHA512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582
 DIST libfontenc-1.1.6.tar.xz 272520 BLAKE2B ccfe4f9524655862e2e5ceed8edccd7da8ec1872b3a8166803540b69fe4f42f1b5b6f2128a00b702368f9009e1bb1edcec5d28c36815abd6d591dc9fc46cd291 SHA512 524247caf035e5d69280575c79ec5a3259c4cd0a4afa375b01985fedf800b42ecd75102e38f85cdce5591d020d361ffa9390adcb7906e939df289e5131088683
 EBUILD libfontenc-1.1.4.ebuild 523 BLAKE2B 0407b0dc7bf0cf4296158378e6fff9d632e25b9b99f4fd4ecf6217701288877547d47c7339980443a9c35de76161dc51088707124def05da1ccc5d0cdfcd27db SHA512 9dce3b3f5d9f717a6ea73537cb27e516b6266af937ec8e468cd046b60631068fec4501277872b9d9e63c340c7551987c4641c68c3ee2fddeaf13f598d4f81164
-EBUILD libfontenc-1.1.6.ebuild 542 BLAKE2B c99c43296bc24e8a24d83a77e26d8aaa9941843f60aa2de86d37679942a5db75353e617d6ea61f5502bde6f1d823055fa7c753510fab251d8e038bc6d0d55d17 SHA512 1386143890e01f9a53dcce7c2b91c34b1c076958fffe3678a9721917eec495bc21b60dfa62293b866592fe23d7fe72ee30d0a36ce5699727ed641a096503380d
+EBUILD libfontenc-1.1.6.ebuild 541 BLAKE2B 488b612ca3e544046642e68829291e8b6114ae03ac7ff587c5a88f2e9ea4f4199b9c58d2027e9c50d575016cee957418d70d1ee9153369940b03c068ea28ef9c SHA512 191999a47e9b96c63348fc26f65ce74a9817d9b051b31c85a587e5a186c7b0c65fa4f29d64291b8e8275318eb489cc1841857cb2333cdd02629873a9307e44ca
 MISC metadata.xml 341 BLAKE2B 8eef39a5f51bea7f961c5605b9bf18c25ecc2a3937f3610275212ef0d6e99903102e7f9cd16c632b7bc22f4968cb259f63470e1e4594eec09752d3985538a3ec SHA512 4c3d24add9b54f986acaa2aceb12df8e59571d0df7370a4fba731d89618d4bfe443fb766f3305f45d46164fe7d465ec65bfe7b617b22e5151f075f8b133a04dc
diff --git a/x11-libs/libfontenc/libfontenc-1.1.6.ebuild b/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
index a5aac48d75c3..0d980987b4fc 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org fontenc library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index e2c63b48330a..5f85248d68ef 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,5 +1,5 @@
 DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
 DIST libpciaccess-0.17.tar.xz 331768 BLAKE2B 41539b3d6385fe7c42b562c7602f87b07730bbbeea7d65d3cc8e5af974ed5f9985b0779d51891493dd241a36bb171a3744e3b1f3fd30bee8a19bb5bd785f4c5f SHA512 8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47
 EBUILD libpciaccess-0.16-r1.ebuild 806 BLAKE2B d04d81707315e16c5b2e5d6fa03b58ee943df4c5b1fdb83e52daac51eab9ad8db6d9920e170a6cf209cf64f3e9411ce07579e1a24c3c078332b26154e17a1126 SHA512 c9c8a66de9c2d3b3bb7156573ab86f54d54603361e1da0ed8dad188c9e582a10bc7d2ec19f172c3ef30a05b5af6e710f3857f34e3d440a3d28d80201c13cfeef
-EBUILD libpciaccess-0.17.ebuild 711 BLAKE2B 0510aa2a227fff718732678ec71847c648737dd5ef0ec0968428d9043e9b189f938161bc6c5af664e8b20538ddaccabe3349be08f57189153638036e31ab0ddc SHA512 723e6d6d69cbe81c46fad4237e9a9b325f6cd6299ca0971885d5310016156b6e8b2019ff484b55f68a6804693ee47a35d0468b83141da8caa204674bfedc244f
+EBUILD libpciaccess-0.17.ebuild 710 BLAKE2B 7dcb2bc4196ebfccbb9dbf63021962e8b6e2d712833e464cffb5fd0fb5cbbecd261fbb6ee641ba4bccf2faf542d0ace9d7d1f398a2e5836c8cfaf162fd44aff6 SHA512 8dfe0d01cd659670c897388595d71df46c8045406ceff3685e7c38152c3685b47a03deea3f3b02818aefef20ebd3aa392e9224df002bd554a16dc9291792b4eb
 MISC metadata.xml 343 BLAKE2B 841587af1693a1a28bc87d7785e79805abf10ea86b5b2bc117b786f005eb18c2d4369a6b7668c7ae6d41de19f2820d2957007b3c5417706713b26ffb5e67ece5 SHA512 89fe0feea88e2fca82867d6ef538a88576626681d6cc1e14c96784d0f0ff7ac9f09434440e8aec295a4fc5e4b07a3b681592129c26777e6182d3369e0720b035
diff --git a/x11-libs/libpciaccess/libpciaccess-0.17.ebuild b/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
index c24b1b5a08cf..136e855dbe74 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.17.ebuild
@@ -8,7 +8,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson-multilib
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index d4df7ac3ded9..3867c08e06c0 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,3 +1,3 @@
-DIST libvdpau-1.5.tar.gz 152838 BLAKE2B c3d76c1e46b718d71daff74232f2de9efb989c496cef7fa1016ec76d751530be39b5b6ad6354819579043f23744a647492d5d52b5ab93cae89dd82fb17d08289 SHA512 cebe0e0d9411b87238fa2adec40516881c61a67f33f80c22372f514e672e2dff839687291ab0b01d47af811c254fa65da579f360fcded3f65e382720548d3ea5
-EBUILD libvdpau-1.5.ebuild 935 BLAKE2B 3dd6bbaa9a3bcf49416a532ecdd071f89c2dda70d83dea08f52376cb89e8f41d4e78f9044f80e0d243ea479b74b0debd317d8a0eec8b3725fc5c4c3eecaab610 SHA512 6a6bd6492b82d6fe68c3427e778bc0f5c9773229e74e36a821e5c5fa080dca501150e5d6550883e26cd18daf1fa4e31bf29011a577bc03267d47cb0bd8cbdd10
+DIST libvdpau-1.5.tar.bz2 143279 BLAKE2B 2c59250aa1fa45755d051381a6edf9967800af5dea6e07eb41a6daeb7dbce909b70683376d8cabbe57a14ab5cf9c25ae3950cce5f701f4a96e4154221c5c9a31 SHA512 7affb14874431eba1be6e8634fcbb6247cbf6956fb88116e06e60de30a7852a407e8598176a369c2ba4bfaef4be58727e51d4bc390f705991ac83d660f611ff5
+EBUILD libvdpau-1.5.ebuild 936 BLAKE2B 14988dea51e796c3491aeab7be549fc3c0a3bcc396e212e80f62a862872cf923abf1218f0cf675749334b9ba8021b7dd9fe002a27bfbcafdfd2baa27736bd2aa SHA512 c578ecb82e4b55c8c04f95a6c49751a58c101caa8e1ab34021f3cabb4732e40a7ab251cb31ad1bfa094e09995c9bd52e0692b3494f858cf84482db021550c118
 MISC metadata.xml 337 BLAKE2B c6bc083b64631699a723efd637a7f46ab56be933d8e4f4d7f8ac2d9d1a71fff503befd5e7cd8eaae7b26254cdc6ff5892b19d086e1ca2ca467024ed105650c33 SHA512 f2a470023b756d043f16defa1fc0ab3f334ce4a2dfcbf648afb641a1dae43998ed37aeb195f69c7f8d218bad200267f198d532581f53e5e3eac67a709c625615
diff --git a/x11-libs/libvdpau/libvdpau-1.5.ebuild b/x11-libs/libvdpau/libvdpau-1.5.ebuild
index b9492cf8a92c..52637e8d784d 100644
--- a/x11-libs/libvdpau/libvdpau-1.5.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.5.ebuild
@@ -7,7 +7,7 @@ inherit meson-multilib virtualx
 
 DESCRIPTION="VDPAU wrapper and trace libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/"
-SRC_URI="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index de6b64f8dd1f..4de99d716de6 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
 DIST libxkbfile-1.1.1.tar.xz 308832 BLAKE2B cc3042a05dc4859edf96235b8ce95b7da33878e9c9b8b7f82f83280f84cbb215f5d3bc32c7f77d8667f0dad7a9500abc68695c8e784dcc7e83e4b30196bc0257 SHA512 2902d21860e27a27159123a19f7d4e0cf9cf8933685f1d2477e69ec647f0f8629b58bbfc391ed45e8b51a10033f18a9d0f16f7f519da9923cd7ed3bd497cf1a2
 EBUILD libxkbfile-1.1.0.ebuild 491 BLAKE2B 9c30eb17f71629266a92ed9a8b626f179543f7395417e98913e9cce1ce9777b66d49d6f57cbd29ff6bde2ae6ec564415c631e0a3fd5f1787e391855a8d67ae34 SHA512 6544ec1c2c28581a28729b78fe8f314935601e8f6ba940c418e9fc5a6a57c2e2f93de58f64aca5d828ff534719484c8d21e7080ad3a369a6962183d65f8d4fc2
-EBUILD libxkbfile-1.1.1.ebuild 510 BLAKE2B e7af5ea2d94bd38e936610f8666841c3ec62b50f30adcf0572977f628967e7409e29053747a50be8eb75046ead136c5879330f3d9f1555abfe1bc7b8b1df48ff SHA512 5dba99e2e9a8dc31c2be49aaf88d6f16b3918cccd20a954fd07bc6699b9905c47e8065566de470fd2035e2f8d2944cf3348c23d8e7529bee9ed3f1f658970ec6
+EBUILD libxkbfile-1.1.1.ebuild 509 BLAKE2B a1604f3586ff0f529b45dca8fb37f63eebcf2d94ee6cae9ea6405a40e5fae446d6bb0dc96b3622233113cb51b8768224cd2f787fb887359de8f2632c59f2dd56 SHA512 e0f29ffd415b7667547defb264d473b6bf1a1013d26aaddbeddce4f73c967310fb54e392518628fa2311b06ddc499c94cee5896cbd1cd337162fb1d0f86d3ab4
 MISC metadata.xml 341 BLAKE2B 6bdfd118881a6eae282b380680ff6484fe69747cb1b1d0cabb00607d1cf06535de084ed07bb8664bc5027db274f263ed34175881cefb7464124891a9eb38e117 SHA512 436ec0aaca5f4a4392dfca223787672744e65354de323e5a6222e6a3eda53cfdbee00dcdacd375e587eb8a9277a0fb8da1c0f84723e577d8764ff884f37ccba9
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
index 9e44d4e853b9..4f666caa6ef7 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbfile library"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index bcd87605b345..0ab14dd46a8b 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,5 +1,5 @@
 DIST libxshmfence-1.3.1.tar.xz 257104 BLAKE2B 22c5ac15340e4aeac25e3f9e92ce25055ea668c60d1c8fb0d8a0801c6a83a3e405dcc32f733a89c8f6f689ca3c205c500ffec41dff000699a29369d8c6a8455d SHA512 f0c33b97204d62dc8352e2728ce12694bdb83ccbd1fd11c19db17246cd62bcd3e675f5b5b88a4e14bda59b4174003c758c24a3d93abc4bf574fdadc3bf07da71
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
 EBUILD libxshmfence-1.3-r2.ebuild 389 BLAKE2B aeb95497e2e636a6613f5802575a947f6a384b6398ecf14340094350b69848411b73b16a3a29d4d8ffc162486f65e86a276a194b2199bf755abeeaae893c7361 SHA512 d54e306ca2145961fd7c6cb00f7af8f954636e51dc113cc98b81c686b569d99a93a86cd523c4c8a5da3e0b1580ac5e485a676ac4f389740766c703d8c2cd982e
-EBUILD libxshmfence-1.3.1.ebuild 416 BLAKE2B 1832d9c2d47089a756978fecad82e48d321fc9f2fea46a0a8d82ccd1c60e05d1853756a86bef880d1e6d70ada154dc278805930224e4210435ee129eb0c670ba SHA512 d1333a0a474927c1c61335400e4deaf606f3e19dd909c90c02a9c60f078725caa798d84e4194356847470a1dc48146fb2c070a45e5c6b7675d873c62112dee58
+EBUILD libxshmfence-1.3.1.ebuild 415 BLAKE2B d14597caefff4174412f5f0368f507bef64b1085ea7b4483ca43c204dd50dd03330ad43d0481d97a0a78ef42a538b9290a6733ecb45680afa5b20a0a19d24034 SHA512 f756333d5540588b6271aa9ecc2841247465338aaa9701911001611154b95dad5d1417880818e24c780b021bf8ae3b7534e6e63963241feadb27a93b2e15b220
 MISC metadata.xml 343 BLAKE2B 4b6c3bd00d5e71b96c4cb0c1eebd1606f5a7e219882a4310251f7b68b0230b4cb76ce1d5ea7f3911fe57a33c07c08ee5bd2ca6ac9d1fe690713a2ed39b0e199e SHA512 f58bff9c90477bd61d09f59b3e92b9d899d0329a1be77a76b3ac74c89e4a20a8b88daa37f4c64a06e5367fd25a40bc9709e98d141be271652185e4f2a3c350aa
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
index 33113143f697..68e5ce6ef244 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.1.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 8eb0b4c92a35..d2b13d3d0670 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,6 +1,6 @@
 DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
 DIST pixman-0.42.2.tar.xz 652984 BLAKE2B 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 SHA512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8
 EBUILD pixman-0.40.0.ebuild 2005 BLAKE2B 443ba3024143ba6106054358c3ecd28e4e3951f378d15740fed4141fa65908fe99b3ba074914b6860f03b5c30c855bfd84bad78d2fcbe6a9241ca452d93491f4 SHA512 1bdf7a0d33ef2b3bf03fa5d2e91b6d71e58336ad9b602869a54a5cf27c2303c4303916223740d1f5d79dae5280c92a12d3717950c5f8071bb2f90d45c0c9cfa0
-EBUILD pixman-0.42.2.ebuild 2182 BLAKE2B 72e5812b103655565949384ae3674b3ff9602fa5d20a45ddd2f5a14fec89bb5695856132b83ca7f3684a551a862f08f4ae3550ec9de6571159f0f17df4f2122e SHA512 6e20f4cccf0e86ec95f8842c2edd75eb3d863e3dfd77835ab23e122734788d6e444361238b5a9bbbfba0fb9716d63339efa14229fced330a43a50fdd55a69f7e
+EBUILD pixman-0.42.2.ebuild 2181 BLAKE2B b2c91ab270be9481b12ecd7ae6ea4af77ec7a39ff3c759ceac63305d7be8e99d7ccfd87b275d13a34f72b93ab14a37fd3ae5e2dc27cd096b540a8d2074435345 SHA512 24691b41c362d105e31a9d0b4d8fd9cc7f517ddd1289881305739d221171d679bef2a922810e90cd606a328648833f31f4be729513726bf5d2d38cf8d029baf8
 EBUILD pixman-9999.ebuild 2188 BLAKE2B 395e1175954276713a15612c19224199befe1f0aded08e9a1db6b24c11a2109216c4ba3f637688e5db176e92103f396c49d02438613c8295d5080bf1dd30e774 SHA512 89dd2c9ee883d92e61ffd0fb8ee00b4dae5110e35ebd66d643471544183c0249f373bc46fb9d6c367f5244abebe8d0eb920ad0d396edc818c282b33bf5c0df7c
 MISC metadata.xml 483 BLAKE2B 4302fc025e7ce3dfb1b2f099371f0b3263942203ffd50730c40afe491feb003d2ec17cbf8ddd4ad3c1c0d752c46b87dd944e907b6c31a6ffdcaab7b518c247fb SHA512 f4777b9c1ae7527be4f354836c51142b095ab27dd56b173a6e0b7146ad68257136f326ff7c0fa564706dcc53aebe9171d8f844bab026c139cab717c559bf2a5e
diff --git a/x11-libs/pixman/pixman-0.42.2.ebuild b/x11-libs/pixman/pixman-0.42.2.ebuild
index 4c274d484e3b..397ec588a58b 100644
--- a/x11-libs/pixman/pixman-0.42.2.ebuild
+++ b/x11-libs/pixman/pixman-0.42.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	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 ~x86-winnt"
+	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 ~x86-winnt"
 	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
 fi
 
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index f3f12b168581..4cd3c67dd0fa 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
 DIST xcb-util-cursor-0.1.4.tar.xz 265508 BLAKE2B 8d7eac0116652833e1835e9c7454bc859901e146b06985b3926fd5f7568d92f2249ef6ea17c2202fa247e36bb998ba5b76fa519e92ca5cd51eb778169c88218c SHA512 d27dd59a4d7ded9994dca77774421dd9533e3ee823b880af35d3219bd7340c89fbc61d1d0fa10e2991de2cac9e6395e09497769d7b8728eedc691e76649107b1
 EBUILD xcb-util-cursor-0.1.3-r4.ebuild 1025 BLAKE2B e1cee4ee659ea5ecdf9c3d315e1c7fa0ee4c2593353524a7de929031fc629b3030a1ce2f9998e9d6dfcf1335e9adf9b7cb6db28aa8e01e20bf45263933237a3a SHA512 7c2ba922ab6841a56c63ae67003bc962cf0b3ccdb76896f76b269c7d2c89464da6d2a6c1c183bf0828a706c884eb46f99af6e8deb1080a775559d62580fe673b
-EBUILD xcb-util-cursor-0.1.4.ebuild 1052 BLAKE2B 8a43fac2d94abe89077bef6d14afff8d53fa4a59faf90c206ffc2ae3afdf4312e8b0f4412c7334a7d7680b4269aaa78c0101c514f4f55952f65beef287e0945b SHA512 bb9fa10b8ed2606f66840ee072104a424b147d61bed898f4a5ffa891414a77d478dd7c83337cdad18a121ed880975880cb1ba2dccc94c1aa4d2d3bc2e409a0ca
+EBUILD xcb-util-cursor-0.1.4.ebuild 1051 BLAKE2B 94f070e474f873ddac21f827cdf938ffc7f518d3d78eb90569e3590c38ac488e7322eb82dc4a9968ac8833c1acc3c9249aad55f045d00980519106a9b791e7f5 SHA512 98395978b592b51783a3ac86578d0fc086ee946388c030f60889c7004137b15e9225a1d67bb091c3142049579d1f82df250c42aecaa4407ced9f27e1b1efea1b
 MISC metadata.xml 344 BLAKE2B 7350bdaa3994406d2c539c1e580759e17729eba1b935c15802e0fcdcb5194ffc2655148bc0a5b1c40329b887e9c41fb26964286e8fc5a29cfae2ce721cb00f01 SHA512 38736ab0f5b649781a67f911269e622c22b8ff75963818552aa772ef460691285260c057581226e00b2ebb9a7ff94c3bca863351ec1d916bd9e0a50537a8caa9
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild
index a170b7ce621b..41211c46bc72 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 708bfc350c34..5df39f30ab2a 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
 DIST xcb-util-image-0.4.1.tar.xz 289016 BLAKE2B 7f1c7c3da950604adf4a22146e9bd3b77fb3b0d35f0a1bb17a1eefeb1ba5546d58a3e40ac0c130d67ebcbc8bdaf40ef734ff19434f66bd57bc4a4a849a88cf82 SHA512 9b47ba38b91196d76541b6ccabeaf291d3b91036f15422909cd6a79b3fd1a9786d5b1728e411bc41cfdf3d60a253485f4ef7c65ffa6ae646fa93439ec782746e
 EBUILD xcb-util-image-0.4.0-r2.ebuild 608 BLAKE2B 4123fca7764fbaaff2b1baddf56c96112fcaddf502019f8fe081ec7330a47ab0745509b8f50e4279903130599b6b8e6d59821f963155bb59ca901f2f5f2e4e47 SHA512 7aa88b81b2ed0b2f18277e997e8d4799a7912da98b3edf9a0284ecc2fe20a04991811dd3c0f81be5d5bcd2a892e12b12fdba046f2595a82d43ed0a171e214c6b
-EBUILD xcb-util-image-0.4.1.ebuild 633 BLAKE2B 3606c45994a60b69c1ded02ab5b668570eb5be25a906ba55220e501690fa121d40837ba25d2ceccc44b8a222fe8d59f9d8045595686f455426c4de218be22e8d SHA512 b5f58583f88220ffb9777e6b9ef6c9754fba1b17f9403cd1dbba3b68949003458f67cffc1b1973d07e49fea4ec13b405dde13b2bb3201ee47c79676ee5c09451
+EBUILD xcb-util-image-0.4.1.ebuild 632 BLAKE2B d23a627e30a50518114fb9ac5db975fb4c4056dee6a20b6d053198156c10f5d088e1bba7935cf9997d24e9a065319f3d5c0dc70a0f0fbd7c07374488f4a6bcfa SHA512 487c091f830c7523dc3866c272f9ac7a8c29c18d18bbd1b06088017526d8a98daacb4a5a5cd1a2743fc01b56b5423c016c234f64e4ad7fd985f35a5e6130bb43
 MISC metadata.xml 343 BLAKE2B f43656c79094ea2102119fdfae5e8a9fd2bef2ede1e4536f637d9041fb46cff927e8207fa25a65437cd5ddccbaea4afd3f2555b7b31eb9db9bbe68c557b0e35c SHA512 a39c03ef5043b4576a7ab27203268f6bebfdc06b1888f819560ea052d66ad49775a6787163fc47db1fa96b81fa8a19b3729b6af4f6391c448f53360e48dea6cb
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
index 0d9c79168d29..0087e7d795c6 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-0.4:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index edba7515fe6a..0039bdadeabf 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
 DIST xcb-util-keysyms-0.4.1.tar.xz 259860 BLAKE2B 15d08761c673647fda2d8faf7fd47b817f7068cde157384d7ea879b0a50983eb97ea6f4b593c26d631419ee59a128f7fb5b3ca029dedf14f6629096fcb49ed7b SHA512 dd53a36b52647f22bf0da8cded4b2974a51899eaac799797017ed8534f14bc2d2d339a14fa5ef387ae4528b7d9a5d31920bb0c71b09ca34f58e5081e768e2bbf
 EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 553 BLAKE2B 005d0de891f6e413ea14a9a3fade43ba68d4f366b16c92df22e36e558948c0ec622b2e041dba4b7c42fa93906d69dec92c2fcdccbbf391ff1c887a2d0409331e SHA512 40a39f29c48278f655ac46c51aad955fa8f8245ba5afe1357f6910dad2f47ce5cfc36cc679293945f8c4a1ed9069d1b8146d4011727850fffaeb6efc05da17c5
-EBUILD xcb-util-keysyms-0.4.1.ebuild 580 BLAKE2B 27b52f0a2b64e0d8b85a03f961aa1913524b6011c3a51ae5eebb8d83810479c1481b7fdf168c6952873805feeaaa51879710698976f94288d59bea606623bb9f SHA512 c916ec4a497cfeb7f98cae0b84757a3ce9fd3074f910c1addae490a2ca279be822dd4a0300d86a289b7c6b72f660e10dba73d391c6d22d301f6e290f1227a8a2
+EBUILD xcb-util-keysyms-0.4.1.ebuild 579 BLAKE2B a630e0758f30540f0df4598a914c94abbb8d74002a6be5244944ad024b7c29465f2bd0a23c8bb514796805c143e6d3cc29994633c711b720558a8f29730c8211 SHA512 8e499dd9b01921f4d2eda748a8ffbaad046ddcaaf169dde8debddbcd7707199e5ddf59b0af0cc8034b282a3a6fedae7baac60b4c66372e1df1df6904e3afdb07
 MISC metadata.xml 345 BLAKE2B 95d38918c502f2397c09c9f07ba88f9059889f51b6339656a48437f149c946b79c8868abb2715bcf78c1d5890ac75d22a1a7e58ab61fdd73a680b351a09fe298 SHA512 467331b043b4dc8aa2a97d6a73fc51aadaaf550f31c0c4095e06315b4d6909cf1cfbeaa6bd14d933b57522143b678a0cbcd7da3320ad22501ea3153e90a6fde8
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
index 55c88fad5c98..14a0752700e7 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 5f1c729872c9..18e3c49e551a 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-util-renderutil-0.3.10.tar.xz 262028 BLAKE2B 49b017fed34cd1c8cceae697bf76dc17c34c32dcc05acaff87c75f74fcd486bc0abc9fe4699cc989c1afd13ac33fc04092719209e9d48aceb5e35d64a5790393 SHA512 9cfa9201be2df7c0b832e1e1fe506e7c7a1e0f2b1b1d4a4b58620eadc241190a36478fa3ea27c32047fa79bf199f17dcd0b106853dbf5eda8cd584f3fc2b0c15
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
-EBUILD xcb-util-renderutil-0.3.10.ebuild 592 BLAKE2B b438e374e3c308bd9fefa630293de89f56dbc32ef7f43c6935c3f690ec4aec27b304b09d06ede4847cead28b71396346b185b58767ce8ad954959c1da686a11c SHA512 69e4232b0aabfb2b64294e19ac96de990b4c23ee560f5ae4a57439d8cdad7aea58c8225c1e445cd923d2be627460dd116078f780018f47b48b43f713ad26eecf
+EBUILD xcb-util-renderutil-0.3.10.ebuild 591 BLAKE2B af6aa6f542dab4fa7b59c9cd375acd1503cb3abe56c3838454c5412f96d9caec1cc64c138fd2e869f0767a1493c3c10b76bc014cf79d1b66152e7e207466932f SHA512 ff9e952c4decb2a5cd60a7bcdd680131d9325c048b2f4f243d0d1ab47240b9c392706f5462656a2163350539ee27e2eef0132feea7f57116787efd9a10f19b02
 EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 565 BLAKE2B 42a83b2be25357c84b670c19a4e1c6abf8936cfd5276eb47e42b0e00b965a9c691ec58f55f778fdd82742e2b5bd0c50c04a37110e1fd9221854232e1b9f5e918 SHA512 ad2172bf30d196a7fc8c4fa176a5f5249a3cf65e5dcc2b6ab3d2681af70dc6cdd304e0b78b8fc886df6cab5f6c1b95af219fe9bd806634bbc1c1e4a6290a267a
 MISC metadata.xml 349 BLAKE2B 49f5b4e390ba8e82461e662b0ab228113caa86ba25683d6cea931936c4002627a4eca860fdf6fe77eb3209aeaa24a0d25b4e132d943267912a158d14a628dc66 SHA512 9f5ad281542dcca4ffae5d5f4c5659f47f83a340effe36eea06031721fffee77340bdd63905d47ad82b72f035aa906f6dc37a9188847406a2460726241c93462
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
index 1527539caa4d..0c93fcb1eb58 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index d72a463f6ea1..f479b63a6732 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
 DIST xcb-util-wm-0.4.2.tar.xz 285152 BLAKE2B 091bdfe318d0ab37df934dd4ea75382a8792577e60471dd6bfb3de8966a9ac9c25c8776a9fa7afb0a0b924f952ebc17084070f1fcfe9665cb5c0e1b2d576d39b SHA512 eab6588e6a47d28a3b25ecd13b5018529419db6b49c74458c093699b60a194933be1e1f6f7799abf03344f7ebc7af88586ff2935938d53644bdd5c763a7fa9b0
 EBUILD xcb-util-wm-0.4.1-r3.ebuild 556 BLAKE2B 56a680e11eb5055f49cb7a66add8672bef850fbc61dbb93f5502693177db94fe78309636aff0f8e61951a692cb5c2de5e86a11a996266af9349b82c950f872db SHA512 0ba1838703bb1f13f73b3fbb623712edf8bae3907196194621fc73b0eee8f7c57fd14b9797478511fb2098e8c269f1245ca248f95fa17eaa995c53432d5b8557
-EBUILD xcb-util-wm-0.4.2.ebuild 583 BLAKE2B 7d98d627dec45f8a3d6fa89ebe4a8ea8fa99beb90d188a144c576805bf380f1d889e2369343e06aa061da8c0997b4d48dd54cacff34545ec7ccfcbeef90bc215 SHA512 cad85e22f3a1e0c13d276e1d6354733834b7adf21c1c3afcb68fd62c39a906acca56a855f3c2d0f50ebcf9e9d7b45efd07899ac2ec7a02cd3b4629677c35826a
+EBUILD xcb-util-wm-0.4.2.ebuild 582 BLAKE2B 5ddb78b92c8dff781a781815904d07eafbbc29cee4e9deafbb5ae1283c878ef7883e641e50c5b153b0f7384319933155db852822fc28dd96997635a9c6be7c7f SHA512 0406ac8909481eaa2db9e98b5ac43272c917ab55a5382ca4b0dfa9fd446f5fae5d0c22eab1fc7f2b5bcea994f6a184f70001becd0c6cec05e2a187d10f456844
 MISC metadata.xml 340 BLAKE2B 73178674ca632e4da2c664fadb411eef0375dc8d9f3be935eaca1696dbe83af995dc5158403808f6377ff857191d15a606816acf5c569e87b95b26d1d2eaa2db SHA512 7ef425868fd0f352e8f88fb415427a5d98ec6cf5332f75af969d1a74a99f6bc2c1c6c9f3c649d7dcde72971e2171b45cacc6a08b0e1bf634cbd1bdb6248ca21a
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
index 760dfda8616e..94b5ea1384ae 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 567e9188c81a..28b7e66d8fe9 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index bcc19970520f..1cac79f36bd2 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -6,5 +6,5 @@ AUX imake-1.0.9-no-get-gcc.patch 1048 BLAKE2B 0ff949e2e12afcb59cefc81b60e9801d14
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
 DIST imake-1.0.9.tar.xz 153332 BLAKE2B d9de997016112833e50d1151448366c538b9796622630724552cc0476deed165621edc1a01318a83b577a85fcfc78b753e6fa9fbdf4c71413319abe542f1beca SHA512 e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
 EBUILD imake-1.0.8-r1.ebuild 676 BLAKE2B 9b48c875622fcb42052cc9b24e2b83f9ca52ba51013388b49666bf96cdce506417bff63b7254750e2815ce40c3e71f184ccf05b904db508b5eeba76c617abeeb SHA512 97a9f6a495354e3a32ecad68b7b3a6004e847d9152255a495bdcaaff42d18c98e4ea1ab27a3f68a359c177464f2f60184518d27b6413d94a04823c866ac9be7d
-EBUILD imake-1.0.9.ebuild 729 BLAKE2B e069ded9807a897b834f048a94d8c5a28583b5f19284cecf9a573046cc55505e4896cf1f84731c075ddc95759a7584a276011005d047c0e6acb1d388f9f7c0ff SHA512 17e8e0623744ee541a3e79b735a4ad6146cf62dff3770dab0d02dcc060344d4be939a4afa6cd7f946c9a9c52044f14aaa070f57eb6ad377068bd3d632be70734
+EBUILD imake-1.0.9.ebuild 728 BLAKE2B 314535157a2b33e011a9ae7c63cb66137e64630f97665bba0e8d003325193fc26024a8c2107dbaed209b4bdcacd80e0376c128826231df46848debd76edb577c SHA512 f7788b8c7f1ff099dac58ca0f235495d101562c30007d4c04994a3d730a1c311788443d41224730eb84bf410d90ef5207a19da01591634386b34ea2cb38c6792
 MISC metadata.xml 337 BLAKE2B 33b94ed7ed8c8068a9fa1e2e3a49b51760e5e19003102a8ff5b76a0f449cc77fbf2aacaa8351a39caf2ab538645eca7862a383e7e4413a59efa69dabf8950c32 SHA512 9e59ae6ff8bef63e98e08ce8eff2d35a1ed3b815b60140523f07f85ea62a3bad952deea65a822393628db1605f2a8ac5ba35c3bb277e85a3cb64dba74936f470
diff --git a/x11-misc/imake/imake-1.0.9.ebuild b/x11-misc/imake/imake-1.0.9.ebuild
index 8c51416260ea..c2494666dbdf 100644
--- a/x11-misc/imake/imake-1.0.9.ebuild
+++ b/x11-misc/imake/imake-1.0.9.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit toolchain-funcs xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index bc107b8b0879..d508598000d4 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,5 +1,5 @@
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
 DIST makedepend-1.0.7.tar.xz 140528 BLAKE2B 673f4a6e212d3929648e69698a1344ac9f803b20a7fb77ba73c052ee13e3a58741f08cc02f262fad51c3aafd8de1257f02c15fee9da6723e49d4658f29b7fec7 SHA512 fd575de737aa56ef8e475d1ddb7b2392e730ee1b23c0b853bbb21975b757c3fc56f94d57ecc5a784dceed2be653feb10909e86fd96fdc074b50fbbd0e27a19db
 EBUILD makedepend-1.0.6.ebuild 403 BLAKE2B 74a1bbc478bd21b67b23cd250d6537aff7be94916f1249fe8da5f37afa5a6e66858a0d60ec4b122affa349ee66e13ff78619ee42ce658593d8ea8ca6110b6afb SHA512 6486ab09ad4a850802bbe4f3dc61ebdd92c462098e43d6cb67a2a830d42a11cf23b3f01794a0900450479da210bc96cd18920abbd609cf8e406a06c3c7a3816f
-EBUILD makedepend-1.0.7.ebuild 423 BLAKE2B e8055b8d1dd6607d607163748a29c91252369c5139e334eb95344b98355ca99121176011965923062427443046adbba027e15ac2c38434399d6f003c917c2e02 SHA512 afc3a605a7b0e0674da54a8de1f1e2379683e1bee6c20631e5c70e59c7f15e40ca6174ef139e33ec16fe136219118d824d9f91cd1624708661f40f2b866f6aca
+EBUILD makedepend-1.0.7.ebuild 422 BLAKE2B c8ec1af070165a2d83ef84b6df0acba3be929cd5654f4ed9af8a23588de5744f2dd28af99980fb6ccf4ecf49e24f26aec24e082ef77ad77c37dcb00e619f3454 SHA512 850c522281b88e3894913266135ca23304f287a66ca6c571a6803e7e7225051161e4696b14cee17e496673917e4ae013c0fa971a4946fce3af92c7adfeb55565
 MISC metadata.xml 342 BLAKE2B a49c408048104b512588271539321c424bfc08a8f54bb82437429662bf85b3f5a09e3a93e0eb1c3a980d571cb08c1fbce58ab5f97f160923ff253c0608206056 SHA512 d2bab9cef77003c68547c0ccf1a454953d0d55edea087963d67f7b6e8ecfc78b811f8f740aa1a7d6374d5a417c66963427b9fe2b1fc1b88d2d1d669eae583d3a
diff --git a/x11-misc/makedepend/makedepend-1.0.7.ebuild b/x11-misc/makedepend/makedepend-1.0.7.ebuild
index a81eb29c2644..329e83efa162 100644
--- a/x11-misc/makedepend/makedepend-1.0.7.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index ecb577989919..400e19d77a1c 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,3 +1,3 @@
-DIST vdpauinfo-1.5.tar.gz 12246 BLAKE2B 5673eb6d00e501234cab3434ee06ef428495f86cf18304eed628e41dd0b17f8fe25aff8ef3bb896f4f70eefe2121446eae740c638b48b3ae1bc3547de4cb3102 SHA512 f3d359242443de919803ae0b8d89809c71e94d59d8ee9994f8f315036b829ad24030b75d953346989c1d0ddf436107041491e299c3212b013ad1d2b3c0571e59
-EBUILD vdpauinfo-1.5-r1.ebuild 606 BLAKE2B 827e399afd8d24622e1b5650a7efc52c55bdc227fdcfe68ada8a831c5c4e922ae2573e1dbdbe62453f9884c6b664d772323a4e3e906bf8f867dc34b0f774eb9e SHA512 719f02f26bdccc92afc21bc8502d5fddd6e21d6004946113eaa6bb281ede40917eb551181bd9abac89249e01b634d8d8c9cd057e17e34475c17014278e2001e1
+DIST vdpauinfo-1.5.tar.bz2 11851 BLAKE2B bb4ee88083fbdf718e3c0e427e6a9c0d5b56148feaf6fa9c7dbb07823f19df44eb7bd08c031d3a40e7929e6fd8fa5c1665dece41758c806cb7ab7c853b7fb3d2 SHA512 a41fd78983dbe5833142535a0860641523ca06e12f5fdf0ed25b6e5b3de82760a8fd8f72a489a596e4453905f614a62992c484d5b53220613827455cd78cfb31
+EBUILD vdpauinfo-1.5-r1.ebuild 607 BLAKE2B 85315c8f503c3d144218aba33c0cfa86e9bab1eff68af9ea6c26e13cfc7b821abbaaec9f445541e6647017c1b66633edf39b083c57729b4e94648723f6737883 SHA512 8641c53a483bc914a4e092f8ade3db6a7f49f6d24a2d9a8c671323c07a538a701c25f19064a35ae87f5cc25ca0eeb789ccf0ba1b9725678b0730db7c05eaaf72
 MISC metadata.xml 338 BLAKE2B 7298a6245d9ebdca8131c884ba50981200f2925520196d69d91ca5c4354227d94077609c5c639cf4157780fc5ae12605e43c0a00d81a1ad11be71a23efd9a481 SHA512 fef4e8a76eec429c6c5cfaada3b6dd48beb3707203937a027b8f0368e2f1159d0bc46e6eb6db0c20148306d29cbebca6e757d09318b28bb63c9d452bf9e2765c
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
index 1094701a0a2e..0a5e0bfd4ccd 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="Displays info about your card's VDPAU support"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/"
-SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 3378558a992d..7cdc7e9b9f8b 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,6 +1,6 @@
 DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
 DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
-EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2066 BLAKE2B f149d99306cf8df43776894b72b06b7173149f45abb0cb38a77e85dd08a63e445647d6532c2066bc9c760882891ca49af1b54fda97e79b1c949a80d264f8ab16 SHA512 22a6f7cb86e056f2dd0887b67562b1f849f9eed71cca16d67edb9a9e436a2941cdf8147d17ba9e536f5bac640a7759928acb08746d8f0e3d2b1c572b7565833a
-EBUILD xdg-utils-1.1.3_p20210805.ebuild 2301 BLAKE2B c9d53696b6b7fc86cfe090e6a718bbb7ff7cbe6109562a6304c8813f3e0f6da8a305857b5f623d667ecb5bfc3a8f4529f0d9c3ca660a96d813217f5060414d0c SHA512 e15e045d0f938638e8351e3bf57a4c4aa77c4ce8bcc849077cc847ff22ebb8b5007b67e87e2171baeb11b97c31a60ce47609c1d3fab669e1b480c5f17bbd5403
+EBUILD xdg-utils-1.1.3_p20200220-r5.ebuild 2075 BLAKE2B 299764eba14b1d6f5406abef797d2c28a6446e1e705b85c45d8b1b240039835c1d569088539cab2f92f1d7bcfcf5f3fdace40809f77b05d28561d443246c2870 SHA512 3422f1cb9ef212fc71a70e8f9f6f11e95b785958a16fd67c95f813e4939522b720cb66971483c09c7b2d86561a5c503208e8b6a3181032ad489af943508ab54c
+EBUILD xdg-utils-1.1.3_p20210805.ebuild 2310 BLAKE2B f56c24d95bb66e5ee34b2d201a83472bd1ab0f81586e2017afe1e2f72620404b31250038924d6b7266e473a8f85cd66b4529c9cc3a57e3e8010c21b2b10ea99c SHA512 6208c19056110e361a0dbefea246a8caaf38ed502b41558b5dc30787d7035660342039291e14c3e9f93a229623eb15771ac5a6b51cf7423034148a66f9c2819b
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
index ee52ffb43458..1ec5697fd2d0 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=app-text/xmlto-0.0.28-r3[text(+)]
-	virtual/awk
+	app-alternatives/awk
 "
 
 DOCS=( ChangeLog README RELEASE_NOTES TODO )
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
index baa74ea8d11d..930cb3204f98 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=app-text/xmlto-0.0.28-r3[text(+)]
-	virtual/awk
+	app-alternatives/awk
 "
 
 DOCS=( ChangeLog README RELEASE_NOTES TODO )
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 402f423ac583..b50b990f801a 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,6 @@
 DIST xkeyboard-config-2.36.tar.xz 880776 BLAKE2B 3ce6d9e5a1e763beb15614cd1b559ff6d56c2f6438b1c0680755a029ac90e48de4a939b1bcc0054a510cc0e08f6ffa6db98fecd4bf11e01510b151aa664425c3 SHA512 a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
 DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a28921d02218402ca0125e8644be04a14f897e357a224fed12f9a85c6d147b4fa659241004bf49ac16c19b7f5fceb2b6d3295 SHA512 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e
 EBUILD xkeyboard-config-2.36.ebuild 1030 BLAKE2B a0bcd6d3b409bfeeb9b987d57e7edd9dbc131ff7cd78cd2741def7c6a70581ea5fbafca2954d85779ece93731573e00dd259d46332b6b8def5f58d424696a6a5 SHA512 77b303d931dca500ae748271ebef479a793392d85da59c9fd5b565d74ce59a2d798ddf1a16d5ecd0e3c6678604b1b1760f91dd1c82a9f1b4ea5fcc57c4e65945
-EBUILD xkeyboard-config-2.37.ebuild 1032 BLAKE2B e34d3aa0f0e9ed4c1dd2ff7296fdb3dfdd51a185caec9d615097efb80ee7f25eb5790c759b57448185ff3248837a1baffd85c354f5611f53c93b012a91d2797e SHA512 0237c65905824c3781b6e88cc1d7dcde1932a0fdc270e11e73ccfe59d757d402f34da365603e427127b824bbb26bab70b82776fe02e3e44ad4788c3b5503abf4
+EBUILD xkeyboard-config-2.37.ebuild 1031 BLAKE2B ddb136aa9f4a1dc9aca1f779e98ff9de676a7585e09b858237f433bde6ee82266052561df3f109edcdf02fa4ee4f6eb5c84fad5132e6b114077fd0b87f6696c2 SHA512 e1d75843a22d08cbaf835046e8a46d009eef503d4b22fe3d79ad42038ac4615219801083d92e7a7019936a1c21151caadf87a3ba39cf9478441ca3923a922835
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
index 4a508d6fe733..b929e91d88ec 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${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 ~sparc-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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 4642a9bc2960..9db71ad50034 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 0dc820222170..3d34c6ab2311 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,6 +1,4 @@
-DIST kitty-0.26.4.tar.xz 4749148 BLAKE2B fe15d2bd3afda49fcdc911d0ada5824dffe7eac69cd22581b86f50b0d20330ef10bf567d4adfafe5e06d20f9d7a10c8acfcffb95a3d5c47c50327576d9600761 SHA512 4d3ef5ba2ca54d0f5cd84ece771297c19c05bd276fc235f92c76d469ad17e55b54de696dce38c9039ae9825c7609e03e937536261c4fb680e936865ee0e4441e
 DIST kitty-0.26.5.tar.xz 4749988 BLAKE2B 488969b4d7c6aed489a540a8e3bee183345fcfb7e05ae5604f4af40f0720ed931cff82cf389e2fa4015eed74762c0630481a99eeb9302c22c89c4f3e247170d4 SHA512 086ae03d0e382afbe3001e357ef51388c7a8e81fa5b4bf9ce8b123a7fc8bfff3bd68d074e926f540a1f2b83062baa831e44d29c017cabfe8221bebe49b64e808
-EBUILD kitty-shell-integration-0.26.4.ebuild 1483 BLAKE2B 8bb6bf5cbd3a11f5773f1783b5d6e8ed5bdac200a61e6df7326913081280f0e334b7c100cb09df05b6a3e99682fbb63117622671184b2cc2f12b87f975c345a0 SHA512 b032be5bdada3925e23bf44ad466b4aa1b51905715c6d5fef0781aeb634f1b728ad1429f75e4fcf8abffc6b88c975d73079037d32f909dfd91b38c8802095e04
 EBUILD kitty-shell-integration-0.26.5.ebuild 1483 BLAKE2B 8bb6bf5cbd3a11f5773f1783b5d6e8ed5bdac200a61e6df7326913081280f0e334b7c100cb09df05b6a3e99682fbb63117622671184b2cc2f12b87f975c345a0 SHA512 b032be5bdada3925e23bf44ad466b4aa1b51905715c6d5fef0781aeb634f1b728ad1429f75e4fcf8abffc6b88c975d73079037d32f909dfd91b38c8802095e04
 EBUILD kitty-shell-integration-9999.ebuild 1403 BLAKE2B 9f1e4aebc1103678d42ba5809c41848b2ace36e2ed0137bdb0f30048cb4372c61f80e509a8087a52b149fe25115ca8aaa511d4697459e1087bee65788055dd85 SHA512 d7674435c3d3d9cfd04d47889f9e0f1cb4e60a6dc3506529829b3782e958fc3cb18fe8b0a25463725128106d6ca8308a17ae961b184e13682a1b05852e22ce4e
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.4.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.4.ebuild
deleted file mode 100644
index 284f791cd143..000000000000
--- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-src_compile() { :; }
-
-src_install() {
-	# install the whole directory in the upstream suggested location
-	# for consistency (i.e. less variation between distros if someone
-	# ssh into Gentoo), then set symlinks to autoload where possible
-	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
-	insinto /usr/share/kitty
-	doins -r shell-integration
-
-	dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash
-
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
-	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
-
-	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
-	# zsh integration is handled automatically without needing to modify rc files,
-	# but may require user intervention depending on zsh invocation or if remote
-
-	# this is used internally by the ssh kitten and is not useful there
-	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
-}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index e0664e3a9ae5..03043a161fac 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,4 @@
-DIST kitty-0.26.4.tar.xz 4749148 BLAKE2B fe15d2bd3afda49fcdc911d0ada5824dffe7eac69cd22581b86f50b0d20330ef10bf567d4adfafe5e06d20f9d7a10c8acfcffb95a3d5c47c50327576d9600761 SHA512 4d3ef5ba2ca54d0f5cd84ece771297c19c05bd276fc235f92c76d469ad17e55b54de696dce38c9039ae9825c7609e03e937536261c4fb680e936865ee0e4441e
 DIST kitty-0.26.5.tar.xz 4749988 BLAKE2B 488969b4d7c6aed489a540a8e3bee183345fcfb7e05ae5604f4af40f0720ed931cff82cf389e2fa4015eed74762c0630481a99eeb9302c22c89c4f3e247170d4 SHA512 086ae03d0e382afbe3001e357ef51388c7a8e81fa5b4bf9ce8b123a7fc8bfff3bd68d074e926f540a1f2b83062baa831e44d29c017cabfe8221bebe49b64e808
-EBUILD kitty-terminfo-0.26.4.ebuild 625 BLAKE2B bd4f3df430b79ca1ad20d73d65969a1ddc8a2f2ebbc38a88c9c9f3658b8baaabf7046f9d6cadbf77e8d131ebc1b8ee30e9615df32b70d09ffbf58ea506fc993f SHA512 a21aec302968475896ab9e1621aeba6f6da4c154c89139e4936609bbddba7f1bd8058fdf0daa6faae436b45d6eb9438390d925f12c87669f6b6929083a50e4d9
 EBUILD kitty-terminfo-0.26.5.ebuild 625 BLAKE2B bd4f3df430b79ca1ad20d73d65969a1ddc8a2f2ebbc38a88c9c9f3658b8baaabf7046f9d6cadbf77e8d131ebc1b8ee30e9615df32b70d09ffbf58ea506fc993f SHA512 a21aec302968475896ab9e1621aeba6f6da4c154c89139e4936609bbddba7f1bd8058fdf0daa6faae436b45d6eb9438390d925f12c87669f6b6929083a50e4d9
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.26.4.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.4.ebuild
deleted file mode 100644
index 8e691381f9bd..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.26.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
-S="${WORKDIR}/kitty-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-RESTRICT="test" # intended to be ran on the full kitty package
-
-BDEPEND="sys-libs/ncurses"
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr/share/terminfo
-	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
-}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index fe8b6e39489a..ac65835a764c 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,8 +1,5 @@
-DIST kitty-0.26.4.tar.xz 4749148 BLAKE2B fe15d2bd3afda49fcdc911d0ada5824dffe7eac69cd22581b86f50b0d20330ef10bf567d4adfafe5e06d20f9d7a10c8acfcffb95a3d5c47c50327576d9600761 SHA512 4d3ef5ba2ca54d0f5cd84ece771297c19c05bd276fc235f92c76d469ad17e55b54de696dce38c9039ae9825c7609e03e937536261c4fb680e936865ee0e4441e
-DIST kitty-0.26.4.tar.xz.sig 566 BLAKE2B 8ac544b077cc30f811be665226e413e3074d3490b99b790c37ff871017131be76163a526f6c5eca6a711724975a4e3d6a6d897f2bacafac6b8f71f8ce141dd8d SHA512 f851daebc0c9d75f39c1e02a3ca14ab77f350c7f606e4e00f4513e084ca86e329dc2da033a6292aaedf683995932e83c58d273552d2afd26a0e541e89bdd4bf9
 DIST kitty-0.26.5.tar.xz 4749988 BLAKE2B 488969b4d7c6aed489a540a8e3bee183345fcfb7e05ae5604f4af40f0720ed931cff82cf389e2fa4015eed74762c0630481a99eeb9302c22c89c4f3e247170d4 SHA512 086ae03d0e382afbe3001e357ef51388c7a8e81fa5b4bf9ce8b123a7fc8bfff3bd68d074e926f540a1f2b83062baa831e44d29c017cabfe8221bebe49b64e808
 DIST kitty-0.26.5.tar.xz.sig 566 BLAKE2B 377202d46e66854e0cf1998506e0fafca54b33d85264e47c13aa4b98d272c786809375f1e277ec169291e06809f11b5b061ec1243a708711fa2350243ad1eca2 SHA512 0c691d8becff2b0f24e09b941d7315efaac831beacfed6f66b9186bde9c502f2ae86289f4b0d8fa6a34624dce7a1e958ba2d0502fd87003ba08b07fa07c6ae17
-EBUILD kitty-0.26.4.ebuild 3610 BLAKE2B 9e8b094a98eba2ecaf05d4e668548a1d739ae70549e4577390e9ae292416999952a6ddf91b8a59f9e400a41a64f3315d67e7c1a44a52fd9b1dedbbce4faa185f SHA512 93905872870522c7412f3ca884c8185f48804cf5f6b0f4b2ec595c5c62dede63251e453137c804113fd3f3cf51d6c21c41b6b2a68068e950ebbd293c354cbf05
 EBUILD kitty-0.26.5-r1.ebuild 3431 BLAKE2B dc4f1f64327be14c10779bdd46d36e36c728e2784f796157b738999e970d5cb14ab9b894a6109078a5e532857738191f1f2ef6860cf939ee722c75217263d788 SHA512 5bf95478b917f3241bc77e57692dd8f532c20aeb35f00b84bd9834c52a9c8220b166a12e9121272ecb92afd82bf9af679107a6c8142932f1c024989f08d9c113
 EBUILD kitty-9999.ebuild 3932 BLAKE2B 86fb6c0fc6dc67a19b0555aaaee87e3f009e1a01e2bd2a85628b9b161b637213fe80d79b25788d4052a2f0db745d582eea044a68e85abd2ff21892cdeb9bc04c SHA512 558f8acd42c128a3127278a797560458e9790e18b93012b12834c2f45d1cc2d6aa15afac70af3661709e961ec4df3be69866d9d975b33669ef811cc62ffe85dd
-MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
+MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
diff --git a/x11-terms/kitty/kitty-0.26.4.ebuild b/x11-terms/kitty/kitty-0.26.4.ebuild
deleted file mode 100644
index e097e42e5591..000000000000
--- a/x11-terms/kitty/kitty-0.26.4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
-		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
-	KEYWORDS="amd64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Fast, feature-rich, GPU-based terminal"
-HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+X test transfer wayland"
-REQUIRED_USE="
-	|| ( X wayland )
-	${PYTHON_REQUIRED_USE}"
-RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
-
-# dlopen: fontconfig,libglvnd
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/openssl:=
-	media-libs/fontconfig
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libglvnd[X?]
-	media-libs/libpng:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libxkbcommon[X?]
-	x11-misc/xkeyboard-config
-	~x11-terms/kitty-shell-integration-${PV}
-	~x11-terms/kitty-terminfo-${PV}
-	X? ( x11-libs/libX11 )
-	transfer? ( net-libs/librsync:= )
-	wayland? ( dev-libs/wayland )"
-DEPEND="
-	${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-	)
-	wayland? ( dev-libs/wayland-protocols )"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-libs/ncurses
-	virtual/pkgconfig
-	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
-	wayland? ( dev-util/wayland-scanner )"
-[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
-
-src_prepare() {
-	default
-
-	# seds unfortunately feel easier on maintainenance than patches here
-	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
-		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
-		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
-		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
-		-i setup.py || die
-
-	if use !transfer; then
-		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
-		rm -r kittens/transfer || die
-	fi
-
-	# test relies on 'who' command which doesn't detect users with pid-sandbox
-	rm kitty_tests/utmp.py || die
-
-	# test may fail/hang depending on environment and shell initialization scripts
-	rm kitty_tests/{shell_integration,ssh}.py || die
-
-	# skip docs for live version
-	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
-}
-
-src_compile() {
-	tc-export CC
-	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
-
-	local conf=(
-		--disable-link-time-optimization
-		--ignore-compiler-warnings
-		--libdir-name=$(get_libdir)
-		--shell-integration="enabled no-rc"
-		--update-check-interval=0
-		--verbose
-	)
-
-	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
-	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
-
-	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
-	rm -r linux-package/share/terminfo || die
-}
-
-src_test() {
-	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
-}
-
-src_install() {
-	insinto /usr
-	doins -r linux-package/.
-
-	fperms +x /usr/bin/kitty \
-		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
-	optfeature "audio-based terminal bell support" media-libs/libcanberra
-	optfeature "opening links from the terminal" x11-misc/xdg-utils
-}
diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
index 6bb38d37be8c..c4f584c5169f 100644
--- a/x11-terms/kitty/metadata.xml
+++ b/x11-terms/kitty/metadata.xml
@@ -13,9 +13,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="transfer">Enable transfer kitten using <pkg>net-libs/librsync</pkg></flag>
-	</use>
 	<upstream>
 		<remote-id type="github">kovidgoyal/kitty</remote-id>
 		<changelog>https://sw.kovidgoyal.net/kitty/changelog</changelog>
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index c9e3154b9080..892966feb054 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,5 @@
 DIST terminology-1.12.1.tar.xz 2722144 BLAKE2B ce6eea2fd6efe8a4a6d654f8e7899336b3bb7a1d2f1728c2ac2f1b367972c8b222e665309e2b704dd1f3bb774784d218789bcd8134348893a265c0e50fa855d9 SHA512 036f1e516d5f9c44185fc417266022bb4a3c34839451b2bd7ab64c9610e71cd1690faee014cf8364ceac12261cb9b57501446a3e6e58ac13f98f11064498a43b
+DIST terminology-1.13.0.tar.xz 2765572 BLAKE2B e918feeb848c9373f38a41a99893210e62fd47206d4c9557a0afcd65a25c978671ddcadbdf955b7514754bc6a47dd3c36ff867b14d3cbda48039b8ac6e8502b8 SHA512 95e8f8bdf51e63b07f7bc5bf1aead98b9bd34c58e13df29d4726f1a81e560d071119035aa94218632e840bc5146c3bc475641934eebd6c7e37e00bed94451beb
 EBUILD terminology-1.12.1-r1.ebuild 1115 BLAKE2B 2f66a03a7fc21fc8894c94f9e1a55a3474324f2e5bf238ace58e01c6111c342681844d26efb5a83ba34304af484f6a63aabcbe57af5e161574c761260ad3f28a SHA512 c8190862a7569dc949568de7e670cf1a932648dffe15c5363a74b9f82a23a90af846be9160c16b586c181fe1d93217e8c876549796801d4f41b17ce14942de3a
+EBUILD terminology-1.13.0.ebuild 1117 BLAKE2B bcdf250c1925d566ddd4e53419386274a01bd97a5cd9f733b8455f6e3b778774dd4c2f6292418ceb38e95d6762a6cdc1f16d1410f7f179bb684094bf92d3b68b SHA512 e245d9d0f96ea24109d1f368fa5d59cb4bd2f658672ad1a7035ed0d0a52d074652e4a9f7faa8af959a27553ef36472e70f60c1b9b2745779785bb3ab0d3bda76
 MISC metadata.xml 336 BLAKE2B 6f8e4a99a9941e3a9dba25832ae43998f1cc27e85c4535494f6762f99e915aa3be299cefdd9a8e9fcd1e5d934c87de826c64c72f1e74f4a49f57aa76de73595f SHA512 12190b1f38b235ba164b13cb7bac3f24fafc65a001c9cc5d7f24fbefed5ed5cb411a563ff57a54db722a3a79b9030d8eeaaaaafa4df79b0e2758393dc9332fa0
diff --git a/x11-terms/terminology/terminology-1.13.0.ebuild b/x11-terms/terminology/terminology-1.13.0.ebuild
new file mode 100644
index 000000000000..109a118568bb
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.13.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit meson python-any-r1 xdg
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/about-terminology"
+SRC_URI="https://download.enlightenment.org/rel/apps/terminology/${P}.tar.xz https://downloads.terminolo.gy/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="extras nls"
+
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	app-arch/lz4
+	>=dev-libs/efl-1.26.1[eet,fontconfig]"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/libintl
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix python shebangs for python-exec[-native-symlinks], #766081
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use nls)
+		$(meson_use extras tests)
+	)
+
+	meson_src_configure
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 695aae8093cd..972feb982151 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 0d70d6915206..0639ec650cd3 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,5 +1,5 @@
 DIST fvwm-crystal-3.7.1.tar.gz 5936306 BLAKE2B 3a47ddab10365faf13c4b9de8ac172b2f91073addd7799315a47901c10b28b6b16c89ccb9c4a313285cd1e9b40d6ecd8b563e8764bb063d249ceb54804d63ec7 SHA512 0e61bd190ab0b9f4c51b65e9bbeb3689c38127769166f90fc2eff655c68b11c60e67ef35417ed7e97d06bb549d2a87ba6785fc6530a5269d19c1243d3cbe27ed
 DIST fvwm-crystal-3.7.5.tar.gz 5962351 BLAKE2B b5a7458c5bc97846ba48e18168da05d0cda4f26b2f0252abcfd12953de4ac80b34a521759152d559fef59ab53e5f252434d1f1840a779271fc9fffd7ec8632b0 SHA512 333eeeabf1b7b88e1ce7ba5e018a013471db215214b5d9bd86d0f0e107d7443f89bc409e23f3ef4a61c9ced63b862614507cb5ae74063f14d9e0d8b1eb97186b
-EBUILD fvwm-crystal-3.7.1.ebuild 2190 BLAKE2B 640654ac6179355f68adaa779f82b4ef9558301809695c28d4106932e7c21814ae3def6f11a4f23b2c50abae2617debd9f17c773805276a011465618079dbaec SHA512 be43c0f199e50b7ef1c687c8813c87e45001d937d6e3a59c85c497f507eeedc067da1d65142bca4896ff4c376431e5b8be246ac025253b5813bed92408408960
-EBUILD fvwm-crystal-3.7.5.ebuild 2224 BLAKE2B 1563625ceaa51daead78a1b7bf4534bd1e0c4a052aded08a27d43e61a9083de7436a99c01416f65e196faa3d5a64a49b5f2643e36b68843e89643b114b1d9b62 SHA512 939aa66ccccdf444644ae3b80c53e64f7b28680cd41e221e9021e95db0598977104badbe4afa66ff2ca1c1e873a845696885dd463c623387d939b1aa73050254
+EBUILD fvwm-crystal-3.7.1.ebuild 2199 BLAKE2B 36583baf8022ddb848cce04ac8888ad0a188d84ec4dbedda2c392927bbb21e7d59b88e4aab29470b25adf5b24972e154b217c3105ce9b46ee77b2eec1f30da51 SHA512 357718d2cacf672c3d68e5c18e37709ff3edc88d1de8e066726b704e3cbb585cddfdde97b81feed83999c2d70c6d216c55bfdcebba244bd6b6585eaa99b9bae0
+EBUILD fvwm-crystal-3.7.5.ebuild 2233 BLAKE2B 6bbcda57b4ee6a28ce036703303548d48b13653d42fbfa99a2779ddf73d2baef2d66f84f01d4a046604c4c55446aa785bf6d3c797a0929969bec35c8ed018b20 SHA512 a6732b7c3245e2c82d69871e93d702be0bf3050861f4e83d8670417ee6cd04881625a333c70ca529bd4230ae81567e8672a0eeea791392edd5548da60dabf3dc
 MISC metadata.xml 1258 BLAKE2B 87ffa421c8884bd447097d404d1bb21264e5b86f620ab554ea4854d68a0b5c62bcfa86f4c1f8ed85b36e56f894f36b63ba675e2b56806013f38dc60a643f1d1c SHA512 7b191ab2ebe7aab32158d167fb5a0b3aa2e0b8cce1b2f7324a02f775bb7a8e23f3f8c74eb1ab1ab00f82887a64f1fa9a1274ebb2741dce8a5a511ad91cd3f113
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild
index b18a36127139..e0a29913a1d9 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
 	|| ( x11-misc/hsetroot media-gfx/feh )
 	sys-apps/sed
 	sys-devel/bc
-	virtual/awk
+	app-alternatives/awk
 	x11-apps/xwd
 	media-sound/alsa-utils"
 
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
index 67e6e4b1901e..869b00cde05b 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.5.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
 	|| ( x11-misc/hsetroot media-gfx/feh )
 	sys-apps/sed
 	sys-devel/bc
-	virtual/awk
+	app-alternatives/awk
 	x11-apps/xwd
 	media-sound/alsa-utils"
 
diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index 2b91a81b2a3f..0e9b48794aeb 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,4 +1,4 @@
 AUX wm-icons-0.4.0-build.patch 673 BLAKE2B a34fd33584928874f4c0a24a34842b640dc1ab4ad030a77d9d596bab1c5eea4cf182c2c06074fe2994cbb7ed09641b43ed5683f51d4976174f608f0fb3cc50d9 SHA512 c55c6b94cfbe4d7502db4c9bb5727fe9858865f7205c06959b483c9a3714d41d22508710322bd17b8aae3259f7b5eb9b01840bb540add3de5d8543b8c72d0b79
 DIST wm-icons-0.4.0.tar.bz2 3433177 BLAKE2B d5d04aaa8da0f0bc8c4887de77febd5a7546981c2f7da0b0869bb2ce9e080488c57ddc4ed89374bb24c0b708c3ac77a6890da4a3624cd98db7e4031336098d98 SHA512 9b21dbb1ac697520792c1e8bfc6b06d4d9933828759571b7af978a670223841fcfe9adcf7f945de3f3a4a39e0d991045d6086be9b293bd89b67cf937262d53a5
-EBUILD wm-icons-0.4.0.ebuild 1224 BLAKE2B cc0aaf6b9667795909fed38712c8ba163a5ef58c20b9a3ed334b50ace7c45d76162896fc9872a5e672233ddf590434807a86473396b86fafa88ca60e9363aad9 SHA512 321055928b8cf2713b4c49ff75be99ed41202b5787b20f6da0ceaa5ef034a394ea7f43a73afc62ddfc818450c8612b9d132e06814f1e826a83a8569c10700deb
+EBUILD wm-icons-0.4.0.ebuild 1233 BLAKE2B 0a0e3369b7e85702fc069a4ad7da86405ba48f67ebf334328afdb43e541ba2f78b5c823d722c1ce923c28f79f3dcb4e2afd52db76247fbaa508d159904f163e4 SHA512 09f28c64aa385f43851a918678c1d9af80395140b333db68e3fe06c8c5a32c62d5e0774b172220a5117037272013a86ca14ee0a38ae65e9651fafa7fb679a6c6
 MISC metadata.xml 414 BLAKE2B 0ca979871246c013b4d697f99b9d841b3dec68a5b16cd92b9824cc6d5732d72869237a1a29ae42f3e10ffee1d5c223ffd1755bb58c60adbb86b52956a7423107 SHA512 e5135e393f4eb1b44f6c4f1d689cdfd7f7367b0226da99e6175ee6fc3631de3dad7a3b1cbaf830a4c8e5489034ef2184ad98bcd88882d4d02f8cc9723ce652d1
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index 2c59b902ddf6..7f6742a7bd1d 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
-	virtual/awk
+	app-alternatives/awk
 	dev-lang/perl
 "
 DEPEND="${RDEPEND}"
author	V3n3RiX <venerix@koprulu.sector>	2022-12-02 08:55:38 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-02 08:55:38 +0000
commit	5a1e5a6812ca9c9555657cce48fe09d2ffa44401 (patch)
tree	5c040bbee9184b24f26b05031a2448e62f6df38a
parent	2c4066122b66fa1eb3e37846f9a6e14529a553d8 (diff)