gentoo auto-resync : 17:03:2023 - 12:27:30

427 files changed, 969 insertions, 5478 deletions

diff --git a/Manifest b/Manifest
index d3538e4274f0..c1b7c813a9a5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29444 BLAKE2B bcbc06987c767e1f69b6c4a06306e02dcb5ec6e74b452c43eb9ffb289e35fecc929f6b85338df2ca355beb9cd032f224d13db33ad6cfcef2289cbf974555aaa7 SHA512 3a312a5236f271765d0f520e9c48d83294e4c31e487a5b0cb0bf55130a3c89967788d4eaca89613a9efd4b9809e7d622b3636c13c3226047cec693f57c939cb3
-TIMESTAMP 2023-03-17T06:09:46Z
+MANIFEST Manifest.files.gz 29471 BLAKE2B 97020182559352fcabecae079adc7f73da5dc97bde1e18a109cdc87361b1769e43bb7c67b542305507bb77c25377a69ee24b69f3301bece4342ebdadcadad38a SHA512 f02cced8077ffc1db301d6999c0871f4f969e2f33ed5b504a42f6bc3ada1631a31ffbc9f26adebff2602760a8bd0aca6cf5de595a88d62d20d291c755b63aebb
+TIMESTAMP 2023-03-17T12:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUBCpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUWIxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klADGw//fGzik3x33Xd+tfFXwYsKeuuDFYF9fwrMDGpugD0Qbq1Sbn5J4J9fDVVV
-rvj0Qh9NSiXynhUcu4eNnCJz5rU/nhSsLeXjKPpNZF4l55dd7d1Y/imEd0H/bjZ9
-5aRIA45H7nPTKng6nwOHS/eE2KgBCT1h9u308DUHHHAk9AFhFI7JwoHoVvIsbBz7
-HbWcAaetAvoDgLwPnLzzcVDyr/ubFetgrgyANZ8ht9c/NDY52b4a0IOkvJQ8mpOM
-E9DgcLpVbzDP4kvVdPJ3EMhEvAw+oKyDS9RxjwhS809Q3Jn/ln68n9GGEa9v4ztU
-Uc7hY/f2lIHpJT8E+uvFrsgZhBtaM6/VUuruQrlicwg/YiblDxJ6TO+hSZYJrF7b
-gyNKsWvV9qy/BF7LW7Y2VW/xoPXta9TCiMUIbxShaqD7J2i0TOzlbz8nu/oKE++r
-IsDfZk7ZNghRcZjdnfOHiTXxt0305U/8J49XTyKbXr2ZcYolHxSd0kDiyONEbzd3
-q5HLTXkfOsDdFpUbhllDJ5QG+jTRUWp2n4zL3cLU/BVV072TdptTNBw75U13fhEg
-5Q9sz1dWs4rGAiiR0OmrpCU28EQy6KpqjeP5totweaeqloUqFbMw8Cl8p+3m0G27
-9AbSr8vDvW4slGfDkEt5r+DVHGpndFjAGV1DU2cVZriqmd6C16M=
-=3DH2
+klDa5g//emiPCpvxxko2eUXJBGbvWlwbFRgedMFpF+5Bgv5wRvxascJaOswejm3A
+aAje+aPXC28bzTsoxeIthGR2OuBCTUMerL6cmVGoAA/WgFHqSQ0jyrQwmXOsE9yt
+4lkyiRm6pCpCBW3YUMhGhVx6LQ2pyyOjwfgf7Gqvhz9jyC5IPjoEfTbYsceX36gu
+xfDSqU1JaJYBCcmMqNtQWf88WQjh8P8HdzsGmxwAMDla88Ylt08eJQur5XCyoc1a
+Xf1tH+PKjDPNzgkOboJ64X3jxtFjT6kcuE0m1JydzfQe9KSET+zGAV1Hq9SqorQ8
+MqHLejnuhHzKyu1Y9ASQuPmzehh3NaUnF38PS1oRCrdzF0xoUye/JOb1VrHJ8kB8
+QmlinZvQJLGUNqPkARd55O7qAqBXzTp56Oe2ysJXz+YezCU6irQ8KQNqhxxj2LJh
+xusjq5exdKBknHbC1L65406HZhJmwbRVrQbU05B5W0a4o4e1CN1zIHVRsiOp3ifi
+PtBDGDDUqJJOblIONJDAAPpAIfTTNwVS8HWvlxH3ewISBUdjcehdheHdFahGJU+M
+iK+crkt3MoUuK44+Qwv8ko9wWbNDlj1UIznWEBmjyfJ5WjvpmnnfsxU3rHK/otYd
+wuTOyy2X4YspeqNWT5VJ4V62E43jxx+tfDwORSImx/BjnSd0h2I=
+=OIYu
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 929c97d83648..59ecb3a8886e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7aae0262d9ea..f506b85a25a8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 8cf3a897d491..06b2d5f35867 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -2,5 +2,5 @@ AUX entr-5.3-no-which.patch 495 BLAKE2B ca5ba048e53c4cdee12b88d792e5e7b6e5fae218
 DIST entr-5.2.tar.gz 25834 BLAKE2B c14eddaaf26994679991c43b38dcea0f1cbf53ce517af462cfed9dea2c914d9c1719053cb3b9f28f04d0cbf8719fe5612963c1428832e02bd55545ba33c72556 SHA512 b12310b6695f0b3d3d830b651dd182ddf2321aad38f569066cc2e5b17570070e48eb4900725c88c1d31a8ff71099aba78fb7508ad60706265cbdf8f29257eaaa
 DIST entr-5.3.tar.gz 20905 BLAKE2B 79b4c39ee3f9530db1d8a6cd62a6aa925e201d6b5b370b25c3884b160a83658688204005db612b1d18743ba39f0de6ccad8492910142ebfff7b550a5ec48516d SHA512 b160cb60de99a743226b472256d937ef6ace54f5350a83420f59ac2706cd0fb042d6f85fcac6c73e76c161c6225b956df8b00156dea9ce55d8b8225e8ca13e7f
 EBUILD entr-5.2.ebuild 611 BLAKE2B ae084f4e1104a3e8652ae939bc338cb36777ef2f380c328d449217a42caa9f0734369c1f872301732742b0845ac9fbf7989049119eb4196baf9711014cfd2f8d SHA512 9e07fe4c426f03c751e52c7f94ec0f0ee5799755e9cae56c47067e15fbc14898e6104fc1f2028b4efdc5f89dc703a8cc95dd5dd4ef786c9707bb97b6923431e9
-EBUILD entr-5.3-r1.ebuild 736 BLAKE2B 86d6d5bf7affba39e888f194737324dd6eadfc52274592a2d50f7a9577ad8c36b5e816043ac6286893eb11e64bc93ea48a7828d66513dd429935d8c4fb5e71db SHA512 8541d8585f5da019d5b265714053b9c5c1fe854e8d14c8039b7394a21e2c0ddbc6485fade34c53164dfc838674a5fcf6d13ed09ce082f53cace377678fa037e7
+EBUILD entr-5.3-r1.ebuild 735 BLAKE2B 8b7dd24df4c35bda9c5043db25a6df372a7a28773f908556c3a7341a5a8a890d2b86533e0576c212e31db7c917cd9426fd530f79f4d0fbfb03368b07281710ed SHA512 db81c3c5fbea27eeb47f4dd2a36b54deb8ab1567df9376bde2660d1a97e6f4444dc50644409350908d27cca4c8b26fe1cca3fda49a5e98f5cb72c42ad61bbd72
 MISC metadata.xml 706 BLAKE2B d01cfcb5fccc39dfa4c298f3f741c9360ac6c77926bda0d3ade3db29e8c08a4a7a42a5d62c9c05eef73172c60aa7dba01da67747b8048dbb2b99a7af798a374b SHA512 d1ecfec008b55545b5a1317968a2d1067b72ef3f8a18d2473635994d6e47cb57b01dfb27c55e3dd3b38298a5657d12fb63c12ec47b127087d7900069d46fd593
diff --git a/app-admin/entr/entr-5.3-r1.ebuild b/app-admin/entr/entr-5.3-r1.ebuild
index 142efed43b1f..848e44370ac6 100644
--- a/app-admin/entr/entr-5.3-r1.ebuild
+++ b/app-admin/entr/entr-5.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index fac413bd9c6b..4c5ce9789dc6 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.65.0.gh.tar.gz 5540778 BLAKE2B 904d43a70d3aa27bb6fafca685d5bf01a9d918e2141d25266561016a91fc4609aebb15d5aa5e8f3cc771d0faf8ad69eddad58a64861d09295ef95b738b458f84 SHA512 48c5f70e7390edbfa8603d4eb9f94dc7654e3f2c861aaf8a1d75e18a9a27c101a020ddd61d6ed9a67698cbc0a851b772c40d871f4b2c0dca9948ea2f6767efbe
-EBUILD exo-1.65.0.ebuild 763 BLAKE2B e97494f3d636b940f860bd553a141b5c1cae0ba8dac343789774c8d3adc96b3ed3bacb5479e3bc4d418a66658e5b30ddb9c9339b21402633d374ab8ccb066d80 SHA512 23cc94f4feb80958e40fe21a469a65ed65a497b3c472930df8597cc62694aa4b117fc08d054dfc93ede708662a83509005c43c3bceabad902ef31c9e558660d8
+DIST exo-1.66.0.gh.tar.gz 5543430 BLAKE2B 26b52cfb118219fa4ee1203cf96c5cbe321eaee86ddbca31ecc9ceb287744b08cbeed659dbb54f8ffa4deadcb03fdea810c24dea11dd1cbbb3f1d1aa3220669e SHA512 3886f2e73d8a6ae41cbbdeb390c4f3036537249d61507cf7e397feeb588bfa70498a49e379933bffe16ef5b7df2018f1b5e975717adb8c65efb8c077a411d15d
+EBUILD exo-1.66.0.ebuild 763 BLAKE2B e97494f3d636b940f860bd553a141b5c1cae0ba8dac343789774c8d3adc96b3ed3bacb5479e3bc4d418a66658e5b30ddb9c9339b21402633d374ab8ccb066d80 SHA512 23cc94f4feb80958e40fe21a469a65ed65a497b3c472930df8597cc62694aa4b117fc08d054dfc93ede708662a83509005c43c3bceabad902ef31c9e558660d8
 MISC metadata.xml 334 BLAKE2B 230d1a47a3e39f796c16a9e9a622fbc27560c951da0c49adf7aca135970c0c944f42da7eb624c7193d44830c72cf95da9d69d977562853de6a00fd8fb6408977 SHA512 cd1366d99abc260c6f2899000e2a517be9a4c43e921078764fdc996871df34c1827e512087c3eb6f95bf3b685c2f34cbc1f1462eaa303a948640a362b4501b01
diff --git a/app-admin/exo/exo-1.65.0.ebuild b/app-admin/exo/exo-1.66.0.ebuild
index 8b7ec86e5d08..8b7ec86e5d08 100644
--- a/app-admin/exo/exo-1.65.0.ebuild
+++ b/app-admin/exo/exo-1.66.0.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 7e26753097ce..4db63d04b3e1 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index c505362d2c16..795f45c55b7b 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -5,6 +5,6 @@ AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99
 AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329a4931487cdff54ab8c77ae302af6bc741da3db61bc34b416d29615808799c8a4c5b39a293021dc1cc16642461037fcb367507ceadcc4456565715 SHA512 704a87fd4b5e50356ac6a0ad68aec04eebb2030d9818c9e23a40f2e621d6e2d5e5660b81997b459e67a8059a0d88a254a41baa833806ce99268ee24b1190ae0b
 AUX trousers-0.3.15-tspi-drop-the-use-of-getpwent_r.patch 2114 BLAKE2B a24415a49a81376303d96654eb5147db5843865a139f2f8f226f3f6d647b4a78c1314ee17384809020fca514117b6aaa43f057fad3e3ba0008133db56109b0e3 SHA512 5402a8c3b41fe5f53d8da29a58e5052990ba254b05c4b2455e5068c0d0ca52513e3b29c6f344abd59c0cefd2192077c194628955154d7474e4f6b3c8464dd59b
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
-EBUILD trousers-0.3.15-r1.ebuild 1600 BLAKE2B 0b47918d58b924d5d8cb80c4b16abfaccab6952bbb47566a12647c7c16c924b2a532d720aec2be92a3b7e959e2819d057d6dfe70c4fbc6198394625dc9d59776 SHA512 3d3bea454af9f36fd68df36e923b2999d99ad43f3d23b7774d6fb39fcdaf57e299700859b10b71e3f347f0a4f973c1cd18056140f61c2f4e74a92f55dba465fe
+EBUILD trousers-0.3.15-r1.ebuild 1598 BLAKE2B 752d525bb474cc06912d55ad458978ba7b2286eda61aaa722c1324393e91253db83d08554436eb35ff0c1940da4f5d513c226ae13426747aab815e9d41ff84d3 SHA512 aa3dd2f3612bf5ed01d766fdbf1e1bd28e20f7a5f82155a5aaa2c3cc18d4c86325980cab13542d761a046b409cd4a24b3543bb2293d8aaaa19ccc595a9c2543e
 EBUILD trousers-0.3.15.ebuild 1537 BLAKE2B d25c6df85b82c68da044c52b46cb551b8071b10ade85f868fb526d6763ae721d8d582c059814f2bd9f66099ec034fe37db4b6d9b095a936acf49509450f6d64b SHA512 9d06c08b97b57cbef371c10d46cdb389848fe15514d5750257f0cd6def5c0924f761978e157448d4720a546b9cb0e2b780a6292347d92a9370c40c6afe1c7c08
 MISC metadata.xml 542 BLAKE2B 07459ff82ec6f21116e860820a212a751bd07fcad1b175417d8d3b12709c870c523776e228c19aa7f824ac13d304afb533c697c22551ef977b3b9c687d2f6b00 SHA512 c980dfc26aaf0c6718fb9088d91296760db245807f0293a6c7abe412774e9bc297c401153df71ebeeddbc28e92441e3e1e78a5e16c5fca8d3445fe0558faadb1
diff --git a/app-crypt/trousers/trousers-0.3.15-r1.ebuild b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
index fd92b70007d2..b3e0685ab946 100644
--- a/app-crypt/trousers/trousers-0.3.15-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~x86"
 IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 79734364485a..b3b38afc4e3e 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 219ab4fc5ea2..66dff038ac58 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -3,13 +3,7 @@ AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 AUX scribus-1.5.8-cmake.patch 1023 BLAKE2B 684765783eda135aa9f1d687aafe6e591f94e5d6bd8fb714a815c3bd5474dd30e075a82eb53fb0492466e201a49e2c72c83627c206d2c6dbc33f5d6f22e708fc SHA512 747d5159b9b9c3d74c0c209e9ce6e00bd929d9d6891c7913ed03904b73e5fa25d811cdc365730d8df06c1ee156ae2dbf671ebda6ecfdf48171bbbafb3d15a356
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
-AUX scribus-1.5.8-poppler-22.03.0.patch 2176 BLAKE2B 72f636999677cb166b96ba35896887daa71e1302081698c8b6a70ecc0d4a6e5c6a5dba41ff911d2bbad76ae17b20483050ba71595948e3d3097026506390e67c SHA512 86ea87f3a31ba5729e7c3f18ddcfcbe706d824c80d3fad85d6ea296ca6468e8f19964d6b6a771b5a8bc9deb1ed0b0baf4a0d2253aa562acad0c65e71c3f2e448
-AUX scribus-1.5.8-poppler-22.04.0.patch 11352 BLAKE2B 392bf170c922c3e47167da287d86d63bbb3110c09bf68c40f3c55ae5886d72b05032c4ef746fbcf0f1934991482ed7891177956229834731e73bdadb292cbc98 SHA512 f05a3607702df1b398e8fdcd913bab761606aeff12e359df0df98d2f8fb2f41f266776d4ba10be9f8a745de6ec70678f8340dc1f8fee85b9bbc2a527d318b5e2
-AUX scribus-1.5.8-poppler-22.09.0.patch 677 BLAKE2B c6f351551e725f3e9d455cc807ceef52dcd81a8eb586485c94c0b4ac16c88be63da377d0558f6d9b881fe28302f8a9cf7a508be11ce08a60e69833dd33060166 SHA512 600a9454dbe70a85f1a675db7a1c88f5ab88765b3bfd1b37ca6298e2d72b299c90e7117903c419bbe71f654172deac9eb5d0def55b19282c3b4a2d8f06832d8c
-AUX scribus-1.5.8-poppler-22.2.0-1.patch 3899 BLAKE2B 616ded940828b14309b1dca597b5b209da3374e41aad01ed3a204888c3ad3ff25fce61bdfa69c947ead67b0a9cbe11f2e4fbdb6054f02bd251477830ddafd375 SHA512 7a5e21cc98bb7d87c326a8576e6ccf368d5fc64538896f5aedcb13598f2aa11cc6f999011e6920f0bf6116e46f5469a713bb7f04fa8c2ca308b0dd07f2c088af
-AUX scribus-1.5.8-poppler-22.2.0-2.patch 1190 BLAKE2B 5eb29f6246d157f14af0a12bf2234f5981bbd012253ac867a499d2fa3c96221724c060af5549731d00ab96ee67dfd18a26662d601d59a5458fd39c69f022c73e SHA512 826f671ae67e157a6a71befaac77b6fa1888fbbd3c708a3d412d01bfe28a9d3b268ecf33b05fa94390904a140b0eba1e46e712024a02e0ec33933df2a711a611
 DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20 SHA512 ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d
 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
-EBUILD scribus-1.5.8-r4.ebuild 4393 BLAKE2B 9541ae29d27affa3378e444a9ba7e387f7cec8ec5efd9e3e9656fc3dd70cb08c897131bc5eab89ebeb6e45f4b31e384a320ae2dd5103d5cc4a1c2db9f701ebcd SHA512 31151ee60a170dfa808fc20361be670a239539919e91a00a634855cfa907943326f41a41202171ab70756dd8fabbd1931e8f17e7515c544399229bb661a0233f
 EBUILD scribus-1.5.8-r5.ebuild 4299 BLAKE2B 981f8e02836e922df9c15953d4ea1ae9167d08f48c0f1a41d502e9ab160308177b3149a465855add49eb06a2c6a8274e0dd3d6aaa8977f26cdc8f52a558969c5 SHA512 c7c118f984d00ae5d7e09809e05a8f64a8dae7a3cde1b37454cc6ebdddb43fc1dfbb6030f919918db5bd552866510eefd01d50846d6cc082ada823c4f32bafc7
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
deleted file mode 100644
index f7a0c03fdd96..000000000000
--- a/app-office/scribus/files/scribus-1.5.8-poppler-22.03.0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Wed, 2 Mar 2022 22:22:53 +0000
-Subject: [PATCH] #16764: Build break with poppler 22.03.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/importpdf.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
-index 154e58a3f0..392dcd9e64 100644
---- a/scribus/plugins/import/pdf/importpdf.cpp
-+++ b/scribus/plugins/import/pdf/importpdf.cpp
-@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
- #endif

- 	globalParams->setErrQuiet(gTrue);

- 

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)

-+	PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };

-+#else

- 	PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};

-+#endif

- 	if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)

- 		return QImage();

- 

-@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn)
- 	globalParams->setErrQuiet(gTrue);

- //	globalParams->setPrintCommands(gTrue);

- 	QList<OptionalContentGroup*> ocgGroups;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)

-+	auto pdfDoc = std::make_unique<PDFDoc>(std::make_unique<GooString>(fname));

-+#else

- 	auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));

-+#endif

- 	if (pdfDoc)

- 	{

- 		if (pdfDoc->getErrorCode() == errEncrypted)

-@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn)
- #else

- 				auto fname = new GooString(QFile::encodeName(fn).data());

- #endif

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)

-+				std::optional<GooString> userPW(std::in_place, text.toLocal8Bit().data());

-+				pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), userPW, userPW, nullptr));

-+#else

- 				auto userPW = new GooString(text.toLocal8Bit().data());

- 				pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));

-+#endif

- 				qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));

- 			}

- 			if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))

diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
deleted file mode 100644
index 290484e7e872..000000000000
--- a/app-office/scribus/files/scribus-1.5.8-poppler-22.04.0.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-https://bugs.gentoo.org/843287
-https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch
-
-From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Fri, 1 Apr 2022 23:52:32 +0000
-Subject: [PATCH] Fix build with poppler 22.04.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@25074 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 123 ++++++++++++++---------
- 1 file changed, 78 insertions(+), 45 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index e20a81f99e..5626fe3477 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s)
- 	int shade = 100;

- 	currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);

- 	fontSize = state->getFontSize();

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+	if (state->getFont() && state->getFont()->getName())

-+		fontName = new GooString(state->getFont()->getName().value());

-+#else

- 	if (state->getFont())

- 		fontName = state->getFont()->getName()->copy();

-+#endif

- 	itemText = s->copy();

- }

- 

-@@ -357,7 +362,12 @@ std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key
- GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)

- {

- 	SlaOutputDev *dev = (SlaOutputDev*)user_data;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+	const PDFRectangle& annotRect = annota->getRect();;

-+	const PDFRectangle* box = &annotRect;

-+#else

- 	PDFRectangle *box = annota->getRect();

-+#endif

- 	double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX;

- 	double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;

- 	double width = box->x2 - box->x1;

-@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
- 			if (apa || !achar)

- 			{

- 				AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors);

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+				const PDFRectangle& annotaRect = annota->getRect();

-+				Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);

-+#else

- 				Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);

-+#endif

- 				ano->draw(gfx, false);

- 				if (!bgFound)

- 					m_currColorFill = annotOutDev->currColorFill;

-@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
- 

- void SlaOutputDev::updateFont(GfxState *state)

- {

--	GfxFont *gfxFont;

--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+	std::optional<GfxFontLoc> fontLoc;

-+	std::string fileName;

-+	std::unique_ptr<FoFiTrueType> ff;

-+	std::optional<std::vector<unsigned char>> tmpBuf;

-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

- 	std::optional<GfxFontLoc> fontLoc;

- 	const GooString * fileName = nullptr;

- 	std::unique_ptr<FoFiTrueType> ff;

-+	char* tmpBuf = nullptr;

- #else

- 	GfxFontLoc * fontLoc = nullptr;

- 	GooString * fileName = nullptr;

- 	FoFiTrueType * ff = nullptr;

-+	char* tmpBuf = nullptr;

- #endif

- 	GfxFontType fontType;

- 	SlaOutFontFileID *id;

- 	SplashFontFile *fontFile;

- 	SplashFontSrc *fontsrc = nullptr;

- 	Object refObj, strObj;

--	char *tmpBuf = nullptr;

- 	int tmpBufLen = 0;

- 	int *codeToGID = nullptr;

- 	const double *textMat = nullptr;

-@@ -2943,7 +2963,11 @@ void SlaOutputDev::updateFont(GfxState *state)
- 

- 	m_font = nullptr;

- 

--	gfxFont = state->getFont();

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+	GfxFont* gfxFont = state->getFont().get();

-+#else

-+	GfxFont* gfxFont = state->getFont();

-+#endif

- 	if (!gfxFont)

- 		goto err1;

- 

-@@ -2968,15 +2992,23 @@ void SlaOutputDev::updateFont(GfxState *state)
- 		if (fontLoc->locType == gfxFontLocEmbedded)

- 		{

- 			// if there is an embedded font, read it to memory

--			tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+			tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef());

- 			if (! tmpBuf)

- 				goto err2;

-+#else

-+			tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);

-+			if (!tmpBuf)

-+				goto err2;

-+#endif

- 

- 			// external font

- 		}

- 		else

- 		{ // gfxFontLocExternal

--#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+			fileName = fontLoc->path;

-+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

- 			fileName = fontLoc->pathAsGooString();

- #else

- 			fileName = fontLoc->path;

-@@ -2985,52 +3017,54 @@ void SlaOutputDev::updateFont(GfxState *state)
- 		}

- 

- 		fontsrc = new SplashFontSrc;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+		if (!fileName.empty())

-+			fontsrc->setFile(fileName);

-+		else

-+			fontsrc->setBuf(std::move(tmpBuf.value()));

-+#else

- 		if (fileName)

- 			fontsrc->setFile(fileName, gFalse);

- 		else

- 			fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);

-+#endif

- 

- 		// load the font file

- 		switch (fontType) {

- 		case fontType1:

--			if (!(fontFile = m_fontEngine->loadType1Font(

--				id,

--				fontsrc,

--				(const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

-+			if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

- 			{

--				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

--				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

- 			break;

- 		case fontType1C:

--			if (!(fontFile = m_fontEngine->loadType1CFont(

--							id,

--							fontsrc,

--							(const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

-+			if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

- 			{

--				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

--				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

- 			break;

- 		case fontType1COT:

--			if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(

--							id,

--							fontsrc,

--							(const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

-+			if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))

- 			{

--				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

--				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

- 			break;

- 		case fontTrueType:

- 		case fontTrueTypeOT:

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+			if (!fileName.empty())

-+				ff = FoFiTrueType::load(fileName.c_str());

-+			else

-+				ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());

-+#else

- 			if (fileName)

- 				ff = FoFiTrueType::load(fileName->getCString());

- 			else

- 				ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

-+#endif

- 			if (ff)

- 			{

- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-@@ -3047,24 +3081,17 @@ void SlaOutputDev::updateFont(GfxState *state)
- 				codeToGID = nullptr;

- 				n = 0;

- 			}

--			if (!(fontFile = m_fontEngine->loadTrueTypeFont(

--							id,

--							fontsrc,

--							codeToGID, n)))

-+			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))

- 			{

--				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

--				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

- 			break;

- 		case fontCIDType0:

- 		case fontCIDType0C:

--			if (!(fontFile = m_fontEngine->loadCIDFont(

--							id,

--							fontsrc)))

-+			if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))

- 			{

--				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

--				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

- 			break;

-@@ -3080,10 +3107,7 @@ void SlaOutputDev::updateFont(GfxState *state)
- 				codeToGID = nullptr;

- 				n = 0;

- 			}

--			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(

--							id,

--							fontsrc,

--							codeToGID, n)))

-+			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))

- 			{

- 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

- 				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-@@ -3105,10 +3129,17 @@ void SlaOutputDev::updateFont(GfxState *state)
- 			}

- 			else

- 			{

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

-+				if (!fileName.empty())

-+					ff = FoFiTrueType::load(fileName.c_str());

-+				else

-+					ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());

-+#else

- 				if (fileName)

- 					ff = FoFiTrueType::load(fileName->getCString());

- 				else

- 					ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

-+#endif

- 				if (! ff)

- 					goto err2;

- #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-@@ -3119,13 +3150,9 @@ void SlaOutputDev::updateFont(GfxState *state)
- 				delete ff;

- #endif

- 			}

--			if (!(fontFile = m_fontEngine->loadTrueTypeFont(

--							id,

--							fontsrc,

--							codeToGID, n, faceIndex)))

-+			if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))

- 			{

--				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",

--				gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-+				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 				goto err2;

- 			}

- 			break;

-@@ -3269,9 +3296,15 @@ void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, doub
- GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)

- {

- //	qDebug() << "beginType3Char";

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)

- 	GfxFont *gfxFont;

-+	if (!(gfxFont = state->getFont().get()))

-+		return gTrue;

-+#else

-+	GfxFont* gfxFont;

- 	if (!(gfxFont = state->getFont()))

- 		return gTrue;

-+#endif

- 	if (gfxFont->getType() != fontType3)

- 		return gTrue;

- 	F3Entry f3e;

diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch
deleted file mode 100644
index 106a6f5162b6..000000000000
--- a/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3741,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState *state)
- 			break;

- 	}

- 	double lw = state->getLineWidth();

--	double *dashPattern;

- 	int dashLength;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)

-+	const double *dashPattern;

-+	const std::vector<double> &dash = state->getLineDash(&DashOffset);

-+	dashPattern = dash.data();

-+	dashLength = dash.size();

-+#else

-+	double *dashPattern;

- 	state->getLineDash(&dashPattern, &dashLength, &DashOffset);

-+#endif

- 	QVector<double> pattern(dashLength);

- 	for (int i = 0; i < dashLength; ++i)

- 	{

diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch
deleted file mode 100644
index 4e0f607c6a07..000000000000
--- a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-1.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Wed, 2 Feb 2022 23:12:52 +0000
-Subject: [PATCH] #16734: Build break with poppler 22.2.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 47 +++++++++++++++++++-----
- 1 file changed, 37 insertions(+), 10 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 5894bf2ad6..3650c96f52 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
- 

- #include "slaoutput.h"

- 

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-+#include <memory>

-+#include <optional>

-+#endif

-+

- #include <poppler/GlobalParams.h>

- #include <poppler/poppler-config.h>

- #include <poppler/FileSpec.h>

-@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
- void SlaOutputDev::updateFont(GfxState *state)

- {

- 	GfxFont *gfxFont;

--	GfxFontLoc *fontLoc;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-+	std::optional<GfxFontLoc> fontLoc;

-+	const GooString * fileName = nullptr;

-+	std::unique_ptr<FoFiTrueType> ff;

-+#else

-+	GfxFontLoc * fontLoc = nullptr;

-+	GooString * fileName = nullptr;

-+	FoFiTrueType * ff = nullptr;

-+#endif

- 	GfxFontType fontType;

- 	SlaOutFontFileID *id;

- 	SplashFontFile *fontFile;

- 	SplashFontSrc *fontsrc = nullptr;

--	FoFiTrueType *ff;

- 	Object refObj, strObj;

--	GooString *fileName;

--	char *tmpBuf;

-+	char *tmpBuf = nullptr;

- 	int tmpBufLen = 0;

--	int *codeToGID;

--	const double *textMat;

-+	int *codeToGID = nullptr;

-+	const double *textMat = nullptr;

- 	double m11, m12, m21, m22, fontSize;

- 	SplashCoord mat[4];

- 	int n = 0;

-@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
- 	SplashCoord matrix[6];

- 

- 	m_font = nullptr;

--	fileName = nullptr;

--	tmpBuf = nullptr;

--	fontLoc = nullptr;

- 

- 	gfxFont = state->getFont();

- 	if (!gfxFont)

-@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
- 		}

- 		else

- 		{ // gfxFontLocExternal

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-+			fileName = fontLoc->pathAsGooString();

-+#else

- 			fileName = fontLoc->path;

-+#endif

- 			fontType = fontLoc->fontType;

- 		}

- 

-@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
- 				ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

- 			if (ff)

- 			{

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-+				codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());

-+				ff.reset();

-+#else

- 				codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);

--				n = 256;

- 				delete ff;

-+#endif

-+				n = 256;

- 			}

- 			else

- 			{

-@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
- 					ff = FoFiTrueType::make(tmpBuf, tmpBufLen);

- 				if (! ff)

- 					goto err2;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)

-+				codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);

-+				ff.reset();

-+#else

- 				codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);

- 				delete ff;

-+#endif

- 			}

- 			if (!(fontFile = m_fontEngine->loadTrueTypeFont(

- 							id,

-@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state)
- 	mat[3] = -m22;

- 	m_font = m_fontEngine->getFont(fontFile, mat, matrix);

- 

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)

- 	delete fontLoc;

-+#endif

- 	if (fontsrc && !fontsrc->isFile)

- 		fontsrc->unref();

- 	return;

- 

- err2:

- 	delete id;

-+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)

- 	delete fontLoc;

-+#endif

-+

- err1:

- 	if (fontsrc && !fontsrc->isFile)

- 		fontsrc->unref();

diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch
deleted file mode 100644
index 73beac2d70d0..000000000000
--- a/app-office/scribus/files/scribus-1.5.8-poppler-22.2.0-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f75c1613db67f4067643d0218a2db3235e42ec9f Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Thu, 3 Feb 2022 19:46:13 +0000
-Subject: [PATCH] Small update vs latest code in poppler
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24885 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 3650c96f52..a6f4e00fa9 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -3072,10 +3072,10 @@ void SlaOutputDev::updateFont(GfxState *state)
- 		delete id;

- 	else

- 	{

--		if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))

-+		fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);

-+		if (!fontLoc)

- 		{

--			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",

--			gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

-+			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");

- 			goto err2;

- 		}

- 

diff --git a/app-office/scribus/scribus-1.5.8-r4.ebuild b/app-office/scribus/scribus-1.5.8-r4.ebuild
deleted file mode 100644
index 02977631023d..000000000000
--- a/app-office/scribus/scribus-1.5.8-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-DEPEND="${PYTHON_DEPS}
-	app-text/libmspub
-	app-text/libqxp
-	app-text/poppler:=
-	dev-libs/hyphen
-	dev-libs/icu:0=
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:0=[icu]
-	media-libs/lcms:2
-	media-libs/libcdr
-	media-libs/libfreehand
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	media-libs/libpng:0=
-	media-libs/libvisio
-	media-libs/libzmf
-	media-libs/tiff:=
-	net-print/cups
-	sys-libs/zlib[minizip]
-	x11-libs/cairo[X,svg(+)]
-	boost? ( dev-libs/boost:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	hunspell? ( app-text/hunspell:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? (
-		$(python_gen_cond_dep '
-			dev-python/pillow[tk?,${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
-	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-1.patch
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-2.patch
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.03.0.patch # bug 834537
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.04.0.patch # bug 843287
-	"${FILESDIR}"/${PN}-1.5.8-poppler-22.09.0.patch
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}/${P}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -r codegen/cheetah scribus/third_party/hyphen || die
-
-	sed \
-		-e "/^\s*unzip\.[ch]/d" \
-		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt Scribus.pro || die
-	rm scribus/ioapi.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	sed \
-		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
-		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DWANT_DISTROBUILD=ON
-		-DWANT_CPP17=ON
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DWITH_BOOST=$(usex boost)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_NOEXAMPLES=$(usex !examples)
-		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DWANT_HUNSPELL=$(usex hunspell)
-		-DWANT_HEADERINSTALL=$(usex !minimal)
-		-DWANT_NOOSG=$(usex !osg)
-		-DWITH_PODOFO=$(usex pdf)
-		-DWANT_NOTEMPLATES=$(usex !templates)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use tk; then
-		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-	if use scripts; then
-		python_fix_shebang "${ED}"/usr/share/scribus/scripts
-		python_optimize "${ED}"/usr/share/scribus/scripts
-	else
-		rm "${ED}"/usr/share/scribus/scripts/*.py || die
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
-	# These files are parsed to populate the help/about window.
-	cat >> "${T}"/COPYING <<- EOF || die
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-
-	local size
-	for size in 16 32 128 256 512; do
-		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
-	done
-	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
-	doicon resources/iconsets/*/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "MS Word .doc file import filter support" app-text/antiword
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 07b93f91e79f..8aff01aa0602 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 2042cbbed5c2..631a8bf292c7 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,5 +1,5 @@
 DIST cmark-0.30.2.tar.gz 246033 BLAKE2B 487f5adf47afdd4133e16b6cca1403cd555f8722b47c423960909de73aacac1d0f8b16311f6d5349addb5f03a86562545bb2ec80771b822bb8e5b82816375124 SHA512 aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17
 DIST cmark-0.30.3.tar.gz 246916 BLAKE2B b63027e1a7d6db21c3b1bfc89deaebb202972cf65b3ddc51f20d6cb2dacfb6724dffd226f3cace1b25dda2cd87bdb201b82779bd7a6068c5f9751513bda226ae SHA512 27383bfef95ae1390c26aff0dd2cbca33704e7d20116bf29da4695d2c9a4146b86daba0da1e91bdb9eab95671702f885e832b3d31d51601731f1dc630df5237b
 EBUILD cmark-0.30.2.ebuild 751 BLAKE2B a768518d10584ef416a1d0b2bd13b03b0826b21fd7116d34be3edd576f8d9cd0d50db7ebe43745c23773428739592a44009ee985e0bd083dd8bd027158374eb5 SHA512 d51bd4cd432985c52ffa00b6c1f24b36193456425c2c09cc7622eab4131c5a29729cdf671de7b19434000aeecc1d8a1d0e1e19688bf22789051d6ec942a2f083
-EBUILD cmark-0.30.3.ebuild 752 BLAKE2B 88fc60b1a18bf8927292d94611834d12116652e9556c0ad37baf15c42639936197e6e31ab61dab0fd94ab282c025405d030b3c542237d9d3d5ecacd85fb95bdc SHA512 a523c6a3157e9efe567aad41531e7f04438d6451554b83517ecac214aaaa80bd2bc8c2ca54a733353d052931e17f6979b7cac98b571f3cba24f80c8e6c647306
+EBUILD cmark-0.30.3.ebuild 751 BLAKE2B 640ee39b865f7902fd8b2174277af954620001e3978de4edd1176468afccbea47a456a21363caf82bbfc7cbb433d2e220561e4dbb2d94efb95a461725af5a3af SHA512 863e9cdf76fd0895ccaa273c2e8f93b76eb7ebc82a311310385281917aa4d7d0523a4608c5382c1ee8c2059590dfdf1aa2f30868daf46f73d6f47f523d5e4e97
 MISC metadata.xml 504 BLAKE2B 5b9b29ddcf02b115bc37aeb217236e5092363991b75247f7d7c5da7e7fe0c5bf15ff0a397b332faefd2b150ff9cc239d4996caf6131306240efd641bffe52431 SHA512 f2ebd2271483a1847c63df11e0e6fa057abe8f19323d86f0632904e03ae321b1e689a98ab941e4d7ebaa50ee9220242f1488b35b08f73cec736df5c0a0024713
diff --git a/app-text/cmark/cmark-0.30.3.ebuild b/app-text/cmark/cmark-0.30.3.ebuild
index f6420bd2387d..42ebdf11074e 100644
--- a/app-text/cmark/cmark-0.30.3.ebuild
+++ b/app-text/cmark/cmark-0.30.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4e41980b945d..4d8dace16634 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 4a30aea1ab1d..899820460040 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,9 +1,7 @@
 AUX tomcat-native-2.0.3-slibtool.patch 1085 BLAKE2B a23d3756071916a550c8418ab1ded93077106313b399545c7e8c5c91201c4d61b5a8c4ae550f197b50186012d64c0be1057cb9099e762f72c3f1dea32f047734 SHA512 c0bb7146e41f4c2785d6675bd46c5c7ba9279119ea8d81db0271c9874d4da9c4d60d8df219adfe02d59d19f5be1be4e659ee3bf50475052a60d43c3d029487dd
-DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
 DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
 DIST tomcat-native-2.0.3-src.tar.gz 318403 BLAKE2B a9936ad951bd521c77b8a3fe3306cb1a7a78bdbb229f84fdf53e5bd71caa55bfcee049de406df0047341c6896e05e7da4e0e2a8524fdda91a24f007176f26503 SHA512 d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
 DIST tomcat-native-2.0.3-src.tar.gz.asc 873 BLAKE2B f9998b9b7c410ac7fe2c72207cec64dcd003142ede4f37abd4ebb04ee930a5d536169c84e24bc7fb328cead15da19c13a991f30bdcce80ffd5380114884ec5f6 SHA512 bc513239ccd2a4b4eb60d30513328bb008b926e702ece8ddb4a9a084d64fc7db02b894f741d7073e5f869e7df948b4539d849e8c602549bab91f7055e3c23222
-EBUILD tomcat-native-1.2.35.ebuild 1193 BLAKE2B ce3e060b2f3d2cdaa88161e14b486040e452add5f499aaf3015b02a5c79564c281889fd8c1248f36b0f4069d472215ca8e8e58525e038b65c56186b7e7323b82 SHA512 42fbee312e571add71350399e3768b3856ec4f3ebf7a60dc1a8769f417114414cc9001ce29c7731c332b60eed1ad408c917e99975ba761707c5325231ab57710
 EBUILD tomcat-native-1.2.36.ebuild 1193 BLAKE2B 4dc4ce63f539bb24d6750adfc1fe24b2f3f64470c5b0d16eb2faf69bd9a9d17692b86d23dc643004b4d7a6dacaf22405fe9f10e9a2e46a107875bbfbc53bff17 SHA512 77aaec34bcd9172b57289f8b0a02e82bf29ed385e21be352b959162241944593a15efa103c4a7704019e71be2fd9c24d3e95ec78198d489705de78046d0ddc4d
 EBUILD tomcat-native-2.0.3-r1.ebuild 2169 BLAKE2B ef455d4fe17957c4e52c38fa3946483e299b80b49106a586f0b43c96be9b57b886049eb2d42c41b7a77b85c04ad88ce8f36f6af8ce5b309b90041f3830d3638e SHA512 0bd0176625f1c10b9b7ee67add2a35a5f1df7195590c8b3d6c6c22afc5d298d069459cca951e2e3108735f370cc2de218b9db9a1d4be332dbebe4b4fd6963d88
 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.35.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.35.ebuild
deleted file mode 100644
index ee306543bfbe..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.35.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 33778e948c98..645384526dbd 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index b6f0c49c4cc4..8ed393bb66b3 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -18,12 +18,12 @@ DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B f1dcb1601ebfa2a37351e3a466a7ca601518c2d
 DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0 SHA512 3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32
 DIST ocaml-4.14.1.tar.gz 5498436 BLAKE2B 6113283ab0f7ac39ade1f35a02c203a6956f8f4efa4f174daf53483c1d874613195c2705ca02760f0ff4abd9b37c91f8dec59c010ac8ae8731790cdd6f429673 SHA512 6340e145c7d11a1ee9fa1699fc6a8a6785f14ff9c05dca708cf278194642ec9b7c562d744d8b38e5dab74b88fa3a5760035e214f5f8fab8b233a344b035db8fb
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
-EBUILD ocaml-4.05.0-r9.ebuild 4361 BLAKE2B 1b5b2a8ba01e4f7bdf6b9d1d8321953dd2f6c1b9a7349711367db7aa371e7609359665b31450f65537bfbe77c206c6b07daa137a03c1976747d096159fc543f3 SHA512 8e9b8fbca0641e5b05af665ef9ba3f63b027d584a5181e9a545cae1b0057ccbaf4a57715ef863b259939a286cf1437e57845698a23d9bf28cf9e7587ff51880c
+EBUILD ocaml-4.05.0-r9.ebuild 4360 BLAKE2B 7e2dde8cad7ef045bba2469e469f5e379db4fdfb527c6e1bd8882209148a1ec2cd4463587290d0a6f15770dfab8dcd3cbdf3cd3b0b88770a34eae1a265abffdd SHA512 234773a0627e0fa1354fed4f9d0254c30d05f8da613fb555f40991b9dde603f703c9d815f4246a7f4f8d923d4a9639f6eca8a539d443e39fed51aa3e650dffb4
 EBUILD ocaml-4.09.0-r3.ebuild 2787 BLAKE2B 0b8b9186db35bc487107555534c7acd6cff09255d7d0fa094751cd3aad3f7f8683abdf26c812ac683cf01ff3052e5cc9f19868b5dbf0c47785a089062314108d SHA512 60eb052399b7b34fc907761a59a90cdd0c00ac9d2eca3cdd2c9de1d09cff8d5d3d2cc905372e7ec05904099fb67d2b1e00c8eb1b65e2dc8534c1db63bc1bb928
 EBUILD ocaml-4.10.2-r3.ebuild 2794 BLAKE2B b5f43066ca3b5b1bfa64a242078896281863960c9cec46d97a2ee6748f9fe1b251d3588b2f4424e7b913fffe2f0324dee755038c71c567c276e55e7bd2a06b93 SHA512 865d99113bf67391e10abc436a02e1fbcca333f713cb59d5035a8973ce348341ba3fb06f97862ddd417cb8a3e53eecf79059db6b504c50a869167a1e49b1f0fd
 EBUILD ocaml-4.11.2-r2.ebuild 2635 BLAKE2B 12d40e4f0dce7f567e2e1a2af34ff1b935884be738d4544dfdc169c7f678ffc3ed22656a3750a754a5326492ead28eb808eccc0a3543e31dd8434fd0b1b107ae SHA512 c5d9d5d241a3fd99b91e55b4767202cde6533e98a5b0c1dc5ccd6603dfa8d363101a9e153a448a373e59e35a833e069b2e1c8a8fcdccecff930f13e173fca25b
 EBUILD ocaml-4.12.1.ebuild 2552 BLAKE2B 84e036c61c68eb6779e7c4a8b9325bee492fc39defebb33664ac4fb642bb7eec4c93f4f9a1b9fc4e183c9db0e385f79d5860f2016991d8d77dae1a7e68e32d56 SHA512 d954f9b044b7f820b3c944cdafe223bc4f484542cf613abeb01ad32e938db44b4fbc2e117281ea68a9d43ed6fda4a1bb500d4cfb54496700832047e764654195
 EBUILD ocaml-4.13.1.ebuild 2515 BLAKE2B 234ee04ea438dcd6c44e0bd3c1ccda332f4169985da645394779c9dd195b6e12f4c8c2835dc9a2784da36bf77b41cd838504df893efc301e5f4fe8b07ad49d2f SHA512 3cd767118881cec9155094d0a1ee07076e9cc22c20ce6373da4680da61689bb6e62035c708334c7ec63ad772aaee6c7f90d4168b86e709fb22236c1aa7cd2224
-EBUILD ocaml-4.14.0-r1.ebuild 2537 BLAKE2B de6f71982adb690e72b6e5d2f21f32ddf0ab1e1fe5d8275ad7533c4831472518b18e3ebf16e0e0f079b38075b12ef4227be355e3531be44b3077ba4265a1e6c1 SHA512 4204a211d8997f0ccbd474f0e1ff5b197828daf87feee7a18a106bcb42eb4f6ecb04c301ef195a33eff7e218a6593c6f2e269196969e0c13fdc18fedf8824ffd
-EBUILD ocaml-4.14.1.ebuild 2475 BLAKE2B 681170754de6307ef952a30216f5b35227c8a87176fc624928201128f90bd116a4e5282844b70f6906ff618a617c589e9d86947358ec677db635e96cfd7b1f7b SHA512 6ebee1ca54c342e9c2ae3326a9439a555cec3eb04d46cf7f2ee9b486b127d007746f4fd201d1d24ce845874c3c1f021484787a11b936a4d07aff537ba22490ea
+EBUILD ocaml-4.14.0-r1.ebuild 2536 BLAKE2B ee489c180fe811ee14d614c720823d3daa2c090f633b19d8c38c0fea486689e37af939e149d29ec87a4f8f4acc279cbdfc738a4b89eb78764192e16d064d549d SHA512 ac8342798edaab4f70308c037d3735360d6a12934aa5a728bd4dcf48d560880efa0c9eeb247e0d71b96bab94b21f56ebd6467578ff2698620308fbf341714921
+EBUILD ocaml-4.14.1.ebuild 2474 BLAKE2B 3e98d51345a1d29acc17ec33045dba91bf2576ccb695f350c7936fd1c78403f2e9853f9bf61f6cf4e553796416a2ad7e2113c00821ae664fada1f73288d10ab5 SHA512 75ee6aeb71efdfb734f646712a4987259686227f2fa960b29a7f46f98625f50a71ae41a83aad11b2750ca308a24a26eb1868cd502e928cf86693d5864330fe23
 MISC metadata.xml 776 BLAKE2B e7b13b4bb764cec6df76ede0eb2d492cc705ce51b18a445fa3f9ebaab119fab8cae45a2a9d02c70f38e19f2e2d2c06de648a3a0843a603dd7b68942c7cd00bdb SHA512 92e3afe1c40991d37dc460d6091ff2b15c83740343e5d8dd69344eb61d873fbd66af1b96e70904f7757c06f2b104d1450883cc79877709c779467af64e2ea96e
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
index e43f9405e0e1..e6811e268de7 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
@@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2"
 # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
 # so here we go with the subslot.
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
index d094b2b5991f..d136814d9ade 100644
--- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex +ocamlopt xemacs"
 
 RDEPEND="sys-libs/binutils-libs:="
diff --git a/dev-lang/ocaml/ocaml-4.14.1.ebuild b/dev-lang/ocaml/ocaml-4.14.1.ebuild
index e57bd96523e6..439749671ad0 100644
--- a/dev-lang/ocaml/ocaml-4.14.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex +ocamlopt xemacs"
 
 RDEPEND="sys-libs/binutils-libs:="
diff --git a/dev-lang/zig-bin/Manifest b/dev-lang/zig-bin/Manifest
index 70e269521879..1c9454b41599 100644
--- a/dev-lang/zig-bin/Manifest
+++ b/dev-lang/zig-bin/Manifest
@@ -1,14 +1,7 @@
-DIST zig-linux-aarch64-0.10.0.tar.xz 40387688 BLAKE2B 47d0cb61f054b79dcd9e5f87f3f910c9440079dca7648a3017c871fb20bc76e07de5b76a438a9d8eda147e77061bebf43b1486160899eeca0972b547b269c607 SHA512 5db0df7fce49dd3ca7002c3d9782a8d16c8b92721cf5f8983978dddcfb42dd31c4e3edad5a321bceda627730320c95dc552226b9e5e06ba84315804153991de1
 DIST zig-linux-aarch64-0.10.1.tar.xz 40321280 BLAKE2B 39abefb80d540d52333ec76203893630ac5df2a784684397033e9ac766f67c4512be71513ebb80faac6c5ebaa2a737859b7bc27b82797232cf97d87d91e8492e SHA512 44dd15b1b2d7bc85a4f8e8171ae5c51122be352249273091b499de5a392c72e262585f981908afd1718a41fa7e67b36f1b65c6cacbf8e9f226a687bd85b7edc6
-DIST zig-linux-armv7a-0.10.0.tar.xz 50805936 BLAKE2B 57a2c8bf10d80a5b06570ebea786be725e6020a7184835a966ddae32a2126910915e2d2bae0932226edb644692ff39e7ab201a8d040c62106ac40539cd3e8096 SHA512 31d16e477a52e10d6ce4e646c7b97d6162c68d5938890b815fb9d5da527248ab46926649d68d5623953b9fbac707131c89d5c8388e9ae5128cf2182d0ab58278
 DIST zig-linux-armv7a-0.10.1.tar.xz 50718132 BLAKE2B 76ef431ef8957272b992f6b861913a961d348120106a7f4b77d1f6b2a042dd8904a1ac744ab6b02b78681eef68af4143372e5315cd113d40711bd26fc78e6632 SHA512 4ec3ccd7ac980bfd9fc7a2f6b2301051d3df43b00143914d869389fc44b48916820d996e27cb922dac152228c4b04a0cce51f7b125317de85440a5479fe8ff7d
-DIST zig-linux-i386-0.10.0.tar.xz 48451732 BLAKE2B e1ae0d48723e1439b612f56dee05776d83a9cabe4bd4ddc6198d777a51a5b2b8c696cf7ce7817641ab46edb91eff992abc4d12de7620d21b1bb63fc482d610da SHA512 6c4152137047efbf2cf3a65583697325baf29c5847734d38622207d15de04aa5bbcd15e37c3c07c51536a2f34ab16ceaf7776c009b0862cb510ed2a0494bdeef
 DIST zig-linux-i386-0.10.1.tar.xz 48367388 BLAKE2B 482ec9e42d9036177f41c459faf82c79ba525f35ed14150d97af9110efab3e9894b8c64f92f9257b224893179134e43306c985ad6a04ae6a7d427d14ef4e7a3f SHA512 97345a8f7f15a83e51635ec667e869833a597511a1b004fa4ab19d78ad234e05e8344823e0c623510c7c5dbeef447d13636223e8d339f6d53f2eca053852a8d3
-DIST zig-linux-riscv64-0.10.0.tar.xz 42272968 BLAKE2B 95fe8589b9be99625acb5c9a97fafd3126b838c7e0722529d34cfe87043cb0e8d6957e6f2bb3ac3ae1fc2f51cf6a062b98abe224c221ba659de1e16703b53255 SHA512 ae00cf4eb5e499bd44e94d6cd77464d85878881034ce088ef69aa1f3fdf58420768112b36007829ecaba74e77e96c0706222a2fc1397b773e3bb5f726a710549
 DIST zig-linux-riscv64-0.10.1.tar.xz 42196008 BLAKE2B a7ae37b1d1db1281b09bbd7e35ecaf390bbe28774bd1a4fa76b4468255be19b07fb514326d48576946f3c4eb04dcef34d6ab14f550407aa33803754fabbd848c SHA512 1a1da96924fa4a16a53721017eadc3363859a4f53671e27b11588200d0302d9065de9ba517ad40940aad98725e617cf853f2e83f732a4e23c33deacb99487ad0
-DIST zig-linux-x86_64-0.10.0.tar.xz 44142400 BLAKE2B 7ba72ce57e616c5ead2fb84dc7e1b0ff08e8dffab56ca30cd00bff1d9b80fd62034f3d78b903f37f911665239a4717a6e93230faa77b3f387b0dada835672fb7 SHA512 87037766e58a736d7e4f9fca1c21dce070f2de8cd08dae7951e67252327b72dd69f79831f5c8e406be7ecc6522184400eba3bd265d3c7020c8fa4d2efc9f8766
 DIST zig-linux-x86_64-0.10.1.tar.xz 44085596 BLAKE2B d689a469dbbe790593a561dd4df01c506212754c48be7de03773c7e690cbab197af10d639e80148f3343204ddf9ecfe09a88a62fb6ef63a262bcc2dd79fecd34 SHA512 1cf88a492b1a47800e213b8801477f4ffabf269f960d27d1849c5aec805b5db3768c83d4daa4a738532b1b7367e8c6812e3eea47c205ea732d7a6269a47e16dc
-EBUILD zig-bin-0.10.0.ebuild 1999 BLAKE2B 5f58d0fb901f1ddcbdd5939687ea4c3d5f6211198efebb0e215999f4156af2a1e76df3bffd7781f57579c2a3026bb8805b2dcc53863141b299155c0f9be08743 SHA512 449e70f2ba79903e6aa97d96260fced9cf2efb76e4a4b111e37c83de735662a7b7ef31d07a2da8b39995e6ab3c55f69aa53b5076fc80e5d2960eee70b60ad61f
 EBUILD zig-bin-0.10.1-r2.ebuild 2156 BLAKE2B dba9afa322e198097f13282f44815e830a33a1d778ee707f059de306b208a52c975c9ab443ce4182b804e38634eb1de2a51a68d34b37a32528c0dcbae15e6ce6 SHA512 3c1ac27fc3ab62587f78177fad2671038a0f0981dbea2d6b63edefdb3f18394943e19e7b408edc8a2f51c11cceb99dea0bc36b0c9f0d2c509d1d6a8e3c9fcfe5
-EBUILD zig-bin-0.10.1.ebuild 1978 BLAKE2B 88c315e88ebb5c3e4398709ed6c30f7ecc6e21d0975b99f3da59d362dd81690d509a08474ce19a07c76b37a94584c8e03d18cae9a395857ae8bfb50e1c8cad74 SHA512 e0d998899bb55576ad37b8d88c0a8e593a8361ffc43249d4f861f3546832d859ec61c203b914d49e8bce2a2a6c83f29836f459d1c191a9ce105714bfa904e0f4
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
diff --git a/dev-lang/zig-bin/zig-bin-0.10.0.ebuild b/dev-lang/zig-bin/zig-bin-0.10.0.ebuild
deleted file mode 100644
index 41c7ad1570e5..000000000000
--- a/dev-lang/zig-bin/zig-bin-0.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-SRC_URI="
-	amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz )
-	arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz )
-	arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz )
-	riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz )
-	x86? ( https://ziglang.org/download/${PV}/zig-linux-i386-${PV}.tar.xz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="!dev-lang/zig"
-# Zig provides its standard library in source form "/opt/zig-bin-{PV}/lib/",
-# and all other Zig libraries are meant to be consumed in source form,
-# because they can use compile-time mechanics (and it is easier for distributions to patch them)
-# Here we use this feature for fixing programs that use standard library
-# Note: Zig build system is also part of standard library, so we can fix it too
-#PATCHES=( )
-
-QA_PREBUILT="opt/${P}/zig"
-
-src_unpack() {
-	unpack ${A}
-
-	mv "${WORKDIR}/"* "${S}" || die
-}
-
-src_install() {
-	insinto /opt/
-	doins -r "${S}"
-
-	dosym -r /opt/${P}/doc/ /usr/share/doc/${PF}
-	dosym -r /opt/${P}/zig /usr/bin/zig
-	fperms 0755 /usr/bin/zig
-}
-
-pkg_postinst() {
-	elog "0.10.0 release introduces self-hosted compiler for general use by default"
-	elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs"
-	elog "Upstream recommends using stage1 if experiencing such breakage,"
-	elog "until bugfix release 0.10.1 or release 0.11.0 where old compiler will be fully replaced"
-	elog "You can use old compiler by using '-fstage1' flag"
-	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
-	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
-}
diff --git a/dev-lang/zig-bin/zig-bin-0.10.1.ebuild b/dev-lang/zig-bin/zig-bin-0.10.1.ebuild
deleted file mode 100644
index 7c9d05764a48..000000000000
--- a/dev-lang/zig-bin/zig-bin-0.10.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-SRC_URI="
-	amd64? ( https://ziglang.org/download/${PV}/zig-linux-x86_64-${PV}.tar.xz )
-	arm? ( https://ziglang.org/download/${PV}/zig-linux-armv7a-${PV}.tar.xz )
-	arm64? ( https://ziglang.org/download/${PV}/zig-linux-aarch64-${PV}.tar.xz )
-	riscv? ( https://ziglang.org/download/${PV}/zig-linux-riscv64-${PV}.tar.xz )
-	x86? ( https://ziglang.org/download/${PV}/zig-linux-i386-${PV}.tar.xz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="!dev-lang/zig"
-# Zig provides its standard library in source form "/opt/zig-bin-{PV}/lib/",
-# and all other Zig libraries are meant to be consumed in source form,
-# because they can use compile-time mechanics (and it is easier for distributions to patch them)
-# Here we use this feature for fixing programs that use standard library
-# Note: Zig build system is also part of standard library, so we can fix it too
-#PATCHES=( )
-
-QA_PREBUILT="opt/${P}/zig"
-
-src_unpack() {
-	unpack ${A}
-
-	mv "${WORKDIR}/"* "${S}" || die
-}
-
-src_install() {
-	insinto /opt/
-	doins -r "${S}"
-
-	dosym -r /opt/${P}/doc/ /usr/share/doc/${PF}
-	dosym -r /opt/${P}/zig /usr/bin/zig
-	fperms 0755 /usr/bin/zig
-}
-
-pkg_postinst() {
-	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
-	elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
-	elog "Upstream recommends:"
-	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
-	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
-	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
-	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
-}
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 607e62d54675..8eedea37a3b6 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,9 +1,5 @@
-AUX zig-0.10.0-avoid-cmake-bug.patch 2200 BLAKE2B 6c06d318f2da258f3c003c5d8eaf66261ec736cb4ea0a87f3b0ff3d7c350bd51523ba2f23ea2bccbaed237fe76dfd6e1b56b1741a5ac6ba3539f7551e2347f70 SHA512 8e5ff85b26fe3f5a19e73aa9ad8d9f6446f936e3c2157b50212218a77747913e1199c0b52181e884755a90dfa839b23f305da82edeba6e8d3ceaff1d20a16efd
 AUX zig-0.10.0-build-dir-install-stage3.patch 1430 BLAKE2B cca909207cadfe1c9b31b9481a705882506363aaf41db7672f42cc66937f85f7b2f2b53346d29a4d748d1aef05e77efcc6e668ac498a7d172a6d8654034d5c4a SHA512 6704adb1f146ed78c8030aad2c739e30d0ec7ffda40273b5520914b16cc67d497afd9b1b59a1acfbb0097d7f5b0a5517973c45ef43ccbc35d8af051500577117
-DIST zig-0.10.0.tar.xz 14530912 BLAKE2B 5949a44ee039b7d5a163344a0fc26af8dd9cf311ed25c7092a665bb59ec7dec8dc3cd39918d81ef02c707aa8989b038fb21dfba3927fd31153a1404739b4ea3c SHA512 9d83ce51cc0ce404c06da820179c1cc47aa50e573fb1c831a96baa12c6b5226abe85b384110f2ffc4cbdc5f24eaba1f14a4e3249ffeaa248c0d73ba29859e682
 DIST zig-0.10.1.tar.xz 15143112 BLAKE2B 4954d95ad763000eedf73a78e62bc0e99d65bba91c7127cdf1ea4503eb67817265daf572f645b7efbe9e24087e690b2768f0b2bc6c43b5fd76eab33143e964fe SHA512 d443adf61556bc95470537c6b0371a0ac99d19a06b15635cf1e5055ae7849039680c9006105e06e1bd6ba0fc12da14c54c1d28ac597c7dee17ee3a5cd9cf79f8
-EBUILD zig-0.10.0-r1.ebuild 3295 BLAKE2B 0997f58541abc6687278dd7eec16944a16b90bd58dc5a4ededea12dbfe9006264fc087c937eb5d1a4579d016df222a5aa8ed721fe42124a0fc85984fe7b38ec3 SHA512 ea1dec43578750945a3401ca1a2cefce0be9bc8da06a65c0e6da2684be6be0ff41b315f110a9ec9f8af99298c16b7369a37c21027ee1f53e82ecaceee13dce56
 EBUILD zig-0.10.1-r2.ebuild 5020 BLAKE2B e1bd6c9a3f256bd6a0a8d3ed3ef0313a30b1570f14e838d496ce618f6104af570b201d88bd6f31711ef55eb94d96796be230ae7c1d04b9eb7a0dd1ffc5188be0 SHA512 ad280c38779573a03b29b182a7b61aa98b3260811240c3ce19716e98b13b1dd9dc4865a265d5bfc048b1ae38026aded35bc25b2ffbbddb6aff7e181f5694c850
-EBUILD zig-0.10.1.ebuild 3205 BLAKE2B 977a4dec97a9bb7708581758e8f99155c3d03b68723e2703f657c096d661555ba50549854c5c31d0ff8bdd412442dd223dd4323182999b8f1fed61dcfe4c06d4 SHA512 0e7861a183c917b9ed8452d302bcec688ca891cfe0a68b88ae59204e96fda138c4f1fc6e17a581708769ee1696aec28c6b25af1af16fe8c4c88a9eab6675ecce
 EBUILD zig-9999.ebuild 3730 BLAKE2B 3f292991c40971e0e9430684b97956d548dde7dbd283b726017418a0df7c43c93b8d78e5f0bef316097e3e6be7b986cf0c41ee327ba6d0290c2eb22a99a5a941 SHA512 71a1d22b46fd774ad444becde28ba321e7fd676c2e6431d9fa31a863e425018352921594e9873adfd6f77bead1d72a75b80e3854a04b985b7ae0d8ace06b854a
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
diff --git a/dev-lang/zig/files/zig-0.10.0-avoid-cmake-bug.patch b/dev-lang/zig/files/zig-0.10.0-avoid-cmake-bug.patch
deleted file mode 100644
index bfc8ac3fde7f..000000000000
--- a/dev-lang/zig/files/zig-0.10.0-avoid-cmake-bug.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://github.com/ziglang/zig/commit/fe2bd9dda8467b775da4fe3bd535aece9e07ee1b
-Bug https://bugs.gentoo.org/886569
-
-From fe2bd9dda8467b775da4fe3bd535aece9e07ee1b Mon Sep 17 00:00:00 2001
-From: Eric Joldasov <bratishkaerik@getgoogleoff.me>
-Date: Wed, 4 Jan 2023 01:04:48 +0600
-Subject: [PATCH] cmake: move 'continue' statement to avoid cmake bug
-
----
- cmake/Findllvm.cmake | 32 +++++++++++---------------------
- 1 file changed, 11 insertions(+), 21 deletions(-)
-
-diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
-index 60a52056d8d..d8662034579 100644
---- a/cmake/Findllvm.cmake
-+++ b/cmake/Findllvm.cmake
-@@ -79,7 +79,11 @@ if(ZIG_USE_LLVM_CONFIG)
-         OUTPUT_VARIABLE LLVM_TARGETS_BUILT_SPACES
-       OUTPUT_STRIP_TRAILING_WHITESPACE)
-     string(REPLACE " " ";" LLVM_TARGETS_BUILT "${LLVM_TARGETS_BUILT_SPACES}")
--    function(NEED_TARGET TARGET_NAME)
-+
-+    set(ZIG_LLVM_REQUIRED_TARGETS "AArch64;AMDGPU;ARM;AVR;BPF;Hexagon;Lanai;Mips;MSP430;NVPTX;PowerPC;RISCV;Sparc;SystemZ;VE;WebAssembly;X86;XCore")
-+
-+    set(ZIG_LLVM_REQUIRED_TARGETS_ENABLED TRUE)
-+    foreach(TARGET_NAME IN LISTS ZIG_LLVM_REQUIRED_TARGETS)
-       list (FIND LLVM_TARGETS_BUILT "${TARGET_NAME}" _index)
-       if (${_index} EQUAL -1)
-         # Save the error message, in case this is the last llvm-config we find
-@@ -87,27 +91,13 @@ if(ZIG_USE_LLVM_CONFIG)
- 
-         # Ignore this directory and try the search again
-         list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")
--        continue()
-+        set(ZIG_LLVM_REQUIRED_TARGETS_ENABLED FALSE)
-+        break()
-       endif()
--    endfunction(NEED_TARGET)
--    NEED_TARGET("AArch64")
--    NEED_TARGET("AMDGPU")
--    NEED_TARGET("ARM")
--    NEED_TARGET("AVR")
--    NEED_TARGET("BPF")
--    NEED_TARGET("Hexagon")
--    NEED_TARGET("Lanai")
--    NEED_TARGET("Mips")
--    NEED_TARGET("MSP430")
--    NEED_TARGET("NVPTX")
--    NEED_TARGET("PowerPC")
--    NEED_TARGET("RISCV")
--    NEED_TARGET("Sparc")
--    NEED_TARGET("SystemZ")
--    NEED_TARGET("VE")
--    NEED_TARGET("WebAssembly")
--    NEED_TARGET("X86")
--    NEED_TARGET("XCore")
-+    endforeach()
-+    if (NOT ZIG_LLVM_REQUIRED_TARGETS_ENABLED)
-+      continue()
-+    endif()
- 
-     # Got it!
-     break()
diff --git a/dev-lang/zig/zig-0.10.0-r1.ebuild b/dev-lang/zig/zig-0.10.0-r1.ebuild
deleted file mode 100644
index 4d9a45ee5fb0..000000000000
--- a/dev-lang/zig/zig-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=15
-inherit edo cmake llvm check-reqs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-BUILD_DIR="${S}/build"
-
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
-	${DEPEND}
-	!dev-lang/zig-bin
-"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/zig"
-
-# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
-# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
-# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
-# (transpiled to C via C backend) for bootstrapping
-CHECKREQS_MEMORY="10G"
-
-PATCHES=(
-	"${FILESDIR}/${P}-avoid-cmake-bug.patch"
-	"${FILESDIR}/${P}-build-dir-install-stage3.patch"
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	ewarn "This version requires 10G of memory for building compiler."
-	ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
-	ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZIG_USE_CCACHE=OFF
-		-DZIG_SHARED_LLVM=ON
-		-DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
-	local ZIG_TEST_STEPS=(
-		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
-		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
-		test-run-translated-c test-std
-	)
-
-	local step
-	for step in "${ZIG_TEST_STEPS[@]}" ; do
-		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
-	done
-}
-
-pkg_postinst() {
-	elog "0.10.0 release introduces self-hosted compiler for general use by default"
-	elog "It means that your code can be un-compilable since this compiler has some new or removed features and new or fixed bugs"
-	elog "Upstream recommends:"
-	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
-	elog " * Waiting for bugfix release 0.10.1"
-	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
-	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
-	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
-}
diff --git a/dev-lang/zig/zig-0.10.1.ebuild b/dev-lang/zig/zig-0.10.1.ebuild
deleted file mode 100644
index b5ed03b123f1..000000000000
--- a/dev-lang/zig/zig-0.10.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=15
-inherit edo cmake llvm check-reqs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-BUILD_DIR="${S}/build"
-
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
-	${DEPEND}
-	!dev-lang/zig-bin
-"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/zig"
-
-# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler
-# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping
-# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler
-# (transpiled to C via C backend) for bootstrapping
-CHECKREQS_MEMORY="10G"
-
-PATCHES=(
-	"${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch"
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	ewarn "This version requires 10G of memory for building compiler."
-	ewarn "If you don't have enough memory, you can wait until 0.11.0 release"
-	ewarn "or (if you are risky) use 9999 version (currently requires only 4GB)"
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DZIG_USE_CCACHE=OFF
-		-DZIG_SHARED_LLVM=ON
-		-DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm=true -Dskip-non-native=true -Drelease -Dtarget=native"
-	local ZIG_TEST_STEPS=(
-		test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output
-		test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c
-		test-run-translated-c test-std
-	)
-
-	local step
-	for step in "${ZIG_TEST_STEPS[@]}" ; do
-		edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS}
-	done
-}
-
-pkg_postinst() {
-	elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0"
-	elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed"
-	elog "Upstream recommends:"
-	elog " * Using old compiler if experiencing such breakage (flag '-fstage1')"
-	elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)"
-	elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler"
-	elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade"
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d5e2185a9ec5..ea21203c4a73 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index b137093fdc24..a8f4368fcf03 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -5,6 +5,5 @@ AUX leveldb-1.23-system-testdeps.patch 920 BLAKE2B 2e2a01c801ba852e312b13beb3dc7
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
 EBUILD leveldb-1.20.ebuild 1696 BLAKE2B cf3635413925eb7fda325336206a17ba3449559e4c70b8f66db79dc0704d4acd5c1f5f08f5e5a9b7b73ebdf9366ab0cb09e94b3957497147e8518e266235414c SHA512 2267e43e96a97110a190882aeb053aee5ef40e6735059989320ba272db5e86a66e384883f10afba274d05c41054f050d22851b89c6be769c6e881e5a9762a681
-EBUILD leveldb-1.23-r4.ebuild 1144 BLAKE2B 38ec2d715468efa44a615a47657d02ea5bb450943f4c205a027b381bc9dc885da18c07fe88347d7508905600659dbe482614f3f363c4520b750c6c5ff6b39754 SHA512 f708de491a90313fb48036ad29f17d9dbde262b88382e15df98461eac188dfe561d291200072ba3b28e3f6c3ea1db7e2c79e74da84e12018619d657d6c7b5992
-EBUILD leveldb-1.23-r5.ebuild 1216 BLAKE2B d3ec7528cac0163ff9c8374a5482482abab86d24af09a655de96f227320996388a0e03f94b9a91b3f7e14114d29bfd454e5512337bed416efc39c6a81871f22f SHA512 5deb77d60ea5622ccd920f2fd511e524b06b8812aa4aff13686af67c8b7e8a99ca75b5f8af29d98c880cdc2184371b0a1b1d42983adcf0ea2e01cc69c1ede7f9
+EBUILD leveldb-1.23-r5.ebuild 1215 BLAKE2B 676e8047875b488d1f12aff5a35cda3c63348f9065c07eff0ae4c026daf9c72c4b5385709fc00e8f8d326e32dfb714748f8df0ccd39dd88b7a0f6d96992ba1aa SHA512 d54f01a29db6d7a9ee07d29ba3fcce88d0a553656c37eaa07bf13f9b3cccd1a13b64f2374cae14f9d8593a884da621c9bb58b9bad97bc00529e3527ec76f7188
 MISC metadata.xml 392 BLAKE2B 5912a3fb0a2763269de18e8be23215dfb0002d5e4fc4a7cf9870f36a2583bc64497e77320e83ce6437349fde84c5d38a5574e248920d1b26dfb6003e79f809b9 SHA512 7da9c4c217de039a538f7c9e87e102cbcbb843da7a1ffbc773e4f8498bcd39cfc3ee83e7d34298ec77d8ea806bd754f48300ce285ea9d409c823b72f626b67d6
diff --git a/dev-libs/leveldb/leveldb-1.23-r4.ebuild b/dev-libs/leveldb/leveldb-1.23-r4.ebuild
deleted file mode 100644
index 265ef4f39682..000000000000
--- a/dev-libs/leveldb/leveldb-1.23-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy +tcmalloc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/crc32c
-	snappy? ( app-arch/snappy:= )
-	tcmalloc? ( dev-util/google-perftools:=[-minimal] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.23-system-testdeps.patch
-	"${FILESDIR}"/${PN}-1.23-remove-benchmark-dep.patch
-)
-
-src_prepare() {
-	sed -e '/fno-rtti/d' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_CRC32C=ON
-		-DLEVELDB_BUILD_BENCHMARKS=OFF
-		-DHAVE_SNAPPY=$(usex snappy)
-		-DHAVE_TCMALLOC=$(usex tcmalloc)
-		-DLEVELDB_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	TEST_TMPDIR="${T}" TEMP="${T}" cmake_src_test
-}
diff --git a/dev-libs/leveldb/leveldb-1.23-r5.ebuild b/dev-libs/leveldb/leveldb-1.23-r5.ebuild
index 0eb776881b7b..c0b712a59c02 100644
--- a/dev-libs/leveldb/leveldb-1.23-r5.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+snappy +tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 3d8f1333f09d..1a816870503f 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -5,5 +5,5 @@ DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae
 DIST libtpms-0.9.6.tar.gz 1264338 BLAKE2B 7b127ef370a48214814bb9ad0e8461ed0af21f32ab84f243945980c5e36ba5e374b4de7a83bf9c67c29264609063d48eae2dae83832daed70170bb1ed39eafea SHA512 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3
 EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1
 EBUILD libtpms-0.9.5.ebuild 1358 BLAKE2B 5a0cfeb68ec4e973527fd12c59ee80331c25c58ccada0f25a85aa4c08500ceaf92bd56cec5157b83e8f939470be723390a261a01a921eaed291e68e04353a0ed SHA512 63df6fc9b53e326046515c5a9a6b8fc62128c08612dfebf4f8f3874dc6ad7e403c3ec62f42f75b5b2f7ce29024dc994cff68f3038a649caeddef4e587d378e6c
-EBUILD libtpms-0.9.6.ebuild 1362 BLAKE2B 9eff8746ba64e0691caeef0dcae0af7048a0ae27eb1452c41addde4e1a35b3bf8ec6f981da85e6919352a950a08f295bf350b30acd498410186447ac13ec9926 SHA512 5d07be2d1f0df9d43d8b02831fee915a32ffeabfec0a52c8ebd422219f6299b88752b2e448d1d0d95d3f07567e36e5e1dc6aa2c3afe84b45ac285af2a0f76e44
+EBUILD libtpms-0.9.6.ebuild 1359 BLAKE2B 126b4908c913e4a2589126eec59c4d45235b9cb8d391f91438df8899fe9c685527d8cf2c55d93d4df6a7ded253be90188f3e8b31e5816811d8141a333c44089d SHA512 84efa1b8c66a52436a00f4ff64ecb5adea518f1c7a8042aeeb428cdfa792627ee8c99f1224db338a59af52de446181740c41908a736351675aee51c362009d09
 MISC metadata.xml 621 BLAKE2B 5431a08a57b654746f41820560912e2bac4fc0c5cd2eb5f44c77e4eda65c1a160845205c3ae76392c4a6f9aa33562999576c055ee6d1b89579a9e2a49c59e4f6 SHA512 5e9fff7be647a2e9e8eb71dadcc6b8cc8577ade658fd4ab8ba20cfd64f1b5ba129fc7e5f8fcfb52e69a646681741079c0bc85b06a92f9086ce66a28770c1a9da
diff --git a/dev-libs/libtpms/libtpms-0.9.6.ebuild b/dev-libs/libtpms/libtpms-0.9.6.ebuild
index 79acc47b57eb..1f6096095608 100644
--- a/dev-libs/libtpms/libtpms-0.9.6.ebuild
+++ b/dev-libs/libtpms/libtpms-0.9.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index c3d2470fefc3..f9bbedc4d1da 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/bigarray-compat/Manifest b/dev-ml/bigarray-compat/Manifest
index 92cd009ddabf..736e0e8e57e1 100644
--- a/dev-ml/bigarray-compat/Manifest
+++ b/dev-ml/bigarray-compat/Manifest
@@ -1,5 +1,5 @@
 DIST bigarray-compat-1.0.0.tar.gz 1385 BLAKE2B afa38fd206de8738db51742467b95df4aec3e4e713c946c2c1d041da7e19483bdb53dca440b50c9c1b3c3a5fd7ac71a63ccfe74a14a5743f10f35429838a1c14 SHA512 c365fee15582aca35d7b05268cde29e54774ad7df7be56762b4aad78ca1409d4326ad3b34af0f1cc2c7b872837290a9cd9ff43b47987c03bba7bba32fe8a030f
 DIST bigarray-compat-1.1.0.tar.gz 2046 BLAKE2B a42ca96452106920a26e8cc95e1f31d887af57687243b6896f4ac80091c78c590ee37e7291c2319b5d9ef3f0fd72b8add463e2ef11f830cee169451f34930c1f SHA512 bbd9c2b319930db832ae8d41844ef81e74ced9f745f32981f2efcc9777220d55e1e5d6dc2965e9e1a6ed5e0d56ad27c672289f8dc28fbe2658f3230cbda5a800
 EBUILD bigarray-compat-1.0.0.ebuild 457 BLAKE2B d425d797c1bda0b8dfcfc9e3f0877e0d97872bb6b0c861f5ac17ca8bcecfa62247524074d3eccaf1f400c9783765857fe57bed3a53f2c489838f17cdffbb4cf8 SHA512 5f1cd104e80347fc53f7ea3c9c7928b07b6ee038d7cdc8b97cd96926f839d62538ec49be7592eabd446fc522112a2568fffeda631ff4aa029adcfcbb84b8bc99
-EBUILD bigarray-compat-1.1.0.ebuild 465 BLAKE2B e3c72ad02d802ef7954565aae263fb6f9ba1424e759fb80f9cb80676e4a1a2456dbff545cb6bc4c84456ab864789f21e4cfc8b1001337c1e81784c6dd7b206bf SHA512 27a262230004ba4307cb62e811802b58632d9228a739f75b4a7af59940c8902a5b3f709dce4d988b905f8896607b82c40c5ca90b83646f4cacf7588f9a970770
+EBUILD bigarray-compat-1.1.0.ebuild 464 BLAKE2B fded675e6e9f9563dc9b42dcc03285faddcfc6a7ae30a3407914a8e68baa1e9546055fd72551e47a3d456298627057c6ec332884abeb10ac3fab8d8f7497397b SHA512 13e73bdb31fd3c58c58d6382dbdb8abab1638e3789b981b44cd5c91347c3107a33af1cf6e1ac95bfbfc0d4c148626fe933fe76e9494e92b812d8657d66eb16d6
 MISC metadata.xml 320 BLAKE2B 01aff5c109d72cdbeea68a7170d2ddc0dbac8b02e667df569c4a1111ba7fc8f73114f1d32dc3883e5bcf07b85bc9d2c5bc6940c65b8ce4d316f2eb7eb9f620a3 SHA512 f4512e72cde3192cd47c1083077ae9d8520cc7067c8249966fd5522d7113b4d4d390897b0abd7fb5c5e292fe490c57e689312ff47b509af3709faf3a27440b3f
diff --git a/dev-ml/bigarray-compat/bigarray-compat-1.1.0.ebuild b/dev-ml/bigarray-compat/bigarray-compat-1.1.0.ebuild
index cb9e03c73c42..20138d8b998e 100644
--- a/dev-ml/bigarray-compat/bigarray-compat-1.1.0.ebuild
+++ b/dev-ml/bigarray-compat/bigarray-compat-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND=""
diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest
index e0749ee3d730..826a8cf4f728 100644
--- a/dev-ml/cairo2/Manifest
+++ b/dev-ml/cairo2/Manifest
@@ -6,5 +6,5 @@ DIST cairo2-0.6.2.tbz 90428 BLAKE2B a8c03e6ea8d4dcfc34a744f48b9a55a5e84b96460235
 DIST cairo2-0.6.4.tbz 90735 BLAKE2B d0e6617a1de99050553ebbb0ea9fa1567051923378b164f8ff073700cbda7275a7c5dc97ed74d9f891b18fe4a051b8da81450da4946364ea7c6e53ec10cc8ba0 SHA512 2fd755b32253a4c441146fb41d13bf7ad4ce3828bc479ece296fb58350e20c7349c22457ad99fa080407b5150ce337a753221043f18b7b641f4c5bc98e37e799
 EBUILD cairo2-0.6.1-r2.ebuild 1125 BLAKE2B aa5eb12c51d2a7839af5409d02f97f64b61c25abb1cbbb899765d7d2b715dfc0600def8e3c12535bfcc02a76103da90af8a9c6da74a0dbe0edfcdb2600e92c1e SHA512 f518e4860666ad2cf205ebf4373f38b982a6e68d0bba7b15e6693d0cc3271e430c686d820327769ebb9760fcfabc3f78b06484c7463583712b4b1d2b452ccbe4
 EBUILD cairo2-0.6.2-r2.ebuild 1002 BLAKE2B 212875ca00883ef31bed13d9c8045347d5a79ef3ce2a84fd736ed315a941641befae4dc361187e202c2261cfecd560aec83e91442527bb6ef9b6ece066f04dec SHA512 c580fd5bc31a27be5997ea7408713d88113ea8eeadb09f63fc5c38fa73e907c0abcceb5a7da3f8522e76f04fbd32be5a31fcd7e3e4948b37ff428ea2825fbeef
-EBUILD cairo2-0.6.4.ebuild 1001 BLAKE2B a7206403f421f1957e3214d3f1b163c4a3e8ee2a87fb07bfb5cdbbb9fec03a47784f7874777dd6bfc098d7a7079a65e66d3d5f613001c0397c53c44ed78bff43 SHA512 413341cb0dfb37c2e1b32ea6edbfecea92ebe4b7a6cc1fcd7c9c80bc085723a9cc4df72838017f6c094c281219a0347115d61be2208a7fb0e6b121720477c5c4
+EBUILD cairo2-0.6.4.ebuild 1000 BLAKE2B 04be06961d3222db84b4e092e047d656be3e0dacceb3de595aca71ca580bfe692e77854caf2889c19302e01e2c1a4e25d1607039c5289f9c23172b7b457b1bb0 SHA512 ca67fb3b18c6ea2c05db71a4674883ab57bf87fef1bb94397d9ff9fba8486d9057e14cfb2f73c476a40847104fa4406147617489993883872bb4f48cf42a845a
 MISC metadata.xml 422 BLAKE2B 247d46b642a4b11443adef6724b00fcf6fd9e8dc09ae1a8bbef9a6069d79efa29a24e24b8ead3231006dae4368da0ed94bcc29b208cb1e0db387754bfffe40e9 SHA512 138f87c890e35c7e3627bc1206927a1cbe7347cbcfe9861f249580dd4ca348c82dad8411c78711d63b70097753bad50a67a1f05dafd9b1349b13a1cd7ff44439
diff --git a/dev-ml/cairo2/cairo2-0.6.4.ebuild b/dev-ml/cairo2/cairo2-0.6.4.ebuild
index 98df33957380..19d4414fad4a 100644
--- a/dev-ml/cairo2/cairo2-0.6.4.ebuild
+++ b/dev-ml/cairo2/cairo2-0.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-$
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/camlp-streams/Manifest b/dev-ml/camlp-streams/Manifest
index 0a09db8d3e71..7dfd2ea781af 100644
--- a/dev-ml/camlp-streams/Manifest
+++ b/dev-ml/camlp-streams/Manifest
@@ -1,5 +1,5 @@
 DIST camlp-streams-5.0.1.tar.gz 17392 BLAKE2B bec87a4b9717bcd05799317542533a83e43b5d7dcdc0d691595678613da4f091f087c00487e1499e088687cc9cf21381386c92e25db9d5f182200805452b43fd SHA512 2efa8dd4a636217c8d49bac1e4e7e5558fc2f45cfea66514140a59fd99dd08d61fb9f1e17804997ff648b71b13820a5d4a1eb70fed9d848aa2abd6e41f853c86
 DIST camlp-streams-5.0.tar.gz 6992 BLAKE2B 54025cec15420ec8e1ad8ce6faaf9132b9197c3bb57acb9b4f39f4dd83939aac25104a6d4fd40035db22cdd33dbffc92597b6913702a252180ef62b60c2503be SHA512 f42e2f5e5ca353b3d647cd7e97a278c167c2d1abd185a634f155965cec29e35d9be7ce940b4c205b0577d7e9b6f714580bfd2e2fd79f1b1b461bc3fb96d26d36
-EBUILD camlp-streams-5.0.1.ebuild 494 BLAKE2B 5d2fbcce5ea16a2532d8f741660197ae0d9510034f6f7129d84486451971be533c6d3173fd21a4e34060dbeec080a38662f90f12df035423d9e7ac57e2d7b5a1 SHA512 5a516594bb5278657471a210a96190db92899f3bacdcd15662c20fc5e27de69f9bc8e0d688d0e018c1262d6e1c7ddc132b1d66cebfc94666fbda686540a907b8
+EBUILD camlp-streams-5.0.1.ebuild 491 BLAKE2B 075b55f83f4f636b282936700967d474266f82d4dcf5ffccf3454400b3a3c8fcfb3a6b23b899dd7e6fc339d5b5817e5b4329ff496f3f8d257f2e176fa72cbcb6 SHA512 0bcb83a296a38a2f3b3f27ad79246446d8ffa20fb2f93784568dd24ccb5941788532762eccacb038b1de8b867318aa3bd559f33947f5285dd074d44d9887ec23
 EBUILD camlp-streams-5.0.ebuild 491 BLAKE2B cd9db6610aa4c70909e8129434a3ecb5fe0f08512b3d9baa705be777c3f7c0ed397747b7359dbedae4436172ad87e4776aff163cf7876ecabcfac2f0c3f0b1ec SHA512 b74bb565a4a30bb21cca11936cebe69156e294c8607f47cfa84367153163cf49d04c01582586e9c4d0e008949b3db8b204f4db5b13041f1725847812859571a4
 MISC metadata.xml 317 BLAKE2B 858cb10172a65e4de3ec62bff2b1bd1e32373c1ad47046e8588b2712931cbe1b0325cac8cb4c301b6652c4bec9bb4b0211c53ef9f95086957e46d02d9859ae40 SHA512 89df222289e49aedbd0e23f6539ff18b8cd75c776a1dd1b6c98ed792ada49684d5a44aae8b52ff7013b99e817407707cc36e09b638a4706c7f1943e232225b23
diff --git a/dev-ml/camlp-streams/camlp-streams-5.0.1.ebuild b/dev-ml/camlp-streams/camlp-streams-5.0.1.ebuild
index d42185a8e1c9..3ef5c727682a 100644
--- a/dev-ml/camlp-streams/camlp-streams-5.0.1.ebuild
+++ b/dev-ml/camlp-streams/camlp-streams-5.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 8a969519af36..2a8e121e1c5f 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -14,5 +14,5 @@ EBUILD camlp4-4.11_p1-r2.ebuild 1225 BLAKE2B 46784ca9b691e68654d84cd237d59452ac6
 EBUILD camlp4-4.12-r1.ebuild 1230 BLAKE2B f4e8f7724daf4bcdcba245c5fe33e7cefe492bf103c1704e0c701f72e84257117e55cf775c0f92e8f3f7e6b45a8ecaa9147d46ce9d6c00a19cdbf6c4cc9d4107 SHA512 9f9bbb61e2b05263071c292f276feab5b3807454fdf07147b8fa5a075d84190019c32ee96482175e7efcdd343365e0e56852124d6cd8843640316e74d60339f0
 EBUILD camlp4-4.13-r1.ebuild 1230 BLAKE2B f4e8f7724daf4bcdcba245c5fe33e7cefe492bf103c1704e0c701f72e84257117e55cf775c0f92e8f3f7e6b45a8ecaa9147d46ce9d6c00a19cdbf6c4cc9d4107 SHA512 9f9bbb61e2b05263071c292f276feab5b3807454fdf07147b8fa5a075d84190019c32ee96482175e7efcdd343365e0e56852124d6cd8843640316e74d60339f0
 EBUILD camlp4-4.14.ebuild 1239 BLAKE2B c61100a82a606c4fe5a360d04173c42313e4943f94aa0e1a5c9940dad62fee883de6fc016769eeaf0848574e394fb03b7c3bf6d501f0d4831c2aaf386ab051a7 SHA512 453d542913e80740d0fc3e744d8bb6adeecaaaf6290ecfedee673506d01592a6a23e16af7803734b0bf666fd8186a0ce32438b8b9e860861dc6971b133d0141a
-EBUILD camlp4-4.14_p1-r1.ebuild 1285 BLAKE2B 48885cf08d7a6a124868c9bbe3c89c2588a6055406b0cd04fa58db6bc47b1f5522c6d2a28d965cce32fa278cf4b05e6ab4f2bf67852093c3a07069d2144a54f7 SHA512 b152f4487ec4de3d01540e77a83cfa2ced51b815550ffbc472f46be48306fcc74f028b53da27922b844c8ff7010db3551ee60badc787ee4f844e393afbbab1ee
+EBUILD camlp4-4.14_p1-r1.ebuild 1284 BLAKE2B c7fb0e4bb615da32e77f74ff0dbb35eab5e176822ceb93eead334c5a5fa6341032e66dd50c32e2225b352c82ad252111adf6f2dc6f1aa67bec75dc4073f460cf SHA512 532079f0eb8607ae3895692aae30b2bdc38ce7985929fc68ef46bba6e081f3761a15ddb18f02098fd56b92421bb8228e4768b41f71732e7f203ed8cc1aaded66
 MISC metadata.xml 416 BLAKE2B 560e2116bb064decbc8d5e5391966be20ecdfa18ffc362c947b3d5f9aeae1bb2e5d3f391f765e9485075e05a90db69c4f9283b028bd15211e6979621b50d4428 SHA512 db6518378e93c20fd831ab4d2b6ac2168dcb456cf8c6e203f4c2d5a121404e530a8646f1346f34bb4db776cc9caf5f39f0749a6f46b7cc087ad38e7512e9872e
diff --git a/dev-ml/camlp4/camlp4-4.14_p1-r1.ebuild b/dev-ml/camlp4/camlp4-4.14_p1-r1.ebuild
index c17caf16182d..3959edb206f2 100644
--- a/dev-ml/camlp4/camlp4-4.14_p1-r1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.14_p1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/_p/-}
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 RDEPEND="=dev-lang/ocaml-4.14*:=[ocamlopt?]"
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 14708368ff4f..3fcb8c18fce4 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -16,7 +16,7 @@ EBUILD camlp5-7.14.ebuild 1134 BLAKE2B 684649ef792bb81a12f7602af883a97d779ca7380
 EBUILD camlp5-8.00.01.ebuild 1062 BLAKE2B 0bee5ed9c04774badd219a2c1c3b54a4d4c17fd27e01d211b6c03b28338da46e9ec763de23a9f80feee59209b2ed0219e56e72cad0d4f5e06f937fe5e5b4a24b SHA512 95cbfe1dd4673cd10814758cf86c7ec98ba66dc523285ec80c28880f01f9ddb724b5bfb7d6a4c7c666ab5c808d025ad26064a67682335a2045696eb38f604835
 EBUILD camlp5-8.00.02.ebuild 1065 BLAKE2B 4b8c725e5207d7fcb7515f4be18c9b5b65e066ce227dc08697b314632d89c61565ee5c4e49eb37df58cc21773fdbf4942eb7aca2d0314282adadea5f11a084a9 SHA512 1de1e5851cb7cf96e584c9443926aff39b413b413b442e6e05a5ab2da4040d415a85885f0cf38b452022f99e48cb4b2b1bec4c5ee43410a0138d69ac882dc1a4
 EBUILD camlp5-8.00.03.ebuild 1032 BLAKE2B 1bd1b75aaef3c011d8e849207957fa79f9b9088c882d08b66bf6597d99fe71c030c8d943b95c3826406868d4ffba0892053c92fbdeb7977a7ed9db820a8e819b SHA512 c7f80dbbc27e8b540f6a53ac19dbbaa51f7c7a54ae752914beb447718d4bfefa0b735ba430ee66584eaa70b2cbbc9df97fd259bcbfbeb78a0f4ea2fef3e9eebc
-EBUILD camlp5-8.00.04.ebuild 1030 BLAKE2B 0b3840ea65dbde9ba199b43bc339313472f8b9e9c7dfe70507f245eec37f3e562317b0494725ed13c247e0a44f0929626ee6ed92a07430f460cd82a71a610bdc SHA512 bcf8f4a0393dbed48f9591c072170bbe612295a6e971b0c3fe7b1c94fdc4618522f281788f277b7e4e085f5f93fe9032b75b9695901f83fc0db14d79cc854fbe
+EBUILD camlp5-8.00.04.ebuild 1027 BLAKE2B 2f87e4c473412a2a29db37eef23185e37fc9bc6cb3938c2362efd3fda5bfdca8e5b6daa77842cffe62136537c1fc854f18aa3b11af026bbf9b7905200b1b61aa SHA512 d848ddcfdde33335f8b089152d4d2ce23f24e6900dc608c08bcb1556682691fe708db2d864687375f3786c6c805566e1f007b2db555e43686fd168d6eb7eadd2
 EBUILD camlp5-8.00.05-r1.ebuild 1057 BLAKE2B 90926568df8183b4511331431e41a5cb5bde6bc417b790a34836c6cbc34b13d4f7c585719504ee6adf989d27096478ab4f338b9ecfc1c8b36b2c859e39813e87 SHA512 96cf5884b4ce43bc8017edf3d7f893d67a0e1aa39748b3480d0b0a8515178dc51a70b312d94d48cc433f1004e38716290e16cb7de34c2b00a4e57085c0b4249a
 EBUILD camlp5-8.00.ebuild 1065 BLAKE2B b89352f90f3a868c7cbd615815c160c1b01fe6b2c3a0b224ee10d72f777006376f5ab1010d72244df84b7f5633c1bbf86af8a918497b3d3e103388d0f0e34932 SHA512 8404c5d01f7f0d291de0a49952999cbef1043496da88777ad6efb9dcf6e2a39fe10f863e0d5f60a9ed704f7b7206b11982427ee8a8e177db2ab6b97ccf79e098
 MISC metadata.xml 416 BLAKE2B a354d5be50f3c22d734a960b5dac99af636478ff44b6fb31758d879ab4b31be5a64993a3cdff8fdaca59c7682d4597a73883c137679ab7817cbfd70869cb2a41 SHA512 b9eb28bca32dde11e1b266526c2381ac8c4bab983d9dab5f84bfffcd684e3c0525afce1e72d0fc7b2369298679a4c859a215ccaf6b223b6fcdf6efde12975fc0
diff --git a/dev-ml/camlp5/camlp5-8.00.04.ebuild b/dev-ml/camlp5/camlp5-8.00.04.ebuild
index 92ed7761d3a1..72fc5526dee9 100644
--- a/dev-ml/camlp5/camlp5-8.00.04.ebuild
+++ b/dev-ml/camlp5/camlp5-8.00.04.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-rel${PV}"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="doc +ocamlopt"
 
 RDEPEND="dev-ml/camlp-streams:="
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index 6de5a93b7c17..f7a0b2266f49 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -1,5 +1,5 @@
 DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1f380393dc3ac59589143e1685dc14085ef566e12fb751c6f1a333dd368795a5083b94a43b71e058e86489f3 SHA512 5c42e0d808230e3820b2e7ef34b544ca51a7bf0a484ce4e1c8b1e4966133196bb3ff7c3ca85b9c50050aca389316eb52f0335f6e2ad60c000594a33171b9a9a9
 DIST camlzip-1.11.tar.gz 28483 BLAKE2B b270e2a764547117d87a18f9ccca82891bc0dce182ea84f76b693acb34488ff25d8975154b843787554798bfd34c16dc6a25c431f8674c8c59eb2c195167c12b SHA512 4d69ef900437e66e00cd345497ec70f407f28cd8344ee5f2fad685d3bfe356924597d1854b752f2841b4007f96d6e0307cfae7e13cfb6f74951ae3eba5198a06
 EBUILD camlzip-1.10.ebuild 904 BLAKE2B 682ca8abdb41d8c1e2ab45089e1310fe34c600852003b59fe06fa88cc0c808ad8db048ff22fde40f4d52bc9ebeb4e9b38c65331f746f339bf9fd4848aeee045d SHA512 ff48de9f754549f4d595280b9d63b3f492abb0a2c67ae75ece55afba30fd4d25c6f648aa1e0e35a06b5db3bccc8b91f9f05def4acea07300328e44bebb405d8a
-EBUILD camlzip-1.11.ebuild 916 BLAKE2B 4b30e4145f40e950658263e19da737df21dfd76d4c95982a500284852ec1218928caab10e5f9f23e0477de2560c9fd07773184711312c15e7457ee1affc744bf SHA512 b05fdd496c85f179b8b3a43625c517896b7b81c9591d8784ee9448b958b024036265939de21c0f4b997de16e2cccb258c7644309a7fdfc321985dd300486d256
+EBUILD camlzip-1.11.ebuild 915 BLAKE2B 813c0df5901747a676e1a922a10c195184789630af113f87b7dbedc2dc755b60217af30a0e9193ee4871556160a1d9a127a45722997834a248f6b276cd3363d8 SHA512 42de8896634d3cb956d60071f7154c0a29e6884bfbfaaab23b4e40cb2fb286c47b620883e324b397bbf4194fbae6851127401ca06f6057ebae9210f1c5da03eb
 MISC metadata.xml 317 BLAKE2B d2d9b49548ab2d8a585cb4823b37b990805229909bb3ab23596ac5d916d2e7a2fe56153b1793d5e0979159e97f28289e14ded93d943541b7ab8def4cc195874b SHA512 5b7aa5dfdc7ec25161029b2d96a2596458b5507359fe25ff82268a98038f8d66f4fc095715348990d7116877035e17b0a2ed2d5541a990dcab1bd0155cc12ba1
diff --git a/dev-ml/camlzip/camlzip-1.11.ebuild b/dev-ml/camlzip/camlzip-1.11.ebuild
index 47c43d09721c..c1a9d1ed1304 100644
--- a/dev-ml/camlzip/camlzip-1.11.ebuild
+++ b/dev-ml/camlzip/camlzip-1.11.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
 
 LICENSE="LGPL-2.1"
 SLOT="1/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.07:=[ocamlopt?]
diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest
index b646b0ee4f28..569ff7fd208c 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -7,5 +7,5 @@ DIST dose3_6.0.1.orig.tar.gz 1417354 BLAKE2B c5fb08c853d2d3589416237addf767912ff
 EBUILD dose3-5.0.1_p16-r4.ebuild 2213 BLAKE2B de760d4d6da007ebe1718b2ae0f5b69767c8a1be6bc077408015693580e6547818365a409bfce8cf7e6f5c5df4d91a5884580f0e5ca45753167368da857838bc SHA512 443abf8b4c3ecb2b6fd79ab9f81b4860de65ef8ee399434ccdd32565f62b109ba0a951a4d1dec9404ab71af5746395af8e6fb56bed6a1ca07ef7397dd39f7ee3
 EBUILD dose3-6.0.1_p2-r1.ebuild 1246 BLAKE2B a2501476fd5fbbc3b0a181aeb94ff63f0213e1c795c98292b16737f1e883ba1b8387644d42ba7dc3660de874f411f8f86b0aa27beb6871f7a26eca81f7e8ce85 SHA512 903a11cafaa8cec37bdc0a2611d30b45c2b4f4f56ed7753b4811a15701c9aae290af867b90911f772412d0c6713fa051376d79d5bfb5d057aee8030ef49d8333
 EBUILD dose3-6.1-r1.ebuild 992 BLAKE2B 9ae68739546a10ca6a2e8befc3854471ec3a89a269af98e100f89d36e3468d94ba2e5e251aeab0407a7712c85669a24021fc771ae6715f307bf8ac51fbb00cf9 SHA512 a68de2da2ec6324e8ed45973fa294930a539f40f8b902f61a6f4c9ff1f6130497fcbb6ba9f574d1e9277f8a0c30cba72365fd9e6c50fd6ec3d1a3dbeafdc0f04
-EBUILD dose3-7.0.0.ebuild 1003 BLAKE2B 5efd9ee1a25485da7a0f021f9ca9fe71b79045ba01669888f59630dead8e15b95faaa2df43a9fcd4b0d283d0bca3ad8adace4fea9015eb7871de9c2d03364b59 SHA512 36615df2f69ee0d92a78cb4dfa70b7cbab06520606b491a4d00c37a8be7e238c93ae60994d53f4f557cc2fd6d454065679f0aaaa4625f05fb86a4ca5f4885a8a
+EBUILD dose3-7.0.0.ebuild 1002 BLAKE2B 76ad26de122154ef4b15713c072a798f13ec50ad70e41c37a630a610c15afb2cf134ad5826180de1d9c610df420c92ec690452fea7367652d36a4478eebd9e65 SHA512 0380806a8cab70503369f4f26c288a7b9adbf7c15c033705875c8b028af95326cf46d80ab041b10f4e32b2bd466f4d78cc24e44fef5a5866eb9d47b89716e794
 MISC metadata.xml 644 BLAKE2B 33ac1e7d6936a2a02afc9064cbc60f96d7882611a9b2085a71622dd4dfad1b31d8a7ede9086b60cf44215e8383b203f4ccf13c829e1388ff7f7a6769b9d94342 SHA512 69b4824c627c5d8b81d8ee1fb17a1109b4106bc2bbb211bd0e5e167678e001ffb8eef3071045a3d4c49d535bee3091b6fa0963fe13a834d95d5ca0e788f85bcc
diff --git a/dev-ml/dose3/dose3-7.0.0.ebuild b/dev-ml/dose3/dose3-7.0.0.ebuild
index 54f8773928dc..d332c40c3384 100644
--- a/dev-ml/dose3/dose3-7.0.0.ebuild
+++ b/dev-ml/dose3/dose3-7.0.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 BDEPEND="
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index b177506bd249..a28511c16042 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -17,6 +17,6 @@ EBUILD dune-3.1.1.ebuild 1519 BLAKE2B 73794b43fe622a63df00e38fb732d391ac8f8f062d
 EBUILD dune-3.2.0.ebuild 1536 BLAKE2B 7b0c2707650ed19052eec8911dc726697722fd4febd56f8a7136f324a4f6d103d464fb1cc1b7d1dc82d8bae612284b8bbc2208ca7f37d05032253547df5c9981 SHA512 3b3c6b9d97454a9f43b4424bbfbee3ec3be7fb3b120e0207497c71b30184f8f0c966ec95205d05ed3710bf11057a54b306ba6b1040ffdb534e2f89433cf91bbd
 EBUILD dune-3.5.0.ebuild 1536 BLAKE2B 7b0c2707650ed19052eec8911dc726697722fd4febd56f8a7136f324a4f6d103d464fb1cc1b7d1dc82d8bae612284b8bbc2208ca7f37d05032253547df5c9981 SHA512 3b3c6b9d97454a9f43b4424bbfbee3ec3be7fb3b120e0207497c71b30184f8f0c966ec95205d05ed3710bf11057a54b306ba6b1040ffdb534e2f89433cf91bbd
 EBUILD dune-3.6.1.ebuild 1566 BLAKE2B 5aca5acdce89bd12cc8e16aca4d9681dce20a4b843706f6eb9f097786ebcc1e9f6a1e11c4c1b9c45d6af078c6b034bcb22082fa3bdad88538db2af299eaa3d64 SHA512 ee271ae26c857d1f5efdf4a0138987e9b02ce5530229e4f16cbd69317fd63f78ffe8ad9816bef5b91e03b257f00499a01d7b4f084a89453bc2eac5348d403377
-EBUILD dune-3.6.2.ebuild 1562 BLAKE2B d2d141d79e355a5af8a4144ef8578f853d83b94b021bac9b3226d80bcca41c1f55804381078edf4b74ba5a9c05c274233b6c0f18773b68fdb27d6915d731ae25 SHA512 aeccd94bccdf8bda05f416ccb507b9cf75cf85ebc87e2179175bc859b212101df83a9e8ac23b2f4ab62e120d00850e970c0412b429c80770eec703844c180cc0
-EBUILD dune-3.7.0.ebuild 1562 BLAKE2B d2d141d79e355a5af8a4144ef8578f853d83b94b021bac9b3226d80bcca41c1f55804381078edf4b74ba5a9c05c274233b6c0f18773b68fdb27d6915d731ae25 SHA512 aeccd94bccdf8bda05f416ccb507b9cf75cf85ebc87e2179175bc859b212101df83a9e8ac23b2f4ab62e120d00850e970c0412b429c80770eec703844c180cc0
+EBUILD dune-3.6.2.ebuild 1561 BLAKE2B 46637f8691911208ab05dc8c1c2b22df8eba240ff689cf3cc71eeccc8af01a87fe7df067bdf63913545e65f4d7b5333ed0b79e76882862fce3a3ef9b58c0db50 SHA512 f8ab4674e7d03db64e08b2e30d7aca7dc93568e7f34e070131680b8f5dab034d639147536c895e824ef98c4a9f51aa4c177ee14a27bd4963706b797edea08176
+EBUILD dune-3.7.0.ebuild 1561 BLAKE2B 46637f8691911208ab05dc8c1c2b22df8eba240ff689cf3cc71eeccc8af01a87fe7df067bdf63913545e65f4d7b5333ed0b79e76882862fce3a3ef9b58c0db50 SHA512 f8ab4674e7d03db64e08b2e30d7aca7dc93568e7f34e070131680b8f5dab034d639147536c895e824ef98c4a9f51aa4c177ee14a27bd4963706b797edea08176
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-3.6.2.ebuild b/dev-ml/dune/dune-3.6.2.ebuild
index efc130751904..fdcf2b0e013d 100644
--- a/dev-ml/dune/dune-3.6.2.ebuild
+++ b/dev-ml/dune/dune-3.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="emacs"
 RESTRICT="strip test"
 
diff --git a/dev-ml/dune/dune-3.7.0.ebuild b/dev-ml/dune/dune-3.7.0.ebuild
index efc130751904..fdcf2b0e013d 100644
--- a/dev-ml/dune/dune-3.7.0.ebuild
+++ b/dev-ml/dune/dune-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="emacs"
 RESTRICT="strip test"
 
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 700ae3ff9233..4fe5e84c70e0 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -7,5 +7,5 @@ DIST extlib-1.7.9.tar.gz 91092 BLAKE2B 6d5f0dc01813357fd9b3efcbe0e4c4308eb538deb
 EBUILD extlib-1.7.7-r1.ebuild 1109 BLAKE2B 735dedadcd0979e296f7b5d89afb79fdb7e849ba650b2f257f43816461d7caf5cc7dd8a125e3faf07d0f576a7cbf0d0aaad6d8c7532957d13917b432daeaaf1e SHA512 ad5522a67d98a5effd10de4cabe459471832afe6f10e529f484e775834e2ebc3dbf300db966bcd5ad71337df49008d13c74ff32dc736cc0e100434bf2c8b487e
 EBUILD extlib-1.7.7.ebuild 972 BLAKE2B ef3c881ba1cea4fbf695c54bb6d61ab7ae2afcc6afa26d29fdc6f8063530bf40bb53e8feaf75f6a47df7b152d0a0a7b58afecb15f03955e7f751edb9a5fd91b9 SHA512 821e4e25e12539e4f039183b1e102dfd899a46b55fe31b12e61368f2af33b2ec9190f2a2690fd7feb4f10515e6368f6749cc834ba281db88067504d7c5cffbfd
 EBUILD extlib-1.7.8.ebuild 925 BLAKE2B b4110605476d37d43eb112abb874ba78f0a6b054a45952bb671f1de7f9f6c46e7fc17d80a769b4cb982bdffbb30e072fc37e5423503cb194dba1b346de9ca7da SHA512 eb042316448e7f41f2c68672e0a09270a91bd788e775fd04909d513b72d7a7ce7ed8c9e7cfb892b750cebe97e0884045186d9e76f538ba7f771de5a11dbbad88
-EBUILD extlib-1.7.9.ebuild 876 BLAKE2B c3786375641aebbe10d74815abbcc3e47d1888cd8d71da3a39e7ec8a3e4b108032c92fa19bbe8c091ae9fbccbf8b511807e34d2f1dde29ef7367fc0ec4fe83da SHA512 9fa094e5b109c905f7526179975d434292fce114fbf2f2a8aba92692e2211143407911bb4e20591ede879b2b94326550ce4c18822e51d1ff5a3bdd118e142560
+EBUILD extlib-1.7.9.ebuild 875 BLAKE2B 0008b03562cb470ab2c8ee5be87e43ead6cbe6bf6cb66d30eb207b2d3bfc9c02bce095173bb17a0321e66ea3d077ac111a37503d8b26ceafcd8cc24be1504685 SHA512 c977767b9027c19baec4a60e9081f5993eb251352ef33dc11900b6c9106a8c91e1e5a281a01cad56a5900413a19342df52075a9180976804e5eb0e99c86ac290
 MISC metadata.xml 478 BLAKE2B a653670b924a76e37d3c836a4f9c41d625afb6171afda77dd96244670e1bc199b52248ea30a348ea8732c2ae83fe6f3aafd1d29caa00238fbec9c6d1bd57b8fc SHA512 4b124d55b447daa2ba909d864b734d79d5ada988ca651bd199de44c150aae305a7fc2492260ff17e21aadad0c396e4441ee4f4a1ba9cd6b15166019dd2e1c212
diff --git a/dev-ml/extlib/extlib-1.7.9.ebuild b/dev-ml/extlib/extlib-1.7.9.ebuild
index fa24bb9e6e46..841d9be0a9d8 100644
--- a/dev-ml/extlib/extlib-1.7.9.ebuild
+++ b/dev-ml/extlib/extlib-1.7.9.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/ocaml-${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
index c67971bf21ea..d18974872485 100644
--- a/dev-ml/fieldslib/Manifest
+++ b/dev-ml/fieldslib/Manifest
@@ -1,5 +1,5 @@
 DIST fieldslib-0.14.0.tar.gz 3677 BLAKE2B 076fe0c83547a5276e6ab304409c1a636132738f8a95c4d9a4260e95f6a3c247341c3901e2cde4f63f1f4db417e3749d1e8cb128cf8c1711004e77f1d42472ef SHA512 245987817585222060c389a632fa229fa3c928090548a0b759e3b1eb06c868d06c0593b01bc41f453c209854a15115fa7650cc36888036f9e305cf2b79a5004c
 DIST fieldslib-0.15.0.tar.gz 3680 BLAKE2B fc6f2ed845906c7956a202d60c49a3ec919a94cf1b8091a925dabceee4c76e22e74768f8c6f83d6f42369aa4ac0a035cc4f8be3828db24313cdb6777853eaadd SHA512 9bba75a93cd55f798f830409579092f96edbdb739808cbeb9c35b99d74baf7ebade5d0e95005cde550a80f337da13e4d088ba5eb26e597b7fc81b80a91037190
 EBUILD fieldslib-0.14.0.ebuild 473 BLAKE2B 894cb61564c6d278d31ecbd2c4d502f44d41631030b912553d69242edb9b33f5ece397ea384b1ae44fee2ddb315b0efc48af2c18adf59de62be2eec6d3634122 SHA512 1decd4330b340d0f92e8035521d7f953d3f2940a0969445dc9d9213a1aaa865b32639f9bc16024b1ccf1cae83a79303548378ceb67c40f8a1d54ef94c0242f49
-EBUILD fieldslib-0.15.0.ebuild 481 BLAKE2B 63c7bb1a364159f930521770f4c2ceba9b5a67b93a42855c14d16de584f147848151b5a579e6015abd37883655c7689f2ebe7d2144c50c6ed7af4cecf8c8c06b SHA512 ecec3b0cfa32f6f65c1a2f91a81e884b7a15dda6cb0e9dce050d849f85646e2d3e6c815e7148a6db546642a25ba7b0c027de5c42bd95063b2fd610df1b28fd2a
+EBUILD fieldslib-0.15.0.ebuild 480 BLAKE2B 60e38f4b1ef12df7c9cd47dd89304ef4ae18e662816b109a3836fe3fade18424e7969f355f7e31ab09ccbeea90fa84110520b2e1423ecc3ab18851913a531100 SHA512 d2be4b63bd7d919fa0b2682f6e67c607aaba5ea01f98471908717f9329598607edce3a0ad5cf6eee3d844ad07ffbc894fe8abc5eb0a777e640ee0a205835aac3
 MISC metadata.xml 747 BLAKE2B 54806e0fbab112c313c3483efde72eb2a54915761b5f6a472513d4f59e07f6e66391e7af94fb8d2046368fa549308827d7a5b75c58077e620540a672a5dacfe9 SHA512 91ff7f2b696ca0e6eaff42d1e0b522e1e554e6fc6046d00fa4415e7498a80277b20e9358d45190a9b12e956d5bda366c66230201cbeb0c11964148b54bb87e2e
diff --git a/dev-ml/fieldslib/fieldslib-0.15.0.ebuild b/dev-ml/fieldslib/fieldslib-0.15.0.ebuild
index 3e177c3f6f4d..96feda059eac 100644
--- a/dev-ml/fieldslib/fieldslib-0.15.0.ebuild
+++ b/dev-ml/fieldslib/fieldslib-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index 5ad18fab44e3..44c75971a1dd 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -3,5 +3,5 @@ DIST integers-0.5.1.tar.gz 12687 BLAKE2B 37807cf0642ff4b85c91b82d7fa6ee46a242750
 DIST integers-0.7.0.tar.gz 12758 BLAKE2B 26244bb4fd6556c4e8e493180211a778552b84ae2de269b02d3094960fe7ab059a83f01263ee9e654e2e0c83195087bae621d7b60efde5eac519f9aae3a962fa SHA512 f71bf73af2e4e0dd5bd039b28bce1fdabfb199ada1836d694814aa6d0c1c2d205531fbfc05581082b2dbb1e9cc0948e594915d5ad6a1cfa1dbffa9e44a7a7450
 EBUILD integers-0.4.0.ebuild 443 BLAKE2B 2825cc12c8d0ece3c63802e946ff57445bb02b2dd7b702a808bac7331e341bf5b729175f90266db6cfa99341f08925665d904e03324d5e9b44e5a165bab6be13 SHA512 c25a789f367e1080897a3ea998eac8304932968c6ca130580ec3232d2fad98a2b0b479b7bdbffbd46290611baa82e6c6688349c10bfa8d5ef14e564b7155ae4f
 EBUILD integers-0.5.1.ebuild 465 BLAKE2B b06b31740a247f0e386a10aad09e55e52e4cdb31351775163dea4f6a4259963f0bca0038c1dafd0ce3e8bcf150e143ad840fc3925f3c409df8c2543a9fc5f495 SHA512 e5cd7d824afed6e32f68b110a898e40d61bf48b30321c5592df376cae7199afb979ad01c0b4fe1d898c155facfa395857fd3afbbdb444d023e1ab407a6c44a2f
-EBUILD integers-0.7.0.ebuild 517 BLAKE2B 933b369f26280ae9d7c26e8dd33f86f133695682f9ee5287dbd4995bcb034aed3b7136f3d28f5fe634fc44e91403a8655f7b60405fe218c481bbd93380523a7f SHA512 fb44e119df2bfc92327ea2185805c4ecf3b96fae57acb12252462c78786edf8e09cab669af206640cde8edbabeea124a48a21fc16834736547a1fa2398261e60
+EBUILD integers-0.7.0.ebuild 515 BLAKE2B ef75500aeb93c32d5bcb0468f2c7db9b2c027d8aacc11d8cad43833c12b959ec864890e5033ef8a6f2246dd4da1d9609ca60a105117fdd1589b0bc878a964d80 SHA512 dc544a6ca8a8d672a60251550993528c376d61b1fc2317a2e0b1a2b4f1f557e6c4581f0e5bcaee7e5d72075ccbbc28d4114c174c0d44635ed56884fca5b1832e
 MISC metadata.xml 427 BLAKE2B 230565ed0daa87fa10797f03b258e23bac9a01166ee589598b5b240c0b7833b7c73a1b32da7c43c8df6e3767876d0d54b289b74a9e062357bbd05e1164ff10dc SHA512 0d29cb64bb76f1c2443a2dd37aec0db81b5af18d902282dbabca9938d5618dcaddabd22cf083bbf3386b8994563c2e33130353e26054aeccb39e51702b136123
diff --git a/dev-ml/integers/integers-0.7.0.ebuild b/dev-ml/integers/integers-0.7.0.ebuild
index b450c62958e2..7fa9afbdb0ed 100644
--- a/dev-ml/integers/integers-0.7.0.ebuild
+++ b/dev-ml/integers/integers-0.7.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/ocaml-${P}
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/stdlib-shims:="
diff --git a/dev-ml/jane-street-headers/Manifest b/dev-ml/jane-street-headers/Manifest
index 7c2444b1c73d..91e8de71fe10 100644
--- a/dev-ml/jane-street-headers/Manifest
+++ b/dev-ml/jane-street-headers/Manifest
@@ -1,5 +1,5 @@
 DIST jane-street-headers-0.14.0.tar.gz 4662 BLAKE2B 22a48e9c254005d28c03399dd9d9347b45b7e3def9c0efdd768162f80ff611be6249d629cd78fd8768c7e6ec5610684e9459b149f3de85da307b2f1e8525296d SHA512 9c80acc57016f98cd88455866523f2463a13d2b7e10cf0d63f5198747615321799a8b3442432b321fa4f33a051f404464e27972317d197ac9513651600673879
 DIST jane-street-headers-0.15.0.tar.gz 4865 BLAKE2B 932468266f6cd56ee2b484c5f4459919b2f0fa659a41d51132c169eda49734e5cc852e6aea5549173df6af603f3118de8bb8362b5d7ca5f27e00999d75eb8fa9 SHA512 83ea5e4cdbae6710c7071325164df06dcb652a69329698c5b0c8832057f4d7325e8a241e5818e78ad2f6b8daeb1d0635528d9bd3b6761c69f8370a7bdb773c1f
 EBUILD jane-street-headers-0.14.0.ebuild 444 BLAKE2B e4c2fe0f51e8105a7e47ad7f13a5e58fc8fa66f61059d6908596852337773cdcabb1a49c79bac8415f24997d51b8536da8ac173efe128830ba87fd87a1dab24e SHA512 342d54ebf0f332146cb729beaa666d7c8cacc93bb11c18b8d96ae7369f900fa42e5020e636ffa040127bb5809191138d47d05bf615bc9086ed5047f9430b0129
-EBUILD jane-street-headers-0.15.0-r1.ebuild 454 BLAKE2B 8f511b78200cafadd1d042fcf61cc79a6db9fde89467d1d08cd49b63a2ab718657565791efbec7b6080634de59a250a96814924febff4075df6512b71113884a SHA512 311f88c07a554d87cb3ff23fc98df1b573dcd70dac06824ca5d67d82212b05beaecc218503a0cd83e12f2dba147e21ce74ab96153c5704ee0b92821a3ac4564c
+EBUILD jane-street-headers-0.15.0-r1.ebuild 453 BLAKE2B ef300453a536dc16d6bdbe7c121abb270496fcfc940bd02ea16c2253184ff1240a72c62fd4e03396b48cf9ec40374af61f3e26a25d2546a8cd481e595bfa0c29 SHA512 896c192f9a2398837d7d5759ff1b61d4dfc7bd598b72a200812150a0a2b53a3c3c8d5f723db067b44470e85cf2d07781c1dfd81bbea04422c312bff083a95bde
 MISC metadata.xml 433 BLAKE2B 7c7ca49386645d46dea571a508c221aa901bf6a68093e301159355d49c4b050a7927c08398cc8d9dc347dec60a0a1af5ffcfdd7a097a1084d969d11260f4b9b7 SHA512 14fe6143cedbf4c65c9e55a6395fcff15f5d9c877b8d511a32c9fd4ad7c878153fe1d74c957bc23d87e3ee3e8edb5553fbdb938986eb18cca23eb8e28bbd2af8
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild
index 2642db3dd897..d5946674994d 100644
--- a/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild
+++ b/dev-ml/jane-street-headers/jane-street-headers-0.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND=""
diff --git a/dev-ml/jingoo/Manifest b/dev-ml/jingoo/Manifest
index b3bcc77fd2f6..56d0808b13bb 100644
--- a/dev-ml/jingoo/Manifest
+++ b/dev-ml/jingoo/Manifest
@@ -1,5 +1,5 @@
 DIST jingoo-1.4.2.tar.gz 67611 BLAKE2B 5d2ead117863a2edd18320da4fa7539a7ebd6c537509b5cd37df3778d90c3459dde73d03d3d97b0ed64cfa4b7ef46f620e5638dd75f7e5b290340cc53761deea SHA512 d54d9114b87efdf49b81931b28ee2b61edbd984792c8371f7498b42175f574da7d2774b7b28702b62eeae704168e18c7e9283c4618045abc559b2d1d680e92ad
 DIST jingoo-1.4.4.tar.gz 68818 BLAKE2B d6049e06dee9ff9bf3a649ce46aafb3c281c5bce312fd7f9723ee682da641e3664c699cc9eca8fb5dbd55540f3ad74b64268fcbc0e56f46a8af36ef2b3c7b996 SHA512 bb46c2cfdb98f188319ce60e0623c0e1e980ff44235029788bd2fb14c2ec3650866deadea9004abdcfa14b031f42bd2327341a60623bd4d86fb0e37c34a7935a
 EBUILD jingoo-1.4.2.ebuild 718 BLAKE2B e9e70ed5a773e1c70b2a5ac858d5306d98199b803e02b0fbbe2c8b8f27261b887694b537a4ac13fee1559120f4d33631b840875d652b791409ddb176a722caf3 SHA512 4439cce76334d0e16902d15b20ea432d7faf36bd9ba3451c33a4fd5d8af60201bb85cc374fe6a3c9761e8c532316793128073bcd6e3cbb29176a487e266a9215
-EBUILD jingoo-1.4.4.ebuild 628 BLAKE2B 79d392f8877ed06d5d3c3888fb821df20ce77b429f03972a242f9e62ebd4f0dc626560d625977a637f189117d26ec17cad252fb60e15ab5c442c0d09a950e4ae SHA512 b4d14f387a1a193783ad4002e23b917593fd5bf5b699541abe77b586f62a2b1e1a82ac1a058fb57d163121e4f9efd7fd101c5b7ad90b45f7918ddfa0e7f266fd
+EBUILD jingoo-1.4.4.ebuild 627 BLAKE2B 6dbdde8d600a2aa109bf975bf2e3d731ea7e945ae7da457e0e74198f14ab39e8890b7f0b0c9e8228ff77461558f45c88262bbf0d17f3c769458af08e7332b55f SHA512 a5977d86d20a260518de1b223b0bb7e2170d64d8df00adb7f92f138ea18232edc84814bb524fada7432d06c2a008adfc59dc39a1973edf6c9aa9d17bc6208a6b
 MISC metadata.xml 318 BLAKE2B a882d48f971b725d9604a9205258cdf6747d2ebcfb868f9782267fa54ca4aca64482032bca93c54708bf9908e700b0c38a96b6f075f834ba2381744920075fd7 SHA512 15f06496cd273fac20f93fd79dec7bfc08ede35639e162e4de9e2e9c90cb187218f0232e4bd011d1b4dd8ebd9ee7c2ec32ea4091cac2adee2f772a3db5e88652
diff --git a/dev-ml/jingoo/jingoo-1.4.4.ebuild b/dev-ml/jingoo/jingoo-1.4.4.ebuild
index b006bbcc0bd3..801385ed4d64 100644
--- a/dev-ml/jingoo/jingoo-1.4.4.ebuild
+++ b/dev-ml/jingoo/jingoo-1.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tategakibunko/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 8f4701e7d955..720051ba32c8 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -10,7 +10,7 @@ DIST lablgtk-3.1.3.tar.gz 1043246 BLAKE2B 639b1a7610ea420cbae893eb40fd0a20a7605e
 DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
 EBUILD lablgtk-2.18.10.ebuild 1971 BLAKE2B b3d752ceb332d17afd8eb4bae3d5a68c7308a18c7c21e29a8248aa9acd2bb3886a31974ec21044d84db5e492838c434f323d13db1fe10ea1683d11927acc4022 SHA512 71f35efe0415be4d9b728317b3bcdd47464bec4427a1f96fe66ea31ca343d5d826c3ec7267db25dc01dec52516d70f09e414f420fe8f2255b3af43b5be18965d
 EBUILD lablgtk-2.18.12.ebuild 2044 BLAKE2B b0aa40188c8b484cedc44a862f5bae94b543a92d1eb59331c8bb2ebbc1d4734724398c9cad53bb733f72152219e8e8908652bc8ce6d686df980a9db3c460254f SHA512 270657f446ed45a15d76b3d6d2f381797b84980d9a339d6fbbf811e71b6b72d3dbc1777aee696d9f5b04e35d7568e2bf65d76603d6420fc60dcc4202a64db11b
-EBUILD lablgtk-2.18.13.ebuild 2067 BLAKE2B af9ffc91db018acda00150b5235502661ebea0717f74520f47a7ae07387a7ed40e349598e1c2b847ae153f689324f12130bd8bf5ef3a4ab26c91b50382bb1432 SHA512 5c00649c3bd7cbff17ff92425fbc29c1962db97a696a02d89f459a778a8ae3aaf84a204b1e5c5963c79e79301e69b4c4a23956cada19819abad675e1e5befc99
+EBUILD lablgtk-2.18.13.ebuild 2066 BLAKE2B 56c886db71ae142260ac25c225280c107e0cd544dfb22c73eed1907cc9626f4d925b335bb17eafaa04d8eb5dbfd9f152d34abd990c04f65aace1314852136e22 SHA512 a21a0e43d2a9d799f5b4c56656cdc5dacf57bd35c4edd90aa17f1b0665e894a64a28a2d05c52b647255fd8eb9fd3be1db203b14116cac849ea1d48c77e54159b
 EBUILD lablgtk-3.1.1.ebuild 703 BLAKE2B 63b744a767e6f1f238434a5e8457c0c01066992d4ced47b839e623b3a9535a15e3285b466a5477a01a17d10a4a0abb135b2d40e202288f89944029c3881e9719 SHA512 cfb13c7b8a4661174c84f6f5966b56bd6ff3c11e18b28149922329d9f8c9eb5ae4d8cc0811bfdf8f53f04b8f66f54118f457d53852bffa755c89e3ffe0612cb0
 EBUILD lablgtk-3.1.2.ebuild 809 BLAKE2B 240985d82a7da9d69c117e6d5c61d3d3e8538bc9de5684d267f5d5983bdac0a335b13e8ff66314ab38dcd94204c93175a9b2f887ac35afa1c8a96f3e8c33e32e SHA512 376d0c3f2026f8b434fd1bf2f2854df478149398680988dcc97ac859702567647ae3769db823f54eeb130de425f2add64cc29255d303460406e8807fea3c762a
 EBUILD lablgtk-3.1.3.ebuild 727 BLAKE2B cf8cfdd01066fc2f7fb5a591f4d9d40f214f2f1155bea1e2640710df3c249615ae25c9d2494705929a67dc0943321a7805a8284e110ded0ca29d03bd6e3f335a SHA512 ea651a1a065162f294ce48aa7e14d1498cbfe31c314ade5e53bc1f6eb18778e2dcd76b7530da7da5d1bdcdaec5d572cbe6590e67b38fa21ea90d7deac4a6457b
diff --git a/dev-ml/lablgtk/lablgtk-2.18.13.ebuild b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild
index 730b0838eb88..3b62d5b68ad4 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.13.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/garrigue/lablgtk/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 SLOT="2/${PV}"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples glade gnomecanvas +ocamlopt sourceview spell svg"
 
 DEPEND=">=dev-lang/ocaml-4.05:=[ocamlopt?]
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index e2c99e44c3cf..aaf32e67daa0 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -5,5 +5,5 @@ DIST menhir-20220210.tar.bz2 1160357 BLAKE2B a9401b50db4dfdfe56c5c10919d4d385cbb
 EBUILD menhir-20190924.ebuild 917 BLAKE2B 6bedbbd0944abf95b6dabd579319642f469104727ab6cedad5f9a3d41bee1f929a99e3554a344bdf5f063bf90f69220705adbe1d719c5e5dead5cdd23cf56c1f SHA512 788f58cf9373ba01b52481565ab8c11abf62760a17b6d7947fa47a0630f41bf13074c4d939f799fcfb015dcff0671cb52834b21239f7c9216a8e694b66fca9f0
 EBUILD menhir-20210419-r1.ebuild 539 BLAKE2B 213464589293893390f0c8a76d25dfb406cc9f0cfcb88b5215d63d3016a8031ddd3f8b5229efacced84d35fdd00f2b61676c105db954dfff7004cee52c46c6d5 SHA512 8a5189ea63412108d7c69d19a9ab530992695244513e0e7cc7421bec5379e78c43f79d697f3c820b99cb66c154bec5d75f44635039bf6033dffd457ba98e7939
 EBUILD menhir-20211012.ebuild 551 BLAKE2B d2e3379100b948a5db33cfd6039091d0a702a532f32a555829ffb7cd209a588690c160629fd547d3167bae6e76f4529b208f978c8cbe160e42c0d3a8284e1db3 SHA512 6c62b083f40a5c90d18aa148ac9e976ffc8d24c2fd11d9d70748ec16106892bed42f07e1ce96b40955d47fa9a83967aa5dc70cfa67a2b88da3c55bcecf358078
-EBUILD menhir-20220210.ebuild 547 BLAKE2B 2e101f86625bb7712592ee7d126df465d80ccc839b9b9760cf458445546ed986ecb6e754733b975836b49b7c237b4d1a9a2050eec59267f6d2860cc3a695eeae SHA512 95f11b8231750896507a528768bef61091be540001d04225f5c8e25e67542f93c0f2b674f1d345d6277cb8678ed93cd8229dd532775dab44665200711e266ae3
+EBUILD menhir-20220210.ebuild 546 BLAKE2B ce6e3b06f0b8c330c792740ff6cb2d2a0ba582bbb6701c3fe53ae3459196f723b125ebe0208996655fd6a505d615b0b1196a6cc2f847d1529494b897b2ad7be7 SHA512 64c23c944f144611da02be78f773d44156786b3c44422d31628658eef3cca1581819dc67c5340f3141092fcff8fc7f7f36d25cf8a9fc94962a8274cf912280f9
 MISC metadata.xml 233 BLAKE2B 4654803edd576a76b70115913e26d306cc35a2356ed110fb6420e2dd48aef88ab71ee4f5b0cba71b4c2a7624ef42707d405700abf41748e532b9fe0f6cb3b778 SHA512 5158dd5a94fb8cc401825355cc3bb6f04768c6df59fc60593d99f530e27dc448223091a8af25d0e2f4ece9b8a7bf01f4f19f91321901c8f82f55cb4a190b7a70
diff --git a/dev-ml/menhir/menhir-20220210.ebuild b/dev-ml/menhir/menhir-20220210.ebuild
index b89c891e328c..9c9d242694a6 100644
--- a/dev-ml/menhir/menhir-20220210.ebuild
+++ b/dev-ml/menhir/menhir-20220210.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 src_install() {
diff --git a/dev-ml/mirage-clock/Manifest b/dev-ml/mirage-clock/Manifest
index be71ba044abf..bfb865b34d00 100644
--- a/dev-ml/mirage-clock/Manifest
+++ b/dev-ml/mirage-clock/Manifest
@@ -1,5 +1,5 @@
 DIST mirage-clock-3.1.0.tar.gz 8441 BLAKE2B a8cc3b1ab3f929c4c28ce5f0dfe30d316b1d9445f4fd053743d5e224e8b5630c9ae2d12804ca690488a238c6aa8cd8b197ca8ca7d9e49b902964570c78ed946b SHA512 e4518a6c47e18c7fd3fd910de2f68cacb18735d59bcfffc79b676c8526466f2134979805222c39496588ef6f16a8f6b1fb79fec478459a3ec474fb60118c5551
 DIST mirage-clock-4.2.0.tar.gz 8440 BLAKE2B 37c701a92ec8cdf71e9d297ec09992f313f1b3637146988b8fac3e7c6e21be4eb2ebe622fdf1ae52612b2cf51e6cbfa87750c62bf68f126d3e61789d461a4a31 SHA512 7c32adf30505fe35a1313c162731b96e283a883dbc18d530344830a1f76d3397a6dd3b76a4ac3024aa02ff917d228c953c9ebdfeeae1f48686e776007234edda
 EBUILD mirage-clock-3.1.0.ebuild 452 BLAKE2B 5291492e74ec3a717e645043c4b57f9b64a70f18b646f2633fdb34695df2182de0e6e8e8840ed7fa6b8a23f51c6442894612f81bd74025facd1c397471b7a6d0 SHA512 29901d65ec09f6b236533704cc6c482328a4bb9ddbe64b3bef5f1b08c84703ca8505275ee11ce1fc4401d83dc942229bca23ac857de3d95bd0e099db98f2e2fe
-EBUILD mirage-clock-4.2.0.ebuild 541 BLAKE2B 2309150bffe6e1751d76cc8489991bdfdfd054dd0143b9771aefa47a3755b17dabb37b2a245831b245fa4ff37957dd4a3559c46fce4fd9c4fb29a8de0d03a9c2 SHA512 1ee1cfca5be4b6d4bc163ef876eff4364f5a31c7f428222e1a9d7dc51543f1e337d87404df50f219b9a21d3220b5dfce6ba7dc2fe6c6938a97afccff8eda34d2
+EBUILD mirage-clock-4.2.0.ebuild 540 BLAKE2B 4155f20cbaa023e473823f35c93a41fb930d5274456a3d9aa7b24ec2b109ffc4cf046789d331b529f9abe9243cdac21b7f4729402505db91777afb44ab86fc06 SHA512 bcbee81c4c7e2ba67ef1fe2f58ecc9bf67424e114f77235607c349aa1981d4e10c36c95e34de2266ee126657135a8defec1863f7b5a45af5cfe2441a896f670c
 MISC metadata.xml 317 BLAKE2B 5d20eb97520a74386bc19338271150e0eb97c39233e07b6ec09b7816084b8e7abe8c0e7bf5eb0f6f06d0a2991930ce77fbd9f31829da9169d0749ba529df248c SHA512 f0b47c1683afc2b2c4f3e8b22561638c3027f2a8a8f74c7e83c7caebe4e8730cb79b2e28ddaacaede20e13ff1428062dba30000eccd76d6137cd8ad1e1042ba2
diff --git a/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild b/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild
index a9376887cb14..b8d1773320c1 100644
--- a/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild
+++ b/dev-ml/mirage-clock/mirage-clock-4.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mirage/mirage-clock/archive/v${PV}.tar.gz
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index b4ef19c86280..441c892d941b 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
 DIST ocaml-compiler-libs-0.12.4.tar.gz 5435 BLAKE2B 2c7b3f79315945d094dd4102da748dda55265bdd36753606ec03eef6a39eb385b84e7bfd0f43a04583271bf7c53b15481e9dcbb48c362d472bb3f740ec48853a SHA512 cf08e8d4bf25fff26a16a05036f08247176f4845d9d9ada85944c3fa89b6df9a5092d7a1025415a3b2ce00dd45b544cc82247648cf3952be2304e5d9ebab121d
 EBUILD ocaml-compiler-libs-0.12.3.ebuild 467 BLAKE2B 6c9c9e8ecf70e13089e9605d8de013d808bb8c6190bf62fb441bbf0276d25617eb8658f2dd5dece471d35959fbb5aa14c031b2e0795fb9753e9ea8ee199cbff8 SHA512 46fd1fc5f2b52cf85772bb8fb1d5fcea16d81817f2cc4135b98d6a8703bb2e45af4688499c7374b263f37afe841c22c733d54d278db1be6bd3479281279962dd
-EBUILD ocaml-compiler-libs-0.12.4.ebuild 475 BLAKE2B da4e1598d6352d05e63aa52beed963b26227817c4381799b9b0e2971a76a43fb6666efb49358edd81e479b99943f026b629f8d86ac5b0085c6c94336332da8ba SHA512 2fe362f21e6ed82a75c80601d167b56558e62ed3fd3accdd5e7906d7f6132e416fd3b885252ba9c518f3e42bc0550a5eca02945c1e3c06bc3e50b6a728f44b76
+EBUILD ocaml-compiler-libs-0.12.4.ebuild 474 BLAKE2B 8cce801a509ea3734320f6b84d93bd603cbdc9716ffb6e10c2ab5af6a68bcec0d01bdf84c7d263efdfee19136660b749eea9637e73aa047c7ae73678e29ec685 SHA512 2f326c32cbe53218823556a363d03e893ada3e0dc85f373884e73985299b944b69bb587e3c9938626668c2dfed7bb63a00fc4089e66b7f59a5c90d7ca6f74e3f
 MISC metadata.xml 433 BLAKE2B b030add0bc65454a09c9b648962ba45faeb4f9f6f3448c2fec14a0f413968ee62d3ea3cdd265abd10f1ff6d8a48e8e85fcdbb45f318c440ee04fb1dd718cf428 SHA512 2f9de8e49252a907bd65d7d343f8e2bcae84bedf6b3472782ada23a345e634a4f63cf2589b5e7a3338bb824ddb334fbc99c91c3aa9514830b1051d1e9f522777
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
index 5590b48f042b..9867417d2e6a 100644
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.4.ebuild
@@ -11,5 +11,5 @@ SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 5960fbce961b..2df0f699def5 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -7,5 +7,5 @@ EBUILD ocaml-migrate-parsetree-1.8.0-r1.ebuild 581 BLAKE2B c04dfd7dafac92455c6e7
 EBUILD ocaml-migrate-parsetree-2.1.0.ebuild 519 BLAKE2B 428a0551cd32ee77eae3418e4711eb40a501efe5eec5bdbb313d0a0de64359a05bd0c4b25f7917c15e64dd88069c92262514a58ff3b5f4ea84e47415926f8cc2 SHA512 5d3f9d361d7b602889ad788feda8a846fa501407e37ecf41fad67a5465a20296a53897a5ea008f6a031fb84cc731bca9654bef1a7512c4052652f0d90615c544
 EBUILD ocaml-migrate-parsetree-2.2.0.ebuild 553 BLAKE2B 263d850bd6e8a14fd50fcb4753002f2507e8254dbee7a758afc06a00b8ae290bcf176150d6dc53253c35ba8258bc379928f0203e111ba8fc266f802565149eb3 SHA512 734656296bf6fe34e133a1015c9e58e3e5475b41a0aca3b59362a6c05723969140e40d8281358e2183a9d18e51c798a50339073dc022011a926097d486dac4a7
 EBUILD ocaml-migrate-parsetree-2.3.0.ebuild 565 BLAKE2B f32ffd892abf9bbab36b920b26835e20b5c2098485c631e0b3501af965cf54e7ecc6c8af81bf8f1305f043be71873ee4a4d34c687e25e9f32ea085a214a4d941 SHA512 b04c4363d3baf3b0b2c164189bae82abb1b4728a44e001406b9e7a7102cb378515d952a63e47fd4a7a637043a79810a1426bcf689a8745fad78c942c89fb8654
-EBUILD ocaml-migrate-parsetree-2.4.0.ebuild 562 BLAKE2B 5c6ff19c16f8cd745820ec1dba5ab8a7e2c9e767ac514f8b48988080b76f73a630b38c2e7f0793cbad23e9e02fd54932a9b3500294b71c5cb8072d13a5148f48 SHA512 7d0ed48d8ea82bac0f896120244dfda9b1358d164aaf69541f924dce47721d627af6a3d59d4f8ce2afb4ffec77033517434568411b3e24c1d54ede03e76e50ea
+EBUILD ocaml-migrate-parsetree-2.4.0.ebuild 561 BLAKE2B 0d10ab549169de55d4bdcbb318d382ce5b28c13310996de6348b67b8b6c47fc6c4641d3562aa228359f2fccffca0354e460490483a7cc61e476d9fd94c5fd46c SHA512 a9a5bcff007b39a0c6e552600b974ffa3acedc033693c186dc49b00bd586ca5ab4d092697f43ea54b9c981e65e00dc92b959b04c05c0e9f7e6439ea5d66a8b95
 MISC metadata.xml 436 BLAKE2B ec12ef5053e8fd2d654d38ca5b81823eed65bde5ae354c27cb166834da0dd0e34a4e038d1912cc9d6653b14cff9cb06d6a3bec4388b6d4d3a96cdc20faec3efa SHA512 99bc47f7b568fc287370b85da88f4f57630844ad50e2085a5f6d6fe17d1707ace3843751b07c061a80076661edcfbfa3714eaa248009b9562e60a591b0047774
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.4.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.4.0.ebuild
index 88dea05cf6b2..bcad667ef590 100644
--- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.4.0.ebuild
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/${PV}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test ) strip"
 
diff --git a/dev-ml/ocplib-endian/Manifest b/dev-ml/ocplib-endian/Manifest
index 0b7edb8cc399..2fa27646ab27 100644
--- a/dev-ml/ocplib-endian/Manifest
+++ b/dev-ml/ocplib-endian/Manifest
@@ -1,5 +1,5 @@
 DIST ocplib-endian-1.1.tar.gz 17544 BLAKE2B 62e4b1cb998ac00fd3cfd7178939b6c9f8c1bebe7c0dc072fbb45b79172cb07f4466e5f1e6e93b41e3fb8c3df8020d2033eb24abfec4906d3ad003fa22bdcd27 SHA512 39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9
 DIST ocplib-endian-1.2.tar.gz 18061 BLAKE2B 25354888f80ec4d09b9605f293b121dd66d365a461d2e40d9c3d41afa56303562d5db03a469469c1d59d304dd0d47657381c2f42b9e4935005c2ce85fbd5b80a SHA512 2e70be5f3d6e377485c60664a0e235c3b9b24a8d6b6a03895d092c6e40d53810bfe1f292ee69e5181ce6daa8a582bfe3d59f3af889f417134f658812be5b8b85
 EBUILD ocplib-endian-1.1-r1.ebuild 535 BLAKE2B aa25e272e02fad5eb0df50fe3152c862ea84f2565374cc86c7b9b6de05f361805c0fa0a0c8253cbc46056c0841a67d5fc1bfab124496dff7f3a4a552b6093eda SHA512 d2b1ae59907a9b45f3aa15aadda0870afc47ea04fdd5e7bf7722410e8b8dbe533a200e0fd6ff40db81390ed97533c7f288dbb99ccfc7bbf20abdba729436a101
-EBUILD ocplib-endian-1.2.ebuild 543 BLAKE2B 4c827fd54dfb201b28eda076b65a02f59aa2cd0db7d296ac717ffc4c2df61cb63e664d19abe12a7eae8e334134de493d84d2cda363b615f6be1a7cc017041781 SHA512 72172426b49d7617bc286024b750165006d7f9ca0a9895151225a0fc333ed9ef2d2f1d75c93eede1d01404d67dfca3078d3ed35e2d71fc4272fe951ca8935513
+EBUILD ocplib-endian-1.2.ebuild 542 BLAKE2B 44d67d93ef9daf31e01a67c414d4cdc75420d11aae4a36c3a087e1e1a8a0953abbe7a8004c6b85b38a269ecef809c74b400c0d5f5dd268389c872779e383fcc5 SHA512 638570397736d02586f276547c7bf2ffcde543b98a7d55bab42413dd0c413ba6ca507021d894190d74338d29fb8a85305c8236cf2ad2e6267c0b7e1dba560170
 MISC metadata.xml 425 BLAKE2B e3ed825024927bb1dbbc26fdfaee8f1e281748e53239368f903739a0deed4c9cfc3516a2a037820f6a8ec29c83ec1ab20dc9287dea9c67f80cac00d022017154 SHA512 06eb10e2ff45685cd1c8398af4ce411ad2f262ce8bd19310866e5b511d55e171637a1bd58a0dabc9ec7c0ed7ae6f86696b72b2b9772b7dfc47316b2d5a5f71c9
diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.2.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.2.ebuild
index 35d1d14b60b6..7e02940b59a7 100644
--- a/dev-ml/ocplib-endian/ocplib-endian-1.2.ebuild
+++ b/dev-ml/ocplib-endian/ocplib-endian-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 # 2 of 70 tests fail
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index a48ef9704805..e1b9c6b275fa 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -6,6 +6,6 @@ DIST opam-full-2.1.2.tar.gz 9442446 BLAKE2B fe5447fe8f9bcedb30bf455e93b54a37e950
 DIST opam-full-2.1.3.tar.gz 9618995 BLAKE2B 6f33e70c2e59be87b643840128b46441828d3d83888f5d321ac23d33b2fbc4d3163cb4303ac82a7f863abcc9300227bbc48bca3b8db5d6fbcebf0e6cf8869a5d SHA512 fe3a3c86335830944683a39a34a9eb385037476853ab3e2a82b8571a9e2021830cccf25cbd5bb891d239f6a47584c1b1d91aa445e6e2a814847346c5cc526ff1
 EBUILD opam-installer-2.0.10-r1.ebuild 1198 BLAKE2B 7c41b6c05fb724b68be01bbe277264bcf397e2b35d3c975e0f8ffe51ffa4ab890c280ba6d94c8a4c68016668a96a1a7ed35cd8469ebda3bc5cbe6ec7c36e7739 SHA512 07063e010bfc56662356ef42a6845dbe1ebce11e987eccd0d7ab9fca8bdb56bf9f558862a1e3c1ae2899a69a17f3e0c4f56739cd5c44c9fdef6097f867e20cbd
 EBUILD opam-installer-2.0.9-r1.ebuild 1194 BLAKE2B 7fd57adbf8d1f8d9d9b5bef83fe48a1fe40a844a3cd7f54027dd5d7e70e03ff109120a294b3e1f8c0430bbb9f6ca643be864b4aa2664baee5a4ade261b6333dc SHA512 76fc6ce77d0da8ba6773ad5f4dc21b11c7e655a8dae1c56feb630559a29043ecdca9293da3fdad6dd686675196c2293f94b49ed753a8f5b070036d99a88e88d1
-EBUILD opam-installer-2.1.2-r1.ebuild 1038 BLAKE2B 63f726695b49d87862a4aee6bb91b294791c9ec7f9df0377789cdc30af2410ab0012d36b0f71bbdaaac2ea4383dc87799430ff615496a733b1f3cafea7ec7289 SHA512 ee0d0e933264ad38d88ac99b2f16c3caaf25849fb743baa0eba05a78923bb08cf47d23bd0a7ca28cb6a6b61718ebb71487d64b07bfd3631be058a142012220af
+EBUILD opam-installer-2.1.2-r1.ebuild 1033 BLAKE2B c368b2cae6a3b3ae2b4f19ecd498243066b019752b6c8ed812fde3deb8d6de30328c46c0aa839434a56330fc10b08feb4e22d163fbb40b23876a37091098dfe2 SHA512 ade9467d022b3650745efffa22fd6c4eca879878c951f89d1e7fd2e8ed4a237402535e1b7e8382dfeacbffa7bb75c8c0e63f95eb24de90bb7d082ff87a21fc7b
 EBUILD opam-installer-2.1.3.ebuild 1076 BLAKE2B e0b782ba8d03a5b65e435d547f8a13e6efac0bb6597f52098253c930c9957587f82739f0142a90d48dbd4ed11f1c00fc12161ca5bb22190eab2a5705e391185f SHA512 09f99625b632a4f2528292283b4763690d688c9d9a10bffc2e984f21e01366eaa6bfc2f7198020cb280dc9201c5504d303e9ff520e89f33560198fec1b574407
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
index 4d09247994f3..5010cdd1712d 100644
--- a/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ OPAM_INSTALLER="${S}/_build/install/default/bin/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
diff --git a/dev-ml/ounit2/Manifest b/dev-ml/ounit2/Manifest
index d8bbfb0c87a4..af8df420671f 100644
--- a/dev-ml/ounit2/Manifest
+++ b/dev-ml/ounit2/Manifest
@@ -4,5 +4,5 @@ DIST ounit-v2.2.4.tbz 57558 BLAKE2B 5cb1eaa1233102af49155b46a1a95742c3c6c5849015
 DIST ounit2-2.2.6.tar.gz 69910 BLAKE2B 7833738e94990c7e67d27665e994c9e3c1505dcb45e2faaba58ef7de9eccc8fc19437fa983da058b1fa2c464e74d90a4eec22380ebfa01ae5e5a9616faf6ada3 SHA512 4d808866dc4f9de6493a17910fafb2452398aef45cb29add54ed25e15a10ec7715bdd52d40190f618e77fe351d8bb67fbe12c1df6a6736c501792a57f6b3768a
 EBUILD ounit2-2.2.3.ebuild 503 BLAKE2B 6de41b834e56cf7e51c97c10f21ce476fc96df609ba9ec2e308ee077078c92f766777f66982d37210d8bfbb15c540659273061debd255adc5c23dd990f07f7c2 SHA512 4a08cc0dc1d2d6ae4c290184ffc5a9d0e1d2d2180883632cc74376ed2809a1ffee4c7c5179230bc537ee911583ff2212400ab47c607c5441d14536bd6a3f1b2e
 EBUILD ounit2-2.2.4.ebuild 498 BLAKE2B b5b21b2d27eba15291a0009de501de051e8214ff845bcb5b7f7432809793aa80df2ccfbcc1ddd0abc94ddb128f1df9c23c1f2f4a22dc8cbd23b8bc92ceb00f18 SHA512 62f31733d78021e5cb3a9ec59bbe4f15a399fc57558d04ac1c60e87a8009286bf9c952e104c37708cb0807fb9942b2731fd6c5e54b57373517fe329bb5e9f085
-EBUILD ounit2-2.2.6.ebuild 591 BLAKE2B a52dfedc46ac0a201bd9e0ca1047bcb75e43043bc3cf19c3a1960c3debbb6add28f9f7f86aea2378eb0ef283467f1426b5a912404af3b5ec4db8fb8c3b15b9ed SHA512 c9abd7c343b13bb2aa5472e25a408ece1f89c1234aad2a2193b27c79ebdca8848cddcdcff89ce8833b1884e8fdd394aaff082548536a93c0f8ab708cf35e656f
+EBUILD ounit2-2.2.6.ebuild 589 BLAKE2B 000bf83bc811b034d947748f2136269e53f7050f2bf1f4d14742d8d8ac60af47ecdd23105a8ec01d01d1b0e2c5da7bcb27f1bfea7b283a6193e10649c9a1ca16 SHA512 5cb108b65d1481f15c7c6b5cf2be5191c3260a65e121b0891445b1c6277c83fc8430736029e3ea558381e2a349f2e646a2ef57bfcb54f2adc08a11466fbcaa25
 MISC metadata.xml 418 BLAKE2B 96fa6f7441ac0051ee08a91ab0639196a97b66025938df081ac052182c87a9095fc17ca56e29f1b07f28e21c9ba65640748ff2284e9eb3c95eba9df37adaeed8 SHA512 029b97ddc0f6e0a850df66b6c484ff937f47e774d323ab6e463eb6dee3d6c994885644fa51c0e66fcf5559dc3afcabc3162ccebf201d66c762ca11660a229de9
diff --git a/dev-ml/ounit2/ounit2-2.2.6.ebuild b/dev-ml/ounit2/ounit2-2.2.6.ebuild
index 4658b3fb40bb..adaa3366584c 100644
--- a/dev-ml/ounit2/ounit2-2.2.6.ebuild
+++ b/dev-ml/ounit2/ounit2-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/ounit-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/parmap/Manifest b/dev-ml/parmap/Manifest
index 41d7afde7f87..9b74a1cb47b5 100644
--- a/dev-ml/parmap/Manifest
+++ b/dev-ml/parmap/Manifest
@@ -6,6 +6,6 @@ DIST parmap-1.2.tar.gz 47083 BLAKE2B e790087273fcf749b000c7ad3a2f5b2cafea91c529e
 EBUILD parmap-1.2.1.ebuild 608 BLAKE2B 92d88cdfa1a4b8d99d84592c40953d3188669e6b5720d4bb18b5fcf27e35477244085b841968cfdb612668c7447e2e77791a83e877339f8567080738899de8a6 SHA512 ebabf3baff2fa3ebc2776e280bfb6fbead79d5f0f4f4f476fe2de10d38d7e64af6896d315e2eb77488352441a3fc0d87d4267a3cdadbfb38a8047d1899845712
 EBUILD parmap-1.2.3.ebuild 603 BLAKE2B 2627f2c8559d5ab41140238d346adf54c512f8cd60c33b32c2c62b8a1f93b5b6638482dee503415d41310476655464a493e5e0280cbc2e86d12e4d92bccb7681 SHA512 739b66dcbb8150169b14257c20774f688dbc4077d3384f3a4a632d1b8745fdfcfdff94953c63381208c9cd593b071ce439c542518679346e4416ea32bf65205d
 EBUILD parmap-1.2.4-r1.ebuild 617 BLAKE2B 5ae5c3d33805a7ad458067ef945fb0db8b420663a91fa90fe8cbbc304d40ae9991608290549ef7a6a558494e3e3bdf4cc479b2f9aab08fdcbe5a6b8871f4cc3e SHA512 b82f1976f9e9f54f12a90196f0afc116a5ccafb92a1d6ff14b72dc9ee23e1cfd7aef76e08151bd2548c33840f2a931bdbb1437ada665a6f21317a40842b292d6
-EBUILD parmap-1.2.5.ebuild 616 BLAKE2B 4f35cd29bfd9a1c82ae039bbac0e2b48e031005cd6dcd212764bfdb19d352b821b0751b7dd7fba1d7a5f1bef4a3830297959047ff8b7ac50ea3ac5817540b4e3 SHA512 dbae3b8b6d27f9a817faf03f13f6f1119914288db7ab05bd28bff61855f3bfcffd24aef4cbdbf0bcf568c46eac55514a95f0b6dbf5be0b00530e62f67e62d357
+EBUILD parmap-1.2.5.ebuild 614 BLAKE2B 315f0f2c8653fa5c7432d2e71ad515a7106ec3ab1b59b00302acc79f56fae7dd37a816b161198581e89365a63b9152b0dda2fdd1a67b3780a695e270907a96b7 SHA512 3cc39331d70edab3a08e27b718995628d2cb327e2c3a12861623d0aa6e97118f13d5b659bfb44dcbb82141616c5cae349474a8afcf369e96dd09719e06378fbd
 EBUILD parmap-1.2.ebuild 603 BLAKE2B 2627f2c8559d5ab41140238d346adf54c512f8cd60c33b32c2c62b8a1f93b5b6638482dee503415d41310476655464a493e5e0280cbc2e86d12e4d92bccb7681 SHA512 739b66dcbb8150169b14257c20774f688dbc4077d3384f3a4a632d1b8745fdfcfdff94953c63381208c9cd593b071ce439c542518679346e4416ea32bf65205d
 MISC metadata.xml 323 BLAKE2B 6e7bcddc8f305eb0ad28f81bf09278c703c7dbfdc7c9825886dae7fa1d8489460a816286f0849cfbc4a1b641cfbc43f6b14a74b0d669593324050f5aefe01c80 SHA512 42cb14a0c6f2439fe053d45546efa9a8a66b2e116aabf02c64f7bb8c28316e302cd86b586cd2d6717f37228a0b04598e99d60feb45d16d301ce8a39da1f02d0a
diff --git a/dev-ml/parmap/parmap-1.2.5.ebuild b/dev-ml/parmap/parmap-1.2.5.ebuild
index 66713ae93932..0864edbdda32 100644
--- a/dev-ml/parmap/parmap-1.2.5.ebuild
+++ b/dev-ml/parmap/parmap-1.2.5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV/+/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator:="
diff --git a/dev-ml/ppx_ignore_instrumentation/Manifest b/dev-ml/ppx_ignore_instrumentation/Manifest
index 68a04cfdd8dc..3ca446c2b786 100644
--- a/dev-ml/ppx_ignore_instrumentation/Manifest
+++ b/dev-ml/ppx_ignore_instrumentation/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_ignore_instrumentation-0.15.0.tar.gz 3679 BLAKE2B 3537d4336a2299e277fcf1e58690233a9e1ecd94c80d144376bef90b45b3c2c94a8eaf5e5ba2b90b12d8f4e3afc257461c4732a2fadba8aa91c7f35ff036fb0f SHA512 ec411cb7a191fcb36f9a29f8ff3839db6f4031e30fa3444896a07235950ca04562a701b3bc7bc5df95e3ff82cfe8996be75bd5dce4bcce8a491898df1bffc50d
-EBUILD ppx_ignore_instrumentation-0.15.0-r1.ebuild 520 BLAKE2B 0876b1fdf4d699baa408566373806b8137aa9de7795a19fd07a29206b6a68bf839e540653f80e683222e17cc5ba6253c11a3803ec27d1d4340865b7ce1739b5f SHA512 96072af298f46295707da919b4ba7ba0f839d9ea820f690e94c5ef74837127689dc84aeb0d25f1bd292478c4a89d45dd60ff7ce3dbedc5dec99046cfead41fe1
+EBUILD ppx_ignore_instrumentation-0.15.0-r1.ebuild 518 BLAKE2B e8179f6d37f9f36efc9a7c00e188ee26a65018badf7391fc8af6676c91dff5f65bb40a719ede174208eb9691a4a021a479379bf82006170439515ce9b75a5747 SHA512 a0d21d5ea01f03770e2c2e7fe319da817c9cb6ebd02083ad0e5a5d1794a73e6d0b2c45c452e5713f7ef6a6baa45e9b740ac3047eb6f2a323ce40d50cffc432a6
 MISC metadata.xml 335 BLAKE2B e78fa9416dac3fb12ccd82e965f1c152b7dc905f3f54c6d0c96b14daf9644ab2afe4f307656658049a89c8baacd507bcbd39ac2796648fc5c75d94ff2a5f8d39 SHA512 8c07521b5ed071d427b7cf30e05105be47f0ca857b0443502312d5080c4501612dfdd36f3858e7d6020def0efd9ab2630fbe13ffa0bfa751d557f8695bb48ca2
diff --git a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
index 3d16a36ca86a..6fd3bcab4bc4 100644
--- a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-ml/ppxlib-0.23.0:="
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index 12c63deb8d75..400cfb75fc89 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -17,6 +17,6 @@ EBUILD ppxlib-0.22.2-r2.ebuild 1139 BLAKE2B 1d7ddf698f286050c117df27983f43117841
 EBUILD ppxlib-0.23.0-r1.ebuild 1011 BLAKE2B 3bfcb9e6ce7f21b2e6dc784dcbcfc297f372232c40c8513460d29306d6976243eebd797a710452ef6c33be71d707b23891126e4275430d26787a8f726a8b1884 SHA512 cc2e0ac82fd5c545f550c1b515ca4a040bf964637d98ee64fae22b405683080e60d9890f193ee8799fea0a9a5098c0ed0671aeb7a31df4c77b65abac84770dd2
 EBUILD ppxlib-0.24.0.ebuild 963 BLAKE2B 71671c594cfe7138204dd9850abc309e66f8d0151dec06b86adad136be09b164c4c4aa767f1115560e9c0b89dd0f8f75a982389fa5ae67cb15d960bfa17b7959 SHA512 c171700b628b46b295cf20f6282870c5f822c0df3e5de30c3835814e01ff184f9807776578fe5f2a2f728e24c39320d0f3e0a80cfbfc318a157452c6a3ed6cca
 EBUILD ppxlib-0.28.0.ebuild 964 BLAKE2B d7e38eb33b23eeafe86d7a7153220a85c021e0739ff51d2a4b3901b5ec0190c24f474140c7f79c19c1301e303a0b81c62e3e651bd7b919e95fe072263bd243ee SHA512 69e3d5bc346878542fdd1dc2e2155cf720e46561106c97441b00c7b23b7e3f6fdccea8556df69c51b263087d83128455940c6b4f3d2c0db2cb15e7350dc51ae4
-EBUILD ppxlib-0.29.0.ebuild 963 BLAKE2B 9319ab0a2855aa59bd642591df1e27e511841cf959a886309dca9f6f72c5daa8087617c1e5b6b9ba45704efa2285019c6685cc9c456f8db65ebacb64d3aa83e9 SHA512 73205852d87fa5af2fd488bfd34e207c4fe4c6c32600c21fec8159e496faa9d9167a5ec9eb2bf7793e03aa543ea60c8363ed33f412786e8ebc05fe1c4431c10b
+EBUILD ppxlib-0.29.0.ebuild 959 BLAKE2B 0ad670b0aab7a3efd0905e135ba76dd0e28b3176a91f26d844151bf30b2df5f6a05630e4a2ce489837437363df3cc93dba618df38767a09be468f1467ead2426 SHA512 c8eedb0a53abc62dd55dcfd90d826bb6387412f2719cd15c9889575f6c0175decfaede78fb9bf9c2ae8c0690451f7492995692fa1eb73bc5e74647e829282cd8
 EBUILD ppxlib-0.29.1.ebuild 964 BLAKE2B d7e38eb33b23eeafe86d7a7153220a85c021e0739ff51d2a4b3901b5ec0190c24f474140c7f79c19c1301e303a0b81c62e3e651bd7b919e95fe072263bd243ee SHA512 69e3d5bc346878542fdd1dc2e2155cf720e46561106c97441b00c7b23b7e3f6fdccea8556df69c51b263087d83128455940c6b4f3d2c0db2cb15e7350dc51ae4
 MISC metadata.xml 419 BLAKE2B 97371846a88fb0008519bfb72fff654aa18401b2066073c09099b1987efbb9ad49012c0ab7624218894130a2cda3d5fba6056522eacd30712d08b7784801d9cf SHA512 8dc94b1dd499f7caa3696de963e69063193892dc939609c581fec3b2d93eca4f266e9360cb5144978ba36864d9143b6fb0a1eb0e0ac5061e04b84a68e787a8f7
diff --git a/dev-ml/ppxlib/ppxlib-0.29.0.ebuild b/dev-ml/ppxlib/ppxlib-0.29.0.ebuild
index 9dee33ce54c6..e5e3edc8b4a1 100644
--- a/dev-ml/ppxlib/ppxlib-0.29.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.29.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
index c970e4001a57..6005f6380ca4 100644
--- a/dev-ml/sexplib0/Manifest
+++ b/dev-ml/sexplib0/Manifest
@@ -3,5 +3,5 @@ DIST sexplib0-0.15.0.tar.gz 16706 BLAKE2B 154b8f3cb48dd6f13e7ed9679a8ecde6ae57a7
 DIST sexplib0-0.15.1.tar.gz 16106 BLAKE2B ab994e151166860c85d646cd759031f668577f2ff97e86b9a949f510220fc84dc80d7c41c91c2ba5e5946c8c4d95d3bb469f2669d919068a05ac5c4fdc4a8f59 SHA512 3f15e011b180cccd96882b6b3d3922c13622151713080261a9646d8df896635a6a85e2df6a5d332784678d0d1cae7eccb190769ac4d9bd68b040bc3b41362056
 EBUILD sexplib0-0.14.0.ebuild 455 BLAKE2B 5760d5f430d84eab8049fc4f0ca7419e70ccbdcd6a7438f41264913b651edfff2b7dd6aee33ed6974ec1d54a9f2bf915e6eab2d9d18c36a5851461f99dc719ce SHA512 97d43640f86a62a6b304c5f36706d831e4ee5d9cdcfbcd402581ee8a7ff130e1bdf73165f82ac95f2bd82f1048d5661b39342911fd4cc084bd67ca660a37f039
 EBUILD sexplib0-0.15.0-r2.ebuild 460 BLAKE2B 3fe35afc0eb118bddd871fd59d67d36c83e0e10b59de6e6f607a872be712b0da1e47b09f6f3a09c8f57d90f65e6581dd5e7646a6d371ab5568f5b11844d6767c SHA512 fe1402826025c65eaba821ee075b13329f0e0e0d8aefb3a984893f45d4fe6b9a1b108fc4ba249506e5b41b652e7ddef0db14894483f9dd175b2b0b37184cabe8
-EBUILD sexplib0-0.15.1-r1.ebuild 458 BLAKE2B fce1d2e579f85f702220d813becb742fb7b5a384c8be8939b8393d3cfcebb61601807990719ba1773cccdd38da083333571c52cf426a2529c6ba958e1f2a3899 SHA512 e42ae352bfbd03e4bf11c00265a103cf56641947ad46a5118ec0dad8584699fb325cc30bcbaa45cc8f4775bd0d1f1c09cbe68a16489a8ab52717f0ca1657dbc1
+EBUILD sexplib0-0.15.1-r1.ebuild 456 BLAKE2B 78affd477ee8d0d59dcb142b7a71f079686af6902aed1bc5fbcb6aeb11125ffcb15245a4fe99e5d531933e1cefe8d9cddbb9d02973413470100fdf37d8b72d5d SHA512 986217acb121025641b69190a9832373254a39e66bd47fa6032ca4a17592d7a2e338bc28cee5da98e3ae898cf735f82f84f2843ae936d3cc7a8dc375186500e6
 MISC metadata.xml 422 BLAKE2B 00ff507c6982a44a6bd1ef0b28f0d0a69db94a6e344c83cff6a765b5fa1a23137cc8497bb5cd9f40fd7cf946849905c4161f883f2075208730f495a8a3fea67f SHA512 2b4f3e191031bff487fc6f984a1b308a5bcb06fead967d7fda290c588ae8d0131c1ff86cbc318b7149b9ffba9e5ca0ad258eef149fffd15d63a9625b88effc80
diff --git a/dev-ml/sexplib0/sexplib0-0.15.1-r1.ebuild b/dev-ml/sexplib0/sexplib0-0.15.1-r1.ebuild
index 4dbf2acee113..95ae8ae86b8e 100644
--- a/dev-ml/sexplib0/sexplib0-0.15.1-r1.ebuild
+++ b/dev-ml/sexplib0/sexplib0-0.15.1-r1.ebuild
@@ -12,5 +12,5 @@ SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest
index 25e68646b4eb..86649ec5914b 100644
--- a/dev-ml/topkg/Manifest
+++ b/dev-ml/topkg/Manifest
@@ -5,5 +5,5 @@ DIST topkg-1.0.7.tar.gz 123763 BLAKE2B e049b745651261d4167f01523c21018c2fa9e2c8d
 EBUILD topkg-1.0.3.ebuild 977 BLAKE2B 25fb14a2f2d52e8b2f18b044c450df093fbf8803fd3ec09aa4a76529c08ce1707039567a06a05349cbd3f178aa2c4d9ba129860a1293713b613e94a7a12d20db SHA512 591ae4ca722f3d85815c0d0b53ade24bef08dfd271897ed0e9fac51441c46c60575efaa60f8110efbb12b68877affbd37619e55646cccef51679a797306dd391
 EBUILD topkg-1.0.5.ebuild 989 BLAKE2B 7ebc9755ffd6fa9f0c5bff88d307859c6553d4d600a06c0b044bc48d63c96afbcbcfbc5c693b35d69e73eb0b49eb23f0d8a93b6a2e98f44b28642c9707693516 SHA512 10c3cf189a21714df866f2222c2ad5d7432ad9d5d21650423fab8412cbfa39a46d61b7a9da7c7ca6e7530bb8e203f7c9e36b349c3ca75eed0e62f1cc24c18daa
 EBUILD topkg-1.0.6.ebuild 989 BLAKE2B bd5697ff93fbe002b6a67d2c12ff7c05ba8e204a61f7cdd53606e6aa029a97234f432b9790b43017746eeb9e7e4cbbe06b6e45896cedf90ac8b473bde6d8ddd2 SHA512 b80170e0a3034291b790f8e511be3b03bc73d90aa17a129fcb623613fe16b2654f3a3649cd7d292293f8404bd35bc92be6ec760df6a8954c82b53fe3b4a34548
-EBUILD topkg-1.0.7.ebuild 986 BLAKE2B 894ac983cd8394dbc9290fc4ae6fd929d4247bd0af15aaf3938bc5e2f1b0e8c8cfe47b7f8ba492cde4e2f032728d696f1ec65fd8a5a01fbc19d7e4b6d30605c9 SHA512 0c2b685de5558f8fac7eb357ceb2efb569535505039616dac9ebb36a4417677558aeb97517d7d2358a9fbd737c2f01fbf3c2df0a722a3afdcfb2e1d06edafe96
+EBUILD topkg-1.0.7.ebuild 984 BLAKE2B 6cf082869c04fde7710b19793a16a2dc98b2e7cd0fa66faf4a55478a0cf2f3e37a9286e3e97e245ac156a20bf65afaf7d452d3bdf5ca7209beffee0ee35117bb SHA512 f10ffc26599c5cec5fb915b4882c5d253d732776dfa5c1a8c5d2fd494fd79e32f6f9d731a3f64054e9cb472be991ffdfebb981d30f69e58a500ec653b3e4b72a
 MISC metadata.xml 417 BLAKE2B 0b80e61196b3796c580559b88e78f3a2f95c434ba1878cb09b22a40c8f0cb964f32215532c9b14c25d5f1124a0614227a9e32fcfc64afcf4519a0c1f89f6a048 SHA512 9c041417cf7da9e56529048a9f5bedba2c0271e14dd80aafa95c10778ad98a145bb020a8984b55ae568053dedc667339bf05ed2f696f208f19289ec3d7089327
diff --git a/dev-ml/topkg/topkg-1.0.7.ebuild b/dev-ml/topkg/topkg-1.0.7.ebuild
index e9dfc943b10e..31d7521572fc 100644
--- a/dev-ml/topkg/topkg-1.0.7.ebuild
+++ b/dev-ml/topkg/topkg-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/result:=
diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index 7439b00bd9e7..5493ec6353d2 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -3,5 +3,5 @@ DIST uutf-1.0.2.tbz 22420 BLAKE2B 8391f6c3cde40db3fa86b9243d8ea8fb52409aa958d102
 DIST uutf-1.0.3.tbz 23363 BLAKE2B fe35596a3c3590df38f34219ac577d34c0899c006087cb015e971002fff0d193d7fdc281d0bc3abe2fd440e7da11cc27d10b0356f9eb73e1a2c647fd0b672bf6 SHA512 50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8
 EBUILD uutf-1.0.1.ebuild 1602 BLAKE2B e034bd86656837aef5f35797ab66db8b976da72e0cdfa108d5a7ca3e60e0c081f45cf9b89132f7da8c315045915f704ae240bf712f95ae5fe489df246ddfa932 SHA512 28eb77dfe9180b17995d518d5b9eb7f487692f0f463039340c4137c9ea668603d89f5a404d0f4d4e2c014ec1cec1e0bc19d3992172280df6778737480679cc18
 EBUILD uutf-1.0.2.ebuild 1602 BLAKE2B e034bd86656837aef5f35797ab66db8b976da72e0cdfa108d5a7ca3e60e0c081f45cf9b89132f7da8c315045915f704ae240bf712f95ae5fe489df246ddfa932 SHA512 28eb77dfe9180b17995d518d5b9eb7f487692f0f463039340c4137c9ea668603d89f5a404d0f4d4e2c014ec1cec1e0bc19d3992172280df6778737480679cc18
-EBUILD uutf-1.0.3.ebuild 1650 BLAKE2B ad1cd6b76a9d8797961701b3643fd3303d8097184fcecd6efcb88f5546ec213d347c46da72a3e130032709d26a0195ee889f7e3975ce78dcf843d2be3285657d SHA512 1a1f10708c57b12f81df241bb6440f800ea8e5f2525f4adee777677a9e140500359a5d3816e3a88008be4fae6ec2c2dd4cfb4673bb5c0414d3b6f4c793ee3b49
+EBUILD uutf-1.0.3.ebuild 1649 BLAKE2B 0cdd6a1bd7506b1d6f6805b8ee62e701bcb86087fe97dc5863d8c4b1aec0cc956d1dcbcb1227a755ce3cdf40b0b985a391b86252094ea7c31272b033da434be8 SHA512 7c29ced3b4cacc1976238093b36b6783f513d99428946a1e03c28f2c9f543e14591ab174eebe6e39ce3bc4bd112ac9f6150aa0e84f296b7f91eb119fc8322aa4
 MISC metadata.xml 391 BLAKE2B 0f8f1c945c9a92d261312c24f4f23e50eb2183ab374e7f72f3e2aadd1678b130f230f39821209ac11156a0bbf3383552ff10552a7657da7c7b76abaa916585f2 SHA512 6953d1cde6c4c779d81b451f762f7aedf2f789aecaf87ac874475003b696546918d8f894cec935bf9cfc4ecdfdc1ec816fb3aa117f90e59fceabaf90d66d5157
diff --git a/dev-ml/uutf/uutf-1.0.3.ebuild b/dev-ml/uutf/uutf-1.0.3.ebuild
index 45823d8f06dc..22f71d02434f 100644
--- a/dev-ml/uutf/uutf-1.0.3.ebuild
+++ b/dev-ml/uutf/uutf-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc utftrip +ocamlopt test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="utftrip? ( ocamlopt )"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b1e6ade7612b..0e77d9c66aad 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/magic/Manifest b/dev-ruby/magic/Manifest
index 4339946c4735..b32079f070b5 100644
--- a/dev-ruby/magic/Manifest
+++ b/dev-ruby/magic/Manifest
@@ -1,4 +1,3 @@
 DIST magic-0.2.9.tar.gz 11642 BLAKE2B 1208e40e1c95ebd8a31f71d860b68acf9663a165fa5f775459f874d79f41c51268a0f0be5d9f6ca416b85a838879d179ccbc10e40047cba1e330f891dbd6297c SHA512 5bc6d6e1b2646b12af7dad15273dc125db68be2d6e6c109484339c8f651349827a90ea81d8feb0441c5811567d85130cda35167e2dbb426842f952fc2ff8ea15
-EBUILD magic-0.2.9-r1.ebuild 708 BLAKE2B 9c143dabd64d7846632864b046a3c0b94498b55e6c73dece5736358794b2c9a99c0775bbb766c47906cbac9cfee38dcfd68266800115e6f6b4bc77985f8a88f9 SHA512 aede495082c8ab22bad78f4456daf47057fe5821f6b919effe81bcd00f0e42bfb4719858a35bff881fe0c50c08be08460e197b8c279d51c0874163ee5ec0c03a
 EBUILD magic-0.2.9-r2.ebuild 816 BLAKE2B c6cf02879a3d016655e238410de464fb6e4959a843e80909f99cac9aa88c1c16ca14cfcb10b736a1f3eb529f26bf6cf0aebc01686bce0ad8e02a06501c5da94b SHA512 5e5d462f17a4877816c9d72d67232645aa1f803ca699f3e396f81ea5d2fc71d00f3456a3a5620840740ec58f31422de4dc405c48ded7e6f84bf73bc2da6ebe7d
 MISC metadata.xml 339 BLAKE2B beb4876fd388f0e612240b7c9ee67e85e3a7e5ac5d502497fa9d80ce15f4b6c7ad2a6847c5235368f903af9581f0ae045ef28a1347e04c02bd577895f7470968 SHA512 652d191bf38a440cf9a0e554489ead5dc3e59ad676939cffdfa527b9f968b01c532e7f96596824fa8e0151c0cb99b1895178588b56cc161e0cf2462dcb017a92
diff --git a/dev-ruby/magic/magic-0.2.9-r1.ebuild b/dev-ruby/magic/magic-0.2.9-r1.ebuild
deleted file mode 100644
index 5de63843ea67..000000000000
--- a/dev-ruby/magic/magic-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/qoobaa/magic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Ruby FFI bindings to libmagic"
-HOMEPAGE="https://github.com/qoobaa/magic"
-
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND+="sys-apps/file"
-DEPEND+="test? ( sys-apps/file )"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-ruby_add_rdepend "dev-ruby/ffi"
-
-each_ruby_test() {
-	${RUBY} -Ilib -Itest test/test_magic.rb || die
-}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 51e7e17dde7c..dbf6888f8cc6 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index 9f40b41e7019..33bf48d9d6c2 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,4 +1,4 @@
-AUX thread-2.8.5-musl.patch 536 BLAKE2B cdf86ff6f8fd1e4a46f5ca2f4ab88b664879a03d45bb107521f40af2c2998be06f709489434adfc7076567589bb2ba94fd60afe0dc76504a9b1e68964d38edf7 SHA512 21bc1af0323e3f172fbc5f2eec1002e3136c066f041fc6cf3a3cbb51511929f5bce93da16f4d8af8a24a3d5e111cf1e01c0d154d13601515fbc348ec506b5366
+AUX thread-2.8.5-musl.patch 621 BLAKE2B bbaf972b18eae3f5e9c53ef525a69892e284ea3b08a8bc6b5c1cc1c41e6dbdaea525feed214e568ed9ee33bc62d454ff01ae85eb8060f2daa6e74eb0216aa11e SHA512 d627cfa29000272ba686436bad273e0fa3bc8ea0f5415bea0b7b41aca88fb6f13ff16f3fe393bf1bea94502fbef59a8b998e3ca8145b5efe9989c11ef4e83408
 DIST thread2.8.2.tar.gz 346222 BLAKE2B 194673b14b3f6b98a46330afa58caaf705feb2d8713606547d0d7e5b18770c5729fd562c81e66b403040622afdbdf62b994bd3ef62678d00915ba48f1eafc786 SHA512 0889f54ba8c76413f0333bdf6f17cca38c4fa8ccfff7e1554a63f38f19471dc72c3afe34d2e38ea00724aa3f0c007051999392a8d188d47265dbf0527dadceea
 DIST thread2.8.5.tar.gz 338776 BLAKE2B b6500ba59f87150d3d4479cae9a55b591a41768c6a74520933157d8fe2ec5374a79cf258fad1f08c775b190c17667dc529605f21a4fdd562320778be94b294a2 SHA512 b1cd049605f44ea5e85a121ff864d9e531491b24579654159dd5f3850b0aa4192ea79844324be3e9c6b395b14e6f765474c792bfd3271c7100b49f0ff22832d0
 EBUILD thread-2.8.2.ebuild 840 BLAKE2B 94e971170043f4aa7eba8ccbe9f6da4e9d8064949ea1bd56ed1848aa4674f19955e7c17579b97cebbcdeb332ce4d1f2de797f901fb5d934dac74421cb951718c SHA512 e43eae4d32004f73f7b994408b69af37b3dbb7d0504eb9d9e41f51470d02c8d886a724485ed22042f163a2807d513e05f538c667e76181727a97d2e9b6649728
diff --git a/dev-tcltk/thread/files/thread-2.8.5-musl.patch b/dev-tcltk/thread/files/thread-2.8.5-musl.patch
index b31f8948d6e1..0743d8628c06 100644
--- a/dev-tcltk/thread/files/thread-2.8.5-musl.patch
+++ b/dev-tcltk/thread/files/thread-2.8.5-musl.patch
@@ -1,3 +1,5 @@
+joining a thread not joinable is no more returning EINVAL
+Its behaviour is undefined
 --- a/tests/thread.test	2023-03-16 21:31:05.333423098 +0100
 +++ b/tests/thread.test	2023-03-16 21:31:25.837324400 +0100
 @@ -100,15 +100,6 @@
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ab60d0661379..357652fdb6cc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index d49b36763b9f..66e8f2d07914 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,9 +1,5 @@
-DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
-DIST xfce4-dev-tools-4.17.2.tar.bz2 353571 BLAKE2B af3ec3e603b2224ee47feefd63eb3e0be6a83dd2d442e8372d71c2aff910a5fb7818c9c93d0347ed239749d14f83f9443c2bde05a815e7449b6ae564186a1b6d SHA512 f08cdfca8c5753fd58fa3eefa56a3ba94bbc708ecf93d4872f3d843720840ef6d57d0af7fa7fdb11d8645f082338d7668bb01c6e531aec8ad89c6cd627529124
 DIST xfce4-dev-tools-4.18.0.tar.bz2 349125 BLAKE2B c82496de1a279a3ce57f895a52ee4eab98d2d174cf7109ac70790d9f1c8a6812196f4ff5bd951352b2345496f0ebf4113472a7e1f9e3826a1d02b163e4108f6e SHA512 59f858b633d95585a74c9b9515a0994744f4355ab3813e582e10c776454ac41c86296a9fbd935d5dae88929ec09ec9c30f48629c7addb5729e6bea108d304f7c
 DIST xfce4-dev-tools-4.19.0.tar.bz2 368601 BLAKE2B 349e3dcf69c1fc1f0af052546d78b86ffc89ca81b66c27e8b7058f549adb0c6a16e6c462a6f5e00e66dc4b419dd2ea7fa43c210d83153e23254b8b5ae5a77fbf SHA512 7372efcb686fe6c1e42f17564d693cbe24792d00fbf131faff46040c8940ad355067d4a4cc5d5de5ec6b9707943c5db5de84eee4a4ff894ef8c33c3616a26044
-EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
-EBUILD xfce4-dev-tools-4.17.2.ebuild 629 BLAKE2B 67dc7710e79735b17caf0f59b60731da8079b3b5e28ab25562d2bc662dc9f6e0183cbe2c330361997ebd256146f5a6fbf7d9220b7251dedf6ed85c68f8292c52 SHA512 deee8675a7e3e9694f9fe303a6de33b925e84fc2e5194f7b4cdef464d03f71ee68afa71764296fefe0cdde68d212c5922cbfcb87b09888e5bcc2cd8a684c8aa1
-EBUILD xfce4-dev-tools-4.18.0.ebuild 626 BLAKE2B c13cb643b3b63ac83146996472c52ca2896353a49afdcd0808829b5b444b3b4b7034ed28bdf753ae6c97343a16c6f3fbdeb38e2a28a0d039541df58077dfcf2f SHA512 f84bdd73815fc44eee3936aa8ed57a9e75270a26e1b50372384667471e8531743dfc9bfe89582902bf31f1341eb015fbacadbbbde2336e8890e59b6c0cd074ea
+EBUILD xfce4-dev-tools-4.18.0.ebuild 625 BLAKE2B 7e0ae9e3b5360249b9db71564b33dfa17c9e57beb798caee94326d8b5589f8357eff7c31dd3c822b247d92a516cc066eaf5c93dc2f6c442cbb21b12798c2f41d SHA512 a3319cbbb0418816fcc4191ba4c10910119992afa2838ac49fdf309ff9fc35aec20d86e3e2df0fa08ceb1338b60fc96b9c244ffc80fcdafe857c3efe5536029f
 EBUILD xfce4-dev-tools-4.19.0.ebuild 672 BLAKE2B cefd34949e5ca824dad4609cd9ad7424d35f0c4e9da13bd28221dab894ea6a79d51f91881aac0500101deb539c17e1dd6b479326037277225c15ebf0c2fdad7a SHA512 b8c0343caf7847d9b89977057135d78ce0e7f5e066a67fabf26dabe83d1b9e3af97e7f92f30746d5566ad78500b37028b22c69dd77238d29aba169f2ccabeda3
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
deleted file mode 100644
index f62529279ef5..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.50"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.2.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.2.ebuild
deleted file mode 100644
index fa89cb983824..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.17.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-dev-tools/start
-	https://gitlab.xfce.org/xfce/xfce4-dev-tools/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-DEPEND="
-	>=dev-libs/glib-2.50
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
index 609e76035dec..19544ac2055c 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.18.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 455e490e52a2..7109e2b1799d 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk-layer-shell/Manifest b/gui-libs/gtk-layer-shell/Manifest
index 7913a025d42d..4e5351efa28f 100644
--- a/gui-libs/gtk-layer-shell/Manifest
+++ b/gui-libs/gtk-layer-shell/Manifest
@@ -1,7 +1,3 @@
-DIST gtk-layer-shell-0.1.0.tar.xz 34580 BLAKE2B db815d711e53485e00de2e0b7d238f6c66ddac9ca790d5f31c44eed965ad01ee07392d27552ae21bb1eab4905cc1d5f7dad9c10fd059afb43ba85c7ea1af2aa5 SHA512 3788559405a495d43279b20b9d64e1fb0fb9be4125eb3011a623565938246310c2e81cb6d52db111e42a9cd0739bb273ccf7fcb7c52db8b74a1e44108e061c6d
-DIST gtk-layer-shell-0.7.0.tar.gz 133511 BLAKE2B 49925796112f7ace01050beb56ebe2ff8a716db56075166c61a7b9d1e4f1b7402c970e14de59404ae9b05f70130542fff7601fee10e0d8780bffa34da0515aa9 SHA512 97463b4bd90318e95576e3f4b05c0acae401b8103b389cb9a0dc7716871d8d8285595ddda76419883c98c6f00fcd4ffdfd9dba48385cb8a6edcbdc7f202e2818
 DIST gtk-layer-shell-0.8.0.tar.gz 134857 BLAKE2B 2f41411c849182f95c068040a17e961a34d1a3df0bb1280b6c57046729396108d4627b5cf9bd826f17ffb5cf77f6761212af159d4326b2d34d9663063667f9f4 SHA512 710019b05785abc3cc8bc639a110f141dd2f37ce1d78e03ed361f1c21caee6c43817499fa05c8228f233bff3ac0b6f6123fa9014a87ae99edb6b10e4ff8f3dde
-EBUILD gtk-layer-shell-0.1.0-r1.ebuild 852 BLAKE2B c4d2823e3a8d4b33b598c029d4e56db888e61b071c70b8f1706833b8dd0cfa3492dcdcfe05cbd7025255e304004fb2503d496d5e5ee1ba9168e4efcd92e5fa7c SHA512 744fb57920dc4b7b3567c8ba8d6694308694bdfc4868ab10c523c6561096a7c2e4f05420df7ea9f13bfe0c2d82ce94b804f682abbff7f1db85ecc95a8dbd79ba
-EBUILD gtk-layer-shell-0.7.0.ebuild 1178 BLAKE2B 46d2df215955403eebff75e6c6820516de95592c65db345487495eae1da6c99d6c742f3093e0e1414d0a0c61d89925611380057952ddc288f7e4838f53699da1 SHA512 2f0b22c72ad23da4341ec841a6170bc90eb0a5e293c3a4457d4afea27698456c44e7f7c5e7ea21526fa292590bc5c2cb4a3826460d344b1dbb5d0135b0a120df
 EBUILD gtk-layer-shell-0.8.0.ebuild 1332 BLAKE2B b0db40e687b1a019e223d49c89d9ddaf63504f36fdd060fcc07f870e8cd1ec4c1d4c869db6e95e3770c8305f5aaa9ae9b3fb4b9adc337b82f2ad49e3f34d2c2f SHA512 23b9c74133445df8f0adad6c1e118c9770cf3832926bdee9211636a0616e7e7d2e36c21167011859312b95b7d837e402555c677b265c63bfdff4771f3b8ad9a6
 MISC metadata.xml 495 BLAKE2B 59bee54b6a6cc173655e2b482873f3ec5a21854a7dfcde8f6073a3c003642802978b182db94dae86c82c0b2409a153691b83720471530e4435ce0eebc5833f19 SHA512 625076c53f3dafb1812000eb3d50a68a837d751e53697429fabc6369161056f8ec16db584e830848cf57b659a10b8ece4b2cddeff1402ab42c4ff474aa954261
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
deleted file mode 100644
index a712e403c388..000000000000
--- a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wmww/${PN}"
-else
-	SRC_URI="https://github.com/wmww/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library to create desktop components for Wayland using the Layer Shell protocol"
-HOMEPAGE="https://github.com/wmww/gtk-layer-shell"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="examples gtk-doc"
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
-	>=dev-libs/wayland-1.10.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use examples)
-		$(meson_use gtk-doc docs)
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.7.0.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.7.0.ebuild
deleted file mode 100644
index 69d6f80c4c94..000000000000
--- a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit meson python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wmww/${PN}"
-else
-	SRC_URI="https://github.com/wmww/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Library to create desktop components for Wayland using the Layer Shell protocol"
-HOMEPAGE="https://github.com/wmww/gtk-layer-shell"
-
-LICENSE="MIT-with-advertising LGPL-3+"
-SLOT="0"
-IUSE="examples gtk-doc introspection test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=x11-libs/gtk+-3.24.26:3[introspection?,wayland]
-	>=dev-libs/wayland-1.10.0
-	>=dev-libs/wayland-protocols-1.16
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	test? ( ${PYTHON_DEPS} )
-"
-
-src_configure() {
-	# note: Next 0.x release should add support for VAPI (vala)
-	local emesonargs=(
-		$(meson_use examples)
-		$(meson_use gtk-doc docs)
-		$(meson_use test tests)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d626454e98fb..4b3fef15e523 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index aa784e043550..75290c97106b 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -5,7 +5,7 @@ DIST intel-gmmlib-22.3.0.tar.gz 843176 BLAKE2B 8874012deec80f5639a4fd1e0f7d94f9b
 DIST intel-gmmlib-22.3.3.tar.gz 843483 BLAKE2B bbc447823fc7a7301cfb5579ff28ead8c3f58c012e309d296232834283c1aadf6ced032db3cdd5fea36e251331c86e3b9cc3a7a8187d743b8075db603fd05cc8 SHA512 9257f4e42cfaf654e2cdf896dcf0c03f5918f889fcf89b4d3540e3c9c9dc60324d74377205d8d37464ee47e60833834ef7ff6af0c52548cfba054492e093d904
 DIST intel-gmmlib-22.3.4.tar.gz 843421 BLAKE2B 8880b66e01015a01aa1464efb84c6cb2b31f1490133c0703601475dc873e2201b02e0b1e1121dc4bdb7c67f3f70701fde459f20625adc3edbfc7720e5743a4fa SHA512 64b1884361746c2ec97c42608af29e1c2d1487a7253f5cd3c1a73b1bf45ba4b0f49766ecbd93fa767863dcfa3dcc58cbf5a613e803eeb5b12e6a42ec622d223b
 EBUILD gmmlib-22.3.0.ebuild 795 BLAKE2B aa072d7de2722997cb9b3b25e8fa6b3463c9550b77fffd4920af453083067105a53c85c8be3fedee817c345d971f26c3e710b9e0899b176231f3fb41dfcabd90 SHA512 033a1447890b49f48f44bb66a21b3a2be616bda44be8dc861421cc9cb9f77268273f871bce537159ae8b74751fb47bf6e1ff95e8382bef87685eb762f5a4c54d
-EBUILD gmmlib-22.3.3.ebuild 796 BLAKE2B 3775ef25e7f1c37c3447d357b24ccbccc7b5579edb45c9c6cc150ba92eb53f32c2b195861007639c3c3829b9efb82278188ef3e218ca1ba6fdd8ebf65dbd0078 SHA512 07a10409cdbf332c4518751a600cc4348ba60d6af6be79caae08cb6a0d8bcd20725ba77195385da188ad1fca5e000286ed97b908ae1b405902d7a51e385aec56
+EBUILD gmmlib-22.3.3.ebuild 795 BLAKE2B 9cfd9cd4326908a5e4d9bb8774d238f9c6094fe81c3c5819d800d440fdc54f816ca04e15016f77f4b378f6f777b71aab12f6b89d4346240015d2879552a24854 SHA512 24a15c24ad0772192939f194aab5839ae0fa0e6c0a1324c7fa6b63512134a4a5a89a7dfa08583e7c9acc5ee37e477975428017406c5ac2e002165b7e7702ca74
 EBUILD gmmlib-22.3.4.ebuild 796 BLAKE2B 3775ef25e7f1c37c3447d357b24ccbccc7b5579edb45c9c6cc150ba92eb53f32c2b195861007639c3c3829b9efb82278188ef3e218ca1ba6fdd8ebf65dbd0078 SHA512 07a10409cdbf332c4518751a600cc4348ba60d6af6be79caae08cb6a0d8bcd20725ba77195385da188ad1fca5e000286ed97b908ae1b405902d7a51e385aec56
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B 7023f9e4f92483e48cd0f7ca9395739df74d4ccc104fb45a76cdcb5ca74ccf75445e14a87355d302cc290108a0bf4c0bdae4a7831f1bba30c40b3e7872767c4e SHA512 815c3eb892de44f887c66f33ea54e19634871b9e147e5c6ab75d73e46b3500935656c04a3c46305ae921afc3fb6bdfeabfecc87e27c5b573a906be693985c609
 MISC metadata.xml 478 BLAKE2B 22fa7744f1f6ae793034225645314ed7f0a5499cc33b570a00aa2c076cb3fdc9c2663654df4998a30fc76f7d833ed4f2022fd8b2869539e25c47f64e6b0f438a SHA512 0c46a6af2f254ee9c314f08654739003f58283e3ec00a8a3e628225e14065d359d0816a05aba1754379dea826d1bf2d501fb35ba58c5020f036917771ea035d9
diff --git a/media-libs/gmmlib/gmmlib-22.3.3.ebuild b/media-libs/gmmlib/gmmlib-22.3.3.ebuild
index 97335b7ca360..5558404d5199 100644
--- a/media-libs/gmmlib/gmmlib-22.3.3.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12.3"
 IUSE="+custom-cflags test"
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 5db11b16d030..37b7c2f187ac 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,5 +1,5 @@
 DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0 SHA512 cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
 DIST leptonica-1.83.1.tar.gz 14028566 BLAKE2B 56c501f16eb58366e4ed2f168f714adef968c271a0636cc0f3663b762aac29352a508421702e8ab063f78f3faf01e3d9eb72fff43093b05722a1a604beb66a59 SHA512 14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553
 EBUILD leptonica-1.82.0-r1.ebuild 2066 BLAKE2B 5915d60328aa57c44be294cf3c390ffd7fb2fac6cbfbb5a2f87a6133c6f1a14a9ba0e3cf5ff23cd4ecf1d6f85413207f55c7ea5fc781006ddee59e12f0d230e6 SHA512 227edb1fb6aa0ed926584b2344c0903dc589582e1fb3d492390e0c4d30752e62ab31df88661eef7a8c08405a1b3033da0a360fa1051d030833c3984ea6a441b4
-EBUILD leptonica-1.83.1.ebuild 2071 BLAKE2B 62ba777b29088e9578465204dd5895c2519fb95641bb43b47513b83eed1d2670c1285f97acb80d2655983e43392e6114bd8c7d171fe227ae1de2340fdd05336a SHA512 9eedac37c225720f25008e94f8c52670c324c90a6462ac2187ef6136a5bcf01bf43d07431cb7701cd71f76780ca6a9dd1a667db6b948bb9db36e14a525a1adca
+EBUILD leptonica-1.83.1.ebuild 2070 BLAKE2B 800c78d2feae8fe0c706e13df1e27ad489524ed81868bf20b901646385c5b8fd46dc2d9063ea3d49e31e9cdedf0ebabdd4d2089452f618070e61fa01e8b88cad SHA512 fa888feb6a60a6d0399a788b55d56a7a8410f875384acc375545c6d1fe9512bc0de4b605ba1266386df8d633eb0c8aaffe9dc252af2943d9d10f8c797453e620
 MISC metadata.xml 606 BLAKE2B 45193dccfdf3394ba6217bb096036b61059b96be60a22381e039df561a66ef091df4fe0476e2c6a6af9f4ee1cced1019d284171e767c18c56ffef3a737794582 SHA512 6b193ead9003b5f54617f4c4852a0a0477c8cd246b4a5e688578d17ec3c03293b6a45e2f6082a16ca6f432fb2bd3f43efe59c5d0cc1c5f741e91116321a10860
diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild b/media-libs/leptonica/leptonica-1.83.1.ebuild
index e6ef3731896b..6e619b9a4b89 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 # N.B. Tests need some features enabled:
 REQUIRED_USE="test? ( jpeg png tiff zlib )"
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 9d97f6d46f82..03e8c933afb4 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -5,7 +5,7 @@ DIST intel-media-22.5.4.tar.gz 27493483 BLAKE2B ac6a93e06eec33edd823b1fd4310cd63
 DIST intel-media-22.6.6.tar.gz 28599397 BLAKE2B 3a3449f0af37c431ff1224bb919de3382767044a728603b9fb3343f6a2ed92ec8f9c30796623a17fe64de617816d0961507171c06e41739c9c650145b93439e2 SHA512 8013ecadfc827a89eea6c72e262c220fe05fc11348ab23d46fb703f170d927739b46b21bad5e79fdebde86b646609339d2333eafb7f0798d77f9c64f20203f90
 DIST intel-media-23.1.2.tar.gz 28625961 BLAKE2B bbeb070f22e9642d3a7510edbf34f438d2c817484ebce75ec3debf86498916a9b1c9ee37c721825a2e8041bd52b7a6501a089fc9d71bd3ecfa5ff6b69b5971b0 SHA512 b5f402c209552caaaa4b6f27094230e6dbed15e24e3bb035a543b72277d19d80d02697b9900ede4137a20e4a02c6ecaf498fe4a58ef247a1f880b9ebc9ca3dbb
 EBUILD libva-intel-media-driver-22.5.4.ebuild 1348 BLAKE2B 06e45d9018fdfd720c9e2251d179cfb28db544595ef2daede5bce4c37e35c5e22b7a335fb19f7d239c5ed017362b91601144aa00efc836470c42ff88c21aef22 SHA512 5525f59567a4cba6ae9ed1d0db84c01445e349a2c9bb8040a08b503d98533a45559d7c128b895fdd9e6479ceb0ead7e71d95f9f899257166df59931d0ceacbdf
-EBUILD libva-intel-media-driver-22.6.6.ebuild 1349 BLAKE2B 61245fc4574b5ee78b89db02c1fdde20c1834b3e4016530cd63b5295627379e832353675756f8e8bcff770f869d77aaedf1e606510281db9b86e22e5d1911eca SHA512 61c6c3010ff565ef9a257d3bca2e731f787ce7e9e725574603fd83d66c1775a88b6d6426436e9e724fc79f6a0f8dc2eb3d7fb48804c72cfe5ff3dd945e7ed87c
+EBUILD libva-intel-media-driver-22.6.6.ebuild 1348 BLAKE2B 42c27e60a9177174c731466ed0d8a7385d97d1f3dfe607dcb08f486b10891d45adaeae518caecba24d7b6bb3727cea1612216daa65398e3a8cfeea7f25bea90a SHA512 9f24af8b9b5e5ca765972d2afa4ba13d48d173450a5e229409ef16273c9d322a4acf47d42f9df151207cc4953be46a203f17426dceba8018c85af2b4e041350c
 EBUILD libva-intel-media-driver-23.1.2.ebuild 1349 BLAKE2B 61245fc4574b5ee78b89db02c1fdde20c1834b3e4016530cd63b5295627379e832353675756f8e8bcff770f869d77aaedf1e606510281db9b86e22e5d1911eca SHA512 61c6c3010ff565ef9a257d3bca2e731f787ce7e9e725574603fd83d66c1775a88b6d6426436e9e724fc79f6a0f8dc2eb3d7fb48804c72cfe5ff3dd945e7ed87c
 EBUILD libva-intel-media-driver-9999.ebuild 1372 BLAKE2B a48874cc6d1cff79803390c8f1ff2651ddb6464f21365d74a2f0b7bc97e392ad0eefa0002f659feda8db7b3424d66938db48be1a238c8bbd76eed220fd241507 SHA512 d6414971a1487d155214b8cfdc053b4657364e547aeafdc3d18d8f16bea241a2b775616f614a4c5320c6c52f119e20ae3ea208f23af684ee712f90bc006ef487
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.6.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.6.ebuild
index bd08b390fd83..1dc86febd94a 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.6.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.6.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
+		KEYWORDS="amd64"
 	fi
 fi
 
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index d463e9a8766e..f63b8f72ad25 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,6 +1,6 @@
 DIST libva-2.16.0.tar.gz 267735 BLAKE2B 59c5dc39e1c40c2f24455ec7b0588eb4898b3cab7c49ffbca997882c634ca7be6334fdb820afada8e2ebf39eb2166c95610df190d90c2a98c4fc25d25c733b32 SHA512 08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
 DIST libva-2.17.0.tar.gz 276993 BLAKE2B 4d003f6649e4356a06438f8a88a5a549e94b12f342b1b72649b17d0aeb259ec7f26c3d1b5d21ca6cfc2b31141e01449ccc94a6bfdf2716976cbc80f63091fcfe SHA512 c9f841b4f35e732bfaa0358fe031207f011be90f95cc46acfd8c83092510cf68fe0921f28ce82402e7cce65f263eeb4d06cc17fd3c525274530a53b212f33779
 EBUILD libva-2.16.0.ebuild 1673 BLAKE2B 70e3fc2d9fa99c691b6c1411b2d491ea586cf24fa13d0f2702ffaaa07cc4ab3c8555329244d65970e550233bfb5ecbeaa28533f87cc51261020f91c289785cce SHA512 0f11878765a5b5813282e7456c03d7072bb35591f512149917fe8203f74669419b24e34ac70260758e01e9c317c5239d5528b81bc9d091da57eb403f811b2852
-EBUILD libva-2.17.0.ebuild 1721 BLAKE2B d988f006fd7181045ba592494bd4434ebc9e33695f61d7af4151137bcc1f5f6a804d9b76b797c0661a574f83e312922838f888c309c491f9c20d9de6926f191d SHA512 5aad109d26e6b55c61ad4b34d33055ee6f1056ed2c8284faa0a5f7118d751e5becb2b64371233c2fb93f59ee59c57b54b24bf43444c44d15efb846cdc8d8553b
+EBUILD libva-2.17.0.ebuild 1719 BLAKE2B d8745a3f8b92c9f61310f61307ef9eb90adbbba4440c2b8a86894d810b22c59d1ff98da3bee803f8446d821fb4aebe06862d142f1563d65968dc76906b4ba853 SHA512 3045261c46456b48a598449cfb7a6b6ed2d5faee979fe87cd3d39fc9f2ab124c302fb8134d70a5a0a4a4994b07b9734ad398947b981437b968ccfb89b1580905
 EBUILD libva-9999.ebuild 1688 BLAKE2B 2ad1b5623dd652d3ee6b7ce8ee7036bf891529ee9624cf6506391e8e95ab06dc0b5a4548a232972fb8e2d80c1a1a4a31113e1c12f6bfd02485434e753644012e SHA512 17ed1d781db916bacd3561e1024609fcc7764c996910305d3adaade3ba6fca433b875737c38c1c8b35c6c689511052b03c7b7ea1970d9c0adad9b134c77172f5
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/libva-2.17.0.ebuild b/media-libs/libva/libva-2.17.0.ebuild
index df783c1633ed..9ad33661b234 100644
--- a/media-libs/libva/libva-2.17.0.ebuild
+++ b/media-libs/libva/libva-2.17.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva"
 else
 	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm64 ~loong ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index f1bdd30e6163..eda00bc07151 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 16992779d98f..13382c5f085c 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,6 +1,6 @@
 DIST libva-utils-2.16.0.tar.gz 1245723 BLAKE2B 3ce3b54f9b8d1e5960fdb7587da9dc4fa9754f3612155e86d99f2f120e31e0e69a40482d7a4571fefc0a8079ba987303cbb433203de9ef6e203e9419b6d91b91 SHA512 d5395c1de4b95f4d0a86621b0338852250a3893b732c6fd69d0622c989bff530461a183c151f322469b1ed7e4815173dbbcf36cc390db9ebbae6fb7d7a90cb9c
 DIST libva-utils-2.17.1.tar.gz 1276454 BLAKE2B bde2b784c6470721b113d5a4429ac0b02b922a6bf37d3554d4c088736d184cb8d8107b714e37d0ba517fd9a52ba43247cd4985604421b5e63af841b649786366 SHA512 db89f70c6efb34d0e390a443b29d706ac6339e157e6451a96aa50d4246ce08b8276608874f20d115a2576b8876c95a2e34abba8fe0a446f6736a807779517c6c
 EBUILD libva-utils-2.16.0.ebuild 1889 BLAKE2B c468daa3e5f410c07cfd156284e8aff90cb6c5ee783ca136602a85930133f00e9c6b6514266c111d0203cb4a8fcbe1804acc84442713f5a8c79887a9160d9759 SHA512 103a4bea8a212253a1ebfce46ebc01863fa6bf24c27a80e6a3d95c8b3a863ca6955e4b56c24d04d5f347c78c802bf336ce62c567b943f3b1dc0ad00bb043b13f
-EBUILD libva-utils-2.17.1.ebuild 1889 BLAKE2B 044544efaea67c653f40370607c00859b51cd4af14e7b3a35c99134240b2ba3ecc6379ea3e99ffc540f05733c9e688470bc54e908a392b9b7420ccb92789bc8e SHA512 7e93091c9227839407f96e863183c29b56bed1f19720a5ae762dbb62f1168cb1def5d61b085c67ec82625ec7f023523a2e07e91b7d1a13a6c3e99113220c9b71
+EBUILD libva-utils-2.17.1.ebuild 1887 BLAKE2B af617d30f0280a3db0acd79210fc4a9a87fac15ab625708c334d283213ffe5f195bdffcca9c3f9ce0aa5ad955d7b14f5aac9126ce2d7e7369583a4553832f5df SHA512 b3747cb360cfd2c1f5a39319e9e286d4673afdc3ec4e39155af3d5fea7d680fd0f6faa1f3a7ce67af4cc15a6306afc89daaa710e71a3c34bc973140d3714a98b
 EBUILD libva-utils-9999.ebuild 1891 BLAKE2B 56031d762b08d5f4808003eba8ca7b62d61ae266805007bead8b85f2379f6b72effc0590f7ceb2013b40a24f7324f50fe70dcc052e1a8a070fd9e97eb2f8edec SHA512 f1aaecbcdf93cd3c91be2fd5716ae63175ceb0144d0cb66cbcb8335ec12d6098f5d841f6893c58ccadeb5155771ddfa5be837741a3f23a49ef9a298f4320da0e
 MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766
diff --git a/media-video/libva-utils/libva-utils-2.17.1.ebuild b/media-video/libva-utils/libva-utils-2.17.1.ebuild
index 2d6c24378eae..28c1a1ca332c 100644
--- a/media-video/libva-utils/libva-utils-2.17.1.ebuild
+++ b/media-video/libva-utils/libva-utils-2.17.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f9f613041b5f..f4bc3718af6f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dff09ea9787c..765c9303807b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 06:09:42 +0000
+Fri, 17 Mar 2023 12:09:45 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c80222d19f44..16fd8084744d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-03-17T06:09:45Z
+TIMESTAMP 2023-03-17T12:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUBClfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUWIxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA3Cw/9Hn/y2G1X0WL1UNiQy+s0LYdO8OJEwrvUbJvi8Bsr2swMR7nwmIuvBF3s
-UPYDMbGG7qk4OobY/jFeXNPM6zp6qAYF5tM1LYSumouJKZTHiDI/HbElRkmUDUB1
-TRVYcKUYf8zZV3SmI4OdapI0v8my+Y86Y/KFlov4g79qieedz6YTAtaEMnq7d6uL
-A7jtWt8eQ3n9reQzr7Xn3pavokR5+YJGur0hKPf+zZxtdqBwheUUL60/33qKFIvr
-I4vtvUA7UnzamatKH8qOjerUwAbJ6kmYLfSZZwWzPyiGWlGee0h94fCkkm2so9g+
-iHLzr1Tlz0Kf84HMyuZUH1Z4ywtD6yziiPp0Ljxr/yhXmFCOonGe/X/A5asCuJz4
-93ClJH01Oe8Ad043GB6PdaxfXp2JW0XF/OX7pgufrtGvY28TrUceMZ0yVZH3pmXc
-CLDD8Uj/UuRfyjQJC1sZeBjXH8V2trWzganM6hnpvI+RL9c2RwNj/hbzeZ6HlHp1
-xB2wvUvOFl55HCO4asHT7KEzGyy+v7WyCj8yfqm2V6N3/GhoXrBk/hRH+6Xn7iFr
-TFULpIyNxXvdpjThQBYuov/DR5C1xpOL7h+uT2pTGE6Unb799DXxujs7CnoiIYZc
-pe7MXIYCYpNm5d7d15DlTLkdiVYCAWVFIYwPeH+QccMf/9BU2Vg=
-=kpWz
+klD7wBAAikO3kc7rCnzGflSALHHxOc+LnESJAmzrAD7wvw2T1LHrGfQn/rADlcBI
+Mh0BgM4YQWYtnOzal/d3dJY38H0f9I1GyusV2ouGMSf3r4h1J+lgDQM/nU2EkUMs
+TjS6Heoix1/Gv9hT4X/mi7CsRsCGp820GqtyFOHPa4ch6FCFdBAdQyX1M7nxk+bz
+W/wdmHDs817Nm6rYaRsn2Ra3btIBEbuiDzcSKwYlw3jfKVpssqX7MSdv9h29qrFW
+8IpY2lent4x2WrDFKLicXO2Zw1R3w5ieJCMUTIGU33RhtT963lmQJeTaVVpBsod4
+VOnc9LUys0nR4Kbfg8lMJL6VT+kHrM9jSJImpQaIMswmOyvbaEu9lICtBIXePJHO
+Yms+CGC0Lvy7Vv9HItZ6NwOD8B0ULZDLzxOvpOQg6dwC+UUcLd14gWEufNsjulNE
+kNIdxAMxMPsklNbttOxY6Vr2S9r5C3EjH8bz0hGbmh2/gXrzMk2LUJWXsRvSvYE9
+x6GbagQeOKbYBdDuZVi6r9pWMQ91vtIu64I3CX/X6WPvFy4nvx1QIZekQsg++x1U
+y9pBpgSxfi5Xun88mr5OQRutmq6b1i6Ni69/KbO3GFzEKh1qxyM2oPPFYicNtIoP
+E6Aux7DZ3QL6pOfQPKo98n1WCCiYmgoOb8p0lMo02TMfSudjfw4=
+=M7qp
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dff09ea9787c..765c9303807b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 06:09:42 +0000
+Fri, 17 Mar 2023 12:09:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index eb4f491b4f1f..6752bd7b88d3 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 25d59754ede4..aec5baa4bd4d 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/entr-5.3-r1 b/metadata/md5-cache/app-admin/entr-5.3-r1
index d30167816a65..4d1c254994ff 100644
--- a/metadata/md5-cache/app-admin/entr-5.3-r1
+++ b/metadata/md5-cache/app-admin/entr-5.3-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://eradman.com/entrproject/ https://github.com/eradman/entr
 INHERIT=edo toolchain-funcs
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://eradman.com/entrproject/code/entr-5.3.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=09aa38e6e2c758c4f2a627ace2767dfc
+_md5_=a291f85ec80249686d9506f04f9e8398
diff --git a/metadata/md5-cache/app-admin/exo-1.65.0 b/metadata/md5-cache/app-admin/exo-1.66.0
index 673c4a7a99ba..08ad2ba1a11f 100644
--- a/metadata/md5-cache/app-admin/exo-1.65.0
+++ b/metadata/md5-cache/app-admin/exo-1.66.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.65.0.tar.gz -> exo-1.65.0.gh.tar.gz
+SRC_URI=https://github.com/exoscale/cli/archive/v1.66.0.tar.gz -> exo-1.66.0.gh.tar.gz
 _md5_=e9656d34c44fbb4045b1d839d67e8d0f
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 9006dd0537c7..b6014e82e5ff 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.15-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.15-r1
index 8914f5b7b8ec..79860df181ff 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.15-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.15-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://trousers.sf.net
 INHERIT=autotools linux-info readme.gentoo-r1 systemd udev
 IUSE=doc selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86
+KEYWORDS=~amd64 arm ~arm64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 ~x86
 LICENSE=CPL-1.0 GPL-2
 RDEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0= selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.15.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=c7c373b9db19c71a999a7e5d57472d7c
+_md5_=0a34c2db8b7f4b4e8f518f1f4a283a4e
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index fe28c725e7ce..950eb996df0a 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/scribus-1.5.8-r4 b/metadata/md5-cache/app-office/scribus-1.5.8-r4
deleted file mode 100644
index ce9896407d10..000000000000
--- a/metadata/md5-cache/app-office/scribus-1.5.8-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libjpeg-turbo:= media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:= net-print/cups sys-libs/zlib[minizip] x11-libs/cairo[X,svg(+)] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) )
-DESCRIPTION=Desktop publishing (DTP) and layout program
-EAPI=8
-HOMEPAGE=https://www.scribus.net/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop flag-o-matic optfeature python-single-r1 xdg
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen dev-libs/icu:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libjpeg-turbo:= media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:= net-print/cups sys-libs/zlib[minizip] x11-libs/cairo[X,svg(+)] boost? ( dev-libs/boost:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[tk?,python_targets_python3_10(-)] ) ) app-text/ghostscript-gpl
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) tk? ( scripts )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.8/scribus-1.5.8.tar.xz
-_eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=008689222d46ac891f3905cc78481e3b
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 1347ca3d829b..92f03a9fa0c9 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/cmark-0.30.3 b/metadata/md5-cache/app-text/cmark-0.30.3
index 2339df3f5af8..c82df28b18e1 100644
--- a/metadata/md5-cache/app-text/cmark-0.30.3
+++ b/metadata/md5-cache/app-text/cmark-0.30.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/commonmark/cmark
 INHERIT=cmake python-any-r1
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/0.30.3
 SRC_URI=https://github.com/commonmark/cmark/archive/0.30.3.tar.gz -> cmark-0.30.3.tar.gz
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=be07d652ac2d9ca88ab6d460f2189a3c
+_md5_=9b131912c3bb7d14be61b8cd1c1910ae
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 380f7096cd16..b3e622f9ea07 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/tomcat-native-1.2.35 b/metadata/md5-cache/dev-java/tomcat-native-1.2.35
deleted file mode 100644
index e5c0bcb0f7be..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.35
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org/native-doc/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=static-libs test
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.35/source/tomcat-native-1.2.35-src.tar.gz
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1dc65bfd4da22899d2236ded40032bc3
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e76e25303e7a..9d578638c878 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/ocaml-4.05.0-r9 b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r9
index 5610de7c0f70..efa92dd118eb 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r9
+++ b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r9
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://ocaml.org
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=emacs flambda latex ncurses +ocamlopt spacetime X xemacs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=QPL-1.0 LGPL-2
 PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( sys-libs/libunwind:= ) X? ( x11-libs/libX11 ) !dev-ml/num
 SLOT=0/4.05
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz mirror://gentoo/ocaml-patches-9.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-lang/ocaml/ocaml-4.05.0-patches-1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=40048e2f8326710713a967f07da87c27
+_md5_=ce2a97973c8b3d74ffe9f2857423b82e
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.14.0-r1 b/metadata/md5-cache/dev-lang/ocaml-4.14.0-r1
index 1349e44fd269..399b7dec3167 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.14.0-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.14.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://ocaml.org/
 INHERIT=flag-o-matic
 IUSE=emacs flambda latex +ocamlopt xemacs
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=QPL-1.0 LGPL-2
 PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:=
 SLOT=0/4.14
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.14.0.tar.gz -> ocaml-4.14.0.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4eac7267b92b7d8c3ea68e4c04d80067
+_md5_=233ca71deb8fa4a3ec5f330858da3fe1
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.14.1 b/metadata/md5-cache/dev-lang/ocaml-4.14.1
index 915bb4c7a238..1027fded7ac4 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.14.1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.14.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://ocaml.org/
 INHERIT=flag-o-matic
 IUSE=emacs flambda latex +ocamlopt xemacs
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=QPL-1.0 LGPL-2
 PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:=
 SLOT=0/4.14.1
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.14.1.tar.gz -> ocaml-4.14.1.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bdb27b4441dd107d285fdd3aa57222e1
+_md5_=8ef0393bc4e5e8bed4689c6f77abde84
diff --git a/metadata/md5-cache/dev-lang/zig-0.10.0-r1 b/metadata/md5-cache/dev-lang/zig-0.10.0-r1
deleted file mode 100644
index 32d08aab9930..000000000000
--- a/metadata/md5-cache/dev-lang/zig-0.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !!sys-devel/llvm:0
-DESCRIPTION=A robust, optimal, and maintainable programming language
-EAPI=8
-HOMEPAGE=https://ziglang.org/
-INHERIT=edo cmake llvm check-reqs
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !dev-lang/zig-bin
-SLOT=0
-SRC_URI=https://ziglang.org/download/0.10.0/zig-0.10.0.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	b2e109b7341cd993b8bdfcc60652a14d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=efe6b2b123c59b7b7c50e72a080a48fc
diff --git a/metadata/md5-cache/dev-lang/zig-0.10.1 b/metadata/md5-cache/dev-lang/zig-0.10.1
deleted file mode 100644
index 0208de579ba2..000000000000
--- a/metadata/md5-cache/dev-lang/zig-0.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !!sys-devel/llvm:0
-DESCRIPTION=A robust, optimal, and maintainable programming language
-EAPI=8
-HOMEPAGE=https://ziglang.org/
-INHERIT=edo cmake llvm check-reqs
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=MIT
-RDEPEND=sys-devel/clang:15= sys-devel/lld:15= sys-devel/llvm:15=[zstd] !dev-lang/zig-bin
-SLOT=0
-SRC_URI=https://ziglang.org/download/0.10.1/zig-0.10.1.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	b2e109b7341cd993b8bdfcc60652a14d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b8a82927c25f48c3c66dd559ebf473b
diff --git a/metadata/md5-cache/dev-lang/zig-bin-0.10.0 b/metadata/md5-cache/dev-lang/zig-bin-0.10.0
deleted file mode 100644
index 641d51a14606..000000000000
--- a/metadata/md5-cache/dev-lang/zig-bin-0.10.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=A robust, optimal, and maintainable programming language
-EAPI=8
-HOMEPAGE=https://ziglang.org/
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=!dev-lang/zig
-SLOT=0
-SRC_URI=amd64? ( https://ziglang.org/download/0.10.0/zig-linux-x86_64-0.10.0.tar.xz ) arm? ( https://ziglang.org/download/0.10.0/zig-linux-armv7a-0.10.0.tar.xz ) arm64? ( https://ziglang.org/download/0.10.0/zig-linux-aarch64-0.10.0.tar.xz ) riscv? ( https://ziglang.org/download/0.10.0/zig-linux-riscv64-0.10.0.tar.xz ) x86? ( https://ziglang.org/download/0.10.0/zig-linux-i386-0.10.0.tar.xz )
-_md5_=bc7722fe9b71f2c1bc321838682e9598
diff --git a/metadata/md5-cache/dev-lang/zig-bin-0.10.1 b/metadata/md5-cache/dev-lang/zig-bin-0.10.1
deleted file mode 100644
index 33f5459f1789..000000000000
--- a/metadata/md5-cache/dev-lang/zig-bin-0.10.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=A robust, optimal, and maintainable programming language
-EAPI=8
-HOMEPAGE=https://ziglang.org/
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=!dev-lang/zig
-SLOT=0
-SRC_URI=amd64? ( https://ziglang.org/download/0.10.1/zig-linux-x86_64-0.10.1.tar.xz ) arm? ( https://ziglang.org/download/0.10.1/zig-linux-armv7a-0.10.1.tar.xz ) arm64? ( https://ziglang.org/download/0.10.1/zig-linux-aarch64-0.10.1.tar.xz ) riscv? ( https://ziglang.org/download/0.10.1/zig-linux-riscv64-0.10.1.tar.xz ) x86? ( https://ziglang.org/download/0.10.1/zig-linux-i386-0.10.1.tar.xz )
-_md5_=d82b378d36efe6ca53ac48dc98d6596b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d9f9e9e1db48..6da47f983538 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/leveldb-1.23-r4 b/metadata/md5-cache/dev-libs/leveldb-1.23-r4
deleted file mode 100644
index cb5665206b3d..000000000000
--- a/metadata/md5-cache/dev-libs/leveldb-1.23-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/crc32c snappy? ( app-arch/snappy:= ) tcmalloc? ( dev-util/google-perftools:=[-minimal] )
-DESCRIPTION=A fast key-value storage library written at Google
-EAPI=7
-HOMEPAGE=https://github.com/google/leveldb
-INHERIT=cmake
-IUSE=+snappy +tcmalloc test
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-libs/crc32c snappy? ( app-arch/snappy:= ) tcmalloc? ( dev-util/google-perftools:=[-minimal] )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/google/leveldb/archive/refs/tags/1.23.tar.gz -> leveldb-1.23.tar.gz
-_eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=752e5711ffe0ff23aa5cc5069d9d0a80
diff --git a/metadata/md5-cache/dev-libs/leveldb-1.23-r5 b/metadata/md5-cache/dev-libs/leveldb-1.23-r5
index dcb3c965155c..c06d7dd1e6e3 100644
--- a/metadata/md5-cache/dev-libs/leveldb-1.23-r5
+++ b/metadata/md5-cache/dev-libs/leveldb-1.23-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/leveldb
 INHERIT=cmake
 IUSE=+snappy +tcmalloc test
-KEYWORDS=amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-libs/crc32c snappy? ( app-arch/snappy:= ) tcmalloc? ( dev-util/google-perftools:=[-minimal] )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/leveldb/archive/refs/tags/1.23.tar.gz -> leveldb-1.23.tar.gz
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ef2c6f5b2f60093a8501496b93a324d
+_md5_=8b07f997c6d26e73f87cd66170d7240c
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.9.6 b/metadata/md5-cache/dev-libs/libtpms-0.9.6
index f90a202b2fae..ec9665214636 100644
--- a/metadata/md5-cache/dev-libs/libtpms-0.9.6
+++ b/metadata/md5-cache/dev-libs/libtpms-0.9.6
@@ -5,10 +5,10 @@ DESCRIPTION=Library providing software emultion of a TPM
 EAPI=8
 HOMEPAGE=https://github.com/stefanberger/libtpms
 INHERIT=autotools
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.9.6.tar.gz -> libtpms-0.9.6.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=fd20195640d7e21b110fa179062a78db
+_md5_=0e6f99993ef600c5ceaf2d378de2519a
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 0d2eca217d71..8459e9d006bf 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/bigarray-compat-1.1.0 b/metadata/md5-cache/dev-ml/bigarray-compat-1.1.0
index 12c70edc3448..1af75318c34d 100644
--- a/metadata/md5-cache/dev-ml/bigarray-compat-1.1.0
+++ b/metadata/md5-cache/dev-ml/bigarray-compat-1.1.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/mirage/bigarray-compat
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/mirage/bigarray-compat/archive/v1.1.0.tar.gz -> bigarray-compat-1.1.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=391735f2860209af79988ff932b60d97
+_md5_=0bf0584dc1a2f6f0f8969150b15d182e
diff --git a/metadata/md5-cache/dev-ml/cairo2-0.6.4 b/metadata/md5-cache/dev-ml/cairo2-0.6.4
index a7d314fe0325..36c4fc4ae277 100644
--- a/metadata/md5-cache/dev-ml/cairo2-0.6.4
+++ b/metadata/md5-cache/dev-ml/cairo2-0.6.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Chris00/ocaml-cairo
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=x11-libs/cairo:=[svg(+)] dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.6.4
 SRC_URI=https://github.com/Chris00/ocaml-cairo/releases/download/0.6.4/cairo2-0.6.4.tbz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=1be0550ebfbe49d5efcc788f8808cc10
+_md5_=f83ef6e3034aad126f1c5cc12274cab3
diff --git a/metadata/md5-cache/dev-ml/camlp-streams-5.0.1 b/metadata/md5-cache/dev-ml/camlp-streams-5.0.1
index 01d6a19f9324..e43f4287621c 100644
--- a/metadata/md5-cache/dev-ml/camlp-streams-5.0.1
+++ b/metadata/md5-cache/dev-ml/camlp-streams-5.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/camlp-streams
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/ocaml/camlp-streams/archive/refs/tags/v5.0.1.tar.gz -> camlp-streams-5.0.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=1648b6020560e6536e0265c12e392dd8
+_md5_=069ce910fe94a846a376778dd4849764
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.14_p1-r1 b/metadata/md5-cache/dev-ml/camlp4-4.14_p1-r1
index f6a06137c420..b9194febe2a9 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.14_p1-r1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.14_p1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/camlp4/camlp4
 INHERIT=edo
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND==dev-lang/ocaml-4.14*:=[ocamlopt?]
 SLOT=0/4.14_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.14+1.tar.gz -> camlp4-4.14_p1.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
-_md5_=ae07a3bd4f7bd0df3671222f3f94ea95
+_md5_=6367d90d951b636cbf98683ed6c582de
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.04 b/metadata/md5-cache/dev-ml/camlp5-8.00.04
index e03ecab952d3..1d6930ac27ea 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.04
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.04
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt +ocamlopt
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-ml/camlp-streams:= dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00.04
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.04.tar.gz -> camlp5-8.00.04.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
-_md5_=442878d72253e2f379b945259e314765
+_md5_=0fd71d885e66532997885d8a238e51b2
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.11 b/metadata/md5-cache/dev-ml/camlzip-1.11
index ffa4c9fefeb6..ccd174e8f864 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.11
+++ b/metadata/md5-cache/dev-ml/camlzip-1.11
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/camlzip
 INHERIT=findlib
 IUSE=+ocamlopt +ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.07:=[ocamlopt?] >=sys-libs/zlib-1.1.3 dev-lang/ocaml:=[ocamlopt?]
 SLOT=1/1.11
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel111.tar.gz -> camlzip-1.11.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9
-_md5_=2fdecd17ae319262f90b9c93cbee8489
+_md5_=09db343a2efec7189c6e73a6ab948c65
diff --git a/metadata/md5-cache/dev-ml/dose3-7.0.0 b/metadata/md5-cache/dev-ml/dose3-7.0.0
index 8ab73913fd00..668d624fce85 100644
--- a/metadata/md5-cache/dev-ml/dose3-7.0.0
+++ b/metadata/md5-cache/dev-ml/dose3-7.0.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=dev-ml/cudf-0.7:=[ocamlopt=] >=dev-ml/extlib-1.7.8:=[ocamlopt=] >=dev-ml/ocamlgraph-2.0.0:=[ocamlopt=] >=dev-ml/re-1.2.2:=[ocamlopt=] dev-ml/parmap:=[ocamlopt=] >=dev-ml/camlzip-1.08:=[ocamlopt=] >=dev-ml/camlbz2-0.7.0:= dev-ml/ocaml-expat:=[ocamlopt=] dev-ml/xml-light:=[ocamlopt=] app-arch/rpm >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/7.0.0
 SRC_URI=https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.bz2
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2c5dca5f41e0a4620ee1190b1f555bd8
+_md5_=f08e339d29a1da182fb15921f0db203b
diff --git a/metadata/md5-cache/dev-ml/dune-3.6.2 b/metadata/md5-cache/dev-ml/dune-3.6.2
index 35730085dc64..5a0b21345169 100644
--- a/metadata/md5-cache/dev-ml/dune-3.6.2
+++ b/metadata/md5-cache/dev-ml/dune-3.6.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=multiprocessing elisp-common
 IUSE=emacs
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08:= emacs? ( >=app-editors/emacs-23.1:* )
 RESTRICT=strip test
 SLOT=0/3.6.2
 SRC_URI=https://github.com/ocaml/dune/archive/3.6.2.tar.gz -> dune-3.6.2.tar.gz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=994b3a9c678f07b9b956273f44981fbd
+_md5_=06dee6fd9491760c493615e975619ccc
diff --git a/metadata/md5-cache/dev-ml/dune-3.7.0 b/metadata/md5-cache/dev-ml/dune-3.7.0
index e14f6b63c427..eccbf2a7834e 100644
--- a/metadata/md5-cache/dev-ml/dune-3.7.0
+++ b/metadata/md5-cache/dev-ml/dune-3.7.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=multiprocessing elisp-common
 IUSE=emacs
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08:= emacs? ( >=app-editors/emacs-23.1:* )
 RESTRICT=strip test
 SLOT=0/3.7.0
 SRC_URI=https://github.com/ocaml/dune/archive/3.7.0.tar.gz -> dune-3.7.0.tar.gz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=994b3a9c678f07b9b956273f44981fbd
+_md5_=06dee6fd9491760c493615e975619ccc
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.9 b/metadata/md5-cache/dev-ml/extlib-1.7.9
index 3c4caafa317b..ac84bd6b89aa 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.9
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib/
 INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt +ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.9
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.9.tar.gz -> extlib-1.7.9.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
-_md5_=1c72e0dda539e784c7cecd495e331c28
+_md5_=e3bbb9139933ac4d1d8f8d893845af3b
diff --git a/metadata/md5-cache/dev-ml/fieldslib-0.15.0 b/metadata/md5-cache/dev-ml/fieldslib-0.15.0
index c94907aa08db..207727562ffa 100644
--- a/metadata/md5-cache/dev-ml/fieldslib-0.15.0
+++ b/metadata/md5-cache/dev-ml/fieldslib-0.15.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/janestreet/fieldslib
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15.0
 SRC_URI=https://github.com/janestreet/fieldslib/archive/v0.15.0.tar.gz -> fieldslib-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=41df528017728e5b14dc09b7be98af18
+_md5_=aabecd257fc5b34596451c9e49b7122d
diff --git a/metadata/md5-cache/dev-ml/integers-0.7.0 b/metadata/md5-cache/dev-ml/integers-0.7.0
index 3efd0d715311..f8e659e2185a 100644
--- a/metadata/md5-cache/dev-ml/integers-0.7.0
+++ b/metadata/md5-cache/dev-ml/integers-0.7.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ocamllabs/ocaml-integers
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.7.0
 SRC_URI=https://github.com/ocamllabs/ocaml-integers/archive/0.7.0.tar.gz -> integers-0.7.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=6b6d427c1e60cbd0f34eda27d9486e3e
+_md5_=57fac449cad2c94c2cc0ad1adfd356a7
diff --git a/metadata/md5-cache/dev-ml/jane-street-headers-0.15.0-r1 b/metadata/md5-cache/dev-ml/jane-street-headers-0.15.0-r1
index 1e48603a6437..3d3aa7e2caa4 100644
--- a/metadata/md5-cache/dev-ml/jane-street-headers-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/jane-street-headers-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/jane-street-headers
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/jane-street-headers/archive/v0.15.0.tar.gz -> jane-street-headers-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=4c6a16bdb0f0ff1bb1e554fd4e88d359
+_md5_=28138042530ea1c7d2425afc7ffc5159
diff --git a/metadata/md5-cache/dev-ml/jingoo-1.4.4 b/metadata/md5-cache/dev-ml/jingoo-1.4.4
index 3b8bc35328f9..5b1a5735def3 100644
--- a/metadata/md5-cache/dev-ml/jingoo-1.4.4
+++ b/metadata/md5-cache/dev-ml/jingoo-1.4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/tategakibunko/jingoo/
 INHERIT=dune
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/menhir:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= dev-ml/ppxlib:= dev-ml/re:= dev-ml/uucp:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tategakibunko/jingoo/archive/v1.4.4.tar.gz -> jingoo-1.4.4.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=9f407bbb6a80ff4b1e62354ade256458
+_md5_=2429097e123945f96289bc4413305318
diff --git a/metadata/md5-cache/dev-ml/lablgtk-2.18.13 b/metadata/md5-cache/dev-ml/lablgtk-2.18.13
index ccbbefa7bb5c..23e23238fd1b 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-2.18.13
+++ b/metadata/md5-cache/dev-ml/lablgtk-2.18.13
@@ -5,9 +5,9 @@ DESCRIPTION=Objective CAML interface for Gtk+2
 EAPI=8
 HOMEPAGE=http://lablgtk.forge.ocamlcore.org
 IUSE=debug examples glade gnomecanvas +ocamlopt sourceview spell svg
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] dev-ml/camlp4:= x11-libs/gtk+:2 glade? ( gnome-base/libglade ) gnomecanvas? ( gnome-base/libgnomecanvas ) sourceview? ( x11-libs/gtksourceview:2.0 ) spell? ( app-text/gtkspell:2 ) svg? ( gnome-base/librsvg:2 )
 SLOT=2/2.18.13
 SRC_URI=https://github.com/garrigue/lablgtk/archive/2.18.13.tar.gz -> lablgtk-2.18.13.tar.gz
-_md5_=535c682f8a53c71e9f5614df34568474
+_md5_=7596a2afcff8ae9a49f50da07286efe3
diff --git a/metadata/md5-cache/dev-ml/menhir-20220210 b/metadata/md5-cache/dev-ml/menhir-20220210
index 7006fe8640ab..e90026ea5e0b 100644
--- a/metadata/md5-cache/dev-ml/menhir-20220210
+++ b/metadata/md5-cache/dev-ml/menhir-20220210
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/20220210
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20220210/menhir-20220210.tar.bz2
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=83c7d67b13eaa141baee683684266824
+_md5_=26c6c590bd3d3858eb8f99ebedd692f5
diff --git a/metadata/md5-cache/dev-ml/mirage-clock-4.2.0 b/metadata/md5-cache/dev-ml/mirage-clock-4.2.0
index 5a9753079c0d..33f380f7eacc 100644
--- a/metadata/md5-cache/dev-ml/mirage-clock-4.2.0
+++ b/metadata/md5-cache/dev-ml/mirage-clock-4.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mirage/mirage-clock
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/4.2.0
 SRC_URI=https://github.com/mirage/mirage-clock/archive/v4.2.0.tar.gz -> mirage-clock-4.2.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ec700b3b5d758f674de16b80801ca256
+_md5_=2f0eb94be53be07f56be339a7240518c
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
index 62b844081341..c3e178038f89 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.12.4
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.4.tar.gz -> ocaml-compiler-libs-0.12.4.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=e8596cea0fb4f4c21013075e263c1f3c
+_md5_=7fd690de01fb79ceede1e29999448679
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.4.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.4.0
index 67f0e08ab050..54c03f3cfec1 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.4.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.4.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree/
 INHERIT=dune
 IUSE=+ocamlopt test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test ) strip
 SLOT=0/2.4.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/2.4.0.tar.gz -> ocaml-migrate-parsetree-2.4.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ad3cd739e1c71366573e3e55b31dd8c6
+_md5_=b28625ca0b7fad8fa99205154fbc09b3
diff --git a/metadata/md5-cache/dev-ml/ocplib-endian-1.2 b/metadata/md5-cache/dev-ml/ocplib-endian-1.2
index 04fc75583929..78d99e7a86c0 100644
--- a/metadata/md5-cache/dev-ml/ocplib-endian-1.2
+++ b/metadata/md5-cache/dev-ml/ocplib-endian-1.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/OCamlPro/ocplib-endian
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/1.2
 SRC_URI=https://github.com/OCamlPro/ocplib-endian/archive/1.2.tar.gz -> ocplib-endian-1.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=364293479c7d60a0cd6c861ac6511d62
+_md5_=13cfedc752438c60047c1d765ee41c14
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.1.2-r1 b/metadata/md5-cache/dev-ml/opam-installer-2.1.2-r1
index 9911ace18c3f..83f90e1e00ec 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.1.2-r1
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.1.2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3:= dev-ml/cmdliner:= ~dev-ml/opam-format-2.1.2:= >=dev-ml/dose3-6:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.2
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.1.2/opam-full-2.1.2.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=15fe0be525d76282c552655681f6ce33
+_md5_=9a24ff4137c1f7fe11d950f2dcbb4806
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.6 b/metadata/md5-cache/dev-ml/ounit2-2.2.6
index 1034e8309e1f..a12eb844e10f 100644
--- a/metadata/md5-cache/dev-ml/ounit2-2.2.6
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/gildor478/ounit
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.2.6
 SRC_URI=https://github.com/gildor478/ounit/archive/v2.2.6.tar.gz -> ounit2-2.2.6.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=774e5e5c7ce650f1b57e01b2de10fd50
+_md5_=8eaf56d124410571c85d7291bab55285
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.5 b/metadata/md5-cache/dev-ml/parmap-1.2.5
index 0758adf7e382..01f870c08cb7 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.5
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.dicosmo.org/code/parmap/
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.5
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.5.tar.gz -> parmap-1.2.5.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=0f6fd7adc6bc94e8a2457a474bdfe642
+_md5_=f89aa96ec5ef60263d8d182a75af30f8
diff --git a/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1 b/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1
index 441a8709c196..42ea3ebbd907 100644
--- a/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_ignore_instrumentation
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ppx_ignore_instrumentation/archive/refs/tags/v0.15.0.tar.gz -> ppx_ignore_instrumentation-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=e26fdd09bb515bc67b151a6d9727d951
+_md5_=600e8ca76c5bcdce28584f2b2d8abb08
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.29.0 b/metadata/md5-cache/dev-ml/ppxlib-0.29.0
index 762910e0cc31..f0294042683d 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.29.0
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.29.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
 INHERIT=dune
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.2.0:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= >=dev-ml/ppx_derivers-1.2.1:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.29.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.29.0.tar.gz -> ppxlib-0.29.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=db8bf9af77bd6275095e77f4e9df9ac2
+_md5_=9572921c3f0b72640defa69ae2836633
diff --git a/metadata/md5-cache/dev-ml/sexplib0-0.15.1-r1 b/metadata/md5-cache/dev-ml/sexplib0-0.15.1-r1
index 0a95655b4ab4..aac1e7fd9030 100644
--- a/metadata/md5-cache/dev-ml/sexplib0-0.15.1-r1
+++ b/metadata/md5-cache/dev-ml/sexplib0-0.15.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/sexplib0
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15.1
 SRC_URI=https://github.com/janestreet/sexplib0/archive/v0.15.1.tar.gz -> sexplib0-0.15.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=d3523db083410dd9d8882c7913d8b463
+_md5_=e557345c793eceba9a66cd8b03dd6945
diff --git a/metadata/md5-cache/dev-ml/topkg-1.0.7 b/metadata/md5-cache/dev-ml/topkg-1.0.7
index 997e30677087..ff24aa3084c1 100644
--- a/metadata/md5-cache/dev-ml/topkg-1.0.7
+++ b/metadata/md5-cache/dev-ml/topkg-1.0.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
 INHERIT=findlib
 IUSE=+ocamlopt +ocamlopt
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.0.7
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v1.0.7.tar.gz -> topkg-1.0.7.tar.gz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9
-_md5_=e63f822524c0932a765a5fb38a67c396
+_md5_=0fcf54eed81763145fc0cb59db17a229
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.3 b/metadata/md5-cache/dev-ml/uutf-1.0.3
index cc5cbee23e4a..6345bcad05c8 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.3
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://erratique.ch/software/uutf
 INHERIT=findlib
 IUSE=doc utftrip +ocamlopt test +ocamlopt
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:=[ocamlopt?] ) dev-lang/ocaml:=[ocamlopt?]
 REQUIRED_USE=utftrip? ( ocamlopt )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.0.3
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.3.tbz
 _eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9
-_md5_=6ff0d49b250619bdbffd538a3dc07d8b
+_md5_=9dabcb285786962bc03f158c9268b869
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index f829c4de673f..7bac09247f0f 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1 b/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
deleted file mode 100644
index 13bebd1685e9..000000000000
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-apps/file ) ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/ffi[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/ffi[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DESCRIPTION=Ruby FFI bindings to libmagic
-EAPI=6
-HOMEPAGE=https://github.com/qoobaa/magic
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-apps/file ruby_targets_ruby27? ( dev-ruby/ffi[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/ffi[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5399893bc074ed83750255693e616a25
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 41cc65b6b51c..fdc8b3dbc74c 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/xfce4-dev-tools-4.16.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.16.0
deleted file mode 100644
index 2415ee55dfce..000000000000
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.16.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/glib-2.50
-DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
-EAPI=7
-HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.16/xfce4-dev-tools-4.16.0.tar.bz2
-_md5_=fced4ee20cb16475f8376cd333cf640e
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.17.2 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.17.2
deleted file mode 100644
index 947c7c75af9b..000000000000
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.17.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/glib-2.50
-DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-dev-tools/start https://gitlab.xfce.org/xfce/xfce4-dev-tools/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.17/xfce4-dev-tools-4.17.2.tar.bz2
-_md5_=74739f5c8705fa4d6af1468c3c355c99
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
index 414a4fc84210..f459d5dd2b1c 100644
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.18.0
@@ -4,9 +4,9 @@ DEPEND=>=dev-libs/glib-2.66.0
 DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-dev-tools/start https://gitlab.xfce.org/xfce/xfce4-dev-tools/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.18/xfce4-dev-tools-4.18.0.tar.bz2
-_md5_=672afc6dc58a25edf3e1dafe9d39f0e0
+_md5_=dc8b0dd23048550affad0807374a8100
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 17847532dab5..0f3102650c64 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/gtk-layer-shell-0.1.0-r1 b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0-r1
deleted file mode 100644
index c50f6cda381e..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/gtk+-3.22.0:3[introspection,wayland] >=dev-libs/wayland-1.10.0
-DESCRIPTION=Library to create desktop components for Wayland using the Layer Shell protocol
-EAPI=7
-HOMEPAGE=https://github.com/wmww/gtk-layer-shell
-INHERIT=meson
-IUSE=examples gtk-doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT-with-advertising
-RDEPEND=>=x11-libs/gtk+-3.22.0:3[introspection,wayland] >=dev-libs/wayland-1.10.0
-SLOT=0
-SRC_URI=https://github.com/wmww/gtk-layer-shell/releases/download/v0.1.0/gtk-layer-shell-0.1.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=909eb3bb702b3f07b4a23aa06789c1d2
diff --git a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.7.0 b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.7.0
deleted file mode 100644
index e598f8cc4caf..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) test? ( || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=x11-libs/gtk+-3.24.26:3[introspection?,wayland] >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.16
-DESCRIPTION=Library to create desktop components for Wayland using the Layer Shell protocol
-EAPI=7
-HOMEPAGE=https://github.com/wmww/gtk-layer-shell
-INHERIT=meson python-any-r1
-IUSE=examples gtk-doc introspection test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=MIT-with-advertising LGPL-3+
-RDEPEND=>=x11-libs/gtk+-3.24.26:3[introspection?,wayland] >=dev-libs/wayland-1.10.0 >=dev-libs/wayland-protocols-1.16
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/wmww/gtk-layer-shell/archive/refs/tags/v0.7.0.tar.gz -> gtk-layer-shell-0.7.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a493ba6b2deaa7afa650c69941e23768
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7092aa5e8b8e..b014dfc53ace 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/gmmlib-22.3.3 b/metadata/md5-cache/media-libs/gmmlib-22.3.3
index 8b1104ed9751..8f44802dc0ee 100644
--- a/metadata/md5-cache/media-libs/gmmlib-22.3.3
+++ b/metadata/md5-cache/media-libs/gmmlib-22.3.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/gmmlib
 INHERIT=cmake
 IUSE=+custom-cflags test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/12.3
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-22.3.3.tar.gz
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2c85f11627687912d2bcd05c8bfa4396
+_md5_=7eb08d071ee486c99c41d3ccac3bb661
diff --git a/metadata/md5-cache/media-libs/leptonica-1.83.1 b/metadata/md5-cache/media-libs/leptonica-1.83.1
index 3a33884e8513..b51888a2d393 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.83.1
+++ b/metadata/md5-cache/media-libs/leptonica-1.83.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.leptonica.org/
 INHERIT=libtool multilib-minimal
 IUSE=gif jpeg jpeg2k png static-libs test tiff utils webp 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
 LICENSE=Apache-2.0
 RDEPEND=gif? ( >=media-libs/giflib-5.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(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/openjpeg: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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( 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(-)?] )
 REQUIRED_USE=test? ( jpeg png tiff zlib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/DanBloomberg/leptonica/releases/download/1.83.1/leptonica-1.83.1.tar.gz
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=099bf34ef887384d2055490447cb790a
+_md5_=f09ac61316c0e8436188959ac02bddd1
diff --git a/metadata/md5-cache/media-libs/libva-2.17.0 b/metadata/md5-cache/media-libs/libva-2.17.0
index e51eff96affb..92999d9d016b 100644
--- a/metadata/md5-cache/media-libs/libva-2.17.0
+++ b/metadata/md5-cache/media-libs/libva-2.17.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson-multilib optfeature
 IUSE=opengl wayland 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=~amd64 arm64 ~loong ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.60[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.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(-)?] ) X? ( >=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/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/libXfixes-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(-)?] 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(-)?] )
 REQUIRED_USE=opengl? ( X )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/archive/2.17.0.tar.gz -> libva-2.17.0.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5ea9506efd437ca10251191259d25346
+_md5_=0f847bc6fb6d9a9b83fb4eeb933380a3
diff --git a/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.6 b/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.6
index e7b0e76fd665..0fe2a47dfb33 100644
--- a/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.6
+++ b/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/media-driver
 INHERIT=cmake
 IUSE=+redistributable test X
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT BSD redistributable? ( no-source-code )
 RDEPEND=>=media-libs/gmmlib-22.3.0:= >=media-libs/libva-2.14.0[X?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/media-driver/archive/intel-media-22.6.6.tar.gz
 _eclasses_=cmake	b2e109b7341cd993b8bdfcc60652a14d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3f41d9fab9f85ce8f7ec0ed2055c2523
+_md5_=d28f26e93a40e9a1536b384e1e0bc808
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index b105bfb90f15..6164f340fc54 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/libva-utils-2.17.1 b/metadata/md5-cache/media-video/libva-utils-2.17.1
index 191d727b5eb4..3e4365486928 100644
--- a/metadata/md5-cache/media-video/libva-utils-2.17.1
+++ b/metadata/md5-cache/media-video/libva-utils-2.17.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson
 IUSE=examples putsurface test +vainfo wayland X
-KEYWORDS=~amd64 arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 ) >=media-libs/libva-2.17.0:=[wayland?,X?]
 REQUIRED_USE=putsurface? ( || ( wayland X ) ) || ( examples putsurface test vainfo )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/intel/libva-utils/archive/2.17.1.tar.gz -> libva-utils-2.17.1.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d7e7ca57a1055bf2caaf1c10a4a6e13f
+_md5_=8ad136d71db4c1911325407844aa4854
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 1df50e8e3606..1337e640d96e 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/liferea-1.12.10 b/metadata/md5-cache/net-news/liferea-1.12.10
index 9a48e49d07f4..b625430b21a3 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.10
+++ b/metadata/md5-cache/net-news/liferea-1.12.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://lzone.de/liferea/
 INHERIT=autotools gnome2-utils optfeature python-single-r1 xdg
 IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.10/liferea-1.12.10.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=43de110a35c604f082bb1ac6a432540e
+_md5_=d1a02350e077a3752e8b19ff314cb7f6
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 7b1c4f67fd6e..bc063e6b7b50 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/electric-9.07 b/metadata/md5-cache/sci-electronics/electric-9.07
new file mode 100644
index 000000000000..4b4d21fd6eac
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/electric-9.07
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/electric/electric.html
+INHERIT=desktop java-pkg-2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://gnu/electric/electricBinary-9.07.jar
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7
+_md5_=0b146561e5485cf4110561a12b73600d
diff --git a/metadata/md5-cache/sci-electronics/magic-8.3.365 b/metadata/md5-cache/sci-electronics/magic-8.3.365
new file mode 100644
index 000000000000..992d285a1a20
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/magic-8.3.365
@@ -0,0 +1,15 @@
+BDEPEND=app-shells/tcsh || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 )
+DEFINED_PHASES=configure install prepare setup
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib:= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) !net-misc/ipsorcery
+DESCRIPTION=The VLSI design CAD tool
+EAPI=8
+HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
+INHERIT=python-any-r1
+IUSE=cairo debug opengl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=HPND GPL-2+
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib:= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl ) !net-misc/ipsorcery
+SLOT=0
+SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.3.365.tgz http://opencircuitdesign.com/~tim/programs/magic/archive/2002a.tar.gz -> magic-tech-mosis-2002a.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f47932d319bd097a5c14b3b08709fc9a
diff --git a/metadata/md5-cache/sci-electronics/pcb-4.3.0 b/metadata/md5-cache/sci-electronics/pcb-4.3.0
new file mode 100644
index 000000000000..17b081140daa
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/pcb-4.3.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/intltool-0.35 virtual/pkgconfig sys-devel/gettext test? ( sci-electronics/gerbv virtual/imagemagick-tools ) 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 sci-electronics/electronics-menu gif? ( media-libs/gd ) gsvit? ( media-libs/gd[png] ) gui? ( x11-libs/gtk+:2 x11-libs/pango dbus? ( sys-apps/dbus ) ) jpeg? ( media-libs/gd[jpeg] ) nelma? ( media-libs/gd[png] ) gcode? ( media-libs/gd[png] ) virtual/libintl png? ( media-libs/gd[png] ) m4lib-png? ( media-libs/gd[png] ) tk? ( >=dev-lang/tk-8:0 )
+DESCRIPTION=GPL Electronic Design Automation: Printed Circuit Board editor
+EAPI=8
+HOMEPAGE=http://pcb.geda-project.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools toolchain-funcs virtualx xdg
+IUSE=dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 sci-electronics/electronics-menu gif? ( media-libs/gd ) gsvit? ( media-libs/gd[png] ) gui? ( x11-libs/gtk+:2 x11-libs/pango dbus? ( sys-apps/dbus ) ) jpeg? ( media-libs/gd[jpeg] ) nelma? ( media-libs/gd[png] ) gcode? ( media-libs/gd[png] ) virtual/libintl png? ( media-libs/gd[png] ) m4lib-png? ( media-libs/gd[png] ) tk? ( >=dev-lang/tk-8:0 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/pcb/pcb/pcb-4.3.0/pcb-4.3.0.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d4d5e1fe2d6a9758a1a93c87f98963a5
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index d308f3fe2329..fae5078f56f1 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/josm-bin-18583 b/metadata/md5-cache/sci-geosciences/josm-bin-18678
index dee58d1711d9..bfecf1208746 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18583
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18678
@@ -1,14 +1,14 @@
 BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=install postinst postrm preinst
 DESCRIPTION=Java-based editor for the OpenStreetMap project
-EAPI=7
+EAPI=8
 HOMEPAGE=https://josm.openstreetmap.de/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop java-utils-2 xdg
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 GPL-2+ GPL-3
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
-SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18583.jar
+SRC_URI=https://josm.openstreetmap.de/download/josm-snapshot-18678.jar
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	eefed04ac580a259ecda1fbd966640b7	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2d370c2b7de95818a7842596a4910494
+_md5_=9dfd4caa61f71bd24a95f434358615ae
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index a39f3f81d957..c52caae35fb9 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/ncdu-1.17 b/metadata/md5-cache/sys-fs/ncdu-1.17
deleted file mode 100644
index 726781e967a3..000000000000
--- a/metadata/md5-cache/sys-fs/ncdu-1.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-lang/perl verify-sig? ( sec-keys/openpgp-keys-yorhel ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=unpack
-DEPEND=sys-libs/ncurses:=[unicode(+)]
-DESCRIPTION=NCurses Disk Usage
-EAPI=8
-HOMEPAGE=https://dev.yorhel.nl/ncdu
-INHERIT=verify-sig
-IUSE=verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:=[unicode(+)]
-SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdu-1.17.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-1.17.tar.gz.asc )
-_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=946f62aea24d89b841b08f0dd1de1d34
diff --git a/metadata/md5-cache/sys-fs/ncdu-2.2.1 b/metadata/md5-cache/sys-fs/ncdu-2.2.1
deleted file mode 100644
index ab3b0ad1ba63..000000000000
--- a/metadata/md5-cache/sys-fs/ncdu-2.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( ~dev-lang/zig-0.10.0 ~dev-lang/zig-bin-0.10.0 ) virtual/pkgconfig dev-lang/perl verify-sig? ( sec-keys/openpgp-keys-yorhel ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install test unpack
-DEPEND=sys-libs/ncurses:=[unicode(+)]
-DESCRIPTION=NCurses Disk Usage
-EAPI=8
-HOMEPAGE=https://dev.yorhel.nl/ncdu
-INHERIT=verify-sig
-IUSE=verify-sig
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:=[unicode(+)]
-SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdu-2.2.1.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-2.2.1.tar.gz.asc ) https://codeberg.org/BratishkaErik/distfiles/media/branch/master/ncdu-2.2.1-upstream-zig-0.10-updates-r1.patch
-_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=f76e538c2ea667bd3d7ba9e681e9a12e
diff --git a/metadata/md5-cache/sys-fs/ncdu-2.2.2 b/metadata/md5-cache/sys-fs/ncdu-2.2.2
deleted file mode 100644
index 03c159f85987..000000000000
--- a/metadata/md5-cache/sys-fs/ncdu-2.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( ~dev-lang/zig-0.10.1 ~dev-lang/zig-bin-0.10.1 ) virtual/pkgconfig dev-lang/perl verify-sig? ( sec-keys/openpgp-keys-yorhel ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install test unpack
-DEPEND=sys-libs/ncurses:=[unicode(+)]
-DESCRIPTION=NCurses Disk Usage
-EAPI=8
-HOMEPAGE=https://dev.yorhel.nl/ncdu
-INHERIT=verify-sig edo
-IUSE=verify-sig
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:=[unicode(+)]
-SLOT=0
-SRC_URI=https://dev.yorhel.nl/download/ncdu-2.2.2.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-2.2.2.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=5b7a86246c44c11c41e093447df58228
diff --git a/metadata/md5-cache/sys-fs/ncdu-bin-2.1.2 b/metadata/md5-cache/sys-fs/ncdu-bin-2.1.2
deleted file mode 100644
index b3da8ad0ac90..000000000000
--- a/metadata/md5-cache/sys-fs/ncdu-bin-2.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-yorhel ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install unpack
-DESCRIPTION=NCurses Disk Usage
-EAPI=8
-HOMEPAGE=https://dev.yorhel.nl/ncdu
-INHERIT=verify-sig
-IUSE=verify-sig
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=amd64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-x86_64.tar.gz ) arm? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-arm.tar.gz ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-aarch64.tar.gz ) x86? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-i386.tar.gz ) verify-sig? ( amd64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-x86_64.tar.gz.asc ) arm? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-arm.tar.gz.asc ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-aarch64.tar.gz.asc ) x86? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-i386.tar.gz.asc ) )
-_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=57d5f599149d3eaf433e30eaa59a31a8
diff --git a/metadata/md5-cache/sys-fs/ncdu-bin-2.2 b/metadata/md5-cache/sys-fs/ncdu-bin-2.2
deleted file mode 100644
index 04127e59e17c..000000000000
--- a/metadata/md5-cache/sys-fs/ncdu-bin-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-yorhel ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=install unpack
-DESCRIPTION=NCurses Disk Usage
-EAPI=8
-HOMEPAGE=https://dev.yorhel.nl/ncdu
-INHERIT=verify-sig
-IUSE=verify-sig
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=amd64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-x86_64.tar.gz ) arm? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-arm.tar.gz ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-aarch64.tar.gz ) x86? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-i386.tar.gz ) verify-sig? ( amd64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-x86_64.tar.gz.asc ) arm? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-arm.tar.gz.asc ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-aarch64.tar.gz.asc ) x86? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-i386.tar.gz.asc ) )
-_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
-_md5_=57d5f599149d3eaf433e30eaa59a31a8
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index f426582035e4..64b6e63327e4 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-sources-4.14.310 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.310
new file mode 100644
index 000000000000..25eb0e3307e3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.310
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.310
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-321.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-321.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-321.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-321.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-321.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-321.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ee38774454b48226c8371ecf497a49b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.278 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.278
new file mode 100644
index 000000000000..c813f9f5f9a6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.278
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.278
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-277.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-277.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-277.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-277.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-277.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-277.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1f6e4346c981da5fbc888002fdb7e82a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.175 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.175
new file mode 100644
index 000000000000..454439ae6911
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.175
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.175
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-184.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-184.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-184.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-184.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-184.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-184.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a5e3ead3c3b119ae8edc1f90f48f370c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.103 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.103
new file mode 100644
index 000000000000..fb0be659d8a9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.103
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15.103
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-108.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-108.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-108.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-108.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-108.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-108.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a53c4773b87f3f1efd0dedd922089637
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.237 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.237
new file mode 100644
index 000000000000..d30252da57a0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.237
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.237
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-243.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-243.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-243.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-243.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-243.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-243.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3f890bbc7b101aa99419682d17811e22
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.20 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.20
new file mode 100644
index 000000000000..631a089fc7a4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1.20
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-24.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-24.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-24.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-24.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-24.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-24.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f4fe9cb5448cbc7a1f0d9841d5f1ae7c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.7
new file mode 100644
index 000000000000..ad07d3e7f1ad
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.2 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.2.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-9.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=11b04c6b798d8e1e821a0d4c20df4ad0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.309 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.310
index 854c5aac5ff1..6769cb19b2a7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.309
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.310
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.309
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.309.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.310
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.310.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.277 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.278
index 4dee9b424753..97ec1f3d8bf8 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.277
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.278
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.277
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.277.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.278
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.278.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.174 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.175
index d9a2a5d59294..1dbcb781adb3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.174
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.175
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.174
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.174.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.175
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.175.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.102 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.103
index bfefd2a49d49..ea40fdc9d1ad 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.102
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.103
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.102
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.102.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.103
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.103.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.236 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.237
index 2b0a86f89d15..e551918cdf53 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.236
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.237
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.236
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.236.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.237
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.237.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.19 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.20
index 57cf1dc48951..cbc75353836a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.19
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.20
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.1.19
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.19.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+SLOT=6.1.20
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.20.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.7
index 029de495f932..6941daa0f592 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.7
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.2.6
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.2.6.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
+SLOT=6.2.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.2.7.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 981ad69a99c4..b8119aa16966 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/exo-4.16.4 b/metadata/md5-cache/xfce-base/exo-4.16.4
deleted file mode 100644
index 64fbf0da9649..000000000000
--- a/metadata/md5-cache/xfce-base/exo-4.16.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/gtk-doc-am dev-util/intltool >=dev-util/xfce4-dev-tools-4.16.0 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=install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=autotools xdg-utils
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/exo/4.16/exo-4.16.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e70d3c7a2a2e1aef762d9be817679a67
diff --git a/metadata/md5-cache/xfce-base/exo-4.17.4 b/metadata/md5-cache/xfce-base/exo-4.17.4
deleted file mode 100644
index 7faf851a3fa5..000000000000
--- a/metadata/md5-cache/xfce-base/exo-4.17.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/gtk-doc-am dev-util/intltool >=dev-util/xfce4-dev-tools-4.16.0 sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-libs/glib-2.66 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:=
-DESCRIPTION=Extensions, widgets and framework library with session support for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/exo/start https://gitlab.xfce.org/xfce/exo/
-INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.66 >=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/exo/4.17/exo-4.17.4.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=58915385b7dcced99bbbeda106960554
diff --git a/metadata/md5-cache/xfce-base/exo-4.18.0 b/metadata/md5-cache/xfce-base/exo-4.18.0
index a0cc842e720c..89854fa8481a 100644
--- a/metadata/md5-cache/xfce-base/exo-4.18.0
+++ b/metadata/md5-cache/xfce-base/exo-4.18.0
@@ -5,10 +5,10 @@ DESCRIPTION=Extensions, widgets and framework library with session support for X
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/exo/start https://gitlab.xfce.org/xfce/exo/
 INHERIT=xdg-utils
-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=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/exo/4.18/exo-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7cb1b0115ada50dfcec5be6ee50bb60b
+_md5_=e87c2b33d83c7e9713846b5645451354
diff --git a/metadata/md5-cache/xfce-base/garcon-0.8.0 b/metadata/md5-cache/xfce-base/garcon-0.8.0
deleted file mode 100644
index acfd8bf13b93..000000000000
--- a/metadata/md5-cache/xfce-base/garcon-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( dev-libs/gobject-introspection )
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/exo/start
-INHERIT=xdg-utils
-IUSE=introspection
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( dev-libs/gobject-introspection:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.8/garcon-0.8.0.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5e07e67d090566bb78d7650635e2ef4c
diff --git a/metadata/md5-cache/xfce-base/garcon-4.17.3 b/metadata/md5-cache/xfce-base/garcon-4.17.3
deleted file mode 100644
index c9bacda5b268..000000000000
--- a/metadata/md5-cache/xfce-base/garcon-4.17.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( >=dev-libs/gobject-introspection-1.66 )
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/garcon/start https://gitlab.xfce.org/xfce/garcon/
-INHERIT=xdg-utils
-IUSE=introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/garcon/4.17/garcon-4.17.3.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0bf6ca201fe2c6195583c467e3a42e34
diff --git a/metadata/md5-cache/xfce-base/garcon-4.18.0 b/metadata/md5-cache/xfce-base/garcon-4.18.0
index 2f4a6544403d..aa6beecb87c0 100644
--- a/metadata/md5-cache/xfce-base/garcon-4.18.0
+++ b/metadata/md5-cache/xfce-base/garcon-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/garcon/start https://gitlab.xfce.org/xfce/garcon/
 INHERIT=xdg-utils
 IUSE=introspection
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/garcon/4.18/garcon-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8938c3feca877584458e4dac1eb328fa
+_md5_=b01089fc805f9ae2c930d5a97d7c4cc9
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
deleted file mode 100644
index ce8c4a1ae178..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.16.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-DESCRIPTION=Unified widget and session management libs for Xfce
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=xdg-utils vala
-IUSE=debug glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.16/libxfce4ui-4.16.1.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b046d17c5e592abbb6a13aeca656eccc
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.17.9 b/metadata/md5-cache/xfce-base/libxfce4ui-4.17.9
deleted file mode 100644
index 2f275ba53bba..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.17.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-DESCRIPTION=Unified widget and session management libs for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
-INHERIT=xdg-utils vala
-IUSE=debug glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.17/libxfce4ui-4.17.9.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=31a5aa6de586af0a8f779777b1e5e769
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.0 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.0
deleted file mode 100644
index 7decf422e4f7..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-DESCRIPTION=Unified widget and session management libs for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
-INHERIT=xdg-utils vala
-IUSE=glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.18/libxfce4ui-4.18.0.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2941b9535e91093c9292e2b1d791ba25
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
index 2e74c8c348e5..61e31e69650b 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/libxfce4ui/start https://gitlab.xfce.org/xfce/libxfce4ui/
 INHERIT=xdg-utils vala
 IUSE=glade +introspection startup-notification system-info vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[introspection?,X] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.17.2:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.18/libxfce4ui-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=effb31630757e2a93f2187cd1e4b8150
+_md5_=93a13be2c61e65a15c66b8783128571b
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.16.0 b/metadata/md5-cache/xfce-base/libxfce4util-4.16.0
deleted file mode 100644
index ab833ec5e1cf..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.50 introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=A basic utility library for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
-INHERIT=vala
-IUSE=+introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/7
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.16/libxfce4util-4.16.0.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8
-_md5_=ab33340a589e8bd1de0ba863d86145b4
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.17.4 b/metadata/md5-cache/xfce-base/libxfce4util-4.17.4
deleted file mode 100644
index cdf6ab6b1cdf..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.17.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.56 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-DESCRIPTION=A basic utility library for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
-INHERIT=vala
-IUSE=+introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.56 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/7
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.17/libxfce4util-4.17.4.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8
-_md5_=1bd0883b6cfc418acbe6d9d1564b383c
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.18.0 b/metadata/md5-cache/xfce-base/libxfce4util-4.18.0
deleted file mode 100644
index 1d0d963bb682..000000000000
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.66.0 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-DESCRIPTION=A basic utility library for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
-INHERIT=vala
-IUSE=+introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.66.0 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/7
-SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.18/libxfce4util-4.18.0.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8
-_md5_=fdf85d23ac8aba6228402524f1a9ffb4
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.18.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
index 0c2ac4875d32..85aab5bc4a57 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/libxfce4util/start https://gitlab.xfce.org/xfce/libxfce4util/
 INHERIT=vala
 IUSE=+introspection vala
-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=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/7
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.18/libxfce4util-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8
-_md5_=59110919fb477bc75644387660a49d70
+_md5_=714d39498b1e8a7384f65a2a3415a48e
diff --git a/metadata/md5-cache/xfce-base/thunar-4.16.11 b/metadata/md5-cache/xfce-base/thunar-4.16.11
deleted file mode 100644
index da1c46d2432e..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-4.16.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.15.3:= >=xfce-base/libxfce4ui-4.15.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= )
-DESCRIPTION=File manager for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
-INHERIT=xdg-utils
-IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-3.22:3 >=xfce-base/exo-4.15.3:= >=xfce-base/libxfce4ui-4.15.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.16/thunar-4.16.11.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ad4fad7b5fedf6d47dad1462c0a4b3e5
diff --git a/metadata/md5-cache/xfce-base/thunar-4.18.3 b/metadata/md5-cache/xfce-base/thunar-4.18.3
index 99275d8b083e..53f1ee6fd144 100644
--- a/metadata/md5-cache/xfce-base/thunar-4.18.3
+++ b/metadata/md5-cache/xfce-base/thunar-4.18.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/start https://gitlab.xfce.org/xfce/thunar/
 INHERIT=xdg-utils
 IUSE=exif introspection libnotify pcre +trash-panel-plugin udisks
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.40.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/exo-4.17.0:= >=xfce-base/libxfce4ui-4.17.6:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre2-10.0:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( dev-libs/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( >=gnome-base/gvfs-1.18.3[udisks,udev] virtual/udev )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/thunar/4.18/thunar-4.18.3.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e80538aedfe4e6550d74bd0352f406f3
+_md5_=7e92424a87302be49f33cdb144a01155
diff --git a/metadata/md5-cache/xfce-base/thunar-volman-4.16.0 b/metadata/md5-cache/xfce-base/thunar-volman-4.16.0
deleted file mode 100644
index d64a126b44a2..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-volman-4.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.50 dev-libs/libgudev:= >=x11-libs/gtk+-3.20:3 >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7 )
-DESCRIPTION=Daemon that enforces volume-related policies
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
-INHERIT=xdg-utils
-IUSE=libnotify
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.50 dev-libs/libgudev:= >=x11-libs/gtk+-3.20:3 >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/thunar-volman/4.16/thunar-volman-4.16.0.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2e45aee9f36c1019f02db82ff61f2c76
diff --git a/metadata/md5-cache/xfce-base/thunar-volman-4.17.1 b/metadata/md5-cache/xfce-base/thunar-volman-4.17.1
deleted file mode 100644
index 56976c81f005..000000000000
--- a/metadata/md5-cache/xfce-base/thunar-volman-4.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.50 dev-libs/libgudev:= >=x11-libs/gtk+-3.20:3 >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7 )
-DESCRIPTION=Daemon that enforces volume-related policies
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/thunar/thunar-volman https://gitlab.xfce.org/xfce/thunar-volman/
-INHERIT=xdg-utils
-IUSE=libnotify
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.50 dev-libs/libgudev:= >=x11-libs/gtk+-3.20:3 >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/thunar-volman/4.17/thunar-volman-4.17.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b9cff86d33b5ce3a11d79aee84870486
diff --git a/metadata/md5-cache/xfce-base/thunar-volman-4.18.0 b/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
index 4455c6d233fc..50d523c95868 100644
--- a/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
+++ b/metadata/md5-cache/xfce-base/thunar-volman-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/thunar-volman https://gitlab.xfce.org/xfce/thunar-volman/
 INHERIT=xdg-utils
 IUSE=libnotify
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libgudev:= >=x11-libs/gtk+-3.24.0:3 >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/thunar-volman/4.18/thunar-volman-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fed368fed5bc2e65668cdd00f61c326f
+_md5_=6382b45ba052ef153db908b917658e0c
diff --git a/metadata/md5-cache/xfce-base/tumbler-4.16.1 b/metadata/md5-cache/xfce-base/tumbler-4.16.1
deleted file mode 100644
index 61ded59f98d0..000000000000
--- a/metadata/md5-cache/xfce-base/tumbler-4.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50:2 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=x11-libs/gdk-pixbuf-2.14:2 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )
-DESCRIPTION=A thumbnail service for Thunar
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
-INHERIT=xdg-utils
-IUSE=curl epub ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50:2 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=x11-libs/gdk-pixbuf-2.14:2 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/tumbler/4.16/tumbler-4.16.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fc602a2f427925bb72da9a3ae8d5eae0
diff --git a/metadata/md5-cache/xfce-base/tumbler-4.17.3 b/metadata/md5-cache/xfce-base/tumbler-4.17.3
deleted file mode 100644
index 1f5b3107f596..000000000000
--- a/metadata/md5-cache/xfce-base/tumbler-4.17.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.56:2 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=xfce-base/libxfce4util-4.17.1:= >=x11-libs/gdk-pixbuf-2.36.2:2 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )
-DESCRIPTION=A thumbnail service for Thunar
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/tumbler/start https://gitlab.xfce.org/xfce/tumbler/
-INHERIT=xdg-utils
-IUSE=curl epub ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.56:2 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=xfce-base/libxfce4util-4.17.1:= >=x11-libs/gdk-pixbuf-2.36.2:2 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/tumbler/4.17/tumbler-4.17.3.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=779186d217c91032e5ead46397350a0e
diff --git a/metadata/md5-cache/xfce-base/tumbler-4.18.0 b/metadata/md5-cache/xfce-base/tumbler-4.18.0
index 276e822fed6a..40b554b6efbe 100644
--- a/metadata/md5-cache/xfce-base/tumbler-4.18.0
+++ b/metadata/md5-cache/xfce-base/tumbler-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/tumbler/start https://gitlab.xfce.org/xfce/tumbler/
 INHERIT=xdg-utils
 IUSE=curl epub ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=xfce-base/libxfce4util-4.17.1:= >=x11-libs/gdk-pixbuf-2.40.0 curl? ( >=net-misc/curl-7.25:= ) epub? ( app-text/libgepub ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( media-libs/libjpeg-turbo:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/tumbler/4.18/tumbler-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=982fcdd8b2be0edb64f87b682a7c09ee
+_md5_=b91508b89a9a8e833d6a047a4e0c217c
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1
deleted file mode 100644
index b0e69fd96d8e..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:= !xfce-base/xfce-utils
-DESCRIPTION=A tool to find and launch installed applications for the Xfce desktop
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start
-INHERIT=xdg-utils
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:= !xfce-base/xfce-utils
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.16/xfce4-appfinder-4.16.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4addb9a6676b7497a47599aafae12226
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.17.2 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.17.2
deleted file mode 100644
index b95b58f5b650..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.17.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:=
-DESCRIPTION=A tool to find and launch installed applications for the Xfce desktop
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start https://gitlab.xfce.org/xfce/xfce4-appfinder/
-INHERIT=xdg-utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.17/xfce4-appfinder-4.17.2.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3898bbf8d09d27302d0942514b7c2fe3
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
index cb314b9eafe7..fe078bc27ce8 100644
--- a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.18.0
@@ -5,10 +5,10 @@ DESCRIPTION=A tool to find and launch installed applications for the Xfce deskto
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start https://gitlab.xfce.org/xfce/xfce4-appfinder/
 INHERIT=xdg-utils
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] >=xfce-base/xfconf-4.14:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.18/xfce4-appfinder-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e5db3b8b41d7b8110cf83075ce4f9a56
+_md5_=8b21f40424767461d24de2bfb0f57ba0
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2 b/metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2
deleted file mode 100644
index 4df64964856f..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The Xfce Desktop Environment (meta package)
-EAPI=7
-HOMEPAGE=https://www.xfce.org/
-IUSE=minimal pulseaudio +svg upower
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
-LICENSE=metapackage
-RDEPEND=x11-themes/hicolor-icon-theme >=xfce-base/exo-4.16 >=xfce-base/garcon-0.8 >=xfce-base/libxfce4ui-4.16 >=xfce-base/libxfce4util-4.16 >=xfce-base/thunar-4.16 >=xfce-base/thunar-volman-4.16 >=xfce-base/tumbler-4.16 >=xfce-base/xfce4-appfinder-4.16 >=xfce-base/xfce4-panel-4.16 >=xfce-base/xfce4-session-4.16 >=xfce-base/xfce4-settings-4.16 x11-terms/xfce4-terminal >=xfce-base/xfconf-4.16 >=xfce-base/xfdesktop-4.16 >=xfce-base/xfwm4-4.16 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin ) svg? ( gnome-base/librsvg ) upower? ( >=xfce-base/xfce4-power-manager-4.16 )
-SLOT=0
-_md5_=e784bc78eed686aef46c56407939d2f0
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.18 b/metadata/md5-cache/xfce-base/xfce4-meta-4.18
index ddab29bf23b4..745fe903122b 100644
--- a/metadata/md5-cache/xfce-base/xfce4-meta-4.18
+++ b/metadata/md5-cache/xfce-base/xfce4-meta-4.18
@@ -3,8 +3,8 @@ DESCRIPTION=The Xfce Desktop Environment (meta package)
 EAPI=8
 HOMEPAGE=https://www.xfce.org/
 IUSE=minimal pulseaudio +svg upower
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=metapackage
 RDEPEND=x11-themes/hicolor-icon-theme >=xfce-base/exo-4.18.0 >=xfce-base/garcon-4.18.0 >=xfce-base/libxfce4ui-4.18.0 >=xfce-base/libxfce4util-4.18.0 >=xfce-base/thunar-4.18.0 >=xfce-base/thunar-volman-4.18.0 >=xfce-base/tumbler-4.18.0 >=xfce-base/xfce4-appfinder-4.18.0 >=xfce-base/xfce4-panel-4.18.0 >=xfce-base/xfce4-session-4.18.0 >=xfce-base/xfce4-settings-4.18.0 x11-terms/xfce4-terminal >=xfce-base/xfconf-4.18.0 >=xfce-base/xfdesktop-4.18.0 >=xfce-base/xfwm4-4.18.0 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin ) svg? ( gnome-base/librsvg ) upower? ( >=xfce-base/xfce4-power-manager-4.18.0 )
 SLOT=0
-_md5_=e291e05edca11f1c11ae98aaeb9ca899
+_md5_=b0d47099cd03a7fee007a5956a8a04f3
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.18_pre2 b/metadata/md5-cache/xfce-base/xfce4-meta-4.18_pre2
deleted file mode 100644
index 0bd6ecd64a74..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-meta-4.18_pre2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The Xfce Desktop Environment (meta package)
-EAPI=8
-HOMEPAGE=https://www.xfce.org/
-IUSE=minimal pulseaudio +svg upower
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=metapackage
-RDEPEND=x11-themes/hicolor-icon-theme >=xfce-base/exo-4.17.4 >=xfce-base/garcon-4.17.3 >=xfce-base/libxfce4ui-4.17.9 >=xfce-base/libxfce4util-4.17.4 >=xfce-base/thunar-4.17.12 >=xfce-base/thunar-volman-4.17.1 >=xfce-base/tumbler-4.17.3 >=xfce-base/xfce4-appfinder-4.17.2 >=xfce-base/xfce4-panel-4.17.5 >=xfce-base/xfce4-session-4.17.2 >=xfce-base/xfce4-settings-4.17.3 x11-terms/xfce4-terminal >=xfce-base/xfconf-4.17.2 >=xfce-base/xfdesktop-4.17.2 >=xfce-base/xfwm4-4.17.2 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin ) svg? ( gnome-base/librsvg ) upower? ( >=xfce-base/xfce4-power-manager-4.17.1 )
-SLOT=0
-_md5_=54c433d2630eaf927eee1de9b46cbea3
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.5 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.5
deleted file mode 100644
index 320447d7b679..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=vala xdg-utils
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.5.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98e27ac60f0fe3c02f3a49e1b364ab45
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.6 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.6
deleted file mode 100644
index 995266d4ddcd..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=vala xdg-utils
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.6.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ff77a2e77f212a610eab33137947b204
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.0
deleted file mode 100644
index 83b5550c58fa..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
-INHERIT=vala xdg-utils
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.0.tar.bz2
-_eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=46f076bf6adaa5fbe5f24b665a9708e6
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
index 79c47a928a9a..94efcf3593a3 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
 INHERIT=vala xdg-utils
 IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.18/xfce4-panel-4.18.1.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4cf1af91009d07116cf1d6eb92a972e5
+_md5_=1e0a814ed26a0ac55a2addfbb8494bcf
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.16.0 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.16.0
deleted file mode 100644
index 8d76e776d633..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) x11-base/xorg-proto
-DESCRIPTION=Power manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
-INHERIT=xdg-utils
-IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.16/xfce4-power-manager-4.16.0.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=64e33c30151f27bc64031507b283d3d1
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.17.1 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.17.1
deleted file mode 100644
index fc42db697330..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) x11-base/xorg-proto
-DESCRIPTION=Power manager for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
-INHERIT=xdg-utils
-IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.17/xfce4-power-manager-4.17.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=90182a423b7a3576b67a659a0ee87ce0
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
index b83f6478bdea..9910ca147980 100644
--- a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
 INHERIT=xdg-utils
 IUSE=networkmanager +panel-plugin policykit
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.18/xfce4-power-manager-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e1dd5edf669e3cf67d5a33e94ffbf558
+_md5_=d44bb29ed9d9bad4abb63e87eba472b0
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.16.0 b/metadata/md5-cache/xfce-base/xfce4-session-4.16.0
deleted file mode 100644
index c5c0586711af..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 )
-DESCRIPTION=A session manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start
-INHERIT=xdg-utils
-IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 >=x11-misc/xlockmore-5.43 x11-misc/slock x11-misc/alock[pam] ) )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.16/xfce4-session-4.16.0.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=161f26dbe0b1c69d9933f19cce80324d
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.17.2 b/metadata/md5-cache/xfce-base/xfce4-session-4.17.2
deleted file mode 100644
index cd423e02685a..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.17.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 )
-DESCRIPTION=A session manager for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
-INHERIT=xdg-utils
-IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.17/xfce4-session-4.17.2.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=44151d3f7e972557b17516e9fd237776
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
index 919148f0239c..f975430171cb 100644
--- a/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
 INHERIT=xdg-utils
 IUSE=nls policykit +xscreensaver
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/xfconf-4.12:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.18/xfce4-session-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ec319c16eb4a9aa8273d5e646627d736
+_md5_=3e95cac45cec92cf00d54684973dcc46
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.16.5 b/metadata/md5-cache/xfce-base/xfce4-settings-4.16.5
deleted file mode 100644
index ee440f792b31..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.16.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DEFINED_PHASES=configure postinst postrm setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.50 media-libs/fontconfig >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1 x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start
-INHERIT=python-single-r1 xdg-utils
-IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier 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 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.50 media-libs/fontconfig >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.15.1:= >=xfce-base/libxfce4util-4.15.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.16/xfce4-settings-4.16.5.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d93125154f6c93d268f840994a2ec213
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.17.3 b/metadata/md5-cache/xfce-base/xfce4-settings-4.17.3
deleted file mode 100644
index ed84977e0340..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.17.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DEFINED_PHASES=configure postinst postrm setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.50 media-libs/fontconfig >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1 x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
-INHERIT=python-single-r1 xdg-utils
-IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier 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 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.50 media-libs/fontconfig >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.17/xfce4-settings-4.17.3.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=380dd44cc1ecd3c598a2e8b11ce41773
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.0 b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.0
deleted file mode 100644
index 8ffbccc0dd3d..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DEFINED_PHASES=configure postinst postrm setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1 x11-base/xorg-proto
-DESCRIPTION=Configuration system for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
-INHERIT=python-single-r1 xdg-utils
-IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier 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 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.18/xfce4-settings-4.18.0.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=411148c4d7a16e38c1392f2004d6b8a6
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1 b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
index 01b7d755c985..0a3d867cbbb4 100644
--- a/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.18.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
 INHERIT=python-single-r1 xdg-utils
 IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier 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 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 media-libs/fontconfig >=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 >=xfce-base/garcon-0.2:= >=xfce-base/exo-4.15.1:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13:= colord? ( x11-misc/colord:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( x11-drivers/xf86-input-libinput ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( >=sys-power/upower-0.9.23 ) xklavier? ( >=x11-libs/libxklavier-5 ) !<xfce-base/exo-4.15.1
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.18/xfce4-settings-4.18.1.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7e8a98dd5ce70356c19628365bf7ccaa
+_md5_=f24e866d6b119422c84a8c61f81df395
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.16.0 b/metadata/md5-cache/xfce-base/xfconf-4.16.0
deleted file mode 100644
index f54faf60b277..000000000000
--- a/metadata/md5-cache/xfce-base/xfconf-4.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.50 sys-apps/dbus >=xfce-base/libxfce4util-4.14:= introspection? ( dev-libs/gobject-introspection:= ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1
-DESCRIPTION=A configuration management system for Xfce
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=bash-completion-r1 vala
-IUSE=debug +introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 sys-apps/dbus >=xfce-base/libxfce4util-4.14:= introspection? ( dev-libs/gobject-introspection:= ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.16/xfconf-4.16.0.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=b2c3a19484ceda2591035fd6ab065b15
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.17.2 b/metadata/md5-cache/xfce-base/xfconf-4.17.2
deleted file mode 100644
index e1f864854cdb..000000000000
--- a/metadata/md5-cache/xfce-base/xfconf-4.17.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) )
-DEFINED_PHASES=configure install test
-DEPEND=>=dev-libs/glib-2.50 sys-apps/dbus >=xfce-base/libxfce4util-4.17.3:= introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-DESCRIPTION=A configuration management system for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfconf/start https://gitlab.xfce.org/xfce/xfconf/
-INHERIT=bash-completion-r1 vala
-IUSE=debug +introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.50 sys-apps/dbus >=xfce-base/libxfce4util-4.17.3:= introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/3
-SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.17/xfconf-4.17.2.tar.bz2
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=e6a7e513537627a0d8c33cccb9565189
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.18.0 b/metadata/md5-cache/xfce-base/xfconf-4.18.0
index 6713dd60075d..0526370a2a50 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfconf-4.18.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfconf/start https://gitlab.xfce.org/xfce/xfconf/
 INHERIT=bash-completion-r1 vala
 IUSE=debug +introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.66.0 sys-apps/dbus >=xfce-base/libxfce4util-4.17.3:= introspection? ( >=dev-libs/gobject-introspection-1.66:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/3
 SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.18/xfconf-4.18.0.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=e19ccf4636d5c5580849b4c2c2210af7
+_md5_=f08a591b5015a84352ee68f541b591c3
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.16.1 b/metadata/md5-cache/xfce-base/xfdesktop-4.16.1
deleted file mode 100644
index 496c37a55db9..000000000000
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= )
-DESCRIPTION=Desktop manager for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=xdg-utils
-IUSE=debug libnotify +thunar
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.50 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.16/xfdesktop-4.16.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3962c936904c150659a77161b2734a63
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.18.0 b/metadata/md5-cache/xfce-base/xfdesktop-4.18.0
deleted file mode 100644
index cf6db9c1c038..000000000000
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= )
-DESCRIPTION=Desktop manager for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfdesktop/start https://gitlab.xfce.org/xfce/xfdesktop/
-INHERIT=xdg-utils
-IUSE=libnotify +thunar
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.18/xfdesktop-4.18.0.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b5f13cfa677ae043c12b607325f74d78
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.18.1 b/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
index cc9c988fb1b5..96c681a23aef 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.18.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfdesktop/start https://gitlab.xfce.org/xfce/xfdesktop/
 INHERIT=xdg-utils
 IUSE=libnotify +thunar
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.18/xfdesktop-4.18.1.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3f93009b4f22d9430fbcaa6b3a89cbe5
+_md5_=a83a9624cff609af19c9f1308db34509
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.16.1-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.16.1-r1
deleted file mode 100644
index c8690993e155..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.16.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xpresent? ( x11-libs/libXpresent ) x11-libs/libICE x11-libs/libSM
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=xdg-utils
-IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xpresent? ( x11-libs/libXpresent )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.16/xfwm4-4.16.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=687fe0e97261fc2a10327584781d769d
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.17.2 b/metadata/md5-cache/xfce-base/xfwm4-4.17.2
deleted file mode 100644
index 1f54ff7bcf3b..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.17.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xpresent? ( x11-libs/libXpresent )
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/xfce/xfwm4/start https://gitlab.xfce.org/xfce/xfwm4
-INHERIT=xdg-utils
-IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xpresent? ( x11-libs/libXpresent )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.17/xfwm4-4.17.2.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=280cdd7c587199411ff31779a4a141d2
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.18.0 b/metadata/md5-cache/xfce-base/xfwm4-4.18.0
index 86779553c016..d5df1423a4f4 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.18.0
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.18.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfwm4/start https://gitlab.xfce.org/xfce/xfwm4
 INHERIT=xdg-utils
 IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.24.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) xpresent? ( x11-libs/libXpresent )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.18/xfwm4-4.18.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=34a96eaaf253735b214b8e1ceb0cf4b0
+_md5_=dede6a64737ee6de3cbf5c76c58be60d
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 802b20e62dfe..e9fecc011fd6 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.7 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.7
deleted file mode 100644
index 95f76b99880a..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
-DESCRIPTION=A panel plugin for showing information about cpufreq settings
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin
-INHERIT=xdg-utils
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.7.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=774a4e3ad4b42f14d34d76149fca1611
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8 b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
index d2d95782169a..ddb54b3cbcf4 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpufreq-plugin-1.2.8
@@ -5,10 +5,10 @@ DESCRIPTION=A panel plugin for showing information about cpufreq settings
 EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/
 INHERIT=xdg-utils
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4ui-4.16:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.2/xfce4-cpufreq-plugin-1.2.8.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=83aed606ce8e7b5e34ba3944e2656b8e
+_md5_=d1761e28bcf543122353789c59133801
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.6 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.6
deleted file mode 100644
index 6eec1fdac052..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
-DESCRIPTION=A system load plug-in for the Xfce panel
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
-INHERIT=xdg-utils
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2+
-RDEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.6.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8a5dfbcfcdc0715922da6adff1797801
diff --git a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7 b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
index 0ddf91c8a7b9..9022939813d0 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
+++ b/metadata/md5-cache/xfce-extra/xfce4-cpugraph-plugin-1.2.7
@@ -5,10 +5,10 @@ DESCRIPTION=A system load plug-in for the Xfce panel
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin
 INHERIT=xdg-utils
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.22:3 >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16.0:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/xfce4-cpugraph-plugin-1.2.7.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=49cef3141ebf6b975d9dadec8d82dc5b
+_md5_=5eb6640162a916927d90014c07e48838
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.3 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.3
deleted file mode 100644
index e6e3c40e82e9..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-DESCRIPTION=A panel plug-in for acpi, lm-sensors and hddtemp sensors
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
-INHERIT=xdg-utils
-IUSE=+acpi hddtemp libnotify lm-sensors video_cards_nvidia
-KEYWORDS=amd64 ~ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-REQUIRED_USE=|| ( hddtemp lm-sensors acpi )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.3.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b6bd4bc98e8da3333a1761a7c0304f04
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4
index ca1fa097f080..aad4cb742529 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/
 INHERIT=xdg-utils
 IUSE=+acpi hddtemp libnotify lm-sensors video_cards_nvidia
-KEYWORDS=amd64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4ui-4.16:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 REQUIRED_USE=|| ( hddtemp lm-sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xfce4-sensors-plugin-1.4.4.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=87eb0e409e451ea325e6720a5c0b6c4f
+_md5_=7bef09f314917b3e2797ee85f684efbb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.1 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.1
deleted file mode 100644
index 0e551c401744..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.14:= upower? ( >=sys-power/upower-0.9.23 )
-DESCRIPTION=System load plug-in for Xfce panel
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
-INHERIT=xdg-utils
-IUSE=upower
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.14:= upower? ( >=sys-power/upower-0.9.23 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-1.3.1.tar.bz2
-_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=67e619364551816fa127b0ef31365c2e
diff --git a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2 b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
index db2eb0874845..609722c3dbae 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/
 INHERIT=xdg-utils
 IUSE=upower
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=xfce-base/libxfce4ui-4.16:=[gtk3(+)] >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfce4-panel-4.16:= >=xfce-base/xfconf-4.14:= upower? ( >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3/xfce4-systemload-plugin-1.3.2.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dc1f82c6d91d008aefaa85073ac988f4
+_md5_=78a8f4e602e601c23cb27955a1fde0ae
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.5.0 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.5.0
deleted file mode 100644
index 6d2e9d68bf22..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:=
-DESCRIPTION=Panel plugin to put the maximized window title and window buttons on the panel
-EAPI=8
-HOMEPAGE=https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/
-INHERIT=python-any-r1 xdg-utils
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-windowck-plugin/0.5/xfce4-windowck-plugin-0.5.0.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d2b57e1a42106c2fb002f8a8be681fef
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 05c1f2d16ee2..c910bd776b2f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-03-17T06:09:45Z
+TIMESTAMP 2023-03-17T12:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUBClfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQUWIxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBRvxAAhbdqqfh3wx/iBnl21ulEd6oyHdBu7TZ9b6yU67lXzcoj8kYSYQZUDKSE
-DoaYJHdetX//HwL0j2GOaHSZB9lVPWXWE8AAezmSdiZvCWQQloLEpDnPWvc14pHe
-u6YC3EaXU7ilLr39X/9RIaiIwiAoAda4p7hr2Y1c16ncKUA4D9nPapsWYimuVKAC
-pw8GkPrltWKruS0uB0ckRxKKFfDFUFXkyL9DApdsqb+JIJWDA2yoHSrRXq5P2J3k
-Kryu1Rcs7s1KzksQngUQZOSETgQZhZYvL1aLRd6vgiod52tO1EKseIU7Hqg77RcU
-CuZ/j8zUQqI1Tx3DH1tcnVp1gvUHq+OXdYAd+WKMRKl1ZcsCWgHvL1CTF8D9eB9t
-Oul+pyHysRCYfNV1wRhtvTgkq/qQAjuUVVnIqLbs8Riw2SiS7OhU2dfci6BqRnsh
-2IvPL+B+QvAOnYPlHUUmS74q2ZPDS0RJPFvn40c83cMRkU63LbBIIchoij7Im/RS
-boS7MRH+g84nrtusm0hz19US9+853roxhLn940ozZ62JFru9jI7ehbQNayiktsuQ
-TjK92MUgdUCcaf/3zRLuv7Sw1FeF/tCzcN9K2at8woaHRzCVzFfNSzwjRjzAefPd
-Gg2xYMVbFekU34/YMKFbM46sLDGPc8bGTGCnpAce1GUx0MBEai0=
-=Pehu
+klCeTQ//bgyXsH90ctHojXNZj096aQJD6FQmPf03XBBQymCoN13b84CWSOi9uW8D
+V65Mpp/HeMQte3nVaMbB3/ODzq1y3jMgWoDhldfWTeZPW2cFpzxlP/ssnFaL13lu
+JwY9YMpbvLf6rp11eDBftdqv+OrguIjOpHHP9oix2xCVyn8LIczgD4A8F+FsuZ/Q
+1CjzJgOFsmNZqkuw4esjKH6rxDZ64mslcYkAcAhfuc4Z8tI7fxZT5zoD3vuiaByP
+HonRaJSyTwqpQUZYQbh9thaKdAEjJjCPDskDiLG+nR7GipvaxVKnAHVAEvJaRnkB
+ptaTBx9gU+tT56Rht5kchQ4am31mr9Fc30PLJhUZUtkQWTOZ55P6hZrCgUshzn/L
+DyvZlJv0pcFKGb3mytYVcAxfaToiquzMShIpavfDVg+wH3N7RlqJutNDg0bInXrR
+zd4rxYHyeXYVA3PLLskfoGnqkhMc1HcEI9tlEIUonr3EIExs+9Q7xFPGXbKzNDjf
+PKa39sYCiJ6tHrwpngkU/Y0Ls0oh4SXRR1VgZrjUrZzv0WK5E6n2o3uQiF9vNK1K
+CqOgm035sTl6gSDDiTsxSKch1a3hUY4DL8ToqUgdNm8D1ihUUPgJ/TIpAoxGeJjI
+6qSg38olkoW0kZuAAb1iCmhiN7Gy33tq4imtXYSM+oHBP6kJcWg=
+=uJYN
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dff09ea9787c..765c9303807b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 06:09:42 +0000
+Fri, 17 Mar 2023 12:09:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9b850466bfe2..7babdc367cf3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Mar 17 06:09:42 AM UTC 2023
+Fri Mar 17 12:09:45 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index baec2f2c2ea0..1ea679264db9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 06:15:01 +0000
+Fri, 17 Mar 2023 12:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 00ea88a5174c..376649a15f42 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-dbeb553c02606090ee9a1ff1c751907200f525fe 1679031119 2023-03-17T05:31:59+00:00
+d071789533eb50c30c5c6372fa695cc9e6290274 1679054455 2023-03-17T12:00:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ffb6032b10c9..8924db58cd95 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1679033401 Fri 17 Mar 2023 06:10:01 AM UTC
+1679055001 Fri 17 Mar 2023 12:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index dff09ea9787c..765c9303807b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Mar 2023 06:09:42 +0000
+Fri, 17 Mar 2023 12:09:45 +0000
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index f8d75097ff69..d2db0a742bdf 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index b5a1a1e91dc4..59b71d076460 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -2,7 +2,7 @@ AUX liferea-1.12.9-webkit-css.patch 1760 BLAKE2B f99c7c86053a6b63a4e3d7cd3b13506
 DIST liferea-1.12.10.tar.bz2 1503040 BLAKE2B 8a935f889b972787a55f0d09c4314ee5ff4d4fa42b46af46d84e5dd5d13df95adf898dc522baadd76e7c752c9f47d771122698882142202002ebf2fa5b0e3f31 SHA512 34b9c5b9c58aaac790e44aa2495a169ea2fbc3cdf351013324615b65c083045c3b09c5d5fa6eeba994184d2d7a9e52626241877c24194f4f771af0f5b3afb067
 DIST liferea-1.12.9.tar.bz2 1496593 BLAKE2B a0887a7b04c47a69166396f06305342232b16eefba04df1a0cda7c9d84880e025d73786a55aaa528a143fccef213fa2de9474fb6fab3f301e54a12dba4a705f1 SHA512 09156e0e5e4342741b6290be17ee94a3204d431c687c17688e23067d151d36a178193f5cf01da222974810a48626c877b0cf917fbdd9ecb6e81254e85750be9b
 DIST liferea-1.14.1.tar.gz 1832915 BLAKE2B 93923a498031a356d7c54a290707d79b1758d7e8a0a684d85fd4baab8ce8642e9f6e2be83e2866044d7e17ed08babfbfed8092a6cf83658d8ea90182bec150d1 SHA512 83abb325865e349c22d3735221cb9fc80075502b212042d5db2dcd6425bc4d344755e7dc8a674b71fcde11b07f8ed0ef1b955c5cb3d5e2b4e4a62d1d8793eb94
-EBUILD liferea-1.12.10.ebuild 1787 BLAKE2B d65a333dbab145f9a2c1fdef7e38561af85b5cf1456405c412ae1197fcf1f3c90f30ef8c9fd5b3ce4a553b93b840abc7c1618ceafde752852a960c814af65d52 SHA512 a1c04aba54405d888d2d28d11b68d52157163c3446d986e33407ba019378674640e89b918c64599cfa49f3ed11dcbe7623d1c595fc3801f3a6410e848916a64c
+EBUILD liferea-1.12.10.ebuild 1786 BLAKE2B e9a0d536a3423de0696cee17e75f5b628abcd9e64b5fd1a7e3b8788d71abe7bba73a2e4f082e5549ee712bfd1fb7387f0c44d39a5fb81e4852950e6b0ca23447 SHA512 5d258566f54ec7c7195a8c080ed2d365f30f4e616cd9faec621d9bf2a5800448d6b8dc64baa3fbad3a48da5409e8b5c177a62f4298fe14c4d87158ecbdcc0ba7
 EBUILD liferea-1.12.9-r2.ebuild 1778 BLAKE2B 910a3fa6e897cae41c69b1fb766a94964f89a0690e60334ea6e2cc82d0814dcc7fe38c3048f3f3859cebac9df1d1f1678b66c08b65bf46b1d36c7c94f71af026 SHA512 a15b3eee4812f128cac0273e11a3f42ca95db0aa2e9d63ea11301385449250063a26512531b8212631a2d9cb14f58969f4b1a634153ec21b0486ff596bb2b7ae
 EBUILD liferea-1.14.1.ebuild 1693 BLAKE2B c39434782ba21911d8ec1c28a373d78876f28e4037fe9d7f176f61e03ddb589b5ef7cd5efc724e5b75439cbab8508e5cad38a9de5ba25dbea53842dcd9541c00 SHA512 413d717cbc8317ae70d1a288cfb291e575fcec2e785900681993bc881b7bfa560b881d0775180b1233c4dba92604c1e67ddc938f54d6dd922f934bd04a6cdd34
 MISC metadata.xml 629 BLAKE2B 88e0018637621448c67f2b514c11f3be85a6f2a4a1a0d7af0df0bea2e2cff8651bf8d064c17c314a31da0090231e35811cd60ad8b2a25175e997dc4a2487ead1 SHA512 ae109cd972bf652d0598b660ef74bba8783d097fe87b1ed5839975c3788a905f1768176ec914b03d6e495c89ccac121ea807fd088f77d7c96e582e175a9aae13
diff --git a/net-news/liferea/liferea-1.12.10.ebuild b/net-news/liferea/liferea-1.12.10.ebuild
index 12b623397023..1fffe934d842 100644
--- a/net-news/liferea/liferea-1.12.10.ebuild
+++ b/net-news/liferea/liferea-1.12.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3bc0636fe987..8718a2421d37 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index f4e6d9210b4d..ebc5b4e0f9ad 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -6,6 +6,10 @@
 dev-python/nbval doc
 dev-python/nbclassic doc
 
+# Bernd Waibel <waebbl-gentoo@posteo.net> (2023-02-23)
+# Mask openvdb, as it pulls in masked media-libs/openexr
+sci-libs/vtk openvdb
+
 # Sam James <sam@gentoo.org> (2022-11-19)
 # Drags in Rails (propshaft->rails)
 dev-ruby/actiontext test
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 1fd7b40d96ae..703c39a8fa69 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -48,6 +48,7 @@
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-17)
 # works on ppc64le
 -app-containers/docker
+-app-containers/docker-buildx
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-22
 # criu works on ppc64le
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 6b90376ee8ef..03686090b535 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -52,6 +52,7 @@ sci-mathematics/geogebra-bin
 # does not work on big-endian ppc64
 # next releases remove that assumption and mask will be lifted
 app-containers/docker
+app-containers/docker-buildx
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-18)
 # openjfx:11 does not work on ppc64be
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 48e652d42736..7f4225c68713 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest
index e319c0210392..a2406614b739 100644
--- a/sci-electronics/electric/Manifest
+++ b/sci-electronics/electric/Manifest
@@ -1,3 +1,5 @@
 DIST electricBinary-9.03.jar 23591444 BLAKE2B f5185917821855eed90dbd39dc8f6a390c9b117c06d960a01ef7061ec7650d13b549950e53c43c4bd0864c0adebc32c1c2e5c68a32dd09f2f46d0111aa8a7fe0 SHA512 e4430c87e1c0d335341057950b887988f46bd222ab6c2d989312036592f16db0b51169f3affc01fe0dbd8077674ed934d4896de46a0f9ee00e71453b2a6b18f2
+DIST electricBinary-9.07.jar 21244560 BLAKE2B 23ad96fc7b213776e0296e281bd289f554261df85738f30b5369f743523231456b8e29f9b18a26ac338c2f093ec514ce219997b763c92aaa0870339af7732f31 SHA512 1f9a1cc061b99c868df25c3bf1da3e21e9d26dc25b6c72b10c8f53488f3ddf0d522e821d4cd57eb85c95fe903fb6ada0d92d501f577d0fe4934988bb4c2d596a
 EBUILD electric-9.03.ebuild 770 BLAKE2B 178c80f28275df4b0ce02d6b66df0f038d35fa1bae924783e46ae682943c8e32db715d7ce6e6caa6b87b469f0ba41e06c2f7fd0a501ee2ebb2df7a98e4c296a4 SHA512 db206a790fdd1e2384c03b700b93da9e5fc7418d24b62eb2cb4c1d319c8220fd74025c21a82b42b050863e9371ff30cd43e911594e47ea2ed567400f19e433a3
+EBUILD electric-9.07.ebuild 763 BLAKE2B aa6f234a7642ae530daa9a0a63d2d68e7852c195dfa4ac411a9eb7afa2638d9418760aa7deffeefa85bcaefb664371269e808fc6b6af507192d1aa7a6fdd2c0a SHA512 3fc35b36abf9c1d8d5cbb9a8261a3a6eb8bbd5c61f92af66fea45fb7d506e790d22a6ec5f860923d106e7b1d7146cfe63010815c1c783b0c12f5e221b8d54307
 MISC metadata.xml 719 BLAKE2B 03b1a0fe9d30bc9ef16ddcc73f0f2bba6d219afec3b26fa46c5b1546fa5484b17c2e1ea2d03154512961be4aeddd70061f40a61d3b5b68258b4f532d9e955e40 SHA512 f56e1bd8817d112906ff30000854d274ac4b29c5dd3d8f4a007554752df7fef1aad00abc890079c72e6fc39cf9b0b85f7fd49f196616a1366e999f999ecf8bcc
diff --git a/sci-electronics/electric/electric-9.07.ebuild b/sci-electronics/electric/electric-9.07.ebuild
new file mode 100644
index 000000000000..39e2f2779ff5
--- /dev/null
+++ b/sci-electronics/electric/electric-9.07.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop java-pkg-2
+
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
+HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
+SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	sci-electronics/electronics-menu"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}"/${PN}Binary-${PV}.jar
+	java-pkg_dolauncher ${PN}
+
+	newicon com/sun/electric/tool/user/help/helphtml/iconplug.png electric.png
+	make_desktop_entry electric "Electric VLSI Design System" electric "Electronics"
+}
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 3933c9ebab0c..aa23025dfaca 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -2,8 +2,10 @@ AUX magic-8.3.232-libdir.patch 525 BLAKE2B 5b85f02031d18299ae098b5ff45163d1c6d16
 AUX magic-8.3.232-verbose-build.patch 1041 BLAKE2B 80ab96d751ff2294e6d82f75e997ecc1ccc00588eae3a6c0d63d49a134567eae864f3a42c46c6a6e0f6b1a53473df30afefbc9a7e48385a4ea9b780523ee0ca0 SHA512 19f3b6c371efccebadb6fa85f479ec4fa32fb7a4e11af58630e7265f19f598fdfb6c0008cf500de601246a6316ccf173f96dafdcca28bbef4e09658989d67a3a
 DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc
 DIST magic-8.3.309.tgz 4175194 BLAKE2B dc63e74abf1a0fee75b1b018f58f73f0ed4ba7acb244aa0f427af1d4051a3344892ee8514a5f99827bd10c8ff44eac907a70150855db48fb97d0e4d436273893 SHA512 1abfd843f3d123bf532672c5e8c58d2c0f50e29ab017c21e4895810163eec430ba07c3b0dd8c571e47f1ce3bacfd37aa4cc667e4cecb3d53b3b7dd1c8205d8c2
+DIST magic-8.3.365.tgz 4206213 BLAKE2B 2a50843c166f55471db13400c047cc5b32e762ad90cefb170c03874427ebce3452a6f13ff1524897672bbd7418d9ace2366d22fba9641310882f505d3463c19f SHA512 8ac3933ae74f5953dfbcfaaeaddb8fded36aa9fe2e371808c53edb96f758451b7d75fd6c47666ae0624de5dbab335f6a2990427e1135165360ddc5ed8a33954d
 DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
 EBUILD magic-8.3.232-r1.ebuild 2244 BLAKE2B c97478f026829812de928f8f88b97461610b2c0f933366d3d779824cebf4c8a10a5f18ba7dce1bfe5f4ef2f0d5d032ea83412c3f50c889fdebc79b2cd154cc89 SHA512 6c12b4fa3a950b71b5f682af6d1a7ec60bce147183aef973d25e9ede4a5c80c67d9d90d00e656f25b2d2bf1d5c02529af91e1a589b5b27e211cfcad7409c49d0
 EBUILD magic-8.3.309-r2.ebuild 2421 BLAKE2B e03d49534a2db6b2cc1950971996a467f36b1c1b9171a36c5c38ae2f8e10c8b60d73c8bd0b8b5cbe416436af8cf996fc1c54d3def8cd0b0b09e64ebb0aed7c03 SHA512 b1b801eb6566b904d526e15ff0f02c85c47aa95aeed6e0190822ea99cdcb9113a96addb923b03712d8b3876c7a07b0adac1d7870c1d9f1c3597ec639f93aff27
 EBUILD magic-8.3.309-r3.ebuild 2532 BLAKE2B 06476e33d83418437318769662e6d4414e2d38aa46dcfa5c11c0d44c129ea2241aec5dbeb64f646a163f9e5ff14bcd30ec929b06d8dfe5001df0ffd9baacc571 SHA512 18858aa02cdff1642f56c8bd92a8a31dce0169bf1500aea8867706b689c1ea8b03784d0915bdd9b7e77f6e9e807325a724cb54aeab0951f180961eb5b0d12020
+EBUILD magic-8.3.365.ebuild 2586 BLAKE2B 29f6c994ac62251df9e0a136b27586a05fbf803596c66855348e055c3fdec99780b6d46121b6b7e331a92f2662042f021c5325bf992264ce47dc3e7b5854f595 SHA512 c866317b044ff41ab82b74a6c9c73df5a61b03852b9f497a532f21eb9878ceb26ca1231da9a795676caa71be8adad1ea327cc13424bddeb0e6ad0166a7c2d4c9
 MISC metadata.xml 1381 BLAKE2B 7f9458b2f3e6c1f511b1f5a0f8f31e58114e29216eaf3927a6570f16bfab24fb357a82b432414a28a16fde8f02a00fafa5b5d915681a68c621b11202dbfc3d32 SHA512 b9cd12c6e4704bde2aa963880e9321fd64239b7f9333a7daa74be6707001ed18ac61bc48dc8f85cfeac9a427e07a3bcfe07607662d206d0f5d75753e333d2632
diff --git a/sci-electronics/magic/magic-8.3.365.ebuild b/sci-electronics/magic/magic-8.3.365.ebuild
new file mode 100644
index 000000000000..feb879ad8924
--- /dev/null
+++ b/sci-electronics/magic/magic-8.3.365.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-any-r1
+
+TECH_MOSIS_VER="2002a"
+
+DESCRIPTION="The VLSI design CAD tool"
+HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
+SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz
+	http://opencircuitdesign.com/~tim/programs/${PN}/archive/${TECH_MOSIS_VER}.tar.gz \
+		-> ${PN}-tech-mosis-${TECH_MOSIS_VER}.tar.gz"
+
+LICENSE="HPND GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cairo debug opengl"
+
+# https://bugs.gentoo.org/887691
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib:=
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
+	dev-tcltk/blt
+	cairo? ( x11-libs/cairo )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	!net-misc/ipsorcery
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-shells/tcsh
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.232-libdir.patch
+)
+
+DOCS=( README.md README.Tcl TODO )
+
+src_prepare() {
+	default
+
+	# Don't embed MAGIC_COMMIT
+	sed -i 's/git rev-parse HEAD//' scripts/defs.mak.in || die
+
+	pushd scripts &>/dev/null || die
+	mv configure.in configure.ac || die
+	popd &>/dev/null || die
+
+	# required for >=autoconf-2.70 (bug #775422)
+	local ac_aux_file
+	for ac_aux_file in install-sh config.guess config.sub ; do
+		ln -s scripts/${ac_aux_file} ${ac_aux_file} || die
+	done
+}
+
+src_configure() {
+	# Short-circuit top-level configure script to retain CFLAGS
+	# Fix tcl/tk detection, bug #447868
+	cd scripts || die
+	econf \
+		--with-tcl="/usr/$(get_libdir)" \
+		--with-tk="/usr/$(get_libdir)" \
+		--with-tcllibs="/usr/$(get_libdir)" \
+		--with-tklibs="/usr/$(get_libdir)" \
+		--disable-modular \
+		$(use_enable debug memdebug) \
+		$(use_enable cairo cairo-offscreen) \
+		$(use_with cairo) \
+		$(use_with opengl)
+}
+
+src_install() {
+	# Make does not always install required .tech files with parallel make install
+	emake DESTDIR="${ED}" install -j1
+	einstalldocs
+
+	# Move docs from libdir to docdir and add symlink.
+	mv "${ED}/usr/$(get_libdir)/magic/doc"/* "${ED}/usr/share/doc/${PF}/" || die
+	rmdir "${ED}/usr/$(get_libdir)/magic/doc" || die
+	dosym -r "${EPREFIX}/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
+
+	# Move tutorial from libdir to datadir and add symlink.
+	dodir /usr/share/${PN}
+	mv "${ED}/usr/$(get_libdir)/magic/tutorial" "${ED}/usr/share/${PN}/" || die
+	dosym -r "${EPREFIX}/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
+
+	# Install latest MOSIS tech files
+	cp -pPR "${WORKDIR}"/${TECH_MOSIS_VER} "${ED}"/usr/$(get_libdir)/magic/sys/current || die
+}
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 4746efa6ff52..43b94c4e81eb 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,4 +1,6 @@
 AUX pcb-4.2.2-fix-autotools.patch 1182 BLAKE2B 627b48ae5ec4cf50a060c95ca13758000837e808aa1eb84ac9ab205d8b438cbe50f428b1c7100e6aad043eaefaa0a32e8797e08a05bfc9345d005199b05f3cf3 SHA512 9c3c1fc4d7e71920e0f06bdc4961ea3cecb7aa27f726f9851e2a69d1aea17a761eca71362a444815956df10338c7b985440d1f4c50a6531597687080ac8bd600
 DIST pcb-4.2.2.tar.gz 5182807 BLAKE2B e2a9ab7fdeb402d9d07717fbc2ad4b31594aada95693c2a7046c73364a43591ee1a537f0cbda67bf46e39d53c61a454f146963fe14a4661fe2ffbc11c2eab99f SHA512 c76fc053fbb0a8a9b7aef494a37d3587efaa2023affd32c3cce895632a7e68fbb85f8862cff8349c7d281365379c07a5471c9467c5977a7aa053a83fc6499c55
+DIST pcb-4.3.0.tar.gz 5383782 BLAKE2B 745db23f9a578b4e785ccaca2f5acccbe83fcd94bfaf34f594fd7fe3ec68d0fe4183f2d705f0a3fb32b1f07b6a4af657ab27cda7b70d652072365828e0a07289 SHA512 eaee631c7c2d0a8047e95634ac1a3892fa38d621d7fd3c8aafaaa05692cf6e6a92ea5733bf512631f9f8c2ff5b6dbeeda7f304cd35cfb771d339976842d64039
 EBUILD pcb-4.2.2.ebuild 2746 BLAKE2B 422854e39687a961c085c8a28855ba96a6d454783e3c9a942b7ab32f0a532dd8ab78eef568e08f5bbe348439fc06b47636be22afe617b069efd9dbd2ce8f5e69 SHA512 ee86e3cebd9d79ace3d1364ecd001abbb7b9de754f1a7edb75c81c31ab43d1bd6f887b8fda0fc264cf4b4ae59d21e645d295344b083420d1fa8b55c636f0e4d5
+EBUILD pcb-4.3.0.ebuild 2792 BLAKE2B 998bfd6f106818a6e22ae3ca11693c902c10ffed1b6ae9cc6c7c4130c2b65c2c4619b78ba6512455d797c3b0ce5291125151b7d00542ded524b9cd0c243c47f8 SHA512 09b129fee0db36f57679657289ceb8335d843ff4d39daca147fb0706342d8aa282cda3662f574a6fc2daad5f0d4eaa9166f9fb3679317da94ed1682638170f95
 MISC metadata.xml 1000 BLAKE2B 16e10d1b03baceb85537eeb0cdf890229bc82c2029c056df362a6bbcab51e65028b49e125f80cd2b7f092f30b8ec900412a29d95d0e31638164d4de29e5c6571 SHA512 06db16a34c69ebb45c8dbe3896b0f1f717a3ec263880ca4a9e9b3af81bda82b94201d4f329c85559761d15b8ab744a178a16a437c8e5e2439f0d1e2b2378f767
diff --git a/sci-electronics/pcb/pcb-4.3.0.ebuild b/sci-electronics/pcb/pcb-4.3.0.ebuild
new file mode 100644
index 000000000000..80f27c1fb2ba
--- /dev/null
+++ b/sci-electronics/pcb/pcb-4.3.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs virtualx xdg
+
+DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
+HOMEPAGE="http://pcb.geda-project.org/"
+SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter"
+# toporouter-output USE flag removed, there seems to be no result
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sci-electronics/electronics-menu
+	gif? ( media-libs/gd )
+	gsvit? ( media-libs/gd[png] )
+	gui? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		dbus? ( sys-apps/dbus )
+	)
+	jpeg? ( media-libs/gd[jpeg] )
+	nelma? ( media-libs/gd[png] )
+	gcode? ( media-libs/gd[png] )
+	virtual/libintl
+	png? ( media-libs/gd[png] )
+	m4lib-png? ( media-libs/gd[png] )
+	tk? ( >=dev-lang/tk-8:0 )"
+#toporouter-output? ( x11-libs/cairo )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+	test? (
+		sci-electronics/gerbv
+		virtual/imagemagick-tools
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.2-fix-autotools.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# tests are unconditional, even in the known presence of missing/disabled
+	# features, so we have to remove feature tests ourselves.
+	if ! use gcode; then
+		sed -i '/^hid_gcode/d' tests/tests.list || die
+	fi
+	if ! use gsvit; then
+		sed -i '/^hid_gsvit/d' tests/tests.list || die
+	fi
+	if ! use nelma; then
+		sed -i '/^hid_nelma/d' tests/tests.list || die
+	fi
+	if ! use png; then
+		sed -i '/^hid_png/d' tests/tests.list || die
+	fi
+	if ! use gif; then
+		sed -i '/^hid_png10[[:digit:]]/d' tests/tests.list || die
+	fi
+	if ! use jpeg; then
+		sed -i '/^hid_png20[[:digit:]]/d' tests/tests.list || die
+	fi
+}
+
+src_configure() {
+	local exporters=( bom gerber ps ipcd356 )
+	if use png || use jpeg || use gif; then
+		exporters+=( png )
+	fi
+	use gcode && exporters+=( gcode )
+	use gsvit && exporters+=( gsvit )
+	use nelma && exporters+=( nelma )
+	use tk || export WISH="${EPREFIX}/bin/true"
+
+	# toporouter-output USE flag removed, seems to do nothing
+	# opengl disabled unconditionally, due to requiring EOL gtkglext
+	econf \
+		--disable-gl \
+		--disable-rpath \
+		--disable-toporouter-output \
+		--disable-update-mime-database \
+		--disable-update-desktop-database \
+		--disable-xrender \
+		--enable-nls \
+		$(use_enable doc) \
+		$(use_enable gif) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable m4lib-png) \
+		$(use_enable toporouter) \
+		$(use_enable gui dbus $(usex dbus yes no)) \
+		--with-gui=$(usex gui gtk batch) \
+		--with-exporters="${exporters[*]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 0de605b6217d..cafeac7bf060 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 3ff17215e61f..4b0f84283ddb 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,7 +1,7 @@
-DIST josm-snapshot-18583.jar 16269996 BLAKE2B 1f661090db02278a05f457093ac6ff8aff060c00ead6347e283892e114ea7bf5c0a96279dd645cf97cbb45a3bf8f8919b5523cc847f52b703b19c4bfa909f463 SHA512 04cd705e745357cc6169a2d12bf7ca9b91615201976326d52dc468921ea959f281d30ff2be8eeb2fbde9e780ca588e6240538036d2cdf66b0316def28dbbf684
 DIST josm-snapshot-18622.jar 16311954 BLAKE2B 01d033cb4105f192ef14176dca79667ef2df95a55507df47dd5d163025d7460246fcc5524133e08e9ee77ee3073dce819072470d3898620d7ed9c5eedd405a34 SHA512 7220c007b87b5128bf9a4ace9a61d2fff4a22834248c85c4b3ab96db7d364f4adc63aa2167419f2418f4c3fb1f96bd3cd6ef05727bc1c4cd46280dc161b4fbe2
 DIST josm-snapshot-18646.jar 16326607 BLAKE2B 8735298e268f2b516f235e7368a44e638455dffc9ab5d8c07672bb2053227bb15473cd71ce1f8b08e3e3dc43ed4c240aab8a9f2b4632cf6d59a30a49a70302a6 SHA512 34fa30e7fdea179efd63c7e68617dec8c3bd3060f5cef57e93bd3cc856495a1b6f7254e84880867467fc1ff09102bbaa1e4e108d0cd8a174e327d261c68ad992
-EBUILD josm-bin-18583.ebuild 976 BLAKE2B 3cc99f62084b75355c0e3963815f236ce465bf35c898707b5851b9d54d3a528d9cdc043914170d9384eabafa4ee754f5e1cfb8b7af6c7bfc2a04f980ae246b46 SHA512 b93b25ed88efb59224f362bd9c3213488f6e464142f1c3ea01f6a1faff4ac4b041a3780be74257b74c53bead2d33e58cfd0ac614a8212cc34b49d1f1b15a2d36
+DIST josm-snapshot-18678.jar 16376303 BLAKE2B 9db4a9bd90e0f2deac4474462091d91505874f936fde330c6a676d4beecf029966d692bc2dadc0f2d44bfcb53d8f40a075a95d0bb4b07f6ffffb160080d88ceb SHA512 af621dab4ad5495fe895639811e6c0e24e463b1c8fbcb70c5626ca68a0b9b1a9b16a34dd746335553dd84974197ba37ab3bb9c5eee19da2209f41da94a8cc28f
 EBUILD josm-bin-18622.ebuild 976 BLAKE2B 3cc99f62084b75355c0e3963815f236ce465bf35c898707b5851b9d54d3a528d9cdc043914170d9384eabafa4ee754f5e1cfb8b7af6c7bfc2a04f980ae246b46 SHA512 b93b25ed88efb59224f362bd9c3213488f6e464142f1c3ea01f6a1faff4ac4b041a3780be74257b74c53bead2d33e58cfd0ac614a8212cc34b49d1f1b15a2d36
 EBUILD josm-bin-18646.ebuild 978 BLAKE2B e601ff9462741ef04a7e52d9afe1c2ead273f61854f87f3a770ae37f75cbb680bf09307439c39238b3fa36e8423465b6f7dbe205d2158f9a2ad032fadf4237eb SHA512 02831baa1bb0501b6ba1bf9a4ee04e0196cb76f53ac686e9d76132ee683dc7e6530115fe2992eb26373b7dece1d9acd872eb2bbf7abdd99cdf28b4558f8a4072
+EBUILD josm-bin-18678.ebuild 978 BLAKE2B e601ff9462741ef04a7e52d9afe1c2ead273f61854f87f3a770ae37f75cbb680bf09307439c39238b3fa36e8423465b6f7dbe205d2158f9a2ad032fadf4237eb SHA512 02831baa1bb0501b6ba1bf9a4ee04e0196cb76f53ac686e9d76132ee683dc7e6530115fe2992eb26373b7dece1d9acd872eb2bbf7abdd99cdf28b4558f8a4072
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-18583.ebuild b/sci-geosciences/josm-bin/josm-bin-18678.ebuild
index 052c23ba1fc8..1aba0e7ffd7b 100644
--- a/sci-geosciences/josm-bin/josm-bin-18583.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-18678.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop java-utils-2 xdg
 
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0 GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8"
 BDEPEND="app-arch/unzip"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 2a170e481588..bde5cab01cf1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 1ada3720f512..c252a4ee7792 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,6 +1,5 @@
 AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
 AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e
-AUX netcdf-4.9.0-fix-musl-execinfo_h.patch 1098 BLAKE2B 3c063fbf452e045b96b411ce1810ea0d535a66f90d421412c9994313303d31b3d4be3377727a0182bac27eb5cb6e675bd3007090d2a94b13dc23a1a1bc252a12 SHA512 aae74f9bef1ec09ac3a488a1305a812b18aeaec6028d57e45f667727f36421676dc20d6f9589284c7b5dbb0957c23ac426ac3ca2f05a10e1b4d6de26851405e4
 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
 DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d
 EBUILD netcdf-4.8.1-r1.ebuild 1810 BLAKE2B e73bab3d4748a0e509f5f6bfeae90ac10250744e3cff0bd588b9337a340c177c97cbb424f7880a5285026b997ec378631933979cfe9b4694d41e4244aabf9bb4 SHA512 aae2f847567d803b175ce97a529763f4e1c74e7a5b65fd85ec235b2451ce02c7afabaac2a90bb4904f8068f822ffac5329fefd5108d396788d36bda6968380c3
diff --git a/sci-libs/netcdf/files/netcdf-4.9.0-fix-musl-execinfo_h.patch b/sci-libs/netcdf/files/netcdf-4.9.0-fix-musl-execinfo_h.patch
deleted file mode 100644
index 7b711327512a..000000000000
--- a/sci-libs/netcdf/files/netcdf-4.9.0-fix-musl-execinfo_h.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# Conditionally include execinfo as it's not available on all libc
-# systems. There is a PR upstream for a similiar issue but the actual
-# issus is not reproducable on Gentoo [math library not found] [1], so
-# for now this is a temporary fix and can be removed once the PR [1]
-# is merged upstream.
-# [1]: https://github.com/Unidata/netcdf-c/pull/1701
-#
-# Closes: https://bugs.gentoo.org/828677
---- a/libhdf5/hdf5debug.c
-+++ b/libhdf5/hdf5debug.c
-@@ -5,7 +5,7 @@
- #include "config.h"
- #include <stdarg.h>
- #include <stdio.h>
--#if !defined _WIN32 && !defined __CYGWIN__
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
-
-@@ -15,15 +15,18 @@
-
- #define STSIZE 1000
-
-+#ifdef HAVE_EXECINFO_H
- #ifdef H5BACKTRACE
- #  if !defined _WIN32 && !defined __CYGWIN__
- static void* stacktrace[STSIZE];
- #  endif
- #endif
-+#endif
-
- int
- nch5breakpoint(int err)
- {
-+#ifdef HAVE_EXECINFO_H
- #ifdef H5BACKTRACE
- #  if !defined _WIN32 && !defined __CYGWIN__
-     int count = 0;
-@@ -39,6 +42,7 @@ nch5breakpoint(int err)
-     if(trace != NULL) free(trace);
- #    endif
- #  endif
-+#endif
- #endif
-     return err;
- }
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dfe5cf127bd0..07d370c12c13 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest
index 661a3cbaf6ba..71327fe7094f 100644
--- a/sys-fs/ncdu-bin/Manifest
+++ b/sys-fs/ncdu-bin/Manifest
@@ -1,19 +1,3 @@
-DIST ncdu-2.1.2-linux-aarch64.tar.gz 278374 BLAKE2B 32a8674f3878f404836473f41c35ac26e2eac6b5b48d61794c32ad5590550920cf5ef0b12fcbb9e7640c933504bcda0698649a31d28c31da3289c0f19577b8dd SHA512 bf954700bbd2d234ee69ce67f649463d9de770a543797e433411384e6212c3b12bb21d7854b8ead021e482094aec6f77755caa6699f9bb9d4e6ce656d332351b
-DIST ncdu-2.1.2-linux-aarch64.tar.gz.asc 833 BLAKE2B 596ab543b9bd7eb8b5a890ec6a598c57833456a681a478837210a2a2bde2f7eaa3dd6dd387a531f38ff3d5172097fd43093479111b765d882ebe757381ca03c7 SHA512 2b21724a019d3608e5a40239832b91a75334b26506e8b19bbb1f1d25fef6571c9f4ee64b317c0afed84e46fb7332227e8579d1399d018c22499cc7c4254a528f
-DIST ncdu-2.1.2-linux-arm.tar.gz 295485 BLAKE2B 0acc3095880ee012eb19f21e14a302b01a2d9c792dcb7e5779f517a214dc850bb78b7620e62a7a99369742a6d4f766d47de0f32ef30e98f38f31802c29fa1c47 SHA512 459a5f148687c68f58f419e767027e1254c4ff43f4848e83d2744198cd11a3dc98591502ff4339d28aa9ddc9a805d5567647788409e355eb73e31e16b9eb8a6c
-DIST ncdu-2.1.2-linux-arm.tar.gz.asc 833 BLAKE2B 605ab67bf8b67faf9625b051979ab5e2fd4df3e870bd003aaedcd8f2f78837dbdeeb4654bd906b923aa550343adabf6033933347d827b33771b9e65f20a1b184 SHA512 c3148f7fb2261cfd72e21c88eed03c0082fe39473a4e66ca4ba05dd77019ceb204bb3d63364af744379c51f497bcc7bceed997e1883c6bc8fda269316e5c6bd5
-DIST ncdu-2.1.2-linux-i386.tar.gz 306261 BLAKE2B 493854be13382e8d3ba2e5ab5e4377a7ca26a3d932cd5e9894cf30664828714fa5d6a0c48bc5688ffd567d06bb314dc95ce1b372e590548816c0027d1185e1f4 SHA512 b4caebfbfb4ff804b87d5154866279735315c4f58f296064a986d7699414f3f0978d007f912fb2e3a0dd9f1c73688ff61d0c3faa599e70e2fe84be21134113bf
-DIST ncdu-2.1.2-linux-i386.tar.gz.asc 833 BLAKE2B cf361fed2a240747ed2df3a3306d255a1eb77c60fbb6c38ef2e616b8a04a8f0eae05241baa3966b6117ab2515a53d532a1477bff214564fc0559de4a2a627d17 SHA512 41d7d8a7aa8bd5731a5db3879d81db8d7c3b1406c62f8cabfbe66b89feb77be8d195be53d2a63228cde7ecf3bcab54eb3162522e5114be4e729f95c533e4939b
-DIST ncdu-2.1.2-linux-x86_64.tar.gz 299337 BLAKE2B e125be86fb8eb7195012379990b2de8868bfd80013e2206f313ebf32bd35c43d03fbe97b86f66fcfe2ca8fedd52287149618c7b2e3b147811bdee5cb51b25923 SHA512 3981bf773b1345e1075a2fdba43867f5524b7ad0d5100e5a5e37cffcd55a691163583f1316e37c3fa986759e29fdbe22b92992a0ecd4a92dbab4ad9eb2c99dce
-DIST ncdu-2.1.2-linux-x86_64.tar.gz.asc 833 BLAKE2B 2faf7bcce57c4612a1d918a7e1038ef9d6eacf63ffcb0df181b2c409d202a4fd512f8ccf82360c788551b93de8762ba8c7dbc2bc6bec80f38456b350a4517010 SHA512 3583e1c556e363677d915961c78fab30eb1e49028d30f397c08839b5fea698f9b063824288259dfd5e1c2b682f027d959fdc59e8833bbfc7f6b4ad77aa6d60f1
-DIST ncdu-2.2-linux-aarch64.tar.gz 305715 BLAKE2B 9d8b0b77b9f52ed9065c1ccbed70e28dc012580778024e121a97a78318d7255b821458441033a317f9a2b69c9ad9ae094e6b0b2a328f7e34aa98c391ed85143a SHA512 4c2d5bf66e7f1871110d60e9eb7dd3ca69c8658c321861c8752bc2972868d912d3132e2f271c3a3bf7ddcbf170dc6a32dfbfe31342fce1dbf96b60c44842a5d4
-DIST ncdu-2.2-linux-aarch64.tar.gz.asc 833 BLAKE2B a995299d3aaf7a3b01e32c6e00c6c3ab955848534583bfc7b7b7884cece53d5db52bb2dd58284b03da23afd92f65234d4cb09ab30d33fcd0ec3f799fde5e3ede SHA512 040c2f89f546f940303018d713c18552c2b9075434f59fea3b5792cdcbc694bd1f5e422c97ea2c0119f253fa49851fab95bff41b2feaa040aac77f2fcc1b8f78
-DIST ncdu-2.2-linux-arm.tar.gz 283173 BLAKE2B c876ad71797109f43ad7db5222d7114841917f2d62904407c9a45e9abda72a48a6372594bb13ad968ac51aaef59547808b3c48021e2654a8cc249ba79e4db900 SHA512 1a696d1737a481384526bd3d57aa233dd5f4880e3cb9f44964ae5a4771fc4756e2a8018fcc97f37d78b6e175bce97cca8d6a7d877c478199b2cc88a9a25da4e3
-DIST ncdu-2.2-linux-arm.tar.gz.asc 833 BLAKE2B 9f54131d05e568404099b373effa3c323e7212782385b32bf37f8dcc9299e7cca25b65dedda6120bc9b12d31398692d31b158b6dad2211d9507f2644080059bd SHA512 81226381b7104ca4f4592b17cc53755ba425b0ec1e7112f908ad908b86fd4595128ee159256227e70f3091dda046dab31f74d31f063eed216f4bdc32907b0737
-DIST ncdu-2.2-linux-i386.tar.gz 290702 BLAKE2B 65a1d43c1781af3f425a5fc7cd8e71f23415c8ffb229d370ad3ef144aaa11d454bc0d601b4456380cff3918ceeee85923c0992b041c48ae9ee0af48dc4c9397d SHA512 e6d5a07ccf0eade260e8e0e7b4e242e05b13ad3c077f07ca0c327e4fbcb397cd72915b18ae517921f192502b9b248f0430bc2ebf78c96218a8301f83dd5bd058
-DIST ncdu-2.2-linux-i386.tar.gz.asc 833 BLAKE2B fe94943669745a74a5d7c52ba1bcb4d40170eb6178867e266de62bb2a2a2abae52121bbdee6236caeaf1628651ee4c514ca9d49d44aa4214489b8034d77011f5 SHA512 1e12849e56accd8c2b1addd4b0b465c1af5e70f6b1073d1504fcdcad6678be263efe8d6da27a07df4de023e1e29ffc325e3dd0b92e09b8d90d830dc25ae2c05e
-DIST ncdu-2.2-linux-x86_64.tar.gz 323041 BLAKE2B 23bd4d18e4250f14f79e47d6ec5a3fb9746bd85dcfaeb6510a7b693383c747e628076cad255f6a076236aa2ec6d5bcf3a55dec3311bc13046bca47aa54ec5fdd SHA512 f56ab20f3be98e4b50a7070f88a759f86bf1d785c5869cde33cc9568934245a047e3cf5de3256a3d587a058468ebebc5f24c68554cb6f0ba9455f62b9fac58e6
-DIST ncdu-2.2-linux-x86_64.tar.gz.asc 833 BLAKE2B 6db456feeafd586d613eca564d5bdb19545440467765f0ef28dd52f81498f3a76d69bade93da7d91f2dc774d9713cf960d7c9aa98f4502ea4f1138fdd88c7f75 SHA512 72116717a9e63ef2da0e820bc71abba0eadf184465258211150b3f1a408c0543ea225267ecbc97808deb4d5377198d981afc4c1e46817d5ce63397c2de298f5f
 DIST ncdu-2.2.1-linux-aarch64.tar.gz 305700 BLAKE2B 74e2e1677a778516068409dcda821ea5a8bf3bd4191f413a193e4cfa987d36a15397fbab2200f8779b4630a3929829fb789532e30081a6ad3fada1127bf75ca2 SHA512 397d7522d75bf0aba2d9ce7a867ffcfdf3c5e9483a7b574a7b7e81166c49f9c42baca58450251bb4c2eafee354ea6abf36cbdd45d0082dbb511cc42733f041d8
 DIST ncdu-2.2.1-linux-aarch64.tar.gz.asc 833 BLAKE2B 8b5cbaa79a2a9db682a6bce16e13cfc2c41daf9191c15415e3601cf33f1b9aa38cc0fec4f050c6005b5b34bf1afb223ad482a9afafa9612154e9d1a140a3105a SHA512 ba937a5113d4973a61276165045eed569ee4680b320bdfc0cfc3d66739fe911ea967f688ce9b65752062ad80dd89796b7bc0683f7d6a19371c6ec9a7422928da
 DIST ncdu-2.2.1-linux-arm.tar.gz 283175 BLAKE2B e8a553db009a4ff97fb8a4c121ffcc01722c3e38ce776f4a7ba26d31d6cc6677b44ac4f0b4bf880c6a0cac78600c7d2e2ac51b34c574d0b38f9f1f9f3d8eb4ff SHA512 31036474999005c97ec5675006900250e766981bc3707eeebcdc67a8c630bb344d32396c743823d9853b39b221c9f1eccdedce024f1f846527f40553c6b5c69e
@@ -22,7 +6,5 @@ DIST ncdu-2.2.1-linux-i386.tar.gz 290694 BLAKE2B a47b93996bf4f03ba08399b0f009890
 DIST ncdu-2.2.1-linux-i386.tar.gz.asc 833 BLAKE2B 5cf6b49965457186def2529fe94f2bb250d51c6ec962174806fa34ce1486ff5b8d81806d8f2d948ff6d6fad1314c3522d678cfec638ce2947e5d2866a6c23373 SHA512 875af06240e8c3c6c8752573a60451d31cb91cb381526ca0ad3078a79da163f4233b32cb3b09b1352b7cfb06218b4ad902c5a64a31457be83e0e71c4afa8ed8d
 DIST ncdu-2.2.1-linux-x86_64.tar.gz 323039 BLAKE2B bb0360e96c41973f4cddb718e16734cf728e5d667b66509706a0d8c75e4e98da51681e36dfc12da748b3ff8621e179d352fee51562aabd70c44a48c16424ee45 SHA512 50cce6048e7f20fee5f20003bfd4d3ccae81f2a9e432b04e0b6556dc9167aec8478efc84a1318e8345547e192214289d0f6ae88548839b250196924e0f723ce7
 DIST ncdu-2.2.1-linux-x86_64.tar.gz.asc 833 BLAKE2B 632921fc5f39ec7517dcad7c85b5238fd151f3a5dd510d30c848c26cfe2cb1b0ba389b575d3f29d20a7be2cd954d083715cfb7f7d8ded197fc884afda0e3c35c SHA512 62d1ed45b5f5ae06ee165ccb07b6a8d6c6697505efdd0e8c2990f78c689f284021ecb1f8c0905ebb9566d697bd8b857c4d844a9f7cb706e53c643786a9baef75
-EBUILD ncdu-bin-2.1.2.ebuild 1110 BLAKE2B 8e6e6a83cd56326542a1dcfb531557300332ade4a01697d559c031682e7ae433af359efcafa0d7979837a5030c1f2c923137e0a03b4e7c01df212c20ec0ab0e1 SHA512 98e27258c427b0e81ade7d6f6dbb9974387a5f479e2bdea2deb40ed621540fccae9420180c5926545c88b92b640b6a2834a805e64886e77910e3f7f5c8114018
 EBUILD ncdu-bin-2.2.1.ebuild 1110 BLAKE2B 8e6e6a83cd56326542a1dcfb531557300332ade4a01697d559c031682e7ae433af359efcafa0d7979837a5030c1f2c923137e0a03b4e7c01df212c20ec0ab0e1 SHA512 98e27258c427b0e81ade7d6f6dbb9974387a5f479e2bdea2deb40ed621540fccae9420180c5926545c88b92b640b6a2834a805e64886e77910e3f7f5c8114018
-EBUILD ncdu-bin-2.2.ebuild 1110 BLAKE2B 8e6e6a83cd56326542a1dcfb531557300332ade4a01697d559c031682e7ae433af359efcafa0d7979837a5030c1f2c923137e0a03b4e7c01df212c20ec0ab0e1 SHA512 98e27258c427b0e81ade7d6f6dbb9974387a5f479e2bdea2deb40ed621540fccae9420180c5926545c88b92b640b6a2834a805e64886e77910e3f7f5c8114018
 MISC metadata.xml 863 BLAKE2B 771d7661e17426fc20d287dbda042d222816d22578614f243438d5680fd9ec5e966a6962dd4f301156e7fb9f850e400e09144788b205f149f6c561c5f1f6cc90 SHA512 a5b2aa2c3a9669873bf02d224a5deb324c8ec87dba54c761aa8bfd58b14a9bdd9b4f21668192b16020a9c6cece48e9c297f164f3147bb2d7e252f15d3ad2477d
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.1.2.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.1.2.ebuild
deleted file mode 100644
index b003a0343eee..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz )
-	arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz )
-	x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-i386.tar.gz )
-	verify-sig? (
-		amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc )
-		arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc )
-		arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc )
-		x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-i386.tar.gz.asc )
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
-
-QA_PREBUILT="usr/bin/ncdu-bin"
-
-src_install() {
-	newbin ncdu ncdu-bin
-}
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.2.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.2.ebuild
deleted file mode 100644
index b003a0343eee..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz )
-	arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz )
-	x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-i386.tar.gz )
-	verify-sig? (
-		amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc )
-		arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc )
-		arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc )
-		x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-i386.tar.gz.asc )
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
-
-QA_PREBUILT="usr/bin/ncdu-bin"
-
-src_install() {
-	newbin ncdu ncdu-bin
-}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index be3257f18284..73d33f13e206 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,16 +1,8 @@
 AUX ncdu-2.2.2-makefile-add-zig-variable.patch 1326 BLAKE2B 0372f075e5c322fb018f8b68a3d60e15725f041c400ab4a1c446843865c08c37b4a121276783ab494385c48559f59946252e231fca273f5dce9ac72778f0a644 SHA512 03793390671bc2dbca038b3d1fe0f165ac0c4b58a3c5a9fb6ad305e360fc6faacd3cac4bfeae6479ddc7da5dabe02b591e82b6bed40d1c5d375b87efb3462fcc
-DIST ncdu-1.17.tar.gz 157187 BLAKE2B 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f SHA512 aa2366797760f0c0b2bea866f0ae0446b8113e3ff6460192a4a42d4d888d473d7f37bc4acff6220fa86003bd96d71761168a2ae0ded36456072176a69564c775
-DIST ncdu-1.17.tar.gz.asc 833 BLAKE2B 8e285bc92351bcd5d3ae83e97772df96f98149e1f7a2aca882518b37448412756ecc24e89fd471b42dc960727dc272b17e05e3a602672e6712711d3bc342afac SHA512 7386901449a5bd98f2d7344dd8147a9facc274b59ec3676be2b3f78797f03b51154b3a6d85f657860e8260c5423140b561ca7e8067863face3320ca5a4951132
 DIST ncdu-1.18.tar.gz 159781 BLAKE2B c590424ed6d18b898d88fa405459f5d8988317d336fdd568ca259248c1598ba780703da9ed643c9685aacc4ce2b26bbfb66e84a99514bc979fe2b9df420d1cd3 SHA512 959ca90ad35055467346c196d7d6e5afc1e57d87c83855dfb92dd8e370bce10c1a1633064854abb3ed581e0ea7b6451474472acd9e4ad3ae91b90311b07cc7d7
 DIST ncdu-1.18.tar.gz.asc 833 BLAKE2B 2695e3f2a26026f5fc56db3d2e0f15288fdff118e12275333f1db3e85d9d7b0290477670153dbd752e14fbeecc4207410fe55ad39fc7b2daa5d697920ac406c3 SHA512 35f0f3f7f61a49cd2ea020b6207551a953c23bb47f5f6483017fc961f857ef0283932386826707137d857377d0ae5e26ed4a4da26d47042977999e95fe389d38
-DIST ncdu-2.2.1-upstream-zig-0.10-updates-r1.patch 47546 BLAKE2B e805010c5d575ac01cc02794905ec08185cf7bc2810571b18021bedca9c7d1079f3d8206295da307c5db70b661b9fd85a35172f8ee1495c88cdb7e52a32ad697 SHA512 a5f703db236842f54f8ce91eadd513283a1c721fa5a2ab00e38f0b7b96e3becf3e086ad43e4284abe6712113ecb3ba3a7c0d149baa3eb16b52d84a7b7a976424
-DIST ncdu-2.2.1.tar.gz 55972 BLAKE2B ac7f281b2fd12144a3498b105594a60478c49049eabeb7b3951c4aac4d5b9c025f823806dc948327e4a6608e629da9d7b15a8073bdb79043116ba095d3becdce SHA512 63a3b0d12c1c265d826276a01b37f7785d50721da5dc35c2934ee6ba7923254c02ab906bc49df60b26b8bf18b7d4c49b0cc02eb7e805cf32cde3e0cd35187973
-DIST ncdu-2.2.1.tar.gz.asc 833 BLAKE2B 0582851ae5a04910765cc1d775a9462f81e966b56ba9aa053964fc38dbaa2dd93b953bfa99bdf7fd01592bcf2a029413e6cc28b04c277ed420731e828200b826 SHA512 e8b2844ecca28de3920512966a8dc1ec6b14c66e132d1e30b11eda0660d70d5152891b6f90524fc795ff7990cba275472242421133761c883ea1a7112efc7894
 DIST ncdu-2.2.2.tar.gz 56096 BLAKE2B fca41e74e4eb2509496276aa964ecf6a20db860d0b1d6bab9a169d8d6c5c7c2d41f088241cf57c92d7cf51bb5d84642c2a3a6db99410e6332061e6d35efa94e6 SHA512 5742b4abca1168256b6a7afa24d25e709bc3b490181d85fc070ddce4aad9d41fa3acb5c5a63676d804d082918fdf2bf0c98a27d8d07a56abeef0574c1b598da6
 DIST ncdu-2.2.2.tar.gz.asc 833 BLAKE2B 5c6e886853aefec7615774b0c10e4a873d4e51da6d4d66ebd78318a40e7ce1a1d98c948ffd30eaa473cf50f9529dfe150d5831744e62f6762ae471b1abcbc4bb SHA512 494b8e08e2b8a87b31db08c5dcbb922c181fcef188974def2ad5550de16b16b281bbd5d8e401327276a07af8bd5979bdc46f84fde10a7e8601f9559cf452a77c
-EBUILD ncdu-1.17.ebuild 683 BLAKE2B c5566d9059a9ee0d9466a5e6f9605402b25a8e3e7e09fd951ccd0ed75c839bee71492ea50118b633cd3b1332280178296d9cf31e055409ea26d845961e297e9c SHA512 0ebac8ef306b017c515340b127ee98df3ab67f27f6fa2fff441ccf161dc1970aa432e37d9e74a1c6220ff303a7e54362df8c6a13065e20306523227fe7e49fbf
 EBUILD ncdu-1.18.ebuild 683 BLAKE2B 5a8eecd8b29af30456f750b4ceaa245bc80d6c9557a05f7932c6e8d5c509258fcf8516e993579ca4a70d4708282529930b0ac34fce4158b801b7f5140b890d39 SHA512 5cc81a788760ee2d41c88b41a50371721f5abae91381fad55bc0ec6458f264b1f309ebf69beb80168570795747411007b243e640116e7f9543caf8b30134691b
-EBUILD ncdu-2.2.1.ebuild 1209 BLAKE2B 31a2f4a4fda0a307acd74696e099fddde1e20d4dcf29d52322122d7bf133295d01511d392233070bb22722127619de19234e96c6bda2b9fd16a5101e4fe88a75 SHA512 2fc2b8a905169b13f8a826d60992a4f9e2f64f4210c0fd907bf0c23fd5a2e3a8fd7519b4b0542c1e10421d4755f082748ccd62f60304d2c57528dee67c19c1cb
 EBUILD ncdu-2.2.2-r1.ebuild 3147 BLAKE2B 742dd09ee8afa30eefd451c4e477c92d230262053c899221cfc915d89b76b7eb12aa4eaa4a40cca4c7502d2c5f20d620b37077508c4d693cfeae3f576715b2ad SHA512 c876fa71eb6af9286118418942efb685c660b70d15f3e97113d13026794e0abc1b130efe63c14b61adf3dbb882661e461f05ef57bd65ce704c9f225d24ded189
-EBUILD ncdu-2.2.2.ebuild 1023 BLAKE2B 72b0501d2e38704d87eed6b28dc8d90eca7e07993a7be4cf2850020023e13126be68fccca242cf8b3c9692c0a515fb9131cd8616a63931a78e57c6f2683ad0be SHA512 2d5d135a1f3be2c26bbaf113a4d35bef16589e4cba97506a6b3769e9fb7627342acd42d170b28f6505141162cd25d1814823c10b2ecab7348ce47adccd8ae147
 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683
diff --git a/sys-fs/ncdu/ncdu-1.17.ebuild b/sys-fs/ncdu/ncdu-1.17.ebuild
deleted file mode 100644
index 78f239da8176..000000000000
--- a/sys-fs/ncdu/ncdu-1.17.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-lang/perl
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
diff --git a/sys-fs/ncdu/ncdu-2.2.1.ebuild b/sys-fs/ncdu/ncdu-2.2.1.ebuild
deleted file mode 100644
index 7d14fd181da6..000000000000
--- a/sys-fs/ncdu/ncdu-2.2.1.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
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-	https://codeberg.org/BratishkaErik/distfiles/media/branch/master/${P}-upstream-zig-0.10-updates-r1.patch
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-PATCHES=(
-	"${DISTDIR}/${P}-upstream-zig-0.10-updates-r1.patch"
-)
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( ~dev-lang/zig-0.10.0 ~dev-lang/zig-bin-0.10.0 )
-	virtual/pkgconfig
-	dev-lang/perl
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_test() {
-	zig build test || die "Tests failed"
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}
diff --git a/sys-fs/ncdu/ncdu-2.2.2.ebuild b/sys-fs/ncdu/ncdu-2.2.2.ebuild
deleted file mode 100644
index 739ef3d534c7..000000000000
--- a/sys-fs/ncdu/ncdu-2.2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig edo
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( ~dev-lang/zig-0.10.1 ~dev-lang/zig-bin-0.10.1 )
-	virtual/pkgconfig
-	dev-lang/perl
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_test() {
-	edo zig build test
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f90e055c609c..3e35fead6978 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1f9afb436801..c34a3b634ba9 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -10,6 +10,9 @@ DIST genpatches-4.14-319.extras.tar.xz 3652 BLAKE2B a70cd6126c49c9b30aade883da27
 DIST genpatches-4.14-320.base.tar.xz 6102024 BLAKE2B bf4d0567a1581730d8be640d4c0177175a474c71d5a3f9dc4fa25432bf8a42d459d0a73c059667add855b81bd19e01e37e376a3e2be421f5f00e3845b32669ae SHA512 92858f774b93778105e6f03271bda7d8c06af8437c005727abd2dac64fccf70111043654c327aca2b1223920bd74437dde031f48a083bb94e76290b8ef53b6b6
 DIST genpatches-4.14-320.experimental.tar.xz 5708 BLAKE2B ab783fd32d50238f44e02d130e09bca2081331ffe048cd407e684432c40cfaa8b3b2d36a8ecc70a11048e76483f8258f23dab8d4c845e5d8bf955e7ab03a1bd9 SHA512 55c3cfa9a54823f22c5f5f51b7f96d91b1e00b5137217c2c4a8d8fda2059b043f56d4a5365269f82ce1b8ea2ae09a369632f54485ccbc79a6cf39e1bfc8224e1
 DIST genpatches-4.14-320.extras.tar.xz 3656 BLAKE2B df297aef2689bd02cabec78acf3cc99ecad0ea132edeee316f4837605c8f3ae166c24752f346916f3b67086f148f3c693063b8636cfca60746b792d49b5eefc5 SHA512 1f46f3636265f83d73087186bbe829f16a233de2b32bacf1524f8510e8e86ff767a0f0d04b3e3c05670a866453944883d3fb2f3e38dc18830aa22c6e840cd2a3
+DIST genpatches-4.14-321.base.tar.xz 6105012 BLAKE2B e72f66dc36f28d879ffab108148e97ec166b6044365d6fe57a000464ba8b933b22014ad8fc04162527e39b68d9b2a4b90cd3ae2d0d6a885efaf763237bc97f1e SHA512 051e4289e8eba751691bd1d946faf8e7708993a29970799bead836e813a0465992e519aa3f2ea34abc94ac346a196683321d9cb007897461270ac2fbe736d49c
+DIST genpatches-4.14-321.experimental.tar.xz 5704 BLAKE2B 1f68373d8650e646ee2c13b41feaa90607b34c697cc572e2e8ea011052e988752e5b18a1cb4fdd8af452075c3da2a4811db4fd4afc5be5b86a3768678a9d1bca SHA512 58ca223472e600900965f0c42c3712dc880e17bb40caae602120e4beea5883cceaf35c312298ea09ba9d1198d0e755f0d0ba3b266dbc210148f4f4a0cb4e0925
+DIST genpatches-4.14-321.extras.tar.xz 3656 BLAKE2B f766e9dd40c4155d448e070d4cd778d06f741d0093fb5a529a0295aed1237956c5e5eaec65f67d360e35df96fbeec1cca02446ffaa9352a0372584a6fc316dbe SHA512 65ca967689d130f326e5f4c65378458c28c2ff7fb7fc6077096a30d5a10cdb6bc0ccd5cf4f894df7cc88213b8b54e6fbdb205121df686bae5b22794b8ecf1d4b
 DIST genpatches-4.19-268.base.tar.xz 5866076 BLAKE2B eab0f67b6ddc72c7d9ccd8073bf51ebc3998bbf6177973def77d0241f32e6a204fc14fcd2d58c31ebbb5492fab2aff12f96c64592dc611475c8dffcaba9faa9c SHA512 0e501a12d97dcd8b9408e7c65eaa262d45a23b7db522054744749d219a0938f8306f88b3a11bc0715e29d8742a7168c4c89ba92a5fea03b32c997d582d54a8c3
 DIST genpatches-4.19-268.experimental.tar.xz 5460 BLAKE2B ff1b65fd218a0ac88f1f48be2a6f21aaa5a01f0609df74518ba34b42ca724ca7bc2fbe3841c1454db454162e7393a40cfaadefcf0faa150b41a1439ce260a9c2 SHA512 1812f45899972d821531843c294b34629396ac08eaac88fd26e229594690ebb64c80b139dde6aef1f3ecd904b7d75c9b56ea00d65f5076dd472dda0cf173f431
 DIST genpatches-4.19-268.extras.tar.xz 3664 BLAKE2B 9a4401bb3e2d7b14a968af60f9e4a6ae6fb9a75cb76e7de340414de20a11040ddfabf6441f7b40a27df34703a9a6f659797aec3a4a17d75e9ccc404f235073ad SHA512 9b58c6b5d7899443b20a42747f0e5b3b18016eaff75b9014960c5d72bfa93cfb988284a1474d051ac8e26331c8ec75b99c1f84df7b07cadc071d969f9981e77e
@@ -22,6 +25,9 @@ DIST genpatches-4.19-275.extras.tar.xz 3664 BLAKE2B 37146ba83019577cb749f0927330
 DIST genpatches-4.19-276.base.tar.xz 6166728 BLAKE2B 03ccc9b8686204bd26971c7af290e193bb881f682085ee67d9b749892aae985623d4b2ddc2af72192caac779468d1639146e9374ea0e0484fa6c77be677386f9 SHA512 edf8235e6f27c74ef01bb74140574e3bd4724a542613e6d786b47a71afcfebd43118baa5ed3296279757320b4238fe6d09b579b338e557b2e3a4eee1880a7019
 DIST genpatches-4.19-276.experimental.tar.xz 5460 BLAKE2B bb20b38dfbc5e292489f51e85f047a2b0e059cb9cf04f58975606d091cb8a9c5a5f7aee8c735343c2dd3a0023a2171afe6a8dc2edaed94b402f49e8b02f49e2f SHA512 79ddc05e3a93380e75a5ba1c9cd7ae5f80af8555a76ad1861fdece808f90b176e5bc18c6aa2dc73cab6fa3efe70559f3226790c659eeff4ad6004c83f527062c
 DIST genpatches-4.19-276.extras.tar.xz 3664 BLAKE2B 59f4c4945347ec5b7e59f48512231ec9d74d57ba6f44aa7d04bb8906bfbf3606978563fdbe4c33abdfc7f670aba047fae9a9b11ddb9df8e27f8c3371260833fc SHA512 095b910331971efcb56a059977417205d4e3c4c08cb28a5c8f872b64e44e42d977eb5c1ee540acff34a7d62cbbf29076de1e4849a62b8e47bf36aacd07c450f8
+DIST genpatches-4.19-277.base.tar.xz 6173256 BLAKE2B 72479dc5114ca201f39c93ed4bd225256bd6b96927210955210f702d7161e12e536c641e9b6fefb5469a54b2f7c6fef9ede04354d77097fbe9a9d8c6db981c25 SHA512 d9bb607ab6ad4e1b45a5e76b845a89cba2840d112ab28ec70f3f6ae8e74440c9635a8a8c3b9386f04f67cc1a770bde0c5ee5e2ba43d2dc785ae7bb7884c66019
+DIST genpatches-4.19-277.experimental.tar.xz 5460 BLAKE2B abe146e4abab97b1b932ac4aedd151e0f2c50ffa0dc9931c82ae294af5c731065f62ad2061de1114134d30af481aa99ff8c89372c393e62d72d5a579cad625ed SHA512 d563b747923fc7e7897d277c418248e81eb13340c3fd4f113d95010feb3ce176b9897ac726c0bf782754a2dbf13083fac837b7d42903198f32aae207f7a24b2d
+DIST genpatches-4.19-277.extras.tar.xz 3664 BLAKE2B d1424d0ba471f1725b487ef23dc22630f9b462c9ae171a3f43d8e9e9ff6f292bcae577a15bc548d9a36034348e453409e1d7bf5d5d08303e2f757d352f954343 SHA512 5e1358ec825702b683867b3e06db11e9fa01b7ca5fa6a57a7aa22a2ad3065df439ed41e4652a33d2c8de8d77454587a71b0f94940317967fbd9ac155565abd28
 DIST genpatches-5.10-172.base.tar.xz 4831748 BLAKE2B 46acfe58044df90c98057fc25903c1af1ff3baccace354659b79b939ca6b2054488c8823c456620880e4af9221e0d26eadfd355aaccf4679989ce2e6077507e5 SHA512 8951a10959454b515269be97e163e73aa7cc8374abc7d0fa73243f67944bd1592051736ec06e2ce29ee01d4e0b79ec783d30b40664105f12aad24c9c4cff0a33
 DIST genpatches-5.10-172.experimental.tar.xz 16880 BLAKE2B ffcc645c2f82fa05d2bd07da4be09355a082de32f9192144917c1ec7f32038f07cf08c243087a20acf8efc8cf9b412b95bf9e1dd5e677f9f03e0ad1f9a6a1ae2 SHA512 baa241b96a5ff3aeb5db574843065db8714a91d7b3b33fcc83c917e4b092501b3479b05537901a3cebb86b7fedff82dbf5e861ff2d37d8c514131e1959940d44
 DIST genpatches-5.10-172.extras.tar.xz 3868 BLAKE2B 32ee2c036c224c800ce53fa94d8f6676c70023bb733cef143355ed5907a4815cb252bc43d1660bedd841dffc814c15a9016d8c0d43b80ece58c9f4bf77c472eb SHA512 10372d1ab1d8bd73dc1c7412498cfb5ce91dc74d5e40c6497aeac24fb71d9c007d03cdbe58b2b7d6304af11816a4981cfc4bdefcd39da19009cb2f0bef9ba5ea
@@ -34,12 +40,18 @@ DIST genpatches-5.10-182.extras.tar.xz 3872 BLAKE2B e73c6a4448be4f9ea39d7e790696
 DIST genpatches-5.10-183.base.tar.xz 5092416 BLAKE2B d4c674fdd2891051748ab33257ed3dd1e85c7f15ee2cb5e73932752ab31ce6aee4a5a3b7a68767f9c1b5f0274693a140c3911fff7fd4a5587814861010cf0fb2 SHA512 bed74ee91b86e61bb2bfd02293a2590d0b5b9a7171c794c768970dcdc8cbd004ac6df87a63cbc9f5f6d1d2372e2960e29d68586b84a077275b61dbf80608a365
 DIST genpatches-5.10-183.experimental.tar.xz 16880 BLAKE2B 03a60fcedf8540ab6205aff1165a1b5ecc8de1eeac1a019fb0b7c17d1cbb9d07306cb94c16f3c07b7f2e50c29880a63a48d680681fc37631ba2092175b92e101 SHA512 23437e86deaeeb162556261344e21f74366bafd4cffacbfe1b169fe5a106b4fa705573dd3311e1f0aeea5b8fdce0db06ea9b5467a579f6242043a0fa40d80c82
 DIST genpatches-5.10-183.extras.tar.xz 3868 BLAKE2B 4f42863c501d8636ee3d991f2e434123a891446182dfd5c45482e8aa439675f62db9388eac0ab00683001d7a7ae49f576968912a048d4e4a947a5e20f2830ccc SHA512 8c2229286e958d1d88c9d93dc3e6d26d98e91fc67f7040d0a96d35b89da8f15d11b339372a3055eeeb448352372cde839e7fc6fbfb0600d03337d224af4a8178
+DIST genpatches-5.10-184.base.tar.xz 5117468 BLAKE2B 6e8e0781f40b520377a2ce331cf46e9aa5aa41423b49283ae7dfcb727bff4adeb54ecc3cda91a31af36d05a1681c7ca5fc28b58a7ecc93a9b909f55436b9a665 SHA512 9b1cb8aa0f9f576fb8944ecad5cd39c97e6a9b9a97b7c80c9c649ea6590be522f393f2f363cbdd47471d6e5abcc469ee166adfc4d3bcc254207f26bceda29181
+DIST genpatches-5.10-184.experimental.tar.xz 16876 BLAKE2B 090a3de53600af7010736b602b37529c8e30dce7d3c80d9252164b7d183aae8723ab53bfb63d79c79b501a564e14c02b852afe4adf0c02e303ee950addd17e3f SHA512 81bddc89de9dab9319099661af7f7ea626d6d7e927369b4e185427945c784c57dde890ece0e1dabc24d11a4c3ce851400415f8f7ac6410ad29143d3e208e4922
+DIST genpatches-5.10-184.extras.tar.xz 3868 BLAKE2B b3fbf5c425fc23d0a80eb7a738b3fcb3c4cd0948c103a2db42f976ebf9ca04e3c10606bbc29dee8816c9812d962aa648a729dc6887ca780adbdbefae1c62b696 SHA512 d1e3a5feda8d135685164bfaef15061751c0ee90e2f66cf36e0d2756a02cac0927f5ea5cd1ad15debc6788978c2afd2f883fc5fe7cc1b7e13200d610d1dd591a
 DIST genpatches-5.15-106.base.tar.xz 4208800 BLAKE2B 07fd817437b15b58e899eadd5ba2c278f9bf5f254a47ca4c702691072feb7c6bdc282de1c6b45ac16820dee4b5614e50e84a4869b66c037cb1be362259bf241c SHA512 453cbb424f0be467ff868a5dcf333dce3eca4593f961a90185d9d12bc54fb29fffce3b9b79dde7e4bd0e8c7dba1057c7b2821765976a6a1075b950ae9736c2a3
 DIST genpatches-5.15-106.experimental.tar.xz 5424 BLAKE2B 13896e0281da9e7a15996410419b15ccda7662bdc4e231d2414de3c6bb77a3891e243e3525bfa4cb69c324629f8901975864ae899dc0a83a84373fce03f47f53 SHA512 82b5e7b6f846a97f67cfb330eaa3b30e661eed8d5224bd7db36266be5e6180e8414feba38452d154f77878a561c06e2aa509a7d5c363c55ffeeabb4ec6c23acc
 DIST genpatches-5.15-106.extras.tar.xz 3936 BLAKE2B 37084de2c64502fe7825f54c2bacdbce1cfc325cabf68ffc0a727f81628d8ede4c4f38fdfdb780592e3e0e7d7df7609ecc1a3b17b7c5ee1525087ab6c02ab110 SHA512 95ed0181923ab92ad01646c792fdc1b3c2e6bad2e9bcf1e5bca3a9852fc2e7b65d66b84fb41d2360b8c3cdc7038e5558179b87799ee4f6e005eb72ff9b587708
 DIST genpatches-5.15-107.base.tar.xz 4209440 BLAKE2B 48fcb9a837d9f13ffa96194e2ec2209decd2d7c50a8d18ce4dadcd15f720496f5a82b821788bc20631b6ca4679cc3f93e48beae4a0c1c515747086476b5c1d5d SHA512 e66a46e0460dc940a021b37f673953d527d87c92f323d3f49d891339bc0040de492193e7415589b47b15ba37fcb05a7c1aeac31d612904afefaf2f748e1ec173
 DIST genpatches-5.15-107.experimental.tar.xz 5420 BLAKE2B 04391ff2a0f7267f7fc173840e8d1583092c4b3e071345492ae0ff2b1d2c0f1150e2dcbfc936f50adc4a732873fb0e567efec6fc6bef9bd506411d822d94763f SHA512 24442cb4a4b0b9a0b9a87f88550c928bf11e3bf0c947c7115d8f5789ebfa0dd920564013a29fe557849f460051ddec6a174c996be7fdf89b08a8256ea86b2180
 DIST genpatches-5.15-107.extras.tar.xz 3932 BLAKE2B 59b1279051d08009a8c6e15c5083d7056f7eab8b5beed72dd3421631e9730c7306ce7cae8c3c82f508db261c2a4b2076a2c6c7d3a5fe98419b240e87a0d1e636 SHA512 8897cf7b1d42fcb4a0a87417913c624dbc65b9ce5689dee3998b65cba54659e7ecea759c97f4993dca4b928fe7844e025aa8dbe54f5ca492d8f858fdeb9ba3d9
+DIST genpatches-5.15-108.base.tar.xz 4254892 BLAKE2B 9c13ebe3e3bec8bd90260432b8cfdcebbdbdeeb00d74a852a4dfc97fbcb3358c581ec38f50e03e1426c0d81afe469618015486f3edcf0d2fd4a3a7b31ab59f75 SHA512 2f259065760edb240ddbc43634f8db2e7cd6e399a2d3afa3e2f49219152e255c58a30ef27562e9b0ffb380f40fac16b327bf261be741ec851d3c2d562626ed5d
+DIST genpatches-5.15-108.experimental.tar.xz 5424 BLAKE2B 5db0089c2bf74573e46996dfeca07daaef42c52713fa905afc3d6c257c4355803966700d3498c89d69df9018ae3d8fb4c3a9c8cd877d1dac7911611320880fd9 SHA512 e831721848447e832e6da61f99b18b91e9890a83d003be43ac3b8e437beb38e1ffd7f76d467b7d66f9ebf68ecf42a01fa0c2c35f79aa0b40587a5333ac4fa7c6
+DIST genpatches-5.15-108.extras.tar.xz 3928 BLAKE2B 544d4db829812206b568ef6167907b94515c69b2082954c1e842180f29b58792369bb40e1f62e6c882f9f6a805eba82cbd69ddcf0c1b8c11208f9013e68386ba SHA512 9006fedf585cafb238b0597b3892b549a4574d4188c1f8d2773dcb84ea62bb1511071a8649191a41f07132c74ada13f2753b23f72ff957899d0c7fbd3c1c4cb5
 DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
 DIST genpatches-5.15-92.experimental.tar.xz 5420 BLAKE2B 9f091fe8429c6479c27819dfe6cd0ac04cc7f35d2af28cd69c6a8f9498664162343ce63de56c77aa3a14e70f638e741e3ffbe08c26a2cbfceca2b9bd6fd852cf SHA512 513f465509cb644e1420161bc909b7a1adc155ae6d7d7af4f0362d4fea4e7dcf5912cadb6737c1d33ed5b5b8dc5ab1b0de15c81bddd4d380b069307d1dc0d4b0
 DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
@@ -58,6 +70,9 @@ DIST genpatches-5.4-241.extras.tar.xz 1812 BLAKE2B cdac5d4fa8b7620b85608b6fe0870
 DIST genpatches-5.4-242.base.tar.xz 5610464 BLAKE2B 54d7c2e11a6b21ed8b16d26a56ffd392f35b82e1bd4548f65c40018ee6607eaea37d791734a31abb30ee061ac85089fbaede39f1ac35c2b0f48220f266d2db17 SHA512 cf7d24286d88319eb872f14c3907956c1ef9e0cba4d1a86e740e9eba3a450a2060c1f03d519ac49ad97e9afefb2a32fa7e77790387819c4d60d15039c425ef28
 DIST genpatches-5.4-242.experimental.tar.xz 16892 BLAKE2B b331aee7d0bc2fe0f101d0548bee00f28107e73dc6904e0c23450fffc29fa062454304b20a47d31cdab55a948334cf93cb72249c6a0e9c7d4ad64c4147b5647f SHA512 eb8c16686d1b80af163e31ad908587bc73cadf59b5f5533ed18620f60f6a95986a80f931757ce026d6e901b4b9ef6474e586a6bd0ef5bae9883889ea9fc26d27
 DIST genpatches-5.4-242.extras.tar.xz 1812 BLAKE2B d2b8f6655e540964c1c6fd81a5e74bc2e7001bf86ec8a7e8293b2088ae24ce4bd41d0eb5097011a2c9669b9ff479bc828c2f8425924c920f35193d466b4dba58 SHA512 8d76a855216ef7dc89babce2d35a7b6b58b641105c117e246a01a779396fdcdb6cbcf7b599683ecbfeb53df09504244cca5569b08b15a4fbe6b81b10d51c8d86
+DIST genpatches-5.4-243.base.tar.xz 5625924 BLAKE2B 5f0df2acaa454f6544e56ed23017ee39e085c7145d5acd6ec696c603caed7732d4858b0dd06b39438df3198edf69f598d42a3a62b5237a9a39e50d1e5753580f SHA512 36281506b470556bf21d374c3570cbf804429978c000634dd0b3904fa97d0b107fea8fdb4177b7a2d8d217bde32e7d05165730ee3823002fa8c7dd5bd5ec170b
+DIST genpatches-5.4-243.experimental.tar.xz 16904 BLAKE2B 5702d81f6dd119bc4b9dcb8005a0d0ae6dd8cb6a4ac21b360107886b24296e5aaca37b67b588f305eafd3ed253d415419f715d570e8e2db580f2109b4c8feb31 SHA512 58bd98ae174aa490642ba5143bc74dfbdf23a26dd38fd4189770b06c8226bced153729ae63a0cc01b6a235f01779c1013137fbc3191970ba4324a32453247d63
+DIST genpatches-5.4-243.extras.tar.xz 1812 BLAKE2B 41f15599d6e24946a023a349a572a89bae06ea2171bd23865b65ff418454da58b9b36c4df8676ac60d74291f6f243a4c25ac58148da5704c567073429382eb69 SHA512 f89dee9b5bebd46a16c7e2f6e543d1df1aabe0f26c6232c8c8c9e62bd29b205bd65f7cb103baefc21f33da3556e4e0fa95ee25bc4b2eb26b655417bc1cbdeea2
 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
 DIST genpatches-6.1-14.experimental.tar.xz 71688 BLAKE2B d1a99bf47e60ce6101a0882e28878c358cf2d285faa27ba0ca6f83779d76c3a5189db0218bd88104bfbf0b4853f65c20329ba22b84e034e4f3d9ba38253ae84f SHA512 701183e4831ea295a003340bdc5be1ce934928a37f5b8690aba2fca63a595682881c0b2beb42bce988b557d0a76a4feddd97da34c77a1c93066fd7d5b85c6ccb
 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
@@ -67,6 +82,9 @@ DIST genpatches-6.1-22.extras.tar.xz 3804 BLAKE2B 6350caa854108959e150ba1537044b
 DIST genpatches-6.1-23.base.tar.xz 1114724 BLAKE2B 35cef45469a4e42a736c5e94529a211dfc1b60a44e695243d4b936e85933efd685a6e8617abc4b20cd42f736979bda6b85fb66fe33f1d48ebe2cb53fb672a913 SHA512 c7cc6f174e7b1b3c5036b4861da9c5b5110c6857c4bca2585bc4090e84382688fe785ae23c3383246682bcf807368a31793921e160882a1dad5b929501c1001a
 DIST genpatches-6.1-23.experimental.tar.xz 82756 BLAKE2B 970a577b654f4372be1a71bf10f3a9eeb4c492fc4d63f0a4b67392482760dbeda037b702e8f60488e49c1455b0781cd4dfdda2c6d40ee4e1aee73d9f9c8daefb SHA512 9645e8c7b02a91bed2b0a4f2ea3d711234dbc64fc0786fa1ed7899619699e33c0214309cf335f0eab006cb823009258a74515367592e0d48a5cef235be1ea596
 DIST genpatches-6.1-23.extras.tar.xz 3808 BLAKE2B 328dc3054c6ce8f31bcef2d682301b7b9b06a6d8b3ae96adcaf187cc6bc85561dccd219bfedffd4171c3e8df9ce998d4e615bcf364223afe8e268198d3a9d403 SHA512 74e378f6efe8fcadd39e29aaec0d0cc3b2ae8edf909f06a0395a2732d4af1337a966490ff3986237f98086a8779deb1fa980506fcd6385061742187b9bb89da6
+DIST genpatches-6.1-24.base.tar.xz 1155780 BLAKE2B e6be4766ec5aba82d12d5209c1ac86b013482c2c1d40a9d5f72afa0f86555816c859795db9fa229415dc813e8b35851c98f11d17884d3e928684827b6c434778 SHA512 5e0c17ed36ccfe2d926e835a74b283ad40a21fdab33220c82c9e87ec2cbe17c3e6cc356bb62e17a1ca12901bd56694819708af438725c67b68c142c64f0a938c
+DIST genpatches-6.1-24.experimental.tar.xz 82732 BLAKE2B 9af573f8a83274fda1cb87c3bc3944b988b1ea3cb6a068883a6234f74aed89fac299fd8837b83630c272ce84aa2662d8018aa70ecce77e34c31240c30f803d42 SHA512 d53451f1379ba85764e1c858ac5744391f1ff5d3c071053161895e9960bfc0761c3cef6220e59a10d6556e485ff0b81928a33baa8e865994b6d02e66a871bae7
+DIST genpatches-6.1-24.extras.tar.xz 3808 BLAKE2B 31803bf14b9c85373217e5b25fec9c401103b7ac996da14ddf03c69331b6073d6aab4c5c85241454fed43b559cdc6ce1be09c0a61315e79e9482907253e5fe4e SHA512 d5035bb0d8e99597e61a8939842a765e592db6133e923985268bfd7f69c512f5ed2cbf97c7372934794e103309c3649b3da11cbd26d4ba19464fdfc96f3759b4
 DIST genpatches-6.2-6.base.tar.xz 297444 BLAKE2B d6f2608f77fbd57a5774da7a945be357ed1e4296082c991726d081a3527bb5d547985d8d3743718375612af2983ab65ccca7198e1f94d40dd012770782316bc7 SHA512 f749689811cb851f778b87f08f5d51777c4e359266a486741f277649b5124ee804629e331df5235792ed2677421fbecfa78c6db5dcbf972e918d4788f6aa0e2d
 DIST genpatches-6.2-6.experimental.tar.xz 72480 BLAKE2B 8029209cbe33cadb6c12e72905a5f16379191e28bb131a7d664faee7427b17cc6742a19aca12608806d68760642fd92b97ae3643aa37a841872f592c128f66ac SHA512 dff1cca057b0004f6b7f7b45eea33ec0c6db375da751729efda10a287db0455d84b627372d56f34f63a4f31dfc35ab3b035fd7bf0661173244d12baa00200dfb
 DIST genpatches-6.2-6.extras.tar.xz 3808 BLAKE2B c9ca7fc71cca9df793bb801335d1d47f1f1bab043d3abb674a9af58bed02136926a491821d73983e1a831ae8ad5ff16b93afb7d54c008543b159d9d36665b6c6 SHA512 94a5a32799a08b77134475d3f1e4cf7af514db89e915df10686904677d0309b8e5b5cc7849b666aa5c9cc88075b1841f14fed9f08e624fe8255aab6379e12615
@@ -76,6 +94,9 @@ DIST genpatches-6.2-7.extras.tar.xz 3808 BLAKE2B fec1e138d4601bdb4b6ac339bdbfcaa
 DIST genpatches-6.2-8.base.tar.xz 378352 BLAKE2B bfdf83b6ed486ad759f6021e48fad9b980a87ba5c54c0f06dbb2af3dccc79b41c7065d5a3a11933d761da759d9b33b314c456b458c9c65f49de75dd2cd4402ee SHA512 48521d82fbb2475b7a477bcd87dbba073f6c72cfde784adb77e9b92c44bc1fae188179199aee9face7bf53538cc5f2cae491173da686a54182579d69585b54e6
 DIST genpatches-6.2-8.experimental.tar.xz 72516 BLAKE2B 72c80cd32575294e6d65232e79d2b758ed8b7550e1a4b6af664f88467aa9dee5859c63838a1d7a0cb763facb60c0c52075d69174f85ed97d1a1675898021542d SHA512 128dd88fa61c93368add4a17cb3b7369e7142090bc7ba772839e3f26e329ca5c3534647bdded0eb6c42ee4562083cb359211c2d397c68561e82b8080799dca65
 DIST genpatches-6.2-8.extras.tar.xz 3808 BLAKE2B 3bb072914898f6f80f3ceef2ac92d44b3dba7aba6232febd7f7ad48232a2d76c3de4414a0822d0c7d45f632f02441e640a0911fa38a24ca88373807e04806ed0 SHA512 a4c3ca924859b487463b20fd470c2f157e404c0380cc8721d9a9c787519b1471c88f72daf57398d0c8582ec966bd9939c2082ad3b3cd71f93b761bf4443f3a35
+DIST genpatches-6.2-9.base.tar.xz 419680 BLAKE2B 9c206118605a2da947feb5b7e4b5c0a022a8f88936af354679ea50fba6f7b99b27794693ea18b7511feb5c46ef9d7cfaa55a1d426d6181e977c73e8c41a5343e SHA512 ccc911b481597853d5ce05fb8c2e2436c1d67a30f567ceb219cc724f5ffc311b7e6a3c13c66ed964ca9d314ab9f00bcd27ea7f078260956b003c59de903c6e6d
+DIST genpatches-6.2-9.experimental.tar.xz 72488 BLAKE2B 005e30cf27e6abf4a22926da6008d1e598048794a6396144fc3452ffaf4673aeb0beda6460020f144504b1e8c8da309a2f2d58a6af6cb837237d588bfe6bb34e SHA512 5ca702abb04018d2f020e6f22c538da099c4d7e079b312aff094b04df5a7d9af073f29f7d329da5c7c4c417608e69365795aef46d1be739a1f69dd677219ac89
+DIST genpatches-6.2-9.extras.tar.xz 3804 BLAKE2B 77458946a2f0e48de6222a91dfbc6393d04e453a7cf3015bbf947265dece444ee7457a60620ca8c580e167a500a33d0e7c886668a3424ca10ca023f1fa99db4a SHA512 7b01d4b89004fca27fb589a23e04068ef330f61d44cc0f6897bcb260636ccb7b0a26becddf20f5c069e9ea00eb084e17a1a549881d87c63851913a386537daab
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
@@ -87,26 +108,33 @@ EBUILD gentoo-sources-4.14.302.ebuild 673 BLAKE2B 5030ee788cd0861532d7237d512664
 EBUILD gentoo-sources-4.14.305.ebuild 736 BLAKE2B 5bddebaa42ee5ca838ca4fbc6551fd6ccf95eff596e77ffcc60aa52deb0020b35f9630b015ea4805d4d0ae49f50e337bc53692f11e3d9fa917911d0d9edc1c64 SHA512 3c1844cc06f1182a4771b62af1991851aeda403f508d259a7a3f5fb7f7a4788a9db90501736b4dc22a0f857770d71ac3304d51b09b3c32e9830c7d4ddee1a119
 EBUILD gentoo-sources-4.14.308.ebuild 749 BLAKE2B d467cc1217c8fd85ddb5077d78a85bb53e72069a62c88debafbc3fd69e66a25f062e692a8ca9387d8e66ecaa643a472e9068173c7ed0a8a409fa5c1310539efa SHA512 dfc636c10b227aa6daeee4cd82b707cd0128423231002fe0b89cfe6ae2366db9e40fc91f10c919b636adfa8ee22578f69055500bb8f16cd63784b353bf502f1e
 EBUILD gentoo-sources-4.14.309.ebuild 745 BLAKE2B 1b63bd2ccff4151ce503f769f3e19831f04b50175b4480fe40167b2ce53b5264b8939a5f372465879018d38b9dea1ec5fb0c132bbbb8c7a4c8003746011292d7 SHA512 f7e6cd253f8ab4008341157016d491a556834827da294f3094b67a71cbd383ea04c0eae1647faa233a7f33f727e52f479b634b7be14e9d115dea89fde5e61dd8
+EBUILD gentoo-sources-4.14.310.ebuild 749 BLAKE2B 7cac5f22c8b0a565f03360508033070151deaf34812f6b1e0ea9368cb3573777357c851358c596d6d35bdcc0d07b6ac374b7593fc28aa4db9afd082df7995921 SHA512 0366f3670588847016640c9e6c1ba3ab5c496ef438971904703477ed65f19e200e8e58f20b79b5ad67b32fa9d5d4470ab1de68ddc738ee3d1abb3b7c25ff934a
 EBUILD gentoo-sources-4.19.269.ebuild 673 BLAKE2B d5040d048967fd92accdd11995c2beab7625dbaa1093d505a4919766feaa735245d3adc7d8aab0e447808c93a0ea6e5fcfc17a2a3489b4087dfcb83ac1493d61 SHA512 527cd3a42a84d21c6afbd9c8fd9901100d6c1f72a2f898ed8e92908dd7714e3ccdce029328a4913133cece720c36960878521b67424cadf99015e6d8322d162b
 EBUILD gentoo-sources-4.19.272.ebuild 736 BLAKE2B 02df789f5c3da309e30a6350e37dcfcb7ab21f952203f5fc75e7b8d46cdc7078786056ea0434c580b20b9c25dc4d65653c1d6cfe73a057541336fc4ddc181d3b SHA512 782f986787f677852914642f2b7d0bc7628c0aa5e0f04d0489daf5f1c21c1609bc5beb601bb9b24cb9dccd322185c381b2c0fa0b6b4363f3d90e8c71888f07aa
 EBUILD gentoo-sources-4.19.276.ebuild 749 BLAKE2B c6f1d131d0407942052b6c45ed38aaa5361e3d1a8dc7e12a31c6dd5093c1f4e3f60de350aa23ab1ec6241a767dbe5a902792b5fd834382ee40457917c94b6859 SHA512 50a5b9676d2a2df2ad7fe4191207993a1129814e732e9f52e6541b4df263f5c010447189132318e7d32dafb1d37f561a273436ba9b2023375fa2d76cd72278cf
 EBUILD gentoo-sources-4.19.277.ebuild 745 BLAKE2B dc0d68f7aa084c3e87be05ad0a6d2495c518b7b6a8eb0b1ed3b5f37c16f6e02616b43ba1a3da39454ae45deb8aa5b0ba88309542a92659362326aab2b556c287 SHA512 3e1c9586e9715e1c28207541c80b462b234cbe491e13f92dd8743734b1862b7ec2fbb5ff427291d33afc499cc2eb247aad26a505100b68ac87bd2113f1f00f6c
+EBUILD gentoo-sources-4.19.278.ebuild 749 BLAKE2B 6e258f8aade96c6fc8caaa5cfca99516983f8dc4e45256a5bff00db9d53fd150b8b4ad4f6579240a56f342e877eed18edabe803c750e036e5e122f57a97aca04 SHA512 f436edb0612b13fa8913a6ee8054aeb0efa68ce682864bda7d1bd81c91914f778f02a349b9f67b62d051324f058e5853689241ee73964feeab6c25ef2ea44091
 EBUILD gentoo-sources-5.10.163.ebuild 673 BLAKE2B ded618a747e93bf461a63b838b84e970e2c601a3412a982d9f4d7a13bc739ab3d32ae059d1dd5da49b383d6d3a91259fe1ae82ead76fa157e67e1d121dbeb543 SHA512 3c8b641cee56323ed27208fef1a0f5d3a948ac45b1d3988cda207e81bb5eed2d939841c76f9c35b9debd03c151f2e4428fa1449642be7c24a4927545d3da07ef
 EBUILD gentoo-sources-5.10.167.ebuild 743 BLAKE2B e70407deb87ab13a77fde033d72301508eb4d07ec467299bf8679b3fc2da214b0d73ea3ff35f42bfc63e7aff0cd4f5304946bf3dd510e1ae37d77ffc4c9aa822 SHA512 c8fd5fedfa428a3a31a8f81d530dfbc0352c597ce8f6f8ce3eadaa435e823450a3d080e296a73d40774d29d8723db52397605765a52a502417ff6a2e1c3bf236
 EBUILD gentoo-sources-5.10.173.ebuild 749 BLAKE2B 0c9a94d448ebc00802a977de216bb26fc28ea27d441dcdf6db105b183e49a8b82d1ec01f88cf1c9f32b80690403460514b9615670e502b1f8aed20103e77f434 SHA512 f2a3cd3cdb6cb4b76ad40b53a511708ce8a4821e1d7378576733ffca774da9d64522246a37c51c5f57e0b7381ae998e567c95b70dd82f0ee9af4b366c1ebc890
 EBUILD gentoo-sources-5.10.174.ebuild 745 BLAKE2B 0051051bc72f6bc0a97f07e039ade7226d63b5d74d8fa7166383f1f081b7f4131f5c2abde1d071e7cd44bd87b6403baf1f400eb1bbc99b59dce8cd736ab84d83 SHA512 d860891796876967965ba471ac685302777f82525a3946ae9f33ebe1f000272cfa4679e9302276e6ca012fa3c4687edbeaa4c34613344ac031c28bf5f8b7dbbe
+EBUILD gentoo-sources-5.10.175.ebuild 749 BLAKE2B 9a4e509e153effb381a268b4f1512543b81cf8becbc8069d12e5675ba638e3ebd3b555cd9fa6a8a5a74715933eab9f0f7e0782d79f78c5f6c8d73bc9405639fd SHA512 2201629cf805bb03d22e16c6ecab697b55ab08aa9c07b83a83ef49a53e3bd6eff87885a25b03b366b0e67fcf958d25665a71be74077bd71bd56d6bfab43271a2
 EBUILD gentoo-sources-5.15.101.ebuild 749 BLAKE2B e475e5c4169fece1dea400ed4c43c27d35a2fec2c87432797b2052f22ca56903224337f6c1a6c94a85d4794c99833a57016e10c41a3ba9ebaf4eed897f79b1ff SHA512 e78b1bcfc960778f4ee47ff951bb9694d9485160d098e6cd176ba6965038293539f1d2bdb8d5b7d7a6183027a484d800b613b0b0ecb72052bd1d2893e264e401
 EBUILD gentoo-sources-5.15.102.ebuild 745 BLAKE2B a11fc81a1faef9dbf2af930bbf435f057b5cccc923ffa9a1bce3ea44bf3af30c84711ccc4cb90d0570b7a436fdfd07d70b316499fd545fa555c4e86793005f8f SHA512 0f86257f14d76122b46991a58830fea7393bd38d9f96dcedbf4778d6db8f47cdc508f172e1500fd4c912edc942cca253021b865d866a1d40c59e0ba173b365d1
+EBUILD gentoo-sources-5.15.103.ebuild 749 BLAKE2B 83099acd9fff0fa6c2848fc1bf8ec380ff451f647509229a0a0d3575996382fb8de403d6e0bbc1fc41c20a339ebcd32f3ca618ebc70cc98beb9d6abb32697bd0 SHA512 ee4f365ca54165688fa2711289aa5f148fc341d481e2f267dcbf6c42af48691d25416ac9ee41916ef500bf945dcc9b023564d81bc2959d7792fe05861068c170
 EBUILD gentoo-sources-5.15.88.ebuild 672 BLAKE2B de140149497a50feadacda0cd38af907076aee71a809d2140bb694aa5ffa3d3a4079ec6fd8914950e29d3c3334052e2de70e01d152353d9a51fc910443e564a6 SHA512 a16a2549002e5a777c9e8be6e14d90e37850c2784bc59e483c9de1d1e06401c547582457b3d46d7fc2eb7f73efbc0357932886167701ee41efcded8d3b11d10f
 EBUILD gentoo-sources-5.15.94.ebuild 742 BLAKE2B ba7248692e7df0bdab0566b0b673146dfcd2109eb024a7cb1baae5e22ac65a5c8e960c6f264c70290c9ad00606396028e27c372ed065e88f12359a660999eb5b SHA512 2c21e3ba35673877a368b43eab390dacb22cdd6201e4347748b91356d9733f1d9c29e2c58e2d6d942d2f6b6567ca035ecb39b082954b7db1e8383c314fbcece1
 EBUILD gentoo-sources-5.4.228.ebuild 673 BLAKE2B 09732f37a84de7a294c164845d4e7e3d317ff783d7c190939502b24bd321a0ed30699cfb5ee4620cfab0abf5bc8ae91ce6d79f033104a3c8f148a59edf2f94b1 SHA512 efc53039db1ccc900e44c287518a75d45719cb4d38d1c9b20a7c7093517bdff0db600ce51e6bc9893cf9987173670aaab78c9e1e4307f7d31e7691c3b653498a
 EBUILD gentoo-sources-5.4.231.ebuild 736 BLAKE2B b350d6563a7a0c897f22b666a051a5d7e0216524bf89bd78dd717a1f8f51e03c005ded787db15caefab4bfe3423d661e5b20a5a177387984b84af50913e836d3 SHA512 e6f76767e83e22c8e1f1cf6b10f0aea87828b7375379bcea5d1b44bb56236263a2b4d82f8d8eb5f8fd514e77e025e234a7b04c1c71febd012ea6de6a83230a66
 EBUILD gentoo-sources-5.4.235.ebuild 749 BLAKE2B cc3fc5893c736964dd1ea1c908c2e303ea2be44f525098ebd733b274f84e46275f944333f681564d5acd4fe56855e759d4347d2271f583459b087718a312cae9 SHA512 5e666cf9401e78ee74c398420d5fd9b96859544976fad966aa1c6882704beebd590693019e18d8619b7845885fad95262ba9d311b87c39e0b724c74251230c8c
 EBUILD gentoo-sources-5.4.236.ebuild 745 BLAKE2B ada1f269542ac420af75ca96a96f4728a1a4e49b2d8e3b671039c4f64731422f808e71c8877d5fb1937931c94b6b6695da23b703f3bbcc9706215ff9c1a9f972 SHA512 975695ce1d9a176c0b14751a7eb540874a4949f84e2a273f8b7bf7a92fe994d23ec3fd568dd961a337dd0811759c607e11fd82e9f8f5f685bcaa054c9eb103be
+EBUILD gentoo-sources-5.4.237.ebuild 749 BLAKE2B 19eee7da13868f39a22f21a6d039fd0bbc7ef2e104b87f679b70240bc02f2f2b5322c221ab65c94b091c3f7bbb6a247776e7ba409335664f963e47e2a14fc065 SHA512 ab15a5f2b5b73e826a9d5361f08f67fcfa8578f0d4e9910e64a23509c74d0b8e4952c2e405eda087a8fdac46f0ad9f68b9b9e6ab269b3f14cce63b9f7ea922f6
 EBUILD gentoo-sources-6.1.12.ebuild 743 BLAKE2B 39249fb257735f33220ee38d7abf4ba841c4062021cd558b69c46a95812b44d61197f66c9619d42bc50ae2dd6461a074f87c99ebd72441e9ffce996b5506707c SHA512 9dfd91f54984eb0b7019147df57e55b484e8a08b1392aa2542842d918b5da1553f569c1903ee0e5b9d5dbdbdd6d85690f16c553b974151f88733d783cffffdb7
 EBUILD gentoo-sources-6.1.18.ebuild 748 BLAKE2B 4dc488736fbc2128a8296bc2ebb2343d734ea624b80c8de533be0a12e74615e6f62c4f5311a170ac62de115ae9253d4b71a868b30071b00f769aebe6d95854db SHA512 4d4e793fdbdfd7cc822066c5d450f6dbd013009d97c6430dd20ab7a04b8a64fa27d8c6f7e7d1819b0af65b69e2bd93fa82e140d66c8c42a8333bced5c11c7773
 EBUILD gentoo-sources-6.1.19.ebuild 744 BLAKE2B 359fd074260d646362f7e4d8d665c7543c69b5e9a5a24c42ecdafd9d7c3a12dfadb5bba07d90f638a21f7ab4f577dfc2da14f1a5b88c0aea244ce8d6346f41d0 SHA512 5bd4d6747333ff1f76d8803b3eba294225ad500fc32b92a73c2e86736b744e65518570fde1bd5144410f478cedeb1cb3a4f92eea7e91514b3469c271d6933c30
+EBUILD gentoo-sources-6.1.20.ebuild 748 BLAKE2B 42c59370c8853b2e2be477ce3db4df6a530ed114ab0ffe140a8c7cf0f31315c9d3243815b7ccf6a971c07b1c9f5e839391e107af68b846d91550a7ec049d1c93 SHA512 c514ea22af280400cde399b2632e861fb63e4dcd113693d9406e72a0cd67426985d61b931bc365c10e91347f6525a1672b797607cf8e43c487b205ca4e2a66bd
 EBUILD gentoo-sources-6.2.4.ebuild 754 BLAKE2B 37c1980a4c24e3921f2ca8d6c0302c189d2a68154a8e9bb83e74cec587f4473f43669639e72a423a786c74c943fba4bca19ca43afd19b4764c7d8df96112218e SHA512 1cc19610d13b1b8b79f5cb972b04b5ac52c6148e8640ac0e8b8cd90a7877b41bb792f18f20105fb1acadadc0a0a820d2f59367cd974aa2770e20aec08e00ea9a
 EBUILD gentoo-sources-6.2.5.ebuild 754 BLAKE2B 6c29df2e5ad945ab7d3c73de5584f939998b15e5cfe5442625a64cca9c5ea14b4e0a4299a6039eb21a0339491e969ed31d29063bf02430ea4e03c19cf790f0ea SHA512 712451df4909566d1c909c8ec6ff3de997c7feae3726dab9b679d381d86230cdcb0cc44ef7e12e0f8fb399efee9384212cb8eb5c6df20e72ac7e408691b84016
 EBUILD gentoo-sources-6.2.6.ebuild 754 BLAKE2B 75ddb6e2afc7441ce24603c9d4c6bf3f15e5174dc7bc31bafb28762bed2c0b297078325083ca8f3d3eb7b0ea83bc18197eb64e8b527a2818de91f53a5d608053 SHA512 0da5f47a973aa9bfa67c91ae9d826a26d7ec1a89f483aff830ec0ab5d9e89ee37015bb77dff85317010a073cfcd4c444ad7493c3d513252256be6ae13e80de95
+EBUILD gentoo-sources-6.2.7.ebuild 754 BLAKE2B 287a65a6b273311f53d869f2fa779cd15056f9bc5ff4857a0fa7fd465ffedf085f664719e9f7b82795f71ca783b05a7672c29d2454f4a2e4cf265ce956e4201f SHA512 de0a5251518112027e278357ac66be9b0bab494747047fbe2a82dae09ecf11cbc138f42fe765b8d2413990358c2d47b8ca2645437e3a7be6bad2c967911a93ac
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.310.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.310.ebuild
new file mode 100644
index 000000000000..ea81a5acfa6e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.310.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="321"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.278.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.278.ebuild
new file mode 100644
index 000000000000..343cacdd28c0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.278.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="277"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.175.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.175.ebuild
new file mode 100644
index 000000000000..c643c10c1e68
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.175.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="184"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.103.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.103.ebuild
new file mode 100644
index 000000000000..fdbd1e676372
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.103.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="108"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.237.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.237.ebuild
new file mode 100644
index 000000000000..5a0b23f8e884
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.237.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="243"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.20.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.20.ebuild
new file mode 100644
index 000000000000..d5cceda59037
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.20.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="24"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.2.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.2.7.ebuild
new file mode 100644
index 000000000000..1905129fde23
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.2.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index cd683b55e5d2..68ab574ef2ea 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
-DIST patch-4.14.309.xz 5057708 BLAKE2B 964caf0e81fb2d45d2361f421ef3990d3a3c2c34756f9a654f9f3773e153fbb5d61080a8b8b66ea2e0606540acf45829f36f3d9a85de161ff0f759c07cee136a SHA512 49053440f98617175f3d50c467316ffb8f98a7b947a60dd776e6b90acca9ee68e74a2884f4e72ddf4b258d92afc53eb6da8cce3c98c7cf4500a075305f8e92e5
-DIST patch-4.19.277.xz 5169348 BLAKE2B 71d57bfe34376cdee263ad9dc974e302908c77f5337948c677619dbb230bc2612e81db394969c3af18593f0521805614ae01e1ebc21076a65829c855b4427392 SHA512 1db760d21f5485f5515814b55b1a0ad05a6563701008e19966e6efabb0cafa8e506b77fc17ef58f3d8d5adba973b197da8fe71e2360c350d99f546f30cb3e729
-DIST patch-5.10.174.xz 4452204 BLAKE2B bfbb01d00687bd45525a2e88d1ce1489e5ddd9dde734f1e3d28dac2da6d12550338846c31c00f77fa659edc54c77e5038980dd9c7861ec2dc69de2ae57ad921b SHA512 2f2d36891bfd12823f95620ac8d9752e009886c189147853dc8eeb2ef67568e27b6b8ecf5ee5969c0e8f6f945c44ddd19d124b4a4cfb5e76dd817d006a1963ed
-DIST patch-5.15.102.xz 3737196 BLAKE2B 9baf905ca456245e32c6496c9e12aef61b2e8746753260546e595ab492f7415d3dae1ced6cf4f66dbc413d6f606e99219999c7918703849ac854e662f89700e5 SHA512 1eb5c970c1daef4c58011d15453549688a942649cde374e7cd6da2751afc68a5ba6a03a44f0d633e82e8eb0f4252789d3054d45d35b1ce5ba7d850aa9258a2ee
-DIST patch-5.4.236.xz 4646584 BLAKE2B 3faed916dc5e1ada2b70d7ad235474a6588fe395ca755971bbd861fbb3b08c2788b17f84cbda8954f55d62f7c0fd92d20d6d8d2e3d9c7c562e8ebc841488937d SHA512 83ec6b6b375804867fa15ec20d455eb683c83e9922e2ac28caee421bd8444c5ad0917ed53bb9ffc1b85e38f65562835f2a5245ad75efb729c181f2f31e2a7c92
-DIST patch-6.1.19.xz 1073624 BLAKE2B 313596f43234b22af1964e06bfb66de653362040b04c33cc1dd79667e3ec33d33ded39245fbd71ae67c80eda6ac34d070f9e69fe450bfa4db07cdfd02f02fb1b SHA512 88b203ab038f85b6af418c4bad6e4fe2b95dd8f0039502eacb9203eb6fd5b08fb7f9ba668edeb912681db45f1fc9fcc923fd3670175683747516764f7d998598
-DIST patch-6.2.6.xz 372440 BLAKE2B 789b3c2a7c06011bf6734a0d9e0eb9dfd61c91e47a420ef228066c9d36f451faff9989bc19cb83ea8446b04df33c34d228c34d83551c601ca85197907d490ef1 SHA512 9dea17f7d385fc1b1cfb95dcd0cfdb5a73d77e52c585c518a91be03ad862017ef8762d423030071cde893814051cbb6898cd14a41ab3939ffac252b1106948e8
-EBUILD vanilla-sources-4.14.309.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-4.19.277.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.10.174.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.15.102.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.4.236.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-6.1.19.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
-EBUILD vanilla-sources-6.2.6.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+DIST patch-4.14.310.xz 5059132 BLAKE2B 984da5e3203fb2b3a9b33d41bff4725d8c17fc515daf64371a2aeb02c95924c7d61eb9eca5d0173abfb956aaaae494728bc241c6e97ca5faa55d5be8b82cfb20 SHA512 9f12147eabbc555f3b956c2befbefa5c06f7aba0d5deb3068b142b9b7909c7938e565258ae6f8b0cb2ff2731d8aa68d51b6e2dc568b2e1ba1c0a42459ee2b120
+DIST patch-4.19.278.xz 5173648 BLAKE2B 7d3161a8656f51ea1c04aefac6513801c374fd42af8598421f1d26eafb12b0572e70c3ac7a1ebdd050686458072b3775a139a7fa0d0a1d524b7136c0bef6118d SHA512 89012c8097634a040dd81a57064d3bba0f426ab00c2582045881d91af7254c0974fc048b3c6eb2bd855db73841d13495b65ca8e580f2a1bd5df066a6fc78797a
+DIST patch-5.10.175.xz 4472448 BLAKE2B 4b1527fd2776181cbedb4fb5361ff5ccd3f00db9d0ab455712b8cdc94950d7f779abe5dd0f1cf8b90edd558e31cfd89692b8b6200f4bc0569c5ecd61f095bdb5 SHA512 895fac50f528b8bbbb3211e44f1df4cc00d12cae9a12f3df170c97019a75b13140918cd56b7a1ada62add7359fe7ae1d0ebc30ca0d5147597cf484b0028b487e
+DIST patch-5.15.103.xz 3775476 BLAKE2B 10f81ed8fb34dc9b4937fbd06e78aea1643c4fd5ff3a42faf88c269dfd927da2c63bc9f40cee78153b8150864d1b364a856d174f6d0e2781b7c27f2a721a8b7c SHA512 d2fb4908166f02e48969f65267fbb9877921700cbf5558736c19b754774b54a66444b05e271224a195aed387ca2d2359de10754e33cf42ecbd0cf2352f4e979d
+DIST patch-5.4.237.xz 4659804 BLAKE2B a20ab715490895910ed5e11b1b2ecc865036dae10b7bb5c2b7ca43985b1846f9f9f42e8d092cdc9fe1dde26f9044c2e4425fdc0578a2afdbe71e01d11ec9f1fb SHA512 6380012c9814017161e8f9d3002bd76f6aa7cc2e7403e2f5a4920646a17cb1d004af8edc0360930278cafe3e875933c21eeca862f0e32d751ede68f4aa4c8ce6
+DIST patch-6.1.20.xz 1111040 BLAKE2B b68476f8fc67d9bb699e3c8ee162e67659460ad616d9489139f4b2e4050f9bf7f3dd1527ff4d93d7b58afdba8aa130e51cda4f6ea41fd69409cbd41f7b7b485c SHA512 0095681ec062fe7cfe8abf7a771632c37e02991e3cde6651a1e6bea290abec8316738548087e12563e1234eae72d7ddd8fbb2c376c56bf533c88f72eac48e6be
+DIST patch-6.2.7.xz 412580 BLAKE2B 74dc2ccc7d0e5e5067590b72758b80f9c7014763ba3caa0bba663ad0c6fae186c6e338375256825bc074beda5bfbe99636b98294830b04ebd174a0d3191fb2e8 SHA512 823bf6253b79e42a69949060c477cbff6a6ed79269fedcb53d0a0e2248939fccea7c9fd47680ced41471bbda10aae45c8f6138d7e411ea662c5836a4b38ab176
+EBUILD vanilla-sources-4.14.310.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-4.19.278.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.10.175.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.15.103.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.4.237.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-6.1.20.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+EBUILD vanilla-sources-6.2.7.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.309.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.310.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.309.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.310.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.277.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.278.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.277.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.278.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.174.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.175.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.174.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.175.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.102.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.103.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.102.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.103.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.236.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.237.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.236.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.237.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.19.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.20.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.19.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.20.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.2.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.2.7.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.2.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.2.7.ebuild
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 8bdea492c483..1e66ac67f2a4 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 9d243839dd19..d14d96c86bac 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,8 +1,3 @@
-AUX exo-4.16.0-allow-cross.patch 2264 BLAKE2B b59456418bfc355aae39841adc530b2303faa1e7f6f3ead6d0657aa7ce5861ed9ce6aa4275335d468a89742cdd8dbf3cbac84412d5a764e6b5aab623082de129 SHA512 69cc01d7780c9cc488a32aab1a4246c7a7933c4c2cf45ac88cbfd6e9259a682ee7f31c079d103f9e86030cdb585eda86e9342c63cfcaed0ef1b249f4ad020ec8
-DIST exo-4.16.4.tar.bz2 876080 BLAKE2B a29511c0d2e1bbbd861cfd8946d2f2917eb1004bb85621d0bb8bb9b1339f213a14da651e16a6492138cceff8e3e0ec1d1132226ac60a9846426bf6dc2a621ded SHA512 2cf2267a0bd8526dc870cbe48a0d95573c153a990caffabb13365c6e90c155b6d3383ad1282715cb22ce413e704d170bf7fec1af09ad1b0609507a46c4d1233d
-DIST exo-4.17.4.tar.bz2 895388 BLAKE2B a48f2c7f1509a41d74b924c428fd57b4801b9e45dfa86a2b300ed5b296f5b4bda489e0e71e10a3dd9720b2164ac0debd3ec86a081413f2157637fed80fa819a7 SHA512 b4d7308931b286ae9ab296970a1de924a5da515032b50a594b564c60b1d7d50c06896615f8b3dc986bd1e44feeddc656fa3788bb745e93162231257fffc90c0c
 DIST exo-4.18.0.tar.bz2 896849 BLAKE2B 99cd22b9f2c806907449afdd640abd85be2ec37269d0436a20300ac88ee4fbe39807e39ba51ae8fe82d621c478d65d1f452209779e7d48caee899305b40f3a27 SHA512 32f3a319ff31a37cdaf8e2e7bdbdbaa9b797d6731a27854838b47d6078f45af83ed1a664aef4663f616fd9abcae9233c6f68ab2cc18599f1b2ced487602c51ce
-EBUILD exo-4.16.4.ebuild 1169 BLAKE2B f10c409f2ecb2e12bcc5988fb75cfe4d9249a3db144af8a87e0458faf05e5e6ae273b36ffa042b0a2411b80bb83888b667282e830a63266418bfc8f5e85c388e SHA512 fa48fdf48cad6eb613d6047f4911b4eb4a347b0dfe2c8afd8738061438eeee61af99d5a2dc96b2f63446da785141ed91cc8fe998e40994f3f4c04e204921e43f
-EBUILD exo-4.17.4.ebuild 993 BLAKE2B 99f04c30d161263723a3785970bf1bb3043e854c3449fd44d899429469e9272c9b4c1bf0ece34c9a3ba3935ba9528077f724039dc033c2b11f9be7174b4317dc SHA512 c1034ad4bf41180a353d002d0c13ad9f97783b54d06f98d91808e99c428eb2f5b3b69a76ed4e1aeeaf29fa53d3aa75a3b2ea725c83fce9b3f92cdaf777d3c49f
-EBUILD exo-4.18.0.ebuild 991 BLAKE2B 77c620c069dfab8b674c345a95bca70b30c72973cb80d26cd58acec893b04e2d0c3dbd21615276f0ece492e3b3bf5a3fbe44395bc194f3678263fe96ccfd9565 SHA512 881d31cee8a75ded33057bad175ad186d96b4962633c5684024eb9c9312eea58f65c03246d5bac458319f233c20839a0dd84fc098300186cd68f1810998b1ed0
+EBUILD exo-4.18.0.ebuild 990 BLAKE2B 710ed1cd8ae9074d974d310a966557c40c07a1e5af0604267fb557d428bbbed57daad11198f8d2af7c1f99e3e93acb56ba99cb9ba736ea7c660cae45390fa273 SHA512 7442a3a6d839a7a746668cd1ade1950bb6547bd66317a3e41cef6be56c42961ae4fd3eafffc14fc06da11d48f1b6fe76c124ea80b3e6f9943cf3947147fd8b0a
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/exo/exo-4.16.4.ebuild b/xfce-base/exo/exo-4.16.4.ebuild
deleted file mode 100644
index dc41a78a4f84..000000000000
--- a/xfce-base/exo/exo-4.16.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16.0-allow-cross.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	# needs to be executed after glib-gettextize, bug 829859
-	intltoolize --automake --copy --force || die "intltoolize failed"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-4.17.4.ebuild b/xfce-base/exo/exo-4.17.4.ebuild
deleted file mode 100644
index 510712a94c77..000000000000
--- a/xfce-base/exo/exo-4.17.4.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 xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/exo/start
-	https://gitlab.xfce.org/xfce/exo/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.66
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.17.2:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/exo-4.18.0.ebuild b/xfce-base/exo/exo-4.18.0.ebuild
index e0b080cf253c..01b4dced08f3 100644
--- a/xfce-base/exo/exo-4.18.0.ebuild
+++ b/xfce-base/exo/exo-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~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"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-base/exo/files/exo-4.16.0-allow-cross.patch b/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
deleted file mode 100644
index 098a0b23d645..000000000000
--- a/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From c3e6d0a34d9b2be550994c39c264e3f96a2cc43a Mon Sep 17 00:00:00 2001
-From: David Michael <fedora.dm0@gmail.com>
-Date: Fri, 8 Jan 2021 18:35:16 -0500
-Subject: [PATCH] configure.ac: Allow cross-compiling
-
-AC_TRY_RUN fails by default when cross-compiling if it does not
-have the fourth parameter.  This implements a new cache variable
-ac_cv_have_strftime_extension for that test which allows overriding
-the result to specify the target system behavior.  It defaults to
-supporting the extension when cross-compiling.
-
-Signed-off-by: David Michael <fedora.dm0@gmail.com>
----
- configure.ac.in | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac.in b/configure.ac.in
-index b98fce6e..0483c8fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,10 +133,16 @@
- dnl ************************************
- AC_FUNC_MMAP()
- 
--dnl ***************************************
--dnl *** Check for strftime() extensions ***
--dnl ***************************************
--AC_TRY_RUN([
-+dnl ***************************************************************************
-+dnl *** Check for strftime() extensions                                     ***
-+dnl ***                                                                     ***
-+dnl *** AC_TRY_RUN must be able to build and execute programs natively on   ***
-+dnl *** the build system, so it fails when cross-compiling unless given an  ***
-+dnl *** action in the fourth parameter.  This sets its results in a cache   ***
-+dnl *** variable that users can override to specify target system behavior. ***
-+dnl ***************************************************************************
-+AC_CACHE_CHECK([for strftime %E and %O modifiers],
-+  [ac_cv_have_strftime_extension], [AC_TRY_RUN([
-   #include <string.h>
-   #include <time.h>
-   int
-@@ -149,9 +155,13 @@
-       return 0;
-     return 1;
-   }
--], [
-+    ],
-+    [ac_cv_have_strftime_extension=yes],
-+    [ac_cv_have_strftime_extension=no],
-+    [ac_cv_have_strftime_extension=cross])])
-+if test x"$ac_cv_have_strftime_extension" != x"no"; then
-   AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
--])
-+fi
- 
- dnl ******************************
- dnl *** Check for i18n support ***
--- 
-GitLab
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 0f7c6aba6640..6b65e26019b9 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,7 +1,3 @@
-DIST garcon-0.8.0.tar.bz2 539061 BLAKE2B 8d7b207fdb325d060c3ecfa5e2574961082706c5a4af59cabebad9d3c915228085dc32442521018bfb7da2d3c169445ac270c00c381e666bfda8774329a60cfc SHA512 708c68c31c0d3d89ecdde4790594837af0d065ecb805131fd7db2eb4c433c0523f44d51f2040f7bf9af729537e5f9e89ed06a435fc0c4e6113db00ad78ba8ce0
-DIST garcon-4.17.3.tar.bz2 550490 BLAKE2B 78b7f0770cdb6a6dd1e08b7732e8c31f13a9b424e588740f37dbbb7233df28b8dfd73d099c678f2bdeaa5a850fcbb707187ba54b1277e0a28e801d6eecc1c2cf SHA512 fef686854b5005d94dbf455e08a24313d014e6ee410509038b7b08a1ea64836cb2b196ca0ccceef341b132f35b64c11b784ae9f02dc4e2b3bb2faa473eb7bce1
 DIST garcon-4.18.0.tar.bz2 550674 BLAKE2B 93bc218c4455c61109ee7086a8cb822aaa154aaebd082c10ae9fd551019bce0fe68a117552c05fbe3a97c671036b5306703ba3c320d9b886715a83fb038c95b0 SHA512 c4b49ba47ac33823199a68ef9bdcba3acfcedde62a96a8a8b3af2bb1f28b3a5fe3e960ee93bdb964fbc01b039047d77f58fbe5b1f9fbd2ccd3d3f968e416a55c
-EBUILD garcon-0.8.0.ebuild 1154 BLAKE2B ee97767e67f83e9f34b56ee6e7d0190a9dc3a25741f46c2c05089a00ee69d45960dca30a3aaf639c1c93b397b943d16d307c97a785f8720f2298fdebff885d6f SHA512 faafa8105c8e31b8c8e11689f87b894262c39b4c825c990b49ea0f136634bcb75b2954512d4cb92e463f3e9ec14617ce0f9bfb14642f6d28fba1edfc57978eb7
-EBUILD garcon-4.17.3.ebuild 1232 BLAKE2B 872d11883a83dbfb004a498eca4700ecbb9536f3dfc61dfbb093a8dc4807cd33181ac85a996aa38fce1ba66c623563447e5bf0b5e424abcf6cf5aed6712502b4 SHA512 f95c14b59034a88f1a6b21ad98ef71ce30f405cdc12240a3ee9b962cd0c50babd272f0ba654a8ef0529a9dc00d77df8ae565a88954d176573f03c9fa20438cb1
-EBUILD garcon-4.18.0.ebuild 1229 BLAKE2B 257aa1c86bb1cfd3fa7094b92e2ff52579b2f5177fd7b488da9a82905f491648b56d2e353b1346858abb6012cac26a9ce03f7495cf362c9d99d9e12c6a2cdfe4 SHA512 d3cb33709283244ce8e80c9380870e668041820e76a437b4c9252804c0a3096d1bdb66b69f43124402d301b23c6933b723ecb815e2edc00b564532e167d2741f
+EBUILD garcon-4.18.0.ebuild 1228 BLAKE2B 02bfa8dbe013024d4db5347ba7b7fee2d152315da16998814b992cad860b42c3ba690c6a1f1447515c200cb9207afa7ae56f6650cf616edc774d232f255dba0a SHA512 853e1960b3dfe645d5df7b35ce709975f87996a20eb22a24712fcfcfefad4e2905395d6439498a04559cffc17993b973f2e00ceb9148258707b9b2a10cc5948c
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/garcon/garcon-0.8.0.ebuild b/xfce-base/garcon/garcon-0.8.0.ebuild
deleted file mode 100644
index 2a991a4425cf..000000000000
--- a/xfce-base/garcon/garcon-0.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection"
-
-RDEPEND=">=dev-libs/glib-2.50.0
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	introspection? ( dev-libs/gobject-introspection )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/garcon/garcon-4.17.3.ebuild b/xfce-base/garcon/garcon-4.17.3.ebuild
deleted file mode 100644
index 2ec5063e184c..000000000000
--- a/xfce-base/garcon/garcon-4.17.3.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
-
-inherit xdg-utils
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/garcon/start
-	https://gitlab.xfce.org/xfce/garcon/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="introspection"
-
-DEPEND="
-	>=dev-libs/glib-2.50.0
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	introspection? ( >=dev-libs/gobject-introspection-1.66 )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/garcon/garcon-4.18.0.ebuild b/xfce-base/garcon/garcon-4.18.0.ebuild
index a02bb12f74a8..fe00a80632b2 100644
--- a/xfce-base/garcon/garcon-4.18.0.ebuild
+++ b/xfce-base/garcon/garcon-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="introspection"
 
 DEPEND="
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index a2d32681a783..d0e1c0ad99ad 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,11 +1,5 @@
-DIST libxfce4ui-4.16.1.tar.bz2 785811 BLAKE2B d1267b328b7e2d07bfe85ce320da6a60d5a7d739c5ded9b213b83b0cde2061d3badc937e71c4353291ed435fb9d1294cadcc99402cdae69f4bcecf412dd525f2 SHA512 c183bbc75539c777fe704d0a1c4e533fdd2efb6cbc980cfedc2eaa80d0e6223db038498774ffcdc720d7f991dd8d9634183a757a4c4d1728cc9956a33cb187d0
-DIST libxfce4ui-4.17.9.tar.bz2 894716 BLAKE2B 0ff31216faee9c7a06524bf311103b4bb3bda4ef09adc7aa0fd028013eefdb3f9ed16334156be6c1c521d17c40358a0186133139758c9b83fa7bf8a3a133b998 SHA512 f433b134eba1e666ef5e6d44e90bc6d61452a5956b5c350995a4f26b461a1eb352561ea1911a51cff72d895904e7ba33c8ae096e083c452500d669fcccd7295a
-DIST libxfce4ui-4.18.0.tar.bz2 896351 BLAKE2B 968f6c65c7de178d00285b68480fa07a10abe23d140df744498c3645bee619d092474ae46430551a48e4f86323a54c88d5c7af6a95ca99614b323cc130681e9b SHA512 a88c948415dd33e4c4e9a69b9315aa8bb9c0172f563326d2c651ef6e84fa78c6bf1656def80c2f24c13f04b9f522e2c1983d0f4f009a74a8581d49049027c937
 DIST libxfce4ui-4.18.1.tar.bz2 910047 BLAKE2B 196ded69668b27fd10d99042789e1b2b38eb1a54df6015d1c268dabbec747469d0883087c2f2dcc121f44091a4e19857d51e607ab50fe2aaa20b3b3bf10ad760 SHA512 3bd8a52755c8542ff6952bb91bf57203605991963865f3d88896850ac5b98aec649c229d8743c1d472e6ac19ada853c428c1706aad0613a951aca1c001d9977d
 DIST libxfce4ui-4.18.2.tar.bz2 901949 BLAKE2B 17bf0541646735ec54da5f322d858896fa2fd132fe93864372a67d4936b4467def749f4a0dd4f3d23ecb7a2b3843367f88ccf74b7e040e7ad6f6c15fec45055f SHA512 758466e2e3096791b99e1a00c9f499d95327581ad336fc1ab0d51e3d150206d522f44c2e6053b0032499dd0cb337510cf6940dc77499cef3ecbb484de7787457
-EBUILD libxfce4ui-4.16.1.ebuild 1727 BLAKE2B 0e00b59daa3ff407dad5ec02f09c7806160a4a80f08b5d1c1d9ca89588b77a295aee83dfd3e697bc87e1e4bbd8a2dbd7b0852494f783a2439515dd171bbd4d2d SHA512 1c3910d58274816dd82ecc058218a33f64eb5f99509912e127fab2b3369f3e64bd6b0a70afd6b1fdd1af84939c197b18d48bf24ee15e530233117bcd978450c3
-EBUILD libxfce4ui-4.17.9.ebuild 1743 BLAKE2B 846c003a7e3f0c607d3e3e131428eef3ffb3daf7e2cc77b60c452fc8bc70b277d472f067700bd058f7726d134f84c17fc92beca08a8799c91d069fb8e74f451f SHA512 534f94650b3b8e308928432f379611cd8088fcc247ceaa1dbaf8f91517d46b00f2c3a774d0c664e42517651464234930becae8f0e3ad0d2eaded39c8b923580b
-EBUILD libxfce4ui-4.18.0.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
-EBUILD libxfce4ui-4.18.1.ebuild 1734 BLAKE2B 395f37aa386a02470e6eca4fd5d434617284d6adb7e40c349b303f5c5261e890535e83c73558bc3a6b4a1ba6e2c5b2f78d1a92db41f4f003a28d3742f5297568 SHA512 d376b9c4b52eba859f0a234619334d8ea7a324aa44c581c6b2f7842fba6d4493ac7175c073490207d3d22123a455e26d40fd471601a0e48fa80495420932ab73
+EBUILD libxfce4ui-4.18.1.ebuild 1733 BLAKE2B 77e3722a235e09c5e802fb57b648030baa054b269788c6f661492ecb27b08ef4e9893b491495ae5c7d14d559a32b8823f45827897a2e72f16ee21ac2286d3b5b SHA512 94534883d35f2dd5458cf58de698eb3b7596c8e032fdc60584a6bb7ec563cc2eb1607b1056876cdf19db4f99afacd52824a0f9451425da1a2a5f04ba1054394f
 EBUILD libxfce4ui-4.18.2.ebuild 1739 BLAKE2B 0da39cc9521bddbe924e82d216e2f2834daf2f0762b0c0c7e2ee6eaf0bf7f30c3a458f161f29a7a68d8b710dcbf02dcd45b7ba29e91c85ff34acccd78f658042 SHA512 c496066821e64e30df458642b5e316e569693b2589257c326f96ebef7077dca8d77e03ebd837a85406c06fab6c3b76ef7ec3fc0e1c8937cdf05d0af9f4e81c61
 MISC metadata.xml 415 BLAKE2B 96ab20930d257e21f8cb46d95f24e7d0fe7568aba5cc097ffb9ec46a5341d58dcf366522de79d8c04b575cd0cf6b96724ed969b8d6338cb842bd50787620ea9b SHA512 9712241bf2f9bb14ac6969f02768e7c4a159f7349eff4a7c9bc8fb779955a555b4cb5770ed32203933e603acb2fa9456cd989a62e274c94320e81e820555644e
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
deleted file mode 100644
index 3914cf85dbfb..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.16.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade +introspection startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3[introspection?,X]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.17.9.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.17.9.ebuild
deleted file mode 100644
index 0fb1236d5c41..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.17.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4ui/start
-	https://gitlab.xfce.org/xfce/libxfce4ui/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade +introspection startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=x11-libs/gtk+-3.22:3[introspection?,X]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.17.2:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.0.ebuild
deleted file mode 100644
index 31a8ab010145..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils vala
-
-DESCRIPTION="Unified widget and session management libs for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4ui/start
-	https://gitlab.xfce.org/xfce/libxfce4ui/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="glade +introspection startup-notification system-info vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3[introspection?,X]
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.17.2:=[introspection?]
-	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-	startup-notification? ( x11-libs/startup-notification )
-	system-info? (
-		dev-libs/libgudev
-		gnome-base/libgtop
-		>=media-libs/libepoxy-1.2
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable system-info glibtop)
-		$(use_enable system-info epoxy)
-		$(use_enable system-info gudev)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
index d4d8cd7ab31b..93c505782b0c 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="glade +introspection startup-notification system-info vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 34c1118ad4c0..66204607e81c 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,9 +1,3 @@
-DIST libxfce4util-4.16.0.tar.bz2 508328 BLAKE2B 99578b898389bd90841a7f903f5473b2ff357cf81256efe1019425b48da32401ce238deffefd299987477f4cdfb77e86e415b55049863c30bf16e0e641e08c72 SHA512 dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c
-DIST libxfce4util-4.17.4.tar.bz2 511520 BLAKE2B 7850dbf49b5624ce8ac97c4188a80afc51f1d258b9760ff3ef7055cedb7dda11c18a784f053c4c25f9622e3db65d97f21ff9974fd9830edf696a81543453f982 SHA512 9774f199cd54c28875801e74e76f6e000579f3cc15e65c72e2edc6723b3a1b93083e9dd2ce0bd37885f4d812c3223552b6caa723ab8ce5169c69ccff8d2f6eb8
-DIST libxfce4util-4.18.0.tar.bz2 511384 BLAKE2B 65db083fb2ecec007f2f1052afad58184a8e607e2959c49e313a87781f92e8b76d1b59daeb1c6b159cfc000ba37edf25aab1df96526ce5aa7c218dc27a896447 SHA512 10ec7798570c95719951fdd6cbd45aefc6950e6012b17f05f9023711a874dbaf79ac5c07d98990f7c5bf9efb1d254732f203f670f23bf23a2004656f46737749
 DIST libxfce4util-4.18.1.tar.bz2 527167 BLAKE2B b5d16b4e6ce541a7de559eb2801cf800dab26c45e83b0c562974f18218fd9ad0d70e40219b573a90f1ea1b9e15a8111cfae6200f581335f305a7e7f6eb07adc9 SHA512 e1459e2268948c8329394bdca56f7e7bef7739b56559c00ce6d70dfbedd038cd73a4873be34b91dbd94a80afc16e2b0e1cc256d3ff4d8fdeef9162fbdb3772cd
-EBUILD libxfce4util-4.16.0.ebuild 1094 BLAKE2B 5c6da62a80dd1d3d2aaa77b771eea7b3c372d1b60ac1585cd6b40c6c0b36a176ea697522cc9bbbc179d566985b23156497a765871962f3a8dfe14f2e0eabc1d6 SHA512 8ddb4aff9b6c055e2defcb8375a7434db9ca0129ffc9590d937f2d2213f808e8e7ac21a9542888058108c0e237b6e23998de8426b5229549be8eeeffdb80f646
-EBUILD libxfce4util-4.17.4.ebuild 1056 BLAKE2B 034def2d188f4c372f961153a1f85892a7e7949181fed62ccf657bf1faa89dab92d2ad0757ded89a594b6f1f25c0e45ef0b9c50a4c5579f357aeffd3e409ccb7 SHA512 ed0f8c9475e597b60a2a2f2913ab6de100c1c9c6035529a2c0e48f512b76626ec3a2fb648a07eaa607fe556a2faccbd08addd93d72c2255619c52241a7a58129
-EBUILD libxfce4util-4.18.0.ebuild 1061 BLAKE2B 4950dd5229e5e12040e017e93316765a9126aad23bbaf12e0efd57adcd49f20cf31aa8fadd060ed38e00606724d2d3bb8f57e121d47cb8cd71c6ea61c289c084 SHA512 3d347a7b5190cad217225edd6d815f9cf3c72948e7046a1c83018565121b3a973812b623f3ccfebf4faec03144d7c89a95e92bb9f41a15c2606cbf7714e9d966
-EBUILD libxfce4util-4.18.1.ebuild 1056 BLAKE2B 703d6accbe535e8119f22614642635ca32a3a40b8c712a60ad641e2c78b358acdd65ac4b8ab1631ad5be04a92e9fb61372eef8997afc6db3c0d10e0106428cbc SHA512 321fcdd38acae7cd851661633c2e7d30c85f583a97fa6399e931ef22ec4ca08f41a1abd158d0021e0b29db9082cd44b9e50b6517da1352dde65fd1014a8b0ed8
+EBUILD libxfce4util-4.18.1.ebuild 1055 BLAKE2B 40d60e23d4fe4284de1fde8e4c83bf2b0409c488fba3da6e1e0cafc1da1c94e03479bec6efab8a884a6e1bcc1f5892efb6cbcbc89cf64f4c22fc641ded9b6820 SHA512 12f598409823e48b76101bfb00f8d45b2e9d739b50290ed7902eb99ad0b36b1b84243461c8b8cbad020db7ee48fecb46a2baca69def1255435ceefbeaf0a98be
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
deleted file mode 100644
index e7ed6027970d..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.16.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vala
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4util/start
-	https://gitlab.xfce.org/xfce/libxfce4util/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50
-	introspection? ( dev-libs/gobject-introspection:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/libxfce4util/libxfce4util-4.17.4.ebuild b/xfce-base/libxfce4util/libxfce4util-4.17.4.ebuild
deleted file mode 100644
index 8d73500053d8..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.17.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4util/start
-	https://gitlab.xfce.org/xfce/libxfce4util/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.56
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/libxfce4util/libxfce4util-4.18.0.ebuild b/xfce-base/libxfce4util/libxfce4util-4.18.0.ebuild
deleted file mode 100644
index d4ab761140fa..000000000000
--- a/xfce-base/libxfce4util/libxfce4util-4.18.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala
-
-DESCRIPTION="A basic utility library for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/libxfce4util/start
-	https://gitlab.xfce.org/xfce/libxfce4util/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
index 53f31381b313..ad7e3a6f517f 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0/7"
-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"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/thunar-volman/Manifest b/xfce-base/thunar-volman/Manifest
index 90cff26787a7..f15df64673a6 100644
--- a/xfce-base/thunar-volman/Manifest
+++ b/xfce-base/thunar-volman/Manifest
@@ -1,7 +1,3 @@
-DIST thunar-volman-4.16.0.tar.bz2 501194 BLAKE2B 3d2fce7bb9a52a950ab84fa9986387af01d7d55864bd8fc1a3051ab406c99648b4ba21d018e806baa07ec1ac7e2bc798eb402b1c0e115e52b58ccdbda0ca4c5f SHA512 33b7561e55491b793aa634dfa0b108788286e6b7a2f60a781b8ba10f73de74630520736ae99c4db66ae2da562a82bb1a6bdacd8307d6d452f26e647da6471af8
-DIST thunar-volman-4.17.1.tar.bz2 510275 BLAKE2B 16501dddec85811263d22b0757fe9f150c262ade9e80566ae141f84544ff52122f4beafeef1fb41b80ea8e562ffd93fdffa4b3dd5cade710b0ed2115f7adce40 SHA512 a36f7fad3d2e9c36d8228ecc30463a2d588d8fa6927029242dcc4138a81259e6d131fd660455ea77ce65e2f1e54240cfe75cbbe1a32f8371ba6c014c0c971098
 DIST thunar-volman-4.18.0.tar.bz2 510289 BLAKE2B 6da7042d85fbdb57b811d1a08c1bdc0b0449b0c37013a37a8a19f15901135cea544f469c68de7880ca10110c9418426ecd0747fd00725077b6e171ec4a0cccf9 SHA512 29681ede6274e999377e2aae2b157ed355d9e471416db2d4beb4432f84c60008f8c5008c87392c20da51d58fc3bd8f097d6f21764903baf1a301fb00e6166420
-EBUILD thunar-volman-4.16.0.ebuild 1046 BLAKE2B 8976f7e52bc6766e18748e5058cfdc5b8a65e7371aa0e78e0ad78c426e78c5ac4b7978ac50e759527c7706e71cc09a6611edb7190f168d7b51ed8dec9d71f450 SHA512 a803c7ce7ef1b5c7c17b9e3577afcd6c66321faff3927ec3eb48c8cc6eb7305a02957ce230495cab2471cd311bbf0c4188ad0164ac4b3c027c16bfa25645764a
-EBUILD thunar-volman-4.17.1.ebuild 1092 BLAKE2B 1359509a4b3a23460b18a5c209fdcef56892e34f53030b3c55bc1d9c8088b14eb9cfd06dabba8987d11df0f5fdf2160abaf6c0b7d297935a2348a6311d8d5c20 SHA512 5cce78acda3980c49e223feb0ad9b7f7063a81ab0789b843fb29d523f690e86c4b05a7421846fdfd91cb3a0f8805586a2f879d7a7a6d7a425574c6159ab93f86
-EBUILD thunar-volman-4.18.0.ebuild 1091 BLAKE2B 51ca8e170025a79d22e9a311cd3eb4360279c6f1a5b91e6e9e72070a8bbd914eb1e24640d333c34fa59ea6d60544f4cc469eef56ef7dd66de36be4f335b990bc SHA512 4df9cb1cba381ebe673cab7f7d1c396e0338d5f14f74cd4bacae883bb0d3a615928349acefbc4ed9d79c5e30f0202b3b606b6e631adf7dbf8d28b8a955effa36
+EBUILD thunar-volman-4.18.0.ebuild 1090 BLAKE2B 9df75398074b24f1248f0e519cb7a947dc7b65d971a305534dd3b343c0fcbfa8c2e14668b9e29c511d5a5b5bf2621de881867185ab65950b8e63976f16ac2e31 SHA512 51d8471aa36c988227288a12a885d1d9c20b514d9db24876c7dc6833fec8f57ab16adcc3a4dc6346b71c6ded1733cd7d174e04d7490ea34e10524ecc89a7a76a
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/thunar-volman/thunar-volman-4.16.0.ebuild b/xfce-base/thunar-volman/thunar-volman-4.16.0.ebuild
deleted file mode 100644
index b1e65a9885aa..000000000000
--- a/xfce-base/thunar-volman/thunar-volman-4.16.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-volman"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-# CC for tvm-burn-cd.svg
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="libnotify"
-
-DEPEND=">=dev-libs/glib-2.50
-	dev-libs/libgudev:=
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/exo-0.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-RDEPEND="${DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/thunar-volman/thunar-volman-4.17.1.ebuild b/xfce-base/thunar-volman/thunar-volman-4.17.1.ebuild
deleted file mode 100644
index d85d390c9a04..000000000000
--- a/xfce-base/thunar-volman/thunar-volman-4.17.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/thunar/thunar-volman
-	https://gitlab.xfce.org/xfce/thunar-volman/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-# CC for tvm-burn-cd.svg
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="libnotify"
-
-DEPEND="
-	>=dev-libs/glib-2.50
-	dev-libs/libgudev:=
-	>=x11-libs/gtk+-3.20:3
-	>=xfce-base/exo-0.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfconf-4.12:=
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-RDEPEND="
-	${DEPEND}
-	virtual/udev
-	>=xfce-base/thunar-1.6[udisks]
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable libnotify notifications)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild b/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
index ff24f1392e8a..8ae68f0c9f25 100644
--- a/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
+++ b/xfce-base/thunar-volman/thunar-volman-4.18.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 # CC for tvm-burn-cd.svg
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="libnotify"
 
 DEPEND="
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 17c11fe5a396..80181f77fa2a 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,7 +1,5 @@
-DIST thunar-4.16.11.tar.bz2 2326592 BLAKE2B 0e077f2b4bba613849d3dabaebfa652fd99cc2d1035320016fd4e87597e1af1f6330c2758feead307c6182784de65a358058e2a482f2e287447cdd05d00c8404 SHA512 41b390ce269911e4f0b83c07bf910274cf13afcd293389b156457764a0c771dcb87c03976debe0c4ce06c6a5eeca32fd043cbc3e92d4c7ea8fb00da973b06404
 DIST thunar-4.18.3.tar.bz2 2797232 BLAKE2B 4193273e75e6a5a1f9bc1f10934f17b2796b04a59ad2b9a01e4f95e922195a7d8912b35850cc86e91607d7aed78c613bd7776a41a7c0a1b2b60933e1930f3036 SHA512 c6795b691938044d4e15a86c50d60c3c58c203964f2f0e9e69f2432a0d5159b1a7654adb4932a81fcc1f6a89e6fd465297d72dfcb7792fd644ecbd820892a6a4
 DIST thunar-4.18.4.tar.bz2 2836333 BLAKE2B 22ab64ae14bbd15e16d314f2252f02fc8a5ae3043502bfc6a1f43c3e28e735e42d1e040db4dc9c3c7d4df6426c16233da78f30284b1679d59b9ada2cf9051fe2 SHA512 c182abc9fbde79f802c2fac01375be8b29b5da36c665f1de1c005ec09561a865c502e9741a3336ef467d05b215041b452200b063bc33d572b0857f901728d9ae
-EBUILD thunar-4.16.11.ebuild 2081 BLAKE2B a840f913d712f0fd4cf1e95ba546980ba5585f6f9a0350a0ee46b94f1bc3fec18d6e3f9910b54687e1c731ad14c5cd42bfedfb325a4fc83cd68cd4921ef81482 SHA512 706f25a2bb739e61afd279c5aa6adc9db076c06df44188c35bb4807223a4183ea52a154e1f3beb868ea9bdfc6a6b8952e8f65f161d205936ec401457db00dbe8
-EBUILD thunar-4.18.3.ebuild 2103 BLAKE2B e5b912a455040209daf4e220e8f713678e3197f2d1e531972a87893280f9ed6e9202b0fd8c0fea2c0fb4e1c7b7ecd2aaa726797bd1b9842f5f85b350623f6043 SHA512 51e2da6fb8d23326d013e895ae1074bc2759b3df50feb599faaeddf675b7bfa1d391588326fd0b5316200b5906bbdb569d679a8dcecb5259e01f58c1202c7a2d
+EBUILD thunar-4.18.3.ebuild 2102 BLAKE2B 6b265e98b993a780bcd0419ca08c0cffcc77bcbc5c604a11d559d69aafb56e5f5e5540a04fdf3462127520ae1ae029edbe0ff342daf0ccba1de2e668d274c8c6 SHA512 98e689e81569705ba631225cba62c65ebd877a30909389f5e0b1efa34baf6c70190216f9e6e79a1e19534fa47fd7f4b109f77192135c57417c8d0f1344e7a6ad
 EBUILD thunar-4.18.4.ebuild 2108 BLAKE2B f5520d18862ff4c7ffc6b37237f955da368a4e37210dbea5621197354b6b10e9d621db9009c901716d094b3277f2fcb4f77b20f95d8e01ed637b5a1222fdf3e5 SHA512 aed4c181021d97d380d7ba0dc6d911487fcc76e22c737cf8db050543a7eef2f0a2e408c453011457b017723d0741de65cfdf30309772a2d6a06d61b79e81c3f5
 MISC metadata.xml 373 BLAKE2B 8565ee8f50389c9ecd482437d0081ce6c9ed0ade1fffd724c2485c03c708565c91bf89a974a37a3deb541e2e0cf35a19881c8b3ee39182f26d1c522088466ff1 SHA512 b73f53699dc6b936d1baa9bffde644a86481083b4ca333b2d5148bcd03c43e9ff9577c6b35a2e40d89071158c4b4deea4d6317e40959f4344b7f974ac3d22c71
diff --git a/xfce-base/thunar/thunar-4.16.11.ebuild b/xfce-base/thunar/thunar-4.16.11.ebuild
deleted file mode 100644
index 66a2b24f0b50..000000000000
--- a/xfce-base/thunar/thunar-4.16.11.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xdg-utils
-
-DESCRIPTION="File manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://www.xfce.org/projects/
-	https://docs.xfce.org/xfce/thunar/start
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
-
-GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
-DEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/gdk-pixbuf-2.14
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/exo-4.15.3:=
-	>=xfce-base/libxfce4ui-4.15.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/xfconf-4.12:=
-	exif? ( >=media-libs/libexif-0.6.19:= )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	pcre? ( >=dev-libs/libpcre-6:= )
-	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
-	udisks? ( dev-libs/libgudev:= )
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-util/desktop-file-utils-0.20-r1
-	x11-misc/shared-mime-info
-	trash-panel-plugin? ( ${GVFS_DEPEND} )
-	udisks? (
-		virtual/udev
-		${GVFS_DEPEND}[udisks,udev]
-	)
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable udisks gudev)
-		$(use_enable libnotify notifications)
-		$(use_enable exif)
-		$(use_enable pcre)
-		$(use_enable trash-panel-plugin tpa-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "If you were using an older Xfce version and Thunar fails to start"
-	elog "with a message similar to:"
-	elog "  Failed to register: Timeout was reached"
-	elog "you may need to reset your xfce4 session:"
-	elog "  rm ~/.cache/sessions/xfce4-session-*"
-	elog "See https://bugs.gentoo.org/698914."
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/thunar/thunar-4.18.3.ebuild b/xfce-base/thunar/thunar-4.18.3.ebuild
index 40a9d707cf2f..32ba663f578e 100644
--- a/xfce-base/thunar/thunar-4.18.3.ebuild
+++ b/xfce-base/thunar/thunar-4.18.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/tumbler/Manifest b/xfce-base/tumbler/Manifest
index 4d1dfea9cf22..53315e5b94a1 100644
--- a/xfce-base/tumbler/Manifest
+++ b/xfce-base/tumbler/Manifest
@@ -1,7 +1,3 @@
-DIST tumbler-4.16.1.tar.bz2 593122 BLAKE2B b07bc8c0a23bea12f4777e72ae407b087550447dcd8c7da36393d070291e79db07f61c604f50675be881f4c1ab53fde007ff35700f902912ef4e558f360c4949 SHA512 483ed34d41349641ad9116655d1efbaa01352316f8ff4780903fd3f21aacea7c42bc80d7710e7ba0c2b9a79d0f971ce7210a03d5acb6c8b6b0750316665a8154
-DIST tumbler-4.17.3.tar.bz2 609521 BLAKE2B 294adfb4e7179362d5d72aac2021c2eabf762692f8b5ea26e74c4b9be4b8deebbfbf55d83208b203532887ad7ff7c12f9627e67fdeaa7f023be33b5f28294822 SHA512 eb9c3c0ec76b2ca2e32bbd3576d18a64cebb52b84274d3574ef2ec5e71851c43c24abe3b1a740a6bcaa9eb7271a1a1d11e3964e80b5d92ec368a4ede0ec339bd
 DIST tumbler-4.18.0.tar.bz2 609664 BLAKE2B f18c8786b0dee452526b1fda34c6a1d442655d8c252cb68cb1593c121fb2daaee520cc7958936e6ba0492b2eddacb7722fde937092bdde91ca34d4ca3ab42667 SHA512 60f0621ab1a7a00909ea04181c7dfb733dfbb33219991b2f81f991c289428e026993639ee1ffa5b46dd6f35866e0a3ad76fadbd11eec5fa926fba0da2278b99f
-EBUILD tumbler-4.16.1.ebuild 1710 BLAKE2B 2ab8236976693463dd76429a5e95d460ee12251465fb464863003ca363586bef8c73be29e5efe309678edf9b536192f9180d7cc398eedeb45c6d56e078b5b3d3 SHA512 b2a116a3fb5a770ada139c6934034bd56a914655877209a270b66e580953252345775f45b169fe8ba1cd8eecc51796c8bee922d00211b900e04d8e7e905afb85
-EBUILD tumbler-4.17.3.ebuild 1803 BLAKE2B bd508e3e71eb61ea0e2a2abfca0930c061315107887f1a495441cd881b61dec35fb75416c2f522220eae03b98c75b56731b3360b757aa9ae5f008775a5da6f68 SHA512 bba90c42f2f405bb9767f25383e1fdcdc0e49bafd8f09b5497c42af666763a15298f3222d522f45f0df0c3e4aafb6bef37705f1465a7790f7e5464447280675c
-EBUILD tumbler-4.18.0.ebuild 1796 BLAKE2B 79d5c97a839e6dba23c2064c3c3c4bf0715ac5e59440424ec5491de583e82cd60e85d1dd49b15a12780b882d2ac1cae0d011768f278f767232b43834a4c6df59 SHA512 c9c688511b5df7f6827026575b20b5b16c2a6b8cf94eb28c35854e09cce49d1651cc0c122ff79b75559f42d19615aab15090ee77d3a0a5a52d4f1d1100156ce3
+EBUILD tumbler-4.18.0.ebuild 1795 BLAKE2B 309c4e94fbf9a8901c6037f65a023abaeb415f6c5d77839a3f9becdf58c2524c2f8a7830d773a82251e76834de3f97e689d15c9e1d08190c7bb97a2e6c66c298 SHA512 2c6fd6aafe352b0b75683359e6d092d4bdccf9ea3d0732848d6d94266e8959975471927072ba63bb7ace50f08ec94967ee36dea14267a789e7218eac75461ebd
 MISC metadata.xml 470 BLAKE2B 0fe0650488303d2daadac810327d41b97e1b3b1a42d928865b854f5e74451d428f4b5e56abada30be41024916c8469fe7cd3da31da638343388082e38388f654 SHA512 3728ab31403249dc4c5e92b93ab0cd9afd82de2acacba5076d08c7c11cbdc426e5ff114ad2bc156731c24395fec80b0154274f18c4c0cea0d276941dc998b27d
diff --git a/xfce-base/tumbler/tumbler-4.16.1.ebuild b/xfce-base/tumbler/tumbler-4.16.1.ebuild
deleted file mode 100644
index 83ceae12b976..000000000000
--- a/xfce-base/tumbler/tumbler-4.16.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A thumbnail service for Thunar"
-HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
-
-DEPEND="
-	>=dev-libs/glib-2.50:2
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-apps/dbus-1.6
-	>=x11-libs/gdk-pixbuf-2.14:2
-	curl? ( >=net-misc/curl-7.25:= )
-	epub? ( app-text/libgepub )
-	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	odf? ( >=gnome-extra/libgsf-1.14.20:= )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )
-"
-RDEPEND="
-	${DEPEND}
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable epub gepub-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/tumbler/tumbler-4.17.3.ebuild b/xfce-base/tumbler/tumbler-4.17.3.ebuild
deleted file mode 100644
index 5804dd5ef5c4..000000000000
--- a/xfce-base/tumbler/tumbler-4.17.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A thumbnail service for Thunar"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/tumbler/start
-	https://gitlab.xfce.org/xfce/tumbler/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
-
-DEPEND="
-	>=dev-libs/glib-2.56:2
-	media-libs/freetype:2=
-	media-libs/libpng:0=
-	>=sys-apps/dbus-1.6
-	>=xfce-base/libxfce4util-4.17.1:=
-	>=x11-libs/gdk-pixbuf-2.36.2:2
-	curl? ( >=net-misc/curl-7.25:= )
-	epub? ( app-text/libgepub )
-	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	odf? ( >=gnome-extra/libgsf-1.14.20:= )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )
-"
-RDEPEND="
-	${DEPEND}
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable curl cover-thumbnailer)
-		$(use_enable epub gepub-thumbnailer)
-		$(use_enable jpeg jpeg-thumbnailer)
-		$(use_enable ffmpeg ffmpeg-thumbnailer)
-		$(use_enable gstreamer gstreamer-thumbnailer)
-		$(use_enable odf odf-thumbnailer)
-		$(use_enable pdf poppler-thumbnailer)
-		$(use_enable raw raw-thumbnailer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/tumbler/tumbler-4.18.0.ebuild b/xfce-base/tumbler/tumbler-4.18.0.ebuild
index 05fab6747dbb..6a9a430f10ce 100644
--- a/xfce-base/tumbler/tumbler-4.18.0.ebuild
+++ b/xfce-base/tumbler/tumbler-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
 
 DEPEND="
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index f03d1c460f86..1734273903c9 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,7 +1,3 @@
-DIST xfce4-appfinder-4.16.1.tar.bz2 579984 BLAKE2B 1441fa6aeb25ee64b809a2ff31340b7e52910a768ec3b605a3832adf36ea4e27eaa3d455a919c47003d551829114ee62e78c2d983cb6bcfded72e218fa6d29f3 SHA512 5a28d93675af7d77de3050e7df9e064a0fd94d579d7e617878329d4385b42594afd8de96740cb91de38ffcc22bda71e4f90b61ff401980a5582bf09b2a19870c
-DIST xfce4-appfinder-4.17.2.tar.bz2 561844 BLAKE2B ae0f78d18cad4df6b21b05dcbc75a036e231e1e7260ad0a5816098e9693faf5dc0b78d82fd526a9557da1fec69f31de0339ef7d84430a592c9badd9741eaf12f SHA512 81f239d84af405c66a099a5f8ee769fcf3fb8a9116d0fb45552dcd27edfaf0c1ca0e90fff32ff39bcc8a741d897d32d9742fbc7fa7082aa8a522ba778bb23f46
 DIST xfce4-appfinder-4.18.0.tar.bz2 562219 BLAKE2B 05aeedcfe6b00509f7c87affbd9ee12d72ad2298168497fa957a0ec189f18348606ff29c177f4c3c5b3e9b7c937d67727828b97b786038ebfd03259f473fae0d SHA512 e33144910bb4391beb6ca88e312c592593ce50a40e10487c5b72eca492dd2f7c3ab7324ce62413ad6f3df0025de29ece96b5d0a566eecbc87bd1d0e62c9156ad
-EBUILD xfce4-appfinder-4.16.1.ebuild 871 BLAKE2B b54ed024531179a16ecfdf9b77be75a7b6fca66bb67ab00f0315dbcf0ca5b8831c5edbd6ab54f5eb24a2b07d49840644244dd5af28618c9dd1f2231a17fe3eb1 SHA512 8f8b6da5ef3a027bb42ef9a67f10111be66a5c9aa162b2336dc23d97eb9c7c7310b8c5919be2721f34ccca6d0cf5e82563fa7c6ac82dc332eeb42bce3e76fa55
-EBUILD xfce4-appfinder-4.17.2.ebuild 917 BLAKE2B c06d2b9bad384edc8328dfd0a36b9ba71d40956fe7e6672d60179f05a11edffd86e3925cde36544de2bf4fcd1dbf85ebd20d70d266b3cbd07cc0c76ed2e421b0 SHA512 0e21df5b096c3450644f40461fc43d55ac99c2650c48b892d27472aa01a2055078193723af87863abde3f432b746a7d6bda2cdb13efac60a4242b98f00d5aa13
-EBUILD xfce4-appfinder-4.18.0.ebuild 916 BLAKE2B 25a21a4a88c629d0474949af4167b8607c05061365b69dcd30217dc3ae086bda28550e3b64a5691f44d6642f950b33da186d43872f4ca4f1d6847cd2340e999d SHA512 67bd9c10e698658163c4b5041ad1ef2f51c27aa6726cb02ed60f9c7a422707cb1859310b8e1912b3eb446033d370e500630db3c130b879218269751752cc2056
+EBUILD xfce4-appfinder-4.18.0.ebuild 915 BLAKE2B f7d50d29ceab8c3f2a35a26a9ffc60d04f45d6cf2bf9eb8bf3a4a63b95403a592a4394bfaea075e6174dcde4e40d418086cecdbd79145fb4d88b2a9254e6dbe5 SHA512 bbb0c806edac85c8525aee9d0f7bc12c33b8bff76d2555144b24f587a38103952be0656f443fde6af176475e3eaa498fe5fb8823031cd737cf0068a47f479f17
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild
deleted file mode 100644
index 69ee41a09a34..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.16.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-appfinder/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/libxfce4ui-4.14:=[gtk3(+)]
-	>=xfce-base/xfconf-4.14:=
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.17.2.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.17.2.ebuild
deleted file mode 100644
index df7b24763c21..000000000000
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.17.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-appfinder/start
-	https://gitlab.xfce.org/xfce/xfce4-appfinder/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-DEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/garcon-0.3:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/libxfce4ui-4.14:=[gtk3(+)]
-	>=xfce-base/xfconf-4.14:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
index 2a9599350bef..c5f759091180 100644
--- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index f0e3f0e363c6..c5a6e85b1379 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,4 +1,2 @@
-EBUILD xfce4-meta-4.16-r2.ebuild 1020 BLAKE2B 3d3b13ab5a44455c3487e56a6a201373f86af0d9b0527287474dceb487f5d4be56a4a89112e809ee56056c3cda752d0e3c68845954548634a063516c4d0af556 SHA512 7682b09d986b9d9c34c46c367915aae397af1cc795f5c1ef68081b2f784460997335a2d58a0d13b1c3589baa5d53ad5d46bce721f5c2bd2024f1c8b4db502b4c
-EBUILD xfce4-meta-4.18.ebuild 1040 BLAKE2B 066525b62429f3bbc5f97d11db6bda533d2f808131556a97ed95013d176be3a6ca103db29d30e9acf71097488fe7caefb798d1c46f35b7198072c04b80684b05 SHA512 264e112783320c8ba516dc88c07cbc69b45b281f7fa91224354ee0e51aa31ddb73fb96d97cb944fd4963d1c801fb10cae8146e84d88ba84016429b093c1397c9
-EBUILD xfce4-meta-4.18_pre2.ebuild 1046 BLAKE2B 791b8dcd5ed51648e9adc16f2aaa77249be01c85e1279afd434cec51c857625b7dfc17c63fff524d42480a42a60b0892dd9808f94e78c2e68525361a1f90c029 SHA512 63b7561f7b76d3a9f796f5c9fca5990e3e9adc50d3c1a714d60b6c124a559d20ab12c887419d6bd0f71094edca66ba4a34ba388d3416bb2eb3508de6070faac0
+EBUILD xfce4-meta-4.18.ebuild 1039 BLAKE2B bd3501eac0dcb140e0a41468631452ca55f8264056b7677abb63400c8555dae93c2e068e08ae78d54cf0bf555f526dad28df143187d1b890dc9d5a2e46e28646 SHA512 e7f70ec536ebc4b2a4103f28b075772f009658010b61d68fab9843fe79493a772344e7b3c96ea9483a6ef3ac4e5b44746bf79d9bcddf8656dc720b171b9b5499
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
deleted file mode 100644
index 47cb9f985f0d..000000000000
--- a/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The Xfce Desktop Environment (meta package)"
-HOMEPAGE="https://www.xfce.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-IUSE="minimal pulseaudio +svg upower"
-
-RDEPEND="
-	x11-themes/hicolor-icon-theme
-	>=xfce-base/exo-4.16
-	>=xfce-base/garcon-0.8
-	>=xfce-base/libxfce4ui-4.16
-	>=xfce-base/libxfce4util-4.16
-	>=xfce-base/thunar-4.16
-	>=xfce-base/thunar-volman-4.16
-	>=xfce-base/tumbler-4.16
-	>=xfce-base/xfce4-appfinder-4.16
-	>=xfce-base/xfce4-panel-4.16
-	>=xfce-base/xfce4-session-4.16
-	>=xfce-base/xfce4-settings-4.16
-	x11-terms/xfce4-terminal
-	>=xfce-base/xfconf-4.16
-	>=xfce-base/xfdesktop-4.16
-	>=xfce-base/xfwm4-4.16
-	!minimal? (
-		media-fonts/dejavu
-		virtual/freedesktop-icon-theme
-		)
-	pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin )
-	svg? ( gnome-base/librsvg )
-	upower? ( >=xfce-base/xfce4-power-manager-4.16 )
-"
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
index e9b46f4bca78..fdc23f22acf6 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.xfce.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="minimal pulseaudio +svg upower"
 
 RDEPEND="
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.18_pre2.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.18_pre2.ebuild
deleted file mode 100644
index 7ed3d8fb7069..000000000000
--- a/xfce-base/xfce4-meta/xfce4-meta-4.18_pre2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The Xfce Desktop Environment (meta package)"
-HOMEPAGE="https://www.xfce.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="minimal pulseaudio +svg upower"
-
-RDEPEND="
-	x11-themes/hicolor-icon-theme
-	>=xfce-base/exo-4.17.4
-	>=xfce-base/garcon-4.17.3
-	>=xfce-base/libxfce4ui-4.17.9
-	>=xfce-base/libxfce4util-4.17.4
-	>=xfce-base/thunar-4.17.12
-	>=xfce-base/thunar-volman-4.17.1
-	>=xfce-base/tumbler-4.17.3
-	>=xfce-base/xfce4-appfinder-4.17.2
-	>=xfce-base/xfce4-panel-4.17.5
-	>=xfce-base/xfce4-session-4.17.2
-	>=xfce-base/xfce4-settings-4.17.3
-	x11-terms/xfce4-terminal
-	>=xfce-base/xfconf-4.17.2
-	>=xfce-base/xfdesktop-4.17.2
-	>=xfce-base/xfwm4-4.17.2
-	!minimal? (
-		media-fonts/dejavu
-		virtual/freedesktop-icon-theme
-	)
-	pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin )
-	svg? ( gnome-base/librsvg )
-	upower? ( >=xfce-base/xfce4-power-manager-4.17.1 )
-"
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index a093785e3416..b716965443ad 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,13 +1,7 @@
-DIST xfce4-panel-4.16.5.tar.bz2 1386556 BLAKE2B e0543e2c2259a03b09ddaef951434127a76f176626b5355497c1f27748c83857cb34ed1ddecf694c36e3422ca9e55fa4e7eae728b0b50e06feb40ca6e867ebdc SHA512 d72220fa2812ae3b420350dab4c9d33e01d26d27ba33e4c16ad848ed1915c3c4aaf41fef24e2e7271e31171536148ad32b55aabc3e1facd4bf8a411990fd27bb
-DIST xfce4-panel-4.16.6.tar.bz2 1390083 BLAKE2B 8f55f4a24f9130f4ed0cc0b77161218ca1bd6dcd6e23c047e5e38c7dc3ef3a158a6b1538732c8c39143e3886e6994c103e81d26cda0ac2442ecb24872179f513 SHA512 7c1236e552de88e6dd831a9f5b567a743ac52b4f62a1c006cece31d162319d9402d7449657f54c70bf4dc09615dbfacf7320ddd22c57c14b54e3623f8903190f
-DIST xfce4-panel-4.18.0.tar.bz2 1451719 BLAKE2B 9a96c146b5d2764f3e5540979df7eecbe861c9527dfbb924643fc3335bf5f2648d760362024969b7d9d4005eec83805378d104bf5995e85afb9b2498946c47f0 SHA512 4269714fb4cd6fb915789f288a0464c7ceb8c0bca73040416f9f10b6c5ed936e0340b11da8bf7e662b5a1453764e360866abf0320a46e30d536603a329d9e727
 DIST xfce4-panel-4.18.1.tar.bz2 1446504 BLAKE2B b7b8c0d26d21a543af7bb05b66e4435cbb059043502f34bed27915eaf2684b324e9e9ca8407d666bf2258fb80e559e9b11e87ffea4067c9dc6a42737bc1345a4 SHA512 6c79b305676fc6f8088f5579352be1379e87cf88b4207be0c579e6ebc9661a76f8decc434ef9973e29ca363bb7a4caf980c41b1800fae7d55f47c0405dd48075
 DIST xfce4-panel-4.18.2.tar.bz2 1448776 BLAKE2B 5c6f0f3eb85348c6181a94d19331a42ba02e36fd32c747c2dd1d8d762b795e5c8f7a21d4c54765fe498f1d0604ef7229c40f625cb3350dff41c7ec32caa49072 SHA512 8f8aa29a3dc1133477bc7075a2bbb7e7811ebd26f94e9771e4b6987e4aaa2733295e3260cf5b9052545181195ddac50e93c421e4518cdd1ccf18c39c4c972712
 DIST xfce4-panel-4.19.0.tar.bz2 1485117 BLAKE2B a70654a1d8633f04310a1a9fb8554254de2f272f6fbbfede3c709a9bdc9b7d6138d5ab26ea83ccc75c9152ee0fb9d2ce7e7b174ace6369eb7d60e14db0828cec SHA512 a1c3c5f535581332c1b5e93bfecabae32cbe610d168f4452bed321466b73e4ca9ca09ca2e7c7f54cb82fe45a6102022bb30f77b57841a9bba03809b703bddf91
-EBUILD xfce4-panel-4.16.5.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
-EBUILD xfce4-panel-4.16.6.ebuild 1511 BLAKE2B f3e24b8299e0e84c1553445c8b825058cb44923286befac2b5520df5c81b3acfabc418f116820caff0df2301ce64c79cc67eb77113e070157da1bfa7a81fd39b SHA512 106664e1351aefcc902717c0b60fcd090bfb65b791dbd9e8e12fc3326002a0444ee4baed03a141187567741ab859901e8adad7f676a1fee3aaffd1d2f6926210
-EBUILD xfce4-panel-4.18.0.ebuild 1596 BLAKE2B 6c2a566c4e4725f05d56fd15e6fdf13899b56f465f6d2430a2fd5efd7d904240027b8385dfbe93445e68a4a541adf987f23c95ee731fa773b4c56955b3691f7c SHA512 a6f20cd9f93f89265d41f512e22868390009e0cd636dd0c6736177b2382c9ad9d0b931dce571d742a72aefdea9437119b3dc139a113bc437044c29a449d13164
-EBUILD xfce4-panel-4.18.1.ebuild 1591 BLAKE2B 46d9f7525a237c8b8c133322ed46830e45053d69abe2e623ef6e3a241533fa5879794fefe88531a564f401cb1bd8c81f498087b745e5a378e60b6355593abebb SHA512 331cec2593d9346972ec76ba96d2ca93aade29ed545daef76b9f57bd860b65560b2108fd418d12e9ffc4c4df4dafab93a1b89456e47c39419f9e7d2e0a51b406
+EBUILD xfce4-panel-4.18.1.ebuild 1590 BLAKE2B cc1136060fcb7cfdfcf51523efee9c17af783e95ec410fe5818a22ec9a439e96afc5fabd0a54c9c26d875c5e4a0efd8bcdb26e97ef0f1f47de1b0a851ae61537 SHA512 123a616f309295e5a3a199d90c209bd22ecc7f33820bf8577976c719d872bd54a05aebb69952230784cb1270c90d3540a849e616e9e06ad7f1e4d037cfa426fb
 EBUILD xfce4-panel-4.18.2.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb
 EBUILD xfce4-panel-4.19.0.ebuild 1826 BLAKE2B 0a8407966507b07e8c34073d3c88e8d46f713b8e5bf24a14a007a3f51e108468b1eefe1aac65f7b45321480debfe371bd19bec2951f2a01cde3c59354a83a46b SHA512 f20c5910fc8c732e3db02ae9f57a5f58356bfec42767d9943f6deee803ebdaee414553f202fd3fb1f7f18c1100ef5a7350b040485de633dba73c92b68f7cdb88
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.5.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.5.ebuild
deleted file mode 100644
index b73513d14978..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.5.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 vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.6.ebuild
deleted file mode 100644
index 954affe6d4ed..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.0.ebuild
deleted file mode 100644
index 1d3a0dd766e6..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-panel/start
-	https://gitlab.xfce.org/xfce/xfce4-panel/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-4.17.0:=
-	>=xfce-base/libxfce4ui-4.17.1:=
-	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
index 44c241826dbb..1554ed519788 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index 28a8c450a33c..f56c601ae3ad 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -1,9 +1,5 @@
-DIST xfce4-power-manager-4.16.0.tar.bz2 1234968 BLAKE2B 0299bc293769411384b34c81c907f75ba6503db11f1636366a599938d37eda0843e1850c584c37186529c0c97eaca73bc5d488d4916087a42c5c5f68ae8787c8 SHA512 1c6ecfb7696bc13c9b11fdfb4ad4e3278de2350bbc59c84c933b28c07c1a0c55b9954794e1f57e4407d2b54ffaace9ea5baed829bf0683332cf9d12bff7e71ec
-DIST xfce4-power-manager-4.17.1.tar.bz2 1239323 BLAKE2B 204068b3762859147d68b5cde668718eca223c4e30cc0bda31ad06e369f1828a2005a05c779c52084c9223dafcde8be26589431781d6a66d0c4a09d8eb9eb564 SHA512 4d6b789c16496e298b3e3ee7c17e2ec5e0e3a7f51f3b71ff8b12b02fc279c1b47f5679b4c1ed7ff6aa387759e3db1cd4f613abd0c1a485b3b6fbf3816f711a8a
 DIST xfce4-power-manager-4.18.0.tar.bz2 1239515 BLAKE2B 1fc2ffcde64e873693322694ef638cc1e3e0773cc3dec663a03bfb7c4833e410e96ab2726fd5b7600149257e8add17ce51da6db5f31895c66007a83ed1837e18 SHA512 5cfa5285b479a0341b4afbf3141f773ff217cd1003cee55087a33f27e392dacf4930bc08b4faa7296dfe9e738d114a56efcecca32145a4cf68856d5d6feb9d24
 DIST xfce4-power-manager-4.18.1.tar.bz2 1217727 BLAKE2B bbd2a70cdb4fbac6146a28895b17896a10aff4a8d5e32ab82852e034977e9d1872d78eca6f8181ff16c74fcdd65ef27d891682bb93ef7ea4d846ccfee07ab034 SHA512 bb84f5a35058fa4aaa8cbe871acd898afb86885172c74d4b811d5b2c1204c0f7865c8488064622c364350c47d9aaecd07f1b65b56f72a547325e6e73bc2eb4ff
-EBUILD xfce4-power-manager-4.16.0.ebuild 1561 BLAKE2B 767541c3ec06bfa8e4f74774e5c14fb1aaf666577253744ce7bd843c97d57e64c8aa4999cd25ffe1c43df043c3968e7ab35623ae34716800de763b3c8dc95a8f SHA512 11d6f3460d3385fe853800e27f43ff565f98e48ec2941ad63c6e6468c92c136fd5fa915c2c9d9a1607d8b55eb471936d4437ea8b2130f1c3b72de70764c6ee3d
-EBUILD xfce4-power-manager-4.17.1.ebuild 1616 BLAKE2B 1350e058fb119325a6825c8e92f7dab6934f9689cb827a171981e1afa9debc7442211f35a314525406c8ff212bd5d6bc0c0692a4b3c340c6ccca8594992d9d9a SHA512 a990377807b36ff69119b3d32d2e41699543bc3c577d6f80b7707195a80c0eed1f0c331e5115a25bd47cb098f4ef8133ef7221e7547e98f9a6ff7b489f6899ee
-EBUILD xfce4-power-manager-4.18.0.ebuild 1615 BLAKE2B 1f4f92f5b4426d0de0c905535ea83a083289268872b02edaca16155dbc2d80e8eb9f6b661187492afde5e09648d0062fffc003358060f86f8bbe677c14237777 SHA512 00967bc6e0d71c5a91ca291f13334c04c5376a743845c7e40f34984d747f6038f26947ceafbc066c9bd80dd2fe5f380422bb7670496f053bb02ccbc67c5da061
+EBUILD xfce4-power-manager-4.18.0.ebuild 1614 BLAKE2B 82efd4979b75e696e36d075481a8461586945b9b4769edfbd9da931e75cdab10e09344cc643e4bb71880d73bc026cc3bfb3135259224a33cf0f2365d91821d41 SHA512 1d0e097580e2b33edb446c6036dd6a442d7beb94840b0318d3b38afae9f21a3637a028c45e6557c8e871a9b6b2e1b93e6bbbdf3a54ee231d4830e2e13e113f6e
 EBUILD xfce4-power-manager-4.18.1.ebuild 1622 BLAKE2B 240c71ad3db1747beba2963664bd159a59f5aeb479a5785464d8bbb023def9384bd821c52cd3f7e99c3672a8597c7d6c9b3a25b06b068b95b7d9e58e314e2dff SHA512 75314fb705d75893c34d1ade6bbb0fd32eac000aa04178d38e6f4e38768af30b33df1972940357325340afea22e8dfbda9a3b7868e3986fcc85ca5d98b965cad
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.16.0.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.16.0.ebuild
deleted file mode 100644
index fa9ed6b50472..000000000000
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.16.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfce4-power-manager"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-IUSE="networkmanager +panel-plugin policykit"
-
-DEPEND=">=dev-libs/glib-2.50
-	>=sys-power/upower-0.99.0
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	x11-libs/libXtst
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? ( >=sys-auth/polkit-0.112 )"
-RDEPEND="${DEPEND}
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND+="
-	x11-base/xorg-proto"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
-	then
-		elog "Suspend/hibernate support requires a logind provider installed"
-		elog "(sys-apps/systemd or sys-auth/elogind)"
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.17.1.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.17.1.ebuild
deleted file mode 100644
index 5bedd2bb3ea2..000000000000
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.17.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Power manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-power-manager/start
-	https://gitlab.xfce.org/xfce/xfce4-power-manager/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="networkmanager +panel-plugin policykit"
-
-DEPEND="
-	>=dev-libs/glib-2.50
-	>=sys-power/upower-0.99.0
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libXext
-	x11-libs/libXtst
-	>=xfce-base/xfconf-4.12:=
-	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
-	policykit? ( >=sys-auth/polkit-0.112 )
-"
-RDEPEND="
-	${DEPEND}
-	networkmanager? ( net-misc/networkmanager )
-"
-DEPEND+="
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		$(use_enable networkmanager network-manager)
-		$(use_enable panel-plugin xfce4panel)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
-	then
-		elog "Suspend/hibernate support requires a logind provider installed"
-		elog "(sys-apps/systemd or sys-auth/elogind)"
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
index be4ef864c8a2..042ca9d73c09 100644
--- a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="networkmanager +panel-plugin policykit"
 
 DEPEND="
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index fa414f6ed198..e4adb164ca23 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,10 +1,5 @@
-AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48
-DIST xfce4-session-4.16.0.tar.bz2 875504 BLAKE2B 8e06e1ff378593b90c3c600bd5aabb3ea9ba9e58854ed615d39009595be4b71c5f77359e4249a93f44aa67795e2d4bf658b83d9c1d445304764eee655ed1f9e9 SHA512 fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
-DIST xfce4-session-4.17.2.tar.bz2 852648 BLAKE2B be74ee215d687b2f01c39e73ece464544cfa7acfb687c1d6cf1d585f53be3cbc96f22271d5b6d35e572667370fc9a6f928878d5cb98c6b7dad53845e54a55ca2 SHA512 dab9b155f1e0368680a2e8429394baef2e2f4890cf7aa0cc4d7d0a01df8cee4605848b9aaae5073d9fa13df8f9a08a5f2311c834590f9d3c3909d17d446b123c
 DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
 DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
-EBUILD xfce4-session-4.16.0.ebuild 1757 BLAKE2B 56eb10e1e704543a9469aba7bb7f294855a7d844433723736fa7d3fb99e8d4eefd893d45ea29a731cc0315fdefb03f08144dffa1af931c6cab155d7c72a836b3 SHA512 3f8346a8b9cad7f20f19e13ec25ad3621abdfe540a76c6c2b347bd9524acb59fb6a6d7b8503af24ab75d76901c868b60ff25dfaa595fee378100cb320efe71ae
-EBUILD xfce4-session-4.17.2.ebuild 1513 BLAKE2B ab88ee446fd99e8dd2e67da5a65e23dd4640fce3a35e3156ec2c6470be2e06c7d24a54cbbb588380957e9e9f1761c8fd626236365ca37bd203d4767840ca8101 SHA512 ac94ef2d3299d48bb7fce89edfaa8f88bf96120ef4ec1f3b990d805fa893017771d12ce4438d1ae5148487c91f12a7fe31b5a56591a5c1fd0a445981079f6152
-EBUILD xfce4-session-4.18.0.ebuild 1512 BLAKE2B 4eab4009792a37ae974deb6ae715ee18cc79d2a89b6814a27df0823dc0208fcd36978718511f7e2d3e57110b71f673c8b191fd76d050c4958de3c2edc063910c SHA512 57601c91d1e8d7725bf4a6207339041f1d4357c853765b2281c701d747d2f28c98286c0d3cb047dbaf584f586eec99a19e0f5c1ff2393580418f31d53fa937df
+EBUILD xfce4-session-4.18.0.ebuild 1511 BLAKE2B 60283009f9d1e6ae909433277c64771c426d46e6c1c6c94143a2d3f783e5a9d5366855888ef55faf9c31b7ab7f84e9c091b43e35efa754ef5ca8771a8c530a11 SHA512 659b67853f4919f2de3c97f3dbaa760901ca1ce7aad86e915fdeb2de4e03c5e2e4a46853c6d01ec991d87c76fe98a6b6b735aa569c9e684f7548b07910278434
 EBUILD xfce4-session-4.18.1.ebuild 1517 BLAKE2B ce0c77fcb148fc8c6768356840ccf61543aea92f4d8de746c983562255abbdb901ec3ac72d5737f4c0e9e938a338f5327c8c71840cfbabd4efd4e6ec463d1625 SHA512 9dea443db1c4f04845fbb527c3895e40e9a1f20c7128c752ed4f78672c40437062496d5e55031ca205ae983d196b3e7d24948bfaa9acf31d8d619bbbc1a42be4
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
deleted file mode 100644
index 0582ecd020a3..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/501370
-http://bugzilla.xfce.org/show_bug.cgi?id=10679
-
---- a/scripts/xflock4
-+++ b/scripts/xflock4
-@@ -35,7 +35,8 @@
- # else run another access locking utility, if installed
- for lock_cmd in \
-   "xlock -mode blank" \
--  "slock"
-+  "slock" \
-+  "alock -bg blank -auth pam"
-   do
-     set -- $lock_cmd
-     if command -v -- $1 >/dev/null 2>&1; then
diff --git a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
deleted file mode 100644
index 81dfb2da9544..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls policykit +xscreensaver"
-
-DEPEND=">=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libSM
-	x11-libs/libwnck:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/libxfce4ui-4.15.1:=
-	>=xfce-base/xfconf-4.12:=
-	policykit? ( >=sys-auth/polkit-0.102 )"
-RDEPEND="${DEPEND}
-	x11-apps/iceauth
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	xscreensaver? ( || (
-		xfce-extra/xfce4-screensaver
-		>=x11-misc/xscreensaver-5.26
-		>=x11-misc/xlockmore-5.43
-		x11-misc/slock
-		x11-misc/alock[pam]
-	) )"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-# TODO: this patch needs updating for the new version, and finding
-# upstream bug.
-#	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		ICEAUTH="${EPREFIX}"/usr/bin/iceauth
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	local sessiondir=/etc/X11/Sessions
-	echo startxfce4 > "${T}"/Xfce4 || die
-	exeinto ${sessiondir}
-	doexe "${T}"/Xfce4
-	dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild
deleted file mode 100644
index 62d5619295d1..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-session/start
-	https://gitlab.xfce.org/xfce/xfce4-session
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls policykit +xscreensaver"
-
-DEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libSM
-	x11-libs/libwnck:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/libxfce4ui-4.15.1:=
-	>=xfce-base/xfconf-4.12:=
-	policykit? ( >=sys-auth/polkit-0.102 )
-"
-RDEPEND="
-	${DEPEND}
-	x11-apps/iceauth
-	x11-apps/xrdb
-	nls? ( x11-misc/xdg-user-dirs )
-	xscreensaver? (
-		|| (
-			xfce-extra/xfce4-screensaver
-			>=x11-misc/xscreensaver-5.26
-			x11-misc/light-locker
-		)
-	)
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable policykit polkit)
-		--with-xsession-prefix="${EPREFIX}"/usr
-		ICEAUTH="${EPREFIX}"/usr/bin/iceauth
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	exeinto /etc/X11/Sessions
-	newexe - Xfce4 <<-EOF
-		startxfce4
-	EOF
-	dosym Xfce4 /etc/X11/Sessions/Xfce
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
index 913fb50e9993..2522c6b76a1e 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls policykit +xscreensaver"
 
 DEPEND="
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 399b015713d5..0858fd57868d 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,11 +1,5 @@
-DIST xfce4-settings-4.16.5.tar.bz2 1498988 BLAKE2B e76a12f4d8f1a31d12beb7227ee0d4b25b3de063499e154a9854627199ba00a34a37cef72696883d20bdab620d00a402a9963aef569290f1bec06fdcc24d0c60 SHA512 1334875d8ae02a63312a3973f310138640b1a1ee80ad6665ee0f45d544092ef556b89259da613c53ab51219c9ac97fee860292133716da136792cdfd3d646e4e
-DIST xfce4-settings-4.17.3.tar.bz2 1517554 BLAKE2B 75bb0a11ea06e38b69c60eba67d7f9eb6ff1dd835eaab04564ed53987ec5926fc671ec715ee76a96ffc52979bfbe38d35a30212b0e3a0d0d25091cc468aab78e SHA512 a932e73392e5b1d7b7aaabd8599348b8bf44cbbfa6deb54b3ee764e2e4b637c91437e33e366d5e1c333efac620f289822e9f45faf214ed5a2f53ad6a7ad59654
-DIST xfce4-settings-4.18.0.tar.bz2 1517874 BLAKE2B d95f3aa53ec669e9c7d0ec24ae066d9af0002fa3606d565da6ee65e527d74fc161025968ef182cbfa8e1675dac240fb34c6b9f2ba437949e460623577a3e1caa SHA512 647c1ca0bad891ad9be910b7ed25e1064e18e3b870ddf25673caf835d6c00bc6724ddec9fb129679c18f0abc1a72966c9dfecae4e16f955f50c72cf08e03595e
 DIST xfce4-settings-4.18.1.tar.bz2 1513041 BLAKE2B 83b47dbe138bd809391833a4525d01b2171dd77ad5826e90f95a181deb39350683b864242ed8708caaaefe19aac748e96ac270fa71ef25a96cdabc5311c2e639 SHA512 868d9d041c7aee621543ea54798f9758dc47719a7684d01ebb55e0193c30a0ac544df6a4961846e4b8c6d9297737be767d6f68446c4ab85870d8c0741cd07515
 DIST xfce4-settings-4.18.2.tar.bz2 1544572 BLAKE2B 8dee6855c98426aace796c7c6fe55770ca2c4c8e0c5129fd70274a0fe6589dd797eb078d79f7fd490c39cd4e1ec1dd90439c4cc030e7594aeb27c84e6e541fa2 SHA512 3371db3952f1863763b613952585873a0b8e1bd8507a64c056a918f3d16c3313e1266cb65dc341d3ce89ab281ee5a5d2cd183b6bb4078609b843524a125769b4
-EBUILD xfce4-settings-4.16.5.ebuild 1761 BLAKE2B 70022b27ddf95652b89e0fac59547ce8e1c77fb53b2a470645938ffaf3d55de57aa0b3fd8371553558faffc93b3ed485be7e20aeea74fcd599c3822f57f0fe37 SHA512 d1a8117fe70dd793cf9780e767a7633a8f18923a9df622848814650a9559a87b2bbd317f0acc54b17f6db70d4096b6d0cfa7d34db861e1434c86e2be74ed51c4
-EBUILD xfce4-settings-4.17.3.ebuild 1816 BLAKE2B b9749632f84e4184516f8530c6e41e0cc239b704ffec9fd23cc849f3528607d82c179460a01a408f428cb84bc90aab232d0462b790c455f70434b99d70c5effc SHA512 53def1ec0d3d9ffae0ec7f7308be93be7a8df4096594b780ff5d8f33eda8bd860de7aa44acd70186bcae8452c6bf0c81e00eef5755ce0f697458fe3c05389bf7
-EBUILD xfce4-settings-4.18.0.ebuild 1820 BLAKE2B 761df5405092625aba448eb7bb45d90c73ed61b174559c55efdfd4a561f9db2429fc963e52f9613bb1671f5d446655b66d70949a82932d065c58dc43c48a9bdd SHA512 dfd3ae579e17be8490fc1ac6c8d6fcbf110e012525b87bf30ab31ea1e69ea5ad9b38b3312523a7bd213dd6a5864ee90a136b9522d27e10f6c9b81d5894c479fe
-EBUILD xfce4-settings-4.18.1.ebuild 1815 BLAKE2B 10785c53a43fa86bae2af37012cfa392e729e73262beacaf0956b604eac74f10b9f0cca111a2ad9e010c9f8f897405b98dd2b8206dcf71cef45530a8269b4e49 SHA512 ccdfbb76b7ad345ac0407777f07faf292dc13eae7047c19cae1e00fa73f8f09a10830154f05655560782f7723bc2fbde40b1f91277889064dde629d4af91990f
+EBUILD xfce4-settings-4.18.1.ebuild 1814 BLAKE2B b7a30fea90f89d256f8511926102bd1cb91ca17a9d79fe061ec0314b41cc8e99adbb93eb0e8f67e90bf03de954fcb19471983e1dfc95d45a3e7b16607519ec93 SHA512 785ba75fc52c310aca81a1dfcbf6abb87867b8e4643ce6976b75bfd41f3d36b51bea77d64a0d30ad567c2ade075efba5e6ab12736c00b8d9e1adcebb02529ce7
 EBUILD xfce4-settings-4.18.2.ebuild 1820 BLAKE2B 761df5405092625aba448eb7bb45d90c73ed61b174559c55efdfd4a561f9db2429fc963e52f9613bb1671f5d446655b66d70949a82932d065c58dc43c48a9bdd SHA512 dfd3ae579e17be8490fc1ac6c8d6fcbf110e012525b87bf30ab31ea1e69ea5ad9b38b3312523a7bd213dd6a5864ee90a136b9522d27e10f6c9b81d5894c479fe
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.16.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.16.5.ebuild
deleted file mode 100644
index 66ee608dd407..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.16.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-settings/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.50
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/exo-4.15.1:=
-	>=xfce-base/libxfce4ui-4.15.1:=
-	>=xfce-base/libxfce4util-4.15.2:=
-	>=xfce-base/xfconf-4.13:=
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )
-	!<xfce-base/exo-4.15.1
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.17.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.17.3.ebuild
deleted file mode 100644
index 231c06907672..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.17.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-settings/start
-	https://gitlab.xfce.org/xfce/xfce4-settings/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.50
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/exo-4.15.1:=
-	>=xfce-base/libxfce4ui-4.17.0:=
-	>=xfce-base/libxfce4util-4.17.2:=
-	>=xfce-base/xfconf-4.13:=
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )
-	!<xfce-base/exo-4.15.1
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.0.ebuild
deleted file mode 100644
index 5ac63306b8df..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfce4-settings/start
-	https://gitlab.xfce.org/xfce/xfce4-settings/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.66.0
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.24.0:3
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/garcon-0.2:=
-	>=xfce-base/exo-4.15.1:=
-	>=xfce-base/libxfce4ui-4.17.0:=
-	>=xfce-base/libxfce4util-4.17.2:=
-	>=xfce-base/xfconf-4.13:=
-	colord? ( x11-misc/colord:= )
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	input_devices_libinput? ( x11-drivers/xf86-input-libinput )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	upower? ( >=sys-power/upower-0.9.23 )
-	xklavier? ( >=x11-libs/libxklavier-5 )
-	!<xfce-base/exo-4.15.1
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable upower upower-glib)
-		$(use_enable input_devices_libinput xorg-libinput)
-		$(use_enable libnotify)
-		$(use_enable colord)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-	)
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
index 6079c79bf373..208e1b52bfa7 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.18.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 2084eb5b1f53..45b190a6e210 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,7 +1,3 @@
-DIST xfconf-4.16.0.tar.bz2 634858 BLAKE2B 34a03e457934310d4750b0811ff3b6fbde0c786656c9cc1bb2dd733e0104c2ab3ff1834fefcea31a6711931406b8ab507a528596b598e92c401defb8e6d7715e SHA512 d2e6b272243d6eda71f42cb3df18cb9c0745a1864718639e9aa494902dfe5b4989b2761fee2195456e5725cad0f744978f9c95c6f01e48aa016a919ce3468344
-DIST xfconf-4.17.2.tar.bz2 625124 BLAKE2B 173f50ab3b0ded6b62bb421006588be662428928174786850591594b7d012ff432945643f514f00195919bc8f5b36e4d2524c27984378e8850580d518a1f4b05 SHA512 2861d58a2007c44745cef7829a6eaf689b72142dcfa25c0a7cebf984ed599e2cb238589ef682da1d7b9fdb99cc0c250a26a68a46553c53e303ac546850f14486
 DIST xfconf-4.18.0.tar.bz2 625755 BLAKE2B dac7ccd7052818436f45e6c257cc6076221d9f5d7c2d836d909be0d9479abd88f6c17748cf0aa65be79a0642c7bb7ebb01b6cd5a22bb22d514fc3ed57be5d4af SHA512 49ac3070e44e0c699c157e6c029bf14d932bc1e60b01bc3b4f7451acf403d451ac52e2dfb14fc97298cc774c7a0895616788cdbfc189976805669fcdb7aa47b6
-EBUILD xfconf-4.16.0.ebuild 1777 BLAKE2B 8e67eafffe8f5d85accd4973385a8ed234e7d363f89cbaed42bc3df5df233f422f2226396f2cb6d80d93f52775ba616362eb79d7484735aea60971ba9b803bb5 SHA512 9d11ecdca867cc4b9c1f16bd382eedec0ca1c5209040a7e3771ef77f56f407fcf2fb363b5f3e171cee856020fd47fb8df476c1aea74b8d482a0536e27befe38b
-EBUILD xfconf-4.17.2.ebuild 1722 BLAKE2B 0e519d0736a5f1e0993b341260cfca7c98c8c12d3b912e7d5f76d3acf03aa3d7b983a1a2a0de221adb37bc63aa1717686b8786f7df6caed5cb9b67f064ad9a7a SHA512 620b12741a74915f4921e6824066f1bd5dde191691c60a5e75ff7053564c8d16910e47b1e7baa23ada45731cf0262c9f115ef9ca3343f3ea95b97511c8c26ef6
-EBUILD xfconf-4.18.0.ebuild 1719 BLAKE2B 36ecfce39f3dee798c843c815b058b921d7974ef14eb863a770be7d452ceb473de8198098ed051a0f8e1aa6b4a7a5fef309782dd7d62693f68824050881a2a42 SHA512 cd11ae6769e8c476f5b9006ea7cac034d3e6faf84b0d9eb8b106361b5b3fbe07c271b98ad2d0602cae6254db868ff51ab96e9ffa807da3102aadcd57cdaddcff
+EBUILD xfconf-4.18.0.ebuild 1718 BLAKE2B 828824afad75a647bccb28c0f56ecdba14624a57351760fa2f89199fc7a2a3bacb8de763f284487b386e0263bfe633b96b5bf1d2c805c369366ad3d14ba8f69f SHA512 996886a10f4a2ae194385a7c2ec0319a76df80798100c1ac9d921b2b73f46ff23456ec36d3ab3b6de303d185d73072708fc71c85f4a4a9082272add50164163b
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfconf/xfconf-4.16.0.ebuild b/xfce-base/xfconf/xfconf-4.16.0.ebuild
deleted file mode 100644
index f5b6e68dadca..000000000000
--- a/xfce-base/xfconf/xfconf-4.16.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 vala
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND=">=dev-libs/glib-2.50
-	sys-apps/dbus
-	>=xfce-base/libxfce4util-4.14:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	!<xfce-base/xfce4-panel-4.13.1
-	!<xfce-base/xfce4-settings-4.13.1"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-		$(use_enable debug checks)
-		--with-bash-completion-dir="$(get_bashcompdir)"
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local service_dir=${HOME}/.local/share/dbus-1/services
-	mkdir -p "${service_dir}" || die
-	cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
-		[D-BUS Service]
-		Name=org.xfce.Xfconf
-		Exec=${S}/xfconfd/xfconfd
-	EOF
-
-	(
-		# start isolated dbus session bus
-		dbus_data=$(dbus-launch --sh-syntax) || exit
-		eval "${dbus_data}"
-
-		# -j>1 often hangs
-		# https://gitlab.xfce.org/xfce/xfconf/-/issues/13
-		nonfatal emake -j1 check
-		ret=${?}
-
-		kill "${DBUS_SESSION_BUS_PID}"
-		exit "${ret}"
-	) || die
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-}
diff --git a/xfce-base/xfconf/xfconf-4.17.2.ebuild b/xfce-base/xfconf/xfconf-4.17.2.ebuild
deleted file mode 100644
index b3a22f37317f..000000000000
--- a/xfce-base/xfconf/xfconf-4.17.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 vala
-
-DESCRIPTION="A configuration management system for Xfce"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfconf/start
-	https://gitlab.xfce.org/xfce/xfconf/
-"
-
-LICENSE="GPL-2+"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.50
-	sys-apps/dbus
-	>=xfce-base/libxfce4util-4.17.3:=
-	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable vala)
-		$(use_enable debug checks)
-		--with-bash-completion-dir="$(get_bashcompdir)"
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local service_dir=${HOME}/.local/share/dbus-1/services
-	mkdir -p "${service_dir}" || die
-	cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
-		[D-BUS Service]
-		Name=org.xfce.Xfconf
-		Exec=${S}/xfconfd/xfconfd
-	EOF
-
-	(
-		# start isolated dbus session bus
-		dbus_data=$(dbus-launch --sh-syntax) || exit
-		eval "${dbus_data}"
-
-		# -j>1 often hangs
-		# https://gitlab.xfce.org/xfce/xfconf/-/issues/13
-		nonfatal emake -j1 check
-		ret=${?}
-
-		kill "${DBUS_SESSION_BUS_PID}"
-		exit "${ret}"
-	) || die
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-}
diff --git a/xfce-base/xfconf/xfconf-4.18.0.ebuild b/xfce-base/xfconf/xfconf-4.18.0.ebuild
index ec950b6e3dc1..2d89a4cb507f 100644
--- a/xfce-base/xfconf/xfconf-4.18.0.ebuild
+++ b/xfce-base/xfconf/xfconf-4.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 7a7784a01afd..f77a16804afa 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,9 +1,5 @@
-DIST xfdesktop-4.16.1.tar.bz2 1942859 BLAKE2B fa4dad67396e794426d619aa71c490a6a92cdd19c26519831062803c15185238115b731490b848626a82e1f800059acd9f49893ae79dbeb479d665acb9007209 SHA512 87e90c2946c80befc38bf724fff6a834d462c47439b727d172e766765d4e7e200a2415c271459b2e820b6d8425f7e92c928ba9a098e63473acf0e7369c122cfb
-DIST xfdesktop-4.18.0.tar.bz2 2136039 BLAKE2B 9bfc3726b8a5f1deb7c0b6ebe50e8e8484d76cb9e1ae7252f9d60c0d5df1cad9d2e34aeaeedacefd4ce99cd94bc87072a1acf580d0a5e2a6ac21b89b7734b921 SHA512 80ba639b5bbf3a7d14ec3e956f7ed70692de0bd0b0a4578fecde91dee825a11046b2972668f331185b4dca0c50721847f5e39f9592e5a24ecbc47733ce0b2a2c
 DIST xfdesktop-4.18.1.tar.bz2 2133258 BLAKE2B 3d4f54b64a6adc5f52bf6b48862b1fbf9b9608113035fdce89a2cb08a674f773f42edc0e1d05a27e89de7df71f7d53f400b794a2a79888cf51570c3ab060db8b SHA512 cafb1e274bbabf1704a6452532fc79657af26eaf92a58374f87a70f31c35fbf213319c6658b3d18bfca2d555b69e07e46949407d1f80e5a37f48e76bbde9dc3e
 DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb884081c95e662350c9e0c05aa9812a4f44e8911c5bb74e026aa1fea22840245a68e1514dd6e439af8dd553c82da562c SHA512 dd8d479b7a43733dc49f692bd88ad5a290d5fa4cdbddf42be293921c750d3017e9c6671cc56ba8888a0df8d3951b0993dffa88418032ad7c68f85d8756081e40
-EBUILD xfdesktop-4.16.1.ebuild 1177 BLAKE2B d4d5846b53a75b05f07e762e2e8f1f05517c873443de32f529f95dd5c7768748019fb26f19bec1c32510b45e00af1966df660925eca6ad4e2af21808466bb75f SHA512 c5e7d0e6c532aaa980f3477a2e6a7e7e2f2e69c0c76d088905a37b9303c251cc44597a7339f472321edcef54f8b001e6eb377b2b333defde76f65d8a7d614ae8
-EBUILD xfdesktop-4.18.0.ebuild 1248 BLAKE2B 81a722121173ba40b2da39129eaa9dafb48d0e3674dbdd1d7f90f2f41ab55e5189a586098373ae26242c10f2337dca42bd3385a681582b9f836bcff36266aebb SHA512 1a059a651021f931b9c4ba423113efa7cea3951e85f7453f9f71dc58260fb909076af812b72abbd34bcd3b28cac2c8592a4c3854dd761841b9289bbc01bb5222
-EBUILD xfdesktop-4.18.1.ebuild 1243 BLAKE2B ea6edd2e7a50c634d669f22ac2c024b9fea6f2f72f4786036fb266136f67522ca8372d8106da1e1343d5faecdc78db3f049d4e90959fb2f0113fbdc587138cea SHA512 23dd5491097411929773e7033c4365005a7f5d1f25648b593e653602d72253191ffdb4d3db26767afe9199007d24e2fefa73f43e526bd5647d4b3ae72421e875
+EBUILD xfdesktop-4.18.1.ebuild 1242 BLAKE2B 8160dfbb42338caaab80f1abe5fc9b586148e30a810cb42d824dc8e108c0593d1eb970799a76bc4708c96df0a2b17b5fe9dff85cba0269a59df245e4e007385f SHA512 e4622751c66d235bf0f6009744f7a16588bbf8e466e5b10ab77884377076a9c6f15cc535a3ad014e12e11206f7d1f98b6d6072f5a85b165d37c831ac8044ca09
 EBUILD xfdesktop-4.19.0.ebuild 1378 BLAKE2B 70bc59dec410fbb97171a861a63b3a8641dc7d62c2d73ecdb4ac004e217673f53e8e24fff5b94d88d4112006bec8c23353a7cd18483584059b0dfe14a8e1d5fa SHA512 d0c11f2a9d66f847265364a6a6e974bea73b0b5c06fc6cc964263fdfc23c5ba46dbced41f850a79e53690e31c2ee5135cd1698884c94cb0c7c98b410dab1deba
 MISC metadata.xml 365 BLAKE2B 3cd0b2d7af4ed8e4fd437c2943ca6324fe0b3ba74f92ef24adf0d2891cd650ca7007827b55d4a0d2ce9684219c417933055db293aa79c8834ca1cefe2a9bcccb SHA512 90ca4f491f2281bdee066d39066cc99e738a7fba87fc4d7ea435462ca7f7dd7bf451f4f6658b0f5d46690058de94ad98c2c6074baa94398d6d26d2950decd574
diff --git a/xfce-base/xfdesktop/xfdesktop-4.16.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.16.1.ebuild
deleted file mode 100644
index 46e47c1b6164..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.16.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-DEPEND="
-	>=x11-libs/cairo-1.12
-	>=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.14:3
-	x11-libs/libX11
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-1.7:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.18.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.18.0.ebuild
deleted file mode 100644
index f022f029c5f6..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.18.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfdesktop/start
-	https://gitlab.xfce.org/xfce/xfdesktop/
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="libnotify +thunar"
-
-DEPEND="
-	>=x11-libs/cairo-1.16
-	>=dev-libs/glib-2.66.0
-	>=x11-libs/gtk+-3.24.0:3
-	>=x11-libs/libwnck-3.14:3
-	x11-libs/libX11
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-4.17.10:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
index 6667d92e19ad..3ca4df53e09f 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="libnotify +thunar"
 
 DEPEND="
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 8058142309ec..cbc8dec9a42b 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,8 +1,3 @@
-AUX xfwm4-4.16.1-gtk_frame_extents.patch 1787 BLAKE2B 17863b299e58f4e9443084997af55f197cd40101b4d3e109a3cd6da5843b23791a448d1efb99a3995ccdd53e5123bb901509e89b6480a0e6aa97fa404046b565 SHA512 2ec542092ee86047280b4d5c46f09aad71434828bd9af2f8940a9ab208c861377ba619da0fdff4ac0f8e69fb17759c7b886732db7406a738e00b6323c25e1ea5
-DIST xfwm4-4.16.1.tar.bz2 1201722 BLAKE2B 4aae9b97095b423964a2ece7fe09b46ecfcea6688af6ab3b38ee34611cd68a7427597cb963b91b209d161c85aed552df15d005268bd8585d365b0cf63adf36b3 SHA512 f0d5d00e58202457d0d7d5f9772e7b2aa3f3339850065609baab7d379248a628d147464cc605698970134b87d58b7867b8c09d0a3a45ab84b2f3aa95be26f0b9
-DIST xfwm4-4.17.2.tar.bz2 1220699 BLAKE2B 4bc011f17ee7fb662e4bb0c656056c45bfb2a07c4964cf9e7791fde35f5b2a072ed7ad8066305228c2af061caee8bf44488ffec0f98a0aba95d3d95fd30123d3 SHA512 2b0c45a5960fca4168431d8efdcaa6d6f22ad26949e40cbe54fb4895f185bb1180386ee61447a0255b3b723657a89b38e6f704d44490ab466be8631fd5494f62
 DIST xfwm4-4.18.0.tar.bz2 1220901 BLAKE2B 3a3db6368063b94fa46407fbf2173021a91efff04ed3d11c757d3e785de5e70289ae03e138e95979b3801a781c05d5f84b86b29727171796e1b80f874865bb36 SHA512 1003bb1ca5254221a5d56ffcb51c12cdef1b17b9d252622c6b18f3d3fbcf9d6e0e66b5f61e0f6eae6601ea3e50a70be98320e60d6738b04e44879e6f4e6da34d
-EBUILD xfwm4-4.16.1-r1.ebuild 1710 BLAKE2B ab3b17a6e1e5b4ce63b4f88de63be547b6846d98fddfe42e699becf94da853d062f1c0f6e98e19aacd651c1315a26f8fc62740f736dc613a9ba4397cf0b0be30 SHA512 49c7772e05611ce483653a1708c6a2420806e0c6c47ad7f9e71d96ded4f9534db62791c7c7861d9d0dae97e0cdf9f55454f0121b42d21630351c9df59765e9fc
-EBUILD xfwm4-4.17.2.ebuild 1548 BLAKE2B 06931b5759a4d5823874144871f6af978f7adb350ac7069badffd2c591b9eb63fa17bdaf6e8f7830f60c77b2c37f32c18600f25cdc23bfc6f4d4ddd4dc90df9d SHA512 1cc9db2172711cc333812a180f22b4a8415b04bb42d0df60b33c7694a91571bff1a75f89712c8d8f8dcf0c3f860bcb7207237c1d73528312d611414dc1a4e8ad
-EBUILD xfwm4-4.18.0.ebuild 1538 BLAKE2B a4f6262c74be8f0bfdc9337fd5df51e517675c51e416eb3c269fb5f5c8302a8d3b0f17e1dd13a79660df71c55fe0266fa3c427ae4617af2ad84bf41f68878bb6 SHA512 091e08a997dc44b9b8658d8d269b92249346b32b77f22f246afe69217c02395d4625c9bb8f4e13b80ad5e57b4f862b7715f7ab674d221cc4d590212f7ff466eb
+EBUILD xfwm4-4.18.0.ebuild 1537 BLAKE2B 5fbe9e0e2b5433d8d763173169570d2835d9089bc540a92a7c75c80192afa574e41bff327de40e032122cad4c78cd023f33a7f4a46e6a2e86557d609fc019127 SHA512 04bed54a20551aa822d23473e56aa4d8d5ca271b681cf4600baa428b6b7305ab8586ca07cb1530673c22501abc7138db386c5e675c6fe122b9f11d9f685bae77
 MISC metadata.xml 337 BLAKE2B e51dd05bbb1b2959c65a70a2d16fb8cf627045ab1abcae5838b013d7edb4d5bd5f79a70f3ae31ebd5c326c13ac2e48909621676af8b38e05df8e6f2e0e80e4fc SHA512 cd7a8c5cf84729ca130cee2f33b5358f8f7edd99ca321b7331f43a5e4e5016b2f664ba88230b7dbbddd2298b2ac846c144df87baa43b88426849d55a8f9a7dca
diff --git a/xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch b/xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch
deleted file mode 100644
index bb170d836b7f..000000000000
--- a/xfce-base/xfwm4/files/xfwm4-4.16.1-gtk_frame_extents.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 488288f6e35d5d3dc077e87fe2ed83129692f62e Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <fourdan@xfce.org>
-Date: Sun, 14 Nov 2021 11:00:55 +0100
-Subject: [PATCH] client: Handle removal of GTK_FRAME_EXTENTS
-
-Chromium and GOOGLE Chrome have now support for GTK_FRAME_EXTENTS.
-
-When maximizing a window, Chromium/Chrome simply removes the property
-on its toplevel rather than setting all values to 0.
-
-xfwm4 would simply ignore the property change because it could not read
-the values and therefore apply the old, wrong values.
-
-Fix xfwm4 to handle the property removal like an actual property change
-to 0.
-
-Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
-Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/603
----
- src/client.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/client.c b/src/client.c
-index 4e6affcfd..310cf90aa 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -4200,6 +4200,7 @@ clientGetGtkFrameExtents (Client * c)
-     DisplayInfo *display_info;
-     gboolean value_changed = FALSE;
-     gulong *extents;
-+    unsigned long old_value;
-     int nitems;
-     int i;
- 
-@@ -4209,6 +4210,8 @@ clientGetGtkFrameExtents (Client * c)
-     screen_info = c->screen_info;
-     display_info = screen_info->display_info;
-     extents = NULL;
-+
-+    old_value = FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS);
-     FLAG_UNSET (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS);
- 
-     if (getCardinalList (display_info, c->window, GTK_FRAME_EXTENTS, &extents, &nitems))
-@@ -4232,6 +4235,9 @@ clientGetGtkFrameExtents (Client * c)
-         XFree (extents);
-     }
- 
-+    /* Adding or removing the property also counts as a change */
-+    value_changed |= (old_value ^ FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS));
-+
-     return value_changed;
- }
- 
--- 
-2.32.0
-
diff --git a/xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild
deleted file mode 100644
index c39278ede9c4..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.16.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXres
-	x11-libs/pango
-	>=x11-libs/libwnck-3.14:3
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-	)
-	xpresent? ( x11-libs/libXpresent )"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	x11-libs/libICE
-	x11-libs/libSM"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gtk_frame_extents.patch" # bug 819771
-)
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		$(use_enable xcomposite compositor)
-		$(use_enable xpresent)
-		--enable-randr
-		--enable-render
-		--enable-xi2
-		--enable-xsync
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.17.2.ebuild b/xfce-base/xfwm4/xfwm4-4.17.2.ebuild
deleted file mode 100644
index b42e4331c03c..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.17.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/xfwm4/start
-	https://gitlab.xfce.org/xfce/xfwm4
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-DEPEND="
-	>=dev-libs/glib-2.20
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXres
-	x11-libs/pango
-	>=x11-libs/libwnck-3.14:3
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-	)
-	xpresent? ( x11-libs/libXpresent )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		$(use_enable xcomposite compositor)
-		$(use_enable xpresent)
-		--enable-randr
-		--enable-render
-		--enable-xi2
-		--enable-xsync
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.18.0.ebuild b/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
index 6b4bd671f283..e4ebfc6488ee 100644
--- a/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 DEPEND="
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index c4e1a27aebd5..c5048692f891 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-cpufreq-plugin/Manifest b/xfce-extra/xfce4-cpufreq-plugin/Manifest
index 885e10a9b135..315f69bc7287 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/Manifest
+++ b/xfce-extra/xfce4-cpufreq-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-cpufreq-plugin-1.2.7.tar.bz2 446055 BLAKE2B bedcf4ece6f1696a13144b0dd9d28a9dfdda255ed72f3b7aa7d572fd33b718a01850aaac90887b79ca57e4a7a9e4a6b234ac880e3a180a459e54c8377da3a9b9 SHA512 6bb7f5790d3ba9756afcb47cde40420453afe191fa111e390f2ad9780f3ab51ac2c6a69586303e9a5d1fb7d1af3eda3dad93f10df072f9ae59e47fc2216db434
 DIST xfce4-cpufreq-plugin-1.2.8.tar.bz2 431599 BLAKE2B f08d27b2461e3ac387dc139231a8febb6239fe8e5132ef89a6d4a8f9009fb7a3dd011ead97f27872fbb4857fc563e65fc2dd6e0f652d8d7299d3c9966d6f8b57 SHA512 482912920703b61ccba59b1a95a4153d06a7c897a59d7c2e5f84f6ea1cac17be2bade72d9187fc62279112f41cd2dd3f3157df31fae165eb2a104b74fec310da
-EBUILD xfce4-cpufreq-plugin-1.2.7.ebuild 842 BLAKE2B bbd2ed78612ae4532c362e240e859bb9e5c31f4673d259f6e48a23b372c2390333028245deb0b42cd539715342b4da9e620767a0e32a8c70ebf9c35f739e5143 SHA512 41341b7c379eb47511dfffbda052ab0786f391b4ea71b2dc6a81c7295ea43cac4b22e57758bcf95305d2cf1af1b18ec2f08d1c486f88bf551266d2d419a2a40c
-EBUILD xfce4-cpufreq-plugin-1.2.8.ebuild 906 BLAKE2B 95802e2ddee479479dc7933eeeb53b22291dd8032724afed745796af06c16beafcd40a9f03237f0256e0809c963f35cbc052ee7479d82b3226f799ee5d05f862 SHA512 1965376d862e537f91c389f5b2dc48d711a30fc57a69e906c9c36a0fd10998124a06e9b4a5ae0cfb754902a9176b781a7497e9031f826b20870965e341311890
+EBUILD xfce4-cpufreq-plugin-1.2.8.ebuild 905 BLAKE2B c538badb0b72a5ec7b8f367a5ceadea682e76ee7cb6c0c239a42b48532352e86e387e76d24fbbc91abbfa18876c2eed781ccb10621b19dcf7fcc4aa00dbbff2c SHA512 41c0979838def15ed62a91393767ad3e86316ae84177ed65dcaacc6ef369b48b2d76b212fc96bec505598b4536e95cd49d57f1a32f4c4c76a6cbceef61e2d994
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.7.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.7.ebuild
deleted file mode 100644
index a48cf1cb5898..000000000000
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A panel plugin for showing information about cpufreq settings"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-
-RDEPEND=">=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.14:=
-	>=xfce-base/libxfce4util-4.14:=
-	>=xfce-base/xfce4-panel-4.14:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
index 39418feaf276..88ac173ea811 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.20
diff --git a/xfce-extra/xfce4-cpugraph-plugin/Manifest b/xfce-extra/xfce4-cpugraph-plugin/Manifest
index d6e0728afb14..331109deb9e4 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/Manifest
+++ b/xfce-extra/xfce4-cpugraph-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-cpugraph-plugin-1.2.6.tar.bz2 458058 BLAKE2B 4cd7c9734a52b39d0606f25d5ae559230819e5672b6fe8fb4f19ed5afcf9a446790fe38753ef294ae99767bf06ae9ae08ebd85d66a83dcfb675d945ae2771d00 SHA512 6205a0a7616b0dc5de3cdeb79a5148ee775b426a16b52c491129f74104ab224ec3b29b042a3c8ee05b77cc8775c83d75a8312b96a71504cde50dc257e8354857
 DIST xfce4-cpugraph-plugin-1.2.7.tar.bz2 438674 BLAKE2B d4ca7c850410aeaad7d5eb0156c4feea4a01a0be0d77a62c0165ead9158d2c7e41220ca8ca38e82db69600991f5578f85c1793d1bc94954e9f9cb85cb147316a SHA512 a89f5d9f986717a78a2cbd31db378c1b220cabfc83bf1c85f2533ecccd17b4ed70a3de9321f2e06fcbca2b77d3b02e5a8541e2adf936567a426e1d7221faaa3b
-EBUILD xfce4-cpugraph-plugin-1.2.6.ebuild 855 BLAKE2B 90b3e7f676a101b3708f65e9f83a044360fb222cf8685875cc5a6555557b67c1132a5fe2c19a0568ba0ed208e0a341f7654ec88cefa22e5e81b04aa8f830d97b SHA512 84b5529933e2fb5a2c6a4dd5cdf13a404f09e7dc098e55e504f3d3db61c3056de782ee30079e5b377d4befedfaf7cb1c4d7c8282e46c9f4b9e2b7df3fc422923
-EBUILD xfce4-cpugraph-plugin-1.2.7.ebuild 932 BLAKE2B 6292d103b7142ba3325cfdad6316fbc3bf01bcfb49a1bf0a457dbedf218b1ae8cf8810bbab26acb0ff31a99acc06e7adea9405b82d1c0f11e2b394776e20e774 SHA512 8e5bfa31fe164d637a7c7d8c89213a29e87133fccbe93bab6889a646c7bf63014399329e6eba08f94286f13e4a1ce3a2b1536fe33bf08aa26c6fb08d81d2a59b
+EBUILD xfce4-cpugraph-plugin-1.2.7.ebuild 931 BLAKE2B 694613942840d2021bf8d6076b6f92dd188009ab113b2987f3f226e0b102d81bfa881e92997e3f5b446734ca33c81c4b0aa8f32ad880d9485b5142e58ebc81e7 SHA512 075b844e168df2bd785e46985741eb04d8a836429187c43194a9fc67e003da54a5376ccbb02e425d810f877bcf0b0310128b5bd95f1a8badfad6d3805f066da8
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.6.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.6.ebuild
deleted file mode 100644
index d8d88e748ae0..000000000000
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A system load plug-in for the Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.14:=
-	>=xfce-base/libxfce4util-4.14:=
-	>=xfce-base/xfce4-panel-4.14:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
index d14d3767c5ac..eb4cc5e6675f 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=x11-libs/gtk+-3.22:3
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index 41d6e16295fa..349de559eec5 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-sensors-plugin-1.4.3.tar.bz2 508993 BLAKE2B 4e857c2b31b6dc1d9e1f5adeb0b34c1f68c0e3386c7211533c5ffdfddddfc307fd16b0a55b6f8697aab87c62e143f3e8795c1a7ba36c3cfd18e92b56e316c7f0 SHA512 2cb91afaf740db5bbbb8451cfa0540ee979671e6a1a640ad61dfeb41328c057bc16fa668e9d536595ef460bfbd41617e8b3d27f63e02324e9764543fa6a0b2b5
 DIST xfce4-sensors-plugin-1.4.4.tar.bz2 472187 BLAKE2B ab59dea6dd2252c23ee7a74567c16ab040152bbe0012349078d306dcad2c699d6e55b32f7d084c6cdf26f51ff324bcac817ea6f01e3957c74cd7799bddd0a147 SHA512 45a5df383cc950f05f33d3d658b4847890e4136d6c72708a4218f1460a27d44a07a3f726d6c509bc706b963041a5dab3259dd94127636fb196d47ab9a0d6f702
-EBUILD xfce4-sensors-plugin-1.4.3.ebuild 1520 BLAKE2B 2161c5fe4f7c8980be116be529c77d144cce0575c48cb3e1d0f42b8429ecc3181013310e6a65578df33b8836c4dc5d0358016295c92afeddf030cc1fa1987524 SHA512 5f5ff024ac8cb53c99d51decc5a6832ede2cad93a985a6a12358f74e92e06c12a0dd3e4c2396879a7b6527b4371c2553583c79533f8f72e94e9882c07ed1d8f7
-EBUILD xfce4-sensors-plugin-1.4.4.ebuild 1586 BLAKE2B 674f2f8c3e5c1352a7e036953d4c8cde2d1556b3fffee11b8d8a9ebe3962bb95c93263dd2a1dce2201e1f9922f2e2ced8ede22a83c8d1b7d1584d70c5974c12c SHA512 60da215d4140606d248d6c7b333cc52c18711eef8010792f2f08121f7a5a3ed5bc7a72a186f31c7485d0952883a3e9fc9b5124eca6009f9cde05a7de04f8d8d8
+EBUILD xfce4-sensors-plugin-1.4.4.ebuild 1585 BLAKE2B 4260702d0e4f03ceaeffd6d8c9ed78fcc527fa3c3c0986549e84e641f02c75fade81ed2a865193bb6d61b21e8bc7efa13380a6c9eb292d61ee653a927f3a38d0 SHA512 7612b53fea4e9f216425e521df2e41e8c9545332bf544643526d3399e17b43a4c60a155a3a0eab115fa24e6edcb1c0d4bfc44d4affc2383d289eb031d3c8ed03
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.3.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.3.ebuild
deleted file mode 100644
index 6cdc789eba9c..000000000000
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A panel plug-in for acpi, lm-sensors and hddtemp sensors"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
-IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
-
-REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
-
-RDEPEND=">=x11-libs/gtk+-3.20:3=
-	>=xfce-base/libxfce4ui-4.14:=
-	>=xfce-base/libxfce4util-4.14:=
-	>=xfce-base/xfce4-panel-4.12:=
-	hddtemp? (
-		app-admin/hddtemp
-		|| (
-			net-analyzer/openbsd-netcat
-			net-analyzer/netcat
-		)
-	)
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
-DEPEND=${RDEPEND}
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable lm-sensors libsensors)
-		$(use_enable hddtemp)
-		$(use_enable hddtemp netcat)
-		$(use_enable acpi procacpi)
-		$(use_enable acpi sysfsacpi)
-		$(use_enable video_cards_nvidia xnvctrl)
-		$(use_enable libnotify notification)
-		--disable-pathchecks
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild
index 90df5f270fc1..57dc1df10287 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
 REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
 
diff --git a/xfce-extra/xfce4-systemload-plugin/Manifest b/xfce-extra/xfce4-systemload-plugin/Manifest
index 0293849c80a7..b9fdee6a3626 100644
--- a/xfce-extra/xfce4-systemload-plugin/Manifest
+++ b/xfce-extra/xfce4-systemload-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-systemload-plugin-1.3.1.tar.bz2 417959 BLAKE2B c9255349cb4f20a8d8165fbf5a124dbffcb4ca3633c32ca7b2cbbebc4770a50a24909158cd3fcaad9f8bab4b756b98b5329b60a1fbbd0ac0be13251bb950d542 SHA512 2b2285c5960a5728dd7818f90605848e462fe5fef8643ff5be64b7087225399395ace5ec8013f6795d410b0acf79ec77c14e2ed0e56007cfe6f13133ba708876
 DIST xfce4-systemload-plugin-1.3.2.tar.bz2 409767 BLAKE2B 1213c007431318628f4f81026ccdbca2e5b9d34462d66354a1c37999aadc0ef9ed84246bc7f185fd633898364dc0440297dde18288f8beea1d5c7bf6663a6a04 SHA512 f432988f439e5fd7ada16b3e6eaa42b3351531ba3e2b63e2570387bf4d7e605ff9d5a97fde3f5f5eb323ff08aaf3c050f161a5768392b80aa99fabaabda82431
-EBUILD xfce4-systemload-plugin-1.3.1.ebuild 1024 BLAKE2B 083b795561b3a767a621129df90d2eb3faae1198ea46cb320469352acdb56ea2589d8a98992f1785b150d02c6ef752b1ea154697f6d00871d21a4d792da17266 SHA512 1c2ab2f8aa8f4783b4f42cdf845995b35ae6fd8c6d4cbb54941b04d1c359d351df29dc64e7f7b4accfabf6a9784487fbd208cbac6849e77cf06633f04b4bb6b9
-EBUILD xfce4-systemload-plugin-1.3.2.ebuild 1129 BLAKE2B 94e0ba3cfa803735682a551bca67c0610e757dfa7f7fb032a21fca7bcc7cbda0203b55d077e3983ad99719fd06c63b0561808f10cd46d5d505d569c663c7b496 SHA512 151f0b4363c458dbae2290afebff7b0b1401f9ee18d117a74f6d70f5bf39860e6f0b0171503c2a5ee3906b831d410e013c8f5cc665ceafea7852971a24c6a448
+EBUILD xfce4-systemload-plugin-1.3.2.ebuild 1128 BLAKE2B ebf318ed3e635b3799b4aeb29fd871571c299cf9e954c040361f6ca96d96387706af7a86c4adf1d570bebe0936ca651877fef64b54761b03b00127ec37b3da1f SHA512 392f8ef6e6eed027c7a886923ff9ea13fbcc18599d45cba943b1001ad9ef50014e08fa7dae7b69a9a14440a0d029b87fd6f4490ca669b9b101b446b512043b62
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.1.ebuild
deleted file mode 100644
index 68065ccd4f29..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="System load plug-in for Xfce panel"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="upower"
-
-RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.14:=
-	upower? ( >=sys-power/upower-0.9.23 )"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		# gtop is needed only as fallback when /proc is not available
-		--disable-libgtop
-		$(use_enable upower)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
index 923752849f8d..a118e82885ed 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="upower"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index c5162c3cd437..716ab75e08a6 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-windowck-plugin-0.5.0.tar.bz2 404966 BLAKE2B 0dd76bdc5688c834c5223f1457a9a7db2b47ddaf8fe6f02970fef44d3cfef1e14136d1b786c65132084a705b5ca12d3c34597c0371c5da9e6661ab04a05a61f8 SHA512 ea3da45460201c88c7b7cd0c18715a2dad63f9c95e96450a2d39217523b5bac8f5dc671d3d71d9c7ca309c5d9b78cf18ddabd955da510a57d3bb2aeeb91507f4
 DIST xfce4-windowck-plugin-0.5.1.tar.bz2 396115 BLAKE2B f7c9c4094cd482a61438345c57b59a9899fb7e15aec686c50f03793b6677ac4c0aa4c9d4cd8dedbb2d4f6fc4780b8dcb751bdb971b3003e981ef61d59a06c99e SHA512 cb5eb377b9c4cd118b923832ffa6bc4dc104fe74f9b1c6ed24a066c9f94c2787fa94782af394a75ed1f36300a7cfad9a2f9fafebdc7f1e7ebc34864ccb1a622c
-EBUILD xfce4-windowck-plugin-0.5.0.ebuild 994 BLAKE2B a58534f2a9fe0ac81db357ce13a4df1ab06dfdea5bff40d66c13c720dac32a58db684ba3ef42b8af9ba2e7d95f0d331a771b183773d4a7c6c5c570cda461ac9f SHA512 ea4f54e1fb52a71131942c1850d007c518b5ead52818b4f5856be536f2476ffa68c403a4c3870e591b3fc77cc1db46be50a80f176e89023504982dde7e3bacbf
 EBUILD xfce4-windowck-plugin-0.5.1.ebuild 852 BLAKE2B e6ddf2ea0b36b6920fd05277e5dea9b8fd74787f2fa77293f24df87c73cbb24301499d8491e23821acb0a7c2bd5a458b4f5f703441b2a80f78ef89a1934ad93a SHA512 555237c9e580215ceb7d1a858bbe445f9633b949815c2eaf64e3ab4f62f7817a2b90a0e6b7c6aa66ce26951f3f0f3aed42ff67da9cc43b73e739c7dc30c397d9
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.5.0.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.5.0.ebuild
deleted file mode 100644
index 858a3554cdeb..000000000000
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit python-any-r1 xdg-utils
-
-DESCRIPTION="Panel plugin to put the maximized window title and window buttons on the panel"
-HOMEPAGE="https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	x11-libs/gtk+:3
-	x11-libs/libwnck:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.14:=
-	>=xfce-base/libxfce4util-4.14:=
-	>=xfce-base/xfce4-panel-4.14:=
-	>=xfce-base/xfconf-4.14:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	python_fix_shebang themes/*/*/generator.py
-	default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}