gentoo auto-resync : 09:06:2023 - 21:49:23

author: V3n3RiX <venerix@koprulu.sector> 2023-06-09 21:49:23 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-06-09 21:49:23 +0100
commit: b8cc45d2d4557cadf73e3411149ffb57ebd8c09b (patch)
tree: 36e9e50b71907f13105d2d76cda896f2097f8201
parent: 60010a4cd6d7c12aaa62f00b5e8a158ed24efba6 (diff)
1309 files changed, 5299 insertions, 2966 deletions
diff --git a/Manifest b/Manifest
index a7ff6609fc0d..bc6ab7e70a82 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29266 BLAKE2B 7f69f1ca73fda5e383dd44a76828ad8783894cc509a2e7ae3b20ecd688f6867222b41c2561166f9d3a6c88b3b6d05f0495a213ff681230afe2d9116ef17fa8b4 SHA512 ff8148b413c20130ce1b1f87b5232b958e1a60fa7c9c8025bdd494eeaeb7ea66b4a51470da41179350df70af16729f4b55a4680665e9697fbf5209fb3834a601
-TIMESTAMP 2023-06-09T14:10:07Z
+MANIFEST Manifest.files.gz 29260 BLAKE2B 795d85057f58854a2b85b81c6eab347bd6c0a99d978c6f849c99590efbb861d5db951be893b124ce61ae37a892533b5a5ad6deedd70865633e7c653f7c426b55 SHA512 1598bc1848611c341d4dbf81625d900349e18b5f834b082ce0ab8aa5edad730ee71298537c83129e7ea65a4efd28ce96fa314d1190c79ca82ff613bebcdf8da9
+TIMESTAMP 2023-06-09T20:10:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSDMr9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSDhyNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCVwQ//fZqf8uymxmszQpr751fmilVxiQJOtxUl7sHVZlesgPXvfjw3lauc4W/H
-P702vpXkSCgrp1r9C00lbQc5qyMFMkrP7AEQvX0LlAs4jfKvRNSyL2Vhl/GaOLDK
-F/yXw+Vu5MPTUuVCRBDQz2nImCO5vO55p9eTF8++3x6AZ35lmv3oN1/2rl43mTzJ
-G9SHm8hE+ntVEktvvqyZkAc3rwYvC3OcwqoF0hE/1BTUGiFB2mONStr0MHBbqler
-X7cwhaBu0xnVuJe8eiCN0+yOmJmTVxbL7OrkhxZHMGzuo3FVq6v5IjKuHi1U0mm3
-qWyrE3eK5eGCCyTZLEQLJAdXvFjKSoL8S2PGAnogL+be6FsCwGqpI11Y1xy7hK/Y
-O5XiCKnrk6BaNYtJibqBLTUtTzRhLRRR4mb2QCp24ZPgxrZn5u9ZT6Og/bx2JUmN
-Wn1OhwOwsDyCeevXoOw2iaH3HLL80QNiYrjaNGdJnO04kqnT4578L6q8cpCZsfGq
-sVnhAY5AzKI/SPcmSv+zgJrQL55/U4pwPxeuqDRM5N8WshQb/rJ5AyozlmxJszxb
-mb50dVXXfWDBTmO/z+rrJHXmUdab2J4fVmSRPMyUzfWt8sv7ITRoggINBK7+qUXK
-AakD2DCwB/fgXNrI0wiOu5r2Hr9cj4xrivFvUSQTTLci1PHeL0M=
-=jh4i
+klAjwA/7BmANqjTh3XoNOBWS81BywgAQPER8t+eixpeM/bb/HwCRduiNb7PgxnUr
+6PlW8ijVAp6F9Rl4RA8f9ASp8JO9CkbGSbpI7NQhXZkRBz/6Ym3DxwYjvGk4qeHq
+rqSrDAkavB9NoQ00rfSPizxoTFkUmBVlsK8MRPufCFbn3HiYV5BYWAL67iPBKGmG
+YWyROSDKgYmDxjes05VEVU0LnMDXaqJj8uN43BzPgoGdWjXG9PeLuHuZU4iXtGc7
+CXBnm8+cMsNdcfNcX5iz2XczP3/9qPGxPzNHQ7y7DU7pTOZCY54Btl86q9HosZFF
+Wc/T/YWkYp1RCNmFUCChcjYagEmQzghx59+vs+1z4M7R+cSrmpU9qHGJOtWS1+dU
+wvZ0P3Lw3H1BYxycMX4Ryr/9RWAgm4Xu2M9ZO+8z29CbtLRYJkryotudFUqxzApU
+xOdX8QpkOyXQMWQuymz9m13U4FPYQcu0NdqxP954oJUl6xzLs/+wKDuzhSdBYwPH
++2oeTBac/RfxtL6FG+G9ZxwHqn7QKTu10RP7pdPIfoWASbFaztqKuR7s6sxSqgV7
+BQGz6V3EwSYWSng+eInqMIOVGq/Cuh1iOe5fCS7IE/qEC6kaLAwA3vA8B1n9V1j0
+WH1U8TKP+4Q20Gjh0Dwr7nr6hDEyQ/SxddK591IW/+XaC0yJezM=
+=lJQu
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f62c4b5c6188..d4a89c873fe1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 5e51d1006b8d..0de72de5713c 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest
index e77c246c0fcf..dfadaf374f5d 100644
--- a/app-containers/conmon/Manifest
+++ b/app-containers/conmon/Manifest
@@ -1,5 +1,5 @@
 DIST conmon-2.1.6.tar.gz 157838 BLAKE2B 319a170ab048c14f3be998391da403799171c5d0e342ac4214a6456398ab872cb6a77cb4d67dbb97a0bc47008c6fa657ba2a166eea4c56ee65db545b08e032bd SHA512 0b5d7f33745766f4f1646e79554e16e1d6c977fd08c5a86c72068aec9f28110b5981c38972134741281c8470c295b6195843f3dbb78e1e9da34b8d577ea41d65
 DIST conmon-2.1.7.tar.gz 158201 BLAKE2B 2f159177cfa78ecafef0217d21c9c56942c5498022d3777368d8caf81c2503aafabf002c0f9ec0537936eca34c156ed9bdd037b5543eca1edd5489d9bc1ac215 SHA512 95d394b399a19a62b894cdd03937ab79b81051eea1db461b1bf957ddd7626d6ca4aa108b8319ed8c08adbdf99fd960c5ba29146e8b0673b5c920708912a72973
 EBUILD conmon-2.1.6.ebuild 1128 BLAKE2B 2b355a1821c8252a815039b0e9658e18b5dbde2ea1e66bc3355d0e43b0ffda211deaf10733aca60187912ba685298940354e0027bb5cc147e1d9edbe76abb290 SHA512 197d4be8955cde92ee0ec8c54cfa5807309efccac70d10aa493db64543ff4808651a9c956170f0b57a1804ea81c6efd61f0792db2d8d83c9b8f9697c910dc712
-EBUILD conmon-2.1.7.ebuild 1130 BLAKE2B b940f56d8b07cdeeb6f93f1b262cdf14346b4125f64cd6df3125abe423a5dcf428dba82d8e0fb6ae5b32b13f2898f7b4e2c5704d2891b484ac62f44834f2ed34 SHA512 75ac70b8e06ecaa391c3c65748eedd5deaea6d5d566ed68ccef0c971261efc0033083cea7c41f4041b4b56923fcba13941086b730ededb4029a3d12fd4b55f72
+EBUILD conmon-2.1.7.ebuild 1129 BLAKE2B 1002718ca72b7e07a3f68b6cac27a0eceb2ad43f0368c8419e08d8584b4826635e76cd9bd6846bc15255f0b7c453bd37b6c8a002c3f330d4801536b556fe3fb3 SHA512 b9290c22dca6c57b19feb841a1784569050026b23df2de37f136f5c0cb4064e80518d36e7b5bd5f1f5d7d88dbeec43f81cd9eb7f51b789df19c560acb92a5bbf
 MISC metadata.xml 327 BLAKE2B f45e25a9bbdbdaf8142c7919e209ed153b819e5222f957600260362211946936c5cefc4f575a84930cad94d8e693efcb40e948c0f976e504a038c99b047be34b SHA512 55a208c97c7671ec03ac0a0b46ccbe70d21e336fe5e1cdc92eb987c9f499453a5f94927b7e3f397651477cf744613d39407d8d5fe1c8e730507077a3c5117b06
diff --git a/app-containers/conmon/conmon-2.1.7.ebuild b/app-containers/conmon/conmon-2.1.7.ebuild
index 86de80dc4020..87ca8ad5fee2 100644
--- a/app-containers/conmon/conmon-2.1.7.ebuild
+++ b/app-containers/conmon/conmon-2.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv"
 IUSE="systemd"
 RESTRICT="test"
 
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index be8bc9b9c967..28c501e563b3 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -6,5 +6,5 @@ DIST podman-4.4.1.tar.gz 14396828 BLAKE2B 4d5ff7d14fc3cbf5fce4b86bda81abfe2575f0
 DIST podman-4.5.0.tar.gz 17423692 BLAKE2B ba28e77626bb4bcdb85b20031e12cf93f2eb3174b678cb8e99557df13e2cdf377ea402eb373a51ea44302f878f8e1cdedda14a2f3ad8c9e88895754fc50c272e SHA512 8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac
 EBUILD podman-4.3.1.ebuild 4782 BLAKE2B 87f1324881c4b0ed54ac37a61e811b14e7b3afe42eee5408906f958b3cde4994a7a14da6e4286a67a05655d2b47578512ba57930845806d4fed8492d9cc1e982 SHA512 921dd64bc9bec2d9c7235894cdd9cd29f3cd950a534c86d278ddb8a4bdc1eab355d92aded07c3eb79bbf48c52e652c28ad0a607959e058b0c99410d31562584d
 EBUILD podman-4.4.1-r1.ebuild 4813 BLAKE2B 10518d471f431d2f61661d8ebf681595762c13f83e73ea46793483711e746b51959391e90780198cea4ac58b803e52dd5e4c5bb438bb21b1bf38b3b2651ea2db SHA512 1e5fe4f2d495a6967eb4a2cd8843fba949077390960eb27e7effbb4bd072faa4849439c3f7b665aa710c62686b0b8a4603e094986a2ce38b61b22924db779edb
-EBUILD podman-4.5.0.ebuild 4941 BLAKE2B 2f943155c00d461056390c8c409b80f12431a2d61c6d0fb17ce47ac0c04ea3ba6d5e9a2a15665e38d03a02e50a65070877b42e5b764f129f89e04e450e613e8f SHA512 98b930b414562ae135e509648024d2c7711b2088d60a8453f03823a6fc88e873fa17ba0155e5f5ab3408d35fdef9f20ee66ae6e528938f4292fca4e7941ee34d
+EBUILD podman-4.5.0.ebuild 4940 BLAKE2B 9919037df5e0f0d0c1bbcbc260b01bc1628a60f6f1be6e57121e9cd4e9c44b539068530b918510dbb17ec9ef8bf670aab193d5233d7ef53f896c521ff1d9b4f3 SHA512 e182a12e9524444ac32e1bd340f625f3fd6ac44f7d1f6b336af501af595941b4a5375471e32ded568da3e0cfb3d5d582e645e53307488c7ab1c2fba9176cdac8
 MISC metadata.xml 1309 BLAKE2B f4e08317d4ed405eca3964b49bbc3a5b8a915245bc5e2b3912d254ee3e75e6475d44879b1118a34bd3fe7568d9be9f4747303eba821cda94d97a16d693f71b49 SHA512 ebabde88fb088061c48400021521c9b8b35f1c5af6a3bb8194f8eb1f4bad2506b77ed8ee8a30e76eb4e262c3d132e03930d23feb43a82604499a5c49ee35886f
diff --git a/app-containers/podman/podman-4.5.0.ebuild b/app-containers/podman/podman-4.5.0.ebuild
index 4d227a2e9deb..a17c3156f136 100644
--- a/app-containers/podman/podman-4.5.0.ebuild
+++ b/app-containers/podman/podman-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.t
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv"
 IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
 RESTRICT="test"
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 633f0dc81a1d..6a51aa6e5cdf 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 3672eb85d0a9..13bf019a0818 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,6 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-3.0.5.tar.gz 270092 BLAKE2B daba86ec09df80d374d1ea632f2bc84ecfbf665874d10fcb410e1bde7787551bb8b128e1ed0a4dc7943f821aaba6f9ae43b83225875f389d02d20d47b6fdf8f3 SHA512 882768c84182a8b11f4f315a9b429cd84399145a97b64772a42e0c7fc478c6c5f93a6c73289410b4d2108786a7c275e99f2e47991bdca315fd7d80a4282eefc9
-EBUILD acme-sh-3.0.5.ebuild 1244 BLAKE2B cc2dcb21ff8b216f91074f8eaa5381e811d2be83b93f66fb65b5787a3087a780ea5d17f47cc3e7f19478e1808259ceb59a9083b651bd967c3a8a00c08d6bf341 SHA512 deb701d30e4944df70349b78c247d08cffb0ec676d49cdf5dc9651a237273317f95a85a186daf8d7b973de6a07b71eee0d6c487c0a69b794a76727006aadbb8c
+DIST acme.sh-3.0.6.tar.gz 275569 BLAKE2B 8b7989e7a6e59e7263a343d7d22ae4c6998dc7fc7e8340fde1dc4226681430c2fca00755781c9a1a9b5c564fc1a25a30cc36c131a81cc11a9c2f15a67c870bc8 SHA512 2ddd561356586a289bcd08770b7347ef2e1cb121948987031a9e53d19abd5beda433e50c659aa3ee5dc3b06bdf8e479b5b31ba0b52c4a283d2c491aead4d10ac
+EBUILD acme-sh-3.0.6.ebuild 1243 BLAKE2B 66fa9b2d39a67325894309a219c46ff44b188b78c76f738798f88015677385c99796ec66a5cc2259ddd006788c6b47c44f2f68eb86a308eb25a6b8f27189187b SHA512 1433edae7c84faae981932dcd9267e2907a8b91ef3aa859d0b7a703dea3c34420fc6bb1f825765b085fb306524b3e9c8ae1fe31b4a758a8706685adc7524da4a
 EBUILD acme-sh-9999.ebuild 1125 BLAKE2B f12d96d5937e7369877dd27265f486c51d694b6d764d0e9ae3b85ce284e01d10e9e2715384409e1930a88d586d84a95db46bccd85e01a8b777e668f3a250b0fa SHA512 1c96737632ff0cbaa9b636d01134807e140c9122ce695fcf301df5ba55acf06c0ab2b5a04c103e1a6fb3cc1d3a5d72111cf3df955fa765c349d6f3a9edc8fbb3
 MISC metadata.xml 677 BLAKE2B 783e74dfc78dc11568fe72316c5bd100d18fd5c90987d9c21386930f98713d6be5de74d395ed919a8dd7986f0bada50d16c24a670ba856318d103b186a514046 SHA512 6a34e252d900761bc12fe5b1f8d8b8277fded6685f8495a307de4906a19d797f2a4eb9b84676ae1f5f43720c092e3f3d081ec243dff19efa626d4d538974efc1
diff --git a/app-crypt/acme-sh/acme-sh-3.0.5.ebuild b/app-crypt/acme-sh/acme-sh-3.0.6.ebuild
index c83e0e967104..321de0c3a864 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.5.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.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
@@ -10,7 +10,7 @@ inherit optfeature
 
 DESCRIPTION="A pure Unix shell script implementing ACME client protocol"
 HOMEPAGE="https://github.com/acmesh-official/acme.sh"
-SRC_URI="https://github.com/acmesh-official/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/acmesh-official/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 5d251eae276f..8dab71f68c46 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 6b437bf3eb2f..9769f7346706 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -2,6 +2,6 @@ DIST dict-en-20230401_lo.oxt 6100359 BLAKE2B 4a1b8bfa8e7987d0ba957d483ec55d3e1d7
 DIST dict-en-20230501_lo.oxt 6101115 BLAKE2B f0acdeccf1c4b58b7becabfd61167eb3f4767c5ae3da7ad752645cce49f3f3262219cfb08d373d02b49b67ddaff184102683c2981f4c28eb6b97d92961b07219 SHA512 bc8172f61cf3d18c0ac519f800b39ed69736e085d51251c60c527677552eefd4fe08e5b5e9fdba3a5856605ea44d3831901b00745f00f16146136d6e8376e4ee
 DIST dict-en-20230601_lo.oxt 6101573 BLAKE2B 22949c952b1545016b298056a46e08f09f5e2865fd7b626df125c055553e72f1ba27d6adcbb22cb9340803989ced44158d4e8ceb2344820b3cd8058864568e66 SHA512 d8f2ad124cea03888856e6b845d94f5df5002852025b28a7217a4d5809069b0c59bb3432766be4b82641e55f17cf76addb5def4669bc41eac4a22ad209453e71
 EBUILD myspell-en-20230401.ebuild 1527 BLAKE2B cb05dbf9a9385491ac8ed8daf8870778122348c3d385b997433ca67f3bc044fb739e21db3aa8dd54fdf8444233587da8c004dae7f7880bcc2292801cde3fd4b4 SHA512 f830480b4a3aca2d22180c863db5280a6c6e66487d835a76fbefeee6167a4f1a27661e103d9f2fa569996749d695203330931854cd91ca957840de18debc644a
-EBUILD myspell-en-20230501.ebuild 1534 BLAKE2B 9b0c08377b641da9ccc6f2ee3fe06e62dcd73d4d757503ee1788190dc576e95366e159cee93fa2101e7f17c06cde7202aa5930a0bd47a79ff9391bf547d3ba74 SHA512 65816550ba0df9f3ecdc32ba985f4eefe0bf807dd5099ce1132139f8417b6617581de889a4eeaf1895b538ca848b2dd6769d074502b2da366583b174c183e00c
+EBUILD myspell-en-20230501.ebuild 1527 BLAKE2B 82c301b74dab1270113cc5c1c8a9616de0e4e34f34370c0e3a5e51543359259502b9d8064d8695769480859e98b7d37c4561c80853e10633d193992db2d7ca5b SHA512 facebfeee708b16041ec5eb2d4e5d651cc0af789265266673c00beaea942b526dcceda77843398ae287065adc34843db2e0b9eca2fb004b0fe5dffccb9e4159b
 EBUILD myspell-en-20230601.ebuild 1534 BLAKE2B 0550439820087bd4b95540145e1e53e796148a24d84d296057aa831846724c62b1349fc3c1d353ce4436d09e5aa3bd69df628ee267192319f55d93eb05dd03be SHA512 b38203f5b37e96667497d3eb6dd24733b9c61153494af3febde189690dd485f41623a0b1d7fdfb252418700a5abe7c51ddddb7d0231410c557ce2d97be4b4b5d
 MISC metadata.xml 289 BLAKE2B 3b19ce0204dedac8876e4a00fa12dd23cadca14d8b422165467e4da65edfb91e3bb924505016333bad4ed1cb2612db674bb857f1a3dc9e1033b53dcdf20cb164 SHA512 9147be5e8b62a3de0ee8aafc33c61132f9856b28653a390be9ee7a89e3057cf06cc0b53149f08c525a6f01b2fac91e8ba6d1ed89ea46e33d8c279e76c22bec54
diff --git a/app-dicts/myspell-en/myspell-en-20230501.ebuild b/app-dicts/myspell-en/myspell-en-20230501.ebuild
index 47751731a611..06643aa5bced 100644
--- a/app-dicts/myspell-en/myspell-en-20230501.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20230501.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1682907652/dict-
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 PLOCALES=( "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
 IUSE+="+l10n_en ${PLOCALES[@]/#/l10n_}"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 4ba86c1779f5..d725bdac6921 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index a7ca09bc22cf..6100515aab84 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -5,5 +5,9 @@ AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a
 DIST vscode-1.78.2-amd64.tar.gz 134674196 BLAKE2B 314ab07185d91bf20d4016b327496924c111c7b7ef6e2775c7abbb5a497a35ad09e5a7176691849ab36e28f4d291e6a4e2cfa4024c00fc45e5b13514997d71c2 SHA512 a5919a7f04257c529a7c0a0147e2f8d18181c90a64198d822957d74e5bc8e5d3c60f7732a4f3c456f0036907d82688d51435dbe26aa25264bd1014fe97da4a1b
 DIST vscode-1.78.2-arm.tar.gz 119250112 BLAKE2B 3a0bf7ea25b85202a3d0be196721e2aacf79dc8c6bcf5ae97d37d04c82ca782b3641435997b029170618f4cab31c59978faf70a5bf89ac2e834e7743e1822063 SHA512 ffeff708c553903c10c9ce833e28286144e1407e59298a05f00ce75912605061914268fff34f74e5e0e6a21989191fa9c5e757c271a784ec0ccfa2db02567679
 DIST vscode-1.78.2-arm64.tar.gz 130761570 BLAKE2B 6fbd079ca89f49419e53e1daf108e6508036a654395bbdc1ce61bed4c9fbb0425738ba39f8d7682b889f80f5c08fdff947f819c36e932bf652f1441182981e07 SHA512 877ce23498c68f2c3eadae5eafc83cecedefa0d290efb2578f3ab0faa6c9aa8d2fe22e9e4f33afbe9a95cfb12b994411de3303b902da73af5c33be43345d52e7
+DIST vscode-1.79.0-amd64.tar.gz 134771216 BLAKE2B eff3918fdc4c48cb9b0dd0ba09f5cf10c707c3fe491905a4150cfd634722d66e49a13c3d08828c3eafcc8b507356308d829b32e5c57313194157c27b9d895e6a SHA512 586898b17af29bf218af765cf7a8c3aefd7b73d181c9bafa3a98fc8f2f74d14c6c132179542b1b5ffa364b153bb8c5d71150d0ef40266913685640c2640c7209
+DIST vscode-1.79.0-arm.tar.gz 119314354 BLAKE2B 23ffd7c9202e5491e41c5b99a707807ca3cd06ba5323f5c67859344c95dc19848ec9daa83bc97f2afa585cd93a4cf62da0608a3cc4788d9e4b71a468a1fad6c3 SHA512 9eecbeaf34b4248915e4c0f922c7033c140cb4944e73775c116bd1e03c8cd3feb2f702e6d089df057b307637e2b4065a06e377b156d22ea92dee1741c846934f
+DIST vscode-1.79.0-arm64.tar.gz 130967654 BLAKE2B fe5a484b12ad1ef6c9cccbe95cab149a0caf9fe6d5f2b5f6354dbf154346f5cfb6d6c4da839149dfff2194b43ac72639a2e5df457aedcd2bcf96cd8fff9515e9 SHA512 b2541ea525ae82b8468b6b41990f73cb881461f352691959402d7927423a1ec215a43db7aac7f9b3ae83e6507cdf5c7645431fc08872dde8df7d6b4ce47c20f3
 EBUILD vscode-1.78.2.ebuild 2916 BLAKE2B ae628ff4f137e052333cfb1ec28c245e66944ef1e7e01982050883825e11f19dfbaa259bfbfc98f30d8e15a3e9aa9f373e1f27385a29b427e14047d19dc8eee6 SHA512 6fa0f6f3328e8f330c252fe30de5d0b4e8f2529cc9950d23d0c116bf4638ee9ce5d94180c7dba1376d2130fdd481a61f193d06d80ecf6f473d5bdb7849458c95
+EBUILD vscode-1.79.0.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
 MISC metadata.xml 1058 BLAKE2B cf7606233d99e4429debe5ef824f235f1ff3083ab5553030453e982bfb5860dd5ccecca3792319665835d604b6ff2cb53ebd885bb959236784c62885087750b2 SHA512 961552953336ad9606c9fc004fc3e0fb8d7481a017b6ba5da683db5ba989f58d474ccb4ea3a001851b2cfe705e7fe3f70ba01a14dd1f048523e73af522d50410
diff --git a/app-editors/vscode/vscode-1.79.0.ebuild b/app-editors/vscode/vscode-1.79.0.ebuild
new file mode 100644
index 000000000000..0362e867fb48
--- /dev/null
+++ b/app-editors/vscode/vscode-1.79.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/util-linux
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/bin/code-tunnel
+	/opt/vscode/chrome_crashpad_handler
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+	dosym -r "/opt/${PN}/bin/code-tunnel" "usr/bin/code-tunnel"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	domenu "${FILESDIR}/vscode-wayland.desktop"
+	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 972db3d28f5c..05654ef51b43 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -8,6 +8,10 @@ DIST vscodium-1.77.3.23102-arm64.tar.gz 111829469 BLAKE2B 1bd2e4f68db9c641a9313c
 DIST vscodium-1.78.2.23132-amd64.tar.gz 119476104 BLAKE2B f1a007c72a377dd8f9c1d1cf9c3c38bbb32d28c94305e0445fa4a94f62bd3a32e5122d881f485ebf63958e8183cbc01df96efe1e98078d065b3e4205b1bf8025 SHA512 b4432b6a47be23af8b36359867de6b84b207c2d65817ba30cda33a3b983174bf9c5a06e44a628fbd4764ad054b441fae77a757b099ab808ca7090efad5a189ea
 DIST vscodium-1.78.2.23132-arm.tar.gz 108208589 BLAKE2B 4f3ca84b8fe87907c21f0befa59969e9cb243f52ffc82ac323ae1a978e538cce31256dead42ce87cef0cbcefd09b106e6db7cc400d404468427c11fb15f8f728 SHA512 921255f6ff635f64753ec0d230bcc26f5ee69fe7160528fd077a6b8f4f6237a7e87bbe6a42b0a2463bfdc8fe466499ca15350e388477ebeaded7ab8335305c54
 DIST vscodium-1.78.2.23132-arm64.tar.gz 119733620 BLAKE2B 95b6cdfa97a02fa18e5a053b5333bcd347b2f2ed4b4a3630c060606a3a79b44e0e12c90c7d98ca86c207963f8711556f58cbab81ff45fcc6c21c0ed3f3b46824 SHA512 aeaea958574b4ce760e9dffd400c0dd3c52eabc228b55d8e6539d3ca611741e81de8e0c86cbe3d72678c5459f70ebd682a9d69fc5857e3c433366c111094d5d9
+DIST vscodium-1.79.0.23159-amd64.tar.gz 120597824 BLAKE2B 0219ea4bffcbc9353ac002037a820e9fd36d7af525c685ee92db63e9b8d8027712ecd892d1b8d4eeffe3d1782e6c794744c0ef6c576b001c4e798f2c5cd81c45 SHA512 0fbdaf930b6d2c13c87fb39bcfcfd77b086b31e9f11ffe19e223ebc72b9ff26e0563c00d143846bc589160f3839cc1245855b235f6af488fd3de0167a32f1487
+DIST vscodium-1.79.0.23159-arm.tar.gz 109325368 BLAKE2B 0f322ba23926052e873ee58b8a8839ae2a8d5730915cbce20ede7e5e8809a0b0742600be96b1760c82debd1ac3a3663c8437020315efc6b667094d0927bf03ae SHA512 c329e7c323e87537951eed63a72401554f2e241ef15b971f44f8516fa9766a5ed335e074a797ad98548b30102dba827fa649f1479f072b68abb306c626ca16ee
+DIST vscodium-1.79.0.23159-arm64.tar.gz 120850283 BLAKE2B ab8edcf8870fe1584c508a4943a86e5c327d2a309139ac86fed0d9f201c950a47f4966664495e2a8bef6727abd531acde5d78e014fc016da632391c45c25a162 SHA512 a8a7780ca0beb8e6784e3eaeb0a516c8b07f40e9bd1b785259df4ec6c64bf89d2eb6d4d6feaeb1106304ffa002d14c5b238d06d5dbd2455841372db9d0fc6234
 EBUILD vscodium-1.77.3.23102.ebuild 3222 BLAKE2B bb0bd79c77f047e7732eabf9b9373e6eacd7505598ad5d9d398ce5767e8ddcd0532defcceb41aeecfc97b4f43383f456a429e52cfcc09617770d1969285d57af SHA512 c0d6bac65e2fa9b4dd115af28e70741830a7b4ac0ae9531543f49c8ba5fb5d5897d26baabb8ceec1f27bcf2a4fe86d0352110ada0b1cf8416bf14cb9676e3da4
 EBUILD vscodium-1.78.2.23132-r1.ebuild 2829 BLAKE2B 55c3fe7ff23e6a1a0e01ef53d3559db436cf898d3f78ad02f0d9ee2e1f80ebea0c8d75f7b8acf8ae6c1e3d6956ae979732b713471fb00851bd4332582786ac48 SHA512 fbfb49e695753130925e14f40fe29f96e79327a54dba4b16fd3b3d8abbbcd6f49bccd5f752a0595e9eb66a443f21913bd4d8eb91a9530aa8b51054d5a789d7f0
+EBUILD vscodium-1.79.0.23159.ebuild 2829 BLAKE2B 55c3fe7ff23e6a1a0e01ef53d3559db436cf898d3f78ad02f0d9ee2e1f80ebea0c8d75f7b8acf8ae6c1e3d6956ae979732b713471fb00851bd4332582786ac48 SHA512 fbfb49e695753130925e14f40fe29f96e79327a54dba4b16fd3b3d8abbbcd6f49bccd5f752a0595e9eb66a443f21913bd4d8eb91a9530aa8b51054d5a789d7f0
 MISC metadata.xml 1302 BLAKE2B ff0c1f72c2394f21e13b89831493df562ca15114fa5006262f794d3f2580deaad01d7e01f87481dcc75cc5044c8b4950955dcc3dbecbc8cfc7a6ceafaf078fb6 SHA512 8ec965d8544c2ab31e3c2f2f3c879b084126880603681fef5e5158af1bc1f2f79351b68284f6a101d486893f968594e1537df1eedeacdebffdf51de7a38ccb25
diff --git a/app-editors/vscodium/vscodium-1.79.0.23159.ebuild b/app-editors/vscodium/vscodium-1.79.0.23159.ebuild
new file mode 100644
index 000000000000..23943923794c
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.79.0.23159.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+	amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+	arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+	arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/util-linux
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/bin/code-tunnel
+	/opt/vscodium/chrome_crashpad_handler
+	/opt/vscodium/chrome-sandbox
+	/opt/vscodium/codium
+	/opt/vscodium/libEGL.so
+	/opt/vscodium/libffmpeg.so
+	/opt/vscodium/libGLESv2.so
+	/opt/vscodium/libvk_swiftshader.so
+	/opt/vscodium/libvulkan.so*
+	/opt/vscodium/resources/app/extensions/*
+	/opt/vscodium/resources/app/node_modules.asar.unpacked/*
+	/opt/vscodium/swiftshader/libEGL.so
+	/opt/vscodium/swiftshader/libGLESv2.so
+"
+
+S="${WORKDIR}"
+
+src_install() {
+	# Cleanup
+	rm "${S}/resources/app/LICENSE.txt" || die
+
+	# Disable update server
+	sed -i "/updateUrl/d" "${S}"/resources/app/product.json || die
+
+	# Install
+	pax-mark m codium
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
+	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
+	domenu "${FILESDIR}/vscodium.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler.desktop"
+	domenu "${FILESDIR}/vscodium-wayland.desktop"
+	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "When compared to the regular VSCode, VSCodium has a few quirks"
+	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 0cb44a7cbf91..5fe356dbe380 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index a4153dd3d817..0e7805d39711 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -4,5 +4,5 @@ AUX blas.eselect-0.3 4990 BLAKE2B 16ae6d336c4c19e92c3b2db9c2fd5d23721921e7141cb3
 AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
 EBUILD eselect-blas-0.1.ebuild 674 BLAKE2B 341925a9dc16ee4b86be3fc73e84057a9fa2db07c61092a1b5c6386662cb8cb4bb878f7941904703f5e5cd6e68a053d8e8df9ee52d8e8d5718896d99dcb22259 SHA512 6b066da1cebbdccc9a9725fd47df5cb37380c5f8c70a28d683db579bb40fbdbfbe127ade957eb574cf72f5d32e0f6f5b47f6038bb80da179a55d53359c2dee14
 EBUILD eselect-blas-0.2.ebuild 685 BLAKE2B a4dc30df8aeae2485487faaa03d870e3883af90dc02fb6d81cb00e03d0aca47488411361ca8a4f3ee2b649b7f259247b289bcd94369763e675d0f1b0cfd2bfd9 SHA512 636e633f7db1492622119bd34c8c231f0629525f5eafba8808b4dcd4a8d8848fe43867883ac80037b4dd7c20484e1ba4cea89870764476384db84fd8fcbe1670
-EBUILD eselect-blas-0.3.ebuild 693 BLAKE2B 0a2d22dfa89899ec47e3850e49812943b1fb9905a7250fce355075e9aaf78b41afadcc53265cb610f4b4d993772b79da02e5734bd3d70d39f3b606452209422b SHA512 9c0f69a02694e8ee9d7b5f9971e1e7ec58262ec5cc1e2db578001e7fc672c0350255a6ed46245724fac58a2a585694823ce7c98f9b77aae255dfabc7fa181900
+EBUILD eselect-blas-0.3.ebuild 685 BLAKE2B 614fd05cf98affaa543d05b780df26e9d70b22158ed0d1198b605213892613d739b9fc5750626895fdd9eadade606c72e96834607d790a71f0e9cda5456e3de2 SHA512 c13c4b47afc5a1e73c681716c486912aee978d242e9ecc46fba4b35903fc20ccb8a91b3d337d97379ca9435d30d24e51fb7d534c185a3d4d66ca5e9410a8bb2c
 MISC metadata.xml 278 BLAKE2B ec2d276da53ec73b30c5f3c1a592d84055592026a448ffdc152835499337f7470cf92d3343f3eca3ec55b44c307878a295a55af0c3d142ef98b1cc892594f187 SHA512 e3ef5c31e448eb600e79d31d402e0822589f5ed22e61df0b45b7a656b6bb0db16d353249debcc480cf6fa0bdcf5f81b360a6e28c796a3dcf432f42f03ab75e71
diff --git a/app-eselect/eselect-blas/eselect-blas-0.3.ebuild b/app-eselect/eselect-blas/eselect-blas-0.3.ebuild
index 2dfac934a3c7..f07c58aaf4bb 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.3.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-eselect/eselect-lapack/Manifest b/app-eselect/eselect-lapack/Manifest
index 6335e1e39d54..9483de49efbc 100644
--- a/app-eselect/eselect-lapack/Manifest
+++ b/app-eselect/eselect-lapack/Manifest
@@ -2,5 +2,5 @@ AUX lapack.eselect-0.2 4893 BLAKE2B 45fe2cd27bc259d406e06900dd36cff0071f2221a6dc
 AUX lapack.eselect-0.3 4935 BLAKE2B 393418247b0ce003253de31246f051cef6fb285ea26d31639c621bf671cc52ed4f129d58bb3dbe7d0508cf617c9031e365f43eab7d8677b6154bdad4a15bc90e SHA512 b216333b6ef5dd7beee0bdc001e6a5732f2a76235c5fd9fe54fb54d8bf06cddcacfb7033eea2a6b6beb72a19e6c6704ae808cb97c8afe2348c124af543409c9d
 AUX lapack.eselect.5 2406 BLAKE2B 12da8dafd86ee178455de3476bfd6f4b2f24318244c4b387b46e45ea7a0b3ed4f33b05207f3f1201f17af4bea2a01798d6de0eb579db3503d27ed3d90f8edec7 SHA512 8659833ef7ff6e78d0592bb2ea34f04647fda68b388d60f7a39f0cd21dc2c5d198b369aae14f2d742d6c6a77cb3da9a46d1ea34a2ee8d403d5faab537dd7b940
 EBUILD eselect-lapack-0.2.ebuild 652 BLAKE2B 7b80b7ccd2b86df8d57c24e65187a849a70b8f8660a6e2dce2a8f28f31d5beeb6271c9a23e169b74f3ac3d1ff78252d11eab0ddd7adf14c90195b631bee5a2f9 SHA512 7191db8ed3c6b96d189e4ea8c52e5e730f3bd019ee4968920c629428408c5164bcb64572c8b6fb1b84dba8dba2f5ed553b8f8c022cd028b440abf4cab3900412
-EBUILD eselect-lapack-0.3.ebuild 660 BLAKE2B f4ead98a8a71c68ab105ff008f9b2d3db429d21499fee27c032089bf64bb00181bdede6e719628625981d2b0be2684d6903ace2fdc53bfb11b843add0bba08dd SHA512 77292ac98a1a26aaf47887b36a77d7f159f5fac9a1e9bde6000e5099b524307530f812d6de11529121931b72056363c91b51cf11110d48427ea068c8a93968d6
+EBUILD eselect-lapack-0.3.ebuild 652 BLAKE2B 56728e77c75b66ea432bc6132c8703f00c625d6ef3835b31624575e2c7e4b851fb56f69c285ec4e3d05e332903d0c7eee475bef2958203dd7aa15db6b2102dea SHA512 42e2fa8962d051476f3f4d180fcf0f895b1e8f2c846db819a8fe7805ccaf051d4892a437e8759486e08a8959eae6e466e5d784ffed46f30f1d51748615560ebf
 MISC metadata.xml 278 BLAKE2B ec2d276da53ec73b30c5f3c1a592d84055592026a448ffdc152835499337f7470cf92d3343f3eca3ec55b44c307878a295a55af0c3d142ef98b1cc892594f187 SHA512 e3ef5c31e448eb600e79d31d402e0822589f5ed22e61df0b45b7a656b6bb0db16d353249debcc480cf6fa0bdcf5f81b360a6e28c796a3dcf432f42f03ab75e71
diff --git a/app-eselect/eselect-lapack/eselect-lapack-0.3.ebuild b/app-eselect/eselect-lapack/eselect-lapack-0.3.ebuild
index ace0c922c6fa..55befdee5259 100644
--- a/app-eselect/eselect-lapack/eselect-lapack-0.3.ebuild
+++ b/app-eselect/eselect-lapack/eselect-lapack-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 # Need skel.bash lib
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index e413342e08c2..b8f344ea7c9f 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index 26e3253d97be..6ace738bc122 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -1,6 +1,5 @@
 AUX hdapsd.conf-20141024 739 BLAKE2B ebd52e9bc5d4849b842cb579ca4ea0892227c94c483d9ec0b9b1dbcf975bfdfb0079460a29dedb6e60236cf9a37814efdd900c6e8c8d4791deb2e81f37dfbbd6 SHA512 e03c7f02af2789a784284f10eed10e10edb82e2ad16d3794299cc9622c00a047f30df7f7d553ef572e265815684d1e783932e0f3b219cca44f0e1f74dc045944
 AUX hdapsd.init-20141024 2177 BLAKE2B c790b9899ca67ecee13a3af54dc821020f551ec35e94866328e28b00ea79eb2f8ba88e618d6b1d854add6024abb75f7fdc1393bfff853f16e2ab4bfb16e03799 SHA512 e45b7e6fafd047c6fe7b172ad552c23b0000b90099a9a12e5a09133258e90d5f121bfa5e8a638f1dcd35110e54fc1da2462cdd501ebb65878286f623c7baa6dc
 DIST hdapsd-20141203.tar.gz 128818 BLAKE2B 0219e30e032032dfd729e97f526eb7402fe4cb72245589ef03cca28f75a6e1f2cbfa55c5aa5599b24f496bbe662467077415fbec47caa1db17d6108e07292daa SHA512 19c1a8b362f15864b71f4fb221c0993b43b3b2d965d5826af06fb9f6b0e345e5da99181493e13e230c7fe77060ae5b373027e8ec90a511566a6ccaef43998178
-EBUILD hdapsd-20141203-r2.ebuild 2183 BLAKE2B ebbebdd87b20ed6a4681d1b270ba69b462da528e0e7c5e553c7cda28c8dae71744089de747f4e9e03890cb35560eb6e23a163c855a622870e25637a87c36b583 SHA512 2b154fd3c40fa8e46822ee0cd8da3b554cf579c46f572ad0a0b9873f0402a826165a49dd8bec9179a5763f31fed758c211e952134b086978ab446d1dc56870e6
-EBUILD hdapsd-20141203-r3.ebuild 2270 BLAKE2B 547503f35de8c034405f5356426ec0baa08d98366a24bb431817c25fb3fbde9b7772bca96da2f74ab344d444f537b128f6d9d79b1c705ee101ed0b5a3f79ac8b SHA512 7bba6c8fb5164f8a824d88fa2276d036ce9f23a44a9882c8aeb87f7f8bb6dc1107aa88960f9b938a338330a12f17640caf802b0d0f68b7749c27eba5af3cf68b
+EBUILD hdapsd-20141203-r3.ebuild 2268 BLAKE2B 410d74e14ce22c99d3bb4382e61abda8b84b8f5171538965fba256f0521284266168e3359594694fec6207a530665b9bdf0a0fc9f6c84fe67efcc7d143692a4c SHA512 87f86a996712bd05885653f8c5f11b60ce08300ce639e9090b962ab05f411b521ce8040e9ce2e3443e03799eb350c7a3568a136076f54e3cbad36a51021a451f
 MISC metadata.xml 554 BLAKE2B 3bb86449e6f32b9c6eb3511aa2eb2de96d144baededfcb15de99b936cde40c532bfaaa77ddd3458667b0435c28100cc7cc71138055654d94096180c81c372027 SHA512 d3c70dd395e1075a3a6fb48e5a47fc7f972a0c9e0a37664e0a039c15e080bbe8615ee36b1702ff3213ccfcab0d58834d8d390f2b9490cb77dfc71919ea153494
diff --git a/app-laptop/hdapsd/hdapsd-20141203-r2.ebuild b/app-laptop/hdapsd/hdapsd-20141203-r2.ebuild
deleted file mode 100644
index 831a25bcbe7e..000000000000
--- a/app-laptop/hdapsd/hdapsd-20141203-r2.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 linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon"
-HOMEPAGE="https://github.com/evgeni/hdapsd/"
-SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libconfig"
-
-BDEPEND=""
-DEPEND="libconfig? ( dev-libs/libconfig:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# We require the hdaps module which can either come from either the
-	# kernel itself (CONFIG_SENSORS_HDAPS) or from the tp_smapi package.
-	if ! has_version app-laptop/tp_smapi[hdaps]; then
-		CONFIG_CHECK="~SENSORS_HDAPS"
-		ERROR_SENSORS_HDAPS="${P} requires app-laptop/tp_smapi[hdaps] or "
-		ERROR_SENSORS_HDAPS+="kernel support for CONFIG_SENSORS_HDAPS enabled"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable libconfig) \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		--docdir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}/hdapsd.conf-20141024" hdapsd
-	newinitd "${FILESDIR}/hdapsd.init-20141024" hdapsd
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	[[ -z $(ls "${ROOT}"/sys/block/*/queue/protect 2>/dev/null) ]] && \
-	[[ -z $(ls "${ROOT}"/sys/block/*/device/unload_heads 2>/dev/null) ]] && \
-		ewarn "Your kernel does NOT support shock protection."
-
-	readme.gentoo_print_elog
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-${PN} requires a kernel module to function properly. The recommended
-approach is to install app-laptop/tp_smapi[hdaps], but the in-tree
-module provided by CONFIG_SENSORS_HDAPS may work as well.
-
-Common daemon parameters can be set in ${EROOT}/etc/conf.d/${PN}. If the
-package was installed with USE=libconfig, then the parameters can also
-be set in ${EROOT}/etc/${PN}.conf, although the former will take
-precedence over the latter if both are used.
-
-You can change the default sampling rate by modifing
-
-	/sys/devices/platform/hdaps/sampling_rate
-
-and you may need to enable shock protection manually by running
-
-	# echo -1 > /sys/block/<disk>/device/unload_heads
-
-as root.
-"
diff --git a/app-laptop/hdapsd/hdapsd-20141203-r3.ebuild b/app-laptop/hdapsd/hdapsd-20141203-r3.ebuild
index ee9f8da5e64c..dc97598dd6d8 100644
--- a/app-laptop/hdapsd/hdapsd-20141203-r3.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20141203-r3.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libconfig"
 
 BDEPEND=""
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 132d928415e1..b92de1c19fab 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 52e48eace34e..601fa0d0be03 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,4 +1,4 @@
 AUX gramps-5.1.3-test_locale.patch 1195 BLAKE2B 1b1aeb08b90bff9db9d028499428efa60a16b48597bcf466c07a77e3f658c8550eca84b899047d1bc6e20eb26e8dfab9637ae7aced1b99167466ea6c51707132 SHA512 70daee9afdce0f939ad3cec094fb4004f5c162e6b49849f83486db5baec074a8673d7a6096a367279019712a11f0b40e827f6cb3019e7dc3cc6bad327fee35ec
 DIST gramps-5.1.5.tar.gz 17425167 BLAKE2B f07fcb84c28f1def84c5568da6ac38a78def8657a0ee010163cb7e0899dd94ebb1c851e2c9d207fd9725754363ac7243a66f0de6e0d9708270d2d43c90485212 SHA512 8e36e8da7cfb41cc0c77881993cfc212a15bf9775dad3c8be131889b70360117e023b6837b91dad28fc03198080290a08c8089856c753246ff14c7fc3bca38be
-EBUILD gramps-5.1.5.ebuild 2909 BLAKE2B 044a8c373398e2df235e699032c9d7ae4ddc5ffa9b15631de681d4fa2e93965ad0cc086d5dc39a8e8ced388c5ef4556143d4b3202beb3ca72616ac19d0870a76 SHA512 1ea68847b10e0a3e7d930d4d5c1309c342b9117cc4b229c50f99cb5124d0aa5374d001afda0825445a6da0173fdff71c04bd578e0723aee4b1070b9664149413
+EBUILD gramps-5.1.5.ebuild 2910 BLAKE2B 23b626f1dbcb0b4076162b855a3adbb43ebd0d2124173be5df10fc0f79baec1d41dc4f954ca05b68d265010726fa6e308d8c45f859dd086c50709c00920ec836 SHA512 a4dba3514bf4cd44a3472de3741ea9ea97bd240a706aa9049152946485c61f1e737a1c4fcee083189a1ae0eaff298ebf704b812c10f6e40f1552c59c167f30ad
 MISC metadata.xml 5703 BLAKE2B 1c4879fcccfb62b99140eff6e5059129bc75b0a6f5f6d55167981b0ca3476e286a786caec2452c5aa9690e287c7142e3e443edc7ef8ad1d6ea4002d37f624647 SHA512 c3c926d1da8d57f5dc3b9f0691299552aceeef437e01f9385a6555c5fcf1ffea82fd1f9e87f20e23bc54d7578e0819786f1d1bc59d633cc30bbd9e79f236f3b5
diff --git a/app-misc/gramps/gramps-5.1.5.ebuild b/app-misc/gramps/gramps-5.1.5.ebuild
index 6748cb19e67b..89f5b7547f9c 100644
--- a/app-misc/gramps/gramps-5.1.5.ebuild
+++ b/app-misc/gramps/gramps-5.1.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="berkdb exif geo postscript +rcs +reports spell test"
 
 # Previously had: !berkdb? ( test ) combined w/ dev-python/bsddb3 dep only for py3.9
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 1115ba8b3ce7..4cab3eabfa0d 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 26074ff34124..a2720fe36063 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,31 +1,11 @@
-DIST amd64-debug-libreoffice-7.4.6.2-r1.tar.xz 1537083264 BLAKE2B 96a3ec7dc44b1952e7b197bbc02a74547d9dd77d364d450c9e9115db0e800147430b9cd09a8e8249f7b253aaf2becd36f34a5cc947b7e382f5145098f534950f SHA512 06494eecb543b657111e0f1d8253ef50e0cc5afc7bce354424bd375cd8f2cb46fe9a71c28632740f52b54380a1e3c24baddeff977c35832504e3bdf223f7814c
-DIST amd64-debug-libreoffice-7.4.6.2.tar.xz 1539083164 BLAKE2B 9fbfb50c2fdd26b4d8d70119ab015c54fe271df01c98ae1a880edae3a1fcc6f4fdbe09203afe612bbbc038d256f15ee791e9c566a75bece143f3d994077d24e8 SHA512 3e1f63890c5bd7b8aba20f0b16c7da8fdf3cde46c187b790f88f1fde979855b750432383fe0e7e26c3bbca0d6e7d7758c89c5f9f7e3f0ff07ce23941d2052b67
 DIST amd64-debug-libreoffice-7.5.3.2.tar.xz 1438237360 BLAKE2B 928b352b148a796bd7dbd20800e33da79190bb9c70201c3fb40b1d2886695d32af8bed55889b5f3680f478029cd86b83b0fc74c167e691e10a445c1a7abe89af SHA512 41363fbe153968c643071e2d6330b5b18b42f5c8d163a3a31180250b5626bccecacff4db60c9c260e441c0e70f4b3629a6686579f830b05199a53042f5757c39
-DIST amd64-debug-libreoffice-gnome-7.4.6.2-r1.xd3 1435537 BLAKE2B 5309bd30fd7208cf1ab02033208fc6b6bd7ad2b2932c68a46e7d62176d79bc78ac05fbba4eff65fdca53535f4eb0c46ac5c73931d3e7f8d0f8fea0f6ca6649f6 SHA512 53da17002c28865acaed3a54cce75f3f52c40f88fefc66e09b54d4809011515db1bc0ba42a9aba8dd3677a6069da219862e79873c0ac8b5be3420040662ae56d
-DIST amd64-debug-libreoffice-gnome-7.4.6.2.xd3 1439342 BLAKE2B 19fa4ac46d2c59eb15ff434b3f33263c68889dd26009d7ea67ff574a68fea5a4d8226cff457926fecf907162b10e913c5e572b4994642acebd8b7d5cea839829 SHA512 20cca2d38b78eb9c5edc50c27760751c0f56bd831c0bb5b46095c16b0e46bee4998705384cf924aed72a648305934dc5078515f286e9ad5a189f5112cf28f7c5
 DIST amd64-debug-libreoffice-gnome-7.5.3.2.xd3 292160961 BLAKE2B bd2575ec62967c0b330d43c3ade71236c255bc54c0d89855e7c4c48974b8c0c04cecd4afd7468b9583e823414dcfb46df8734a3dfe3a56d9235bb25e4f5f7f2b SHA512 d066cab66d722828ff8135bc2d53a575fa3485c3227373ec890103eba237d95c296a77dda27e62a480cf6aaf88d0aa7df600dc256852c711a9fd9d99a4c14f8c
-DIST amd64-debug-libreoffice-gnome-java-7.4.6.2-r1.xd3 789863525 BLAKE2B 47e487a0df97005f38a4198de7cc64831c8514278865062427bd7c124a6d69b014e85d61b94d7db6dcffe9d3a3d56c0d6b81a88f685aace8a8c30ee3f1da1548 SHA512 5dc565e560755f3b02639bf202344327e52c997a777c0fd86ae2fb7557c8193af85b61e944f06418cdf98dac2ce732764826386dd21ce44cf129464521b64a03
-DIST amd64-debug-libreoffice-gnome-java-7.4.6.2.xd3 789537145 BLAKE2B 5821ac0aac4de9cf21702c36fdea1421ca22ef2a0357af152850344e63cfc687774c88b4b45e4bcd100d9148e4c72619f7b9dae6d2ff048f4bf48de8a53923d2 SHA512 fba03563aa0d297120b2b6a930dd45431e0b7c6a1ef0f1b31d57ae030136aa251c119660612b49525cac1064650bb2e61166c8cc65a4ce1dc0e0309884dcea19
 DIST amd64-debug-libreoffice-gnome-java-7.5.3.2.xd3 744201123 BLAKE2B b401019add0b903e4883665e080396f1b9815f5eb17dfbe6fb4194a2602ed23470feda86ec4d7fd6289378c0f77f3578dbd73eba58215ce281f422483e4fcc22 SHA512 f4e427fedbd62b8a73cd8c6f3298ad65078b59dcf00dc3327b04f3085d615071246e242f99999b424133a4ed3fdbd72d9c9706bfe7af8f55aa3585977891f0c1
-DIST amd64-debug-libreoffice-java-7.4.6.2-r1.xd3 788420818 BLAKE2B 6445598a1a793508e1630bdf0c25aefb10a05fed786806d5d56ea94a60cb572ae45ba9b79e8545c2414d2e0ab697e2a87e7cc272fb35631a1432f394616514b5 SHA512 30f602db799369bfbfc5bf7af570b74dd317add1aeee82888ad21626d96e73f51559bd3362619e9df513b4c31009e7d03111a265c55e2c47aeb0cc8a61a0a2e2
-DIST amd64-debug-libreoffice-java-7.4.6.2.xd3 788080379 BLAKE2B 4e4524eb5040fff153b6b961572eb8e3f82b107fc176bb974eb680a0d640d939f63c37a96460c22b7650d5c7307148cf54472434cee0f4a77feef0042cf6982d SHA512 63e146988c4ed6744e97a6f9b1dae7e8b977f341089dbb6f4a4ca30b4bb5ca0e0adc8e3a6a0d2eb1cf62818dcd3e1e6f79f956889b6d79472a5cb5226a576e2e
 DIST amd64-debug-libreoffice-java-7.5.3.2.xd3 742863493 BLAKE2B 992ce90e57ba7adfc551fda26b7ef43dbcea4969fbb7ba8372f1ad96956b0dab8795968c552e8248f52fd650e824dbe34989cf8122a2171ed0e4a997c0ba9d9b SHA512 5e39ad81360bf064de743e99cdecbd1ec004707f7ef423a46eb129fd0cde90bcfd42dbdcd6d2e7f20ac9a910783331a21a6baee7d76db51f7393a1f39cf2ba5d
-DIST amd64-debug-libreoffice-kde-7.4.6.2-r1.xd3 483468319 BLAKE2B 7a31392728c48fc8882b9fed70d667b9c575b4bd01ba6b6c66341631007d31cda817ebfba5b97567cc81ef8bb8c9c9b69334176a8fdbc35848d9658ed9d5d04d SHA512 35b32de8f2450ba13e4c64a081a8f6b65a56c66b1e0920c4f9da1bfddc701773f71ec35711e240d8170f9d9a053c2244aad785c4c89625a7c1f99bd81af03896
-DIST amd64-debug-libreoffice-kde-7.4.6.2.xd3 484349149 BLAKE2B 3e72807deaf6d4fff8c43f14a78ae3ce10f6da0a3b13c1784c1f8c2890bf0378f0c943ba507c1244970a4f21ecb5af3a7c241ed94807f01074123206daf73b4e SHA512 45dc37ae22ce619bd8bafd7013f16f2194479c0cb1e2404f9a0a8404f00ea82aa50ee87c46eebb104296d152a55f6c58c4938553094c4df41904c81819037c23
 DIST amd64-debug-libreoffice-kde-7.5.3.2.xd3 436624127 BLAKE2B e3c8f7ed73d674896fa0e1ea1d9ba3e718ea0da9460ad2367b5dfdd85d1fd409cf97d0de56f3260310623c536ccd317856b0357bc614c97d26aa2ce99b2f40da SHA512 36417733de834ba50560bf0295720ad7a2835772a2900649231c885a7148d7bf468feb02f1eca073c65cc278c80433de9f2e96cbcd239d683b7a0990de7865f5
-DIST amd64-debug-libreoffice-kde-java-7.4.6.2-r1.xd3 797248933 BLAKE2B 6066055a6a12eb747df6ad005eea649407c46383027c207962c50fc6eff4de8252e56c915c5b985aae885e0ee39e41c257a803943fe9166410be01eced769233 SHA512 85b5446707bf95384654ccbcc4d7cee41c5816cbe81c8117349df407ea13b3551e2cb1bab1368df2ee0f6eba3e5342fb30a4ad2d5d169842b82d00fe23752f53
-DIST amd64-debug-libreoffice-kde-java-7.4.6.2.xd3 797166654 BLAKE2B 10e7e1dcde798a804128fa9f5fb240029a3199f60a03a8f2429b389cab0bda99d6d6393a96e6da117a4f7d84e6bdb5f191752643a8c74f367cb39c15829c4c3e SHA512 b4202f14390906761fb421aeacef586194018a119d5838ccdfe6287cce2c72fb71ab82029c99ab3804b3a8104d3d893317588b48f200efd32110e7695bbc088e
 DIST amd64-debug-libreoffice-kde-java-7.5.3.2.xd3 747089491 BLAKE2B 7569d67c9796473c4822bd185aa52c3124d47c70f94da886ebc9c2aa673f465dddea4028b4ef491a69317beeea646abbfbb7ef942c044d4a7e4a1e3abad693e4 SHA512 6d63c11d3a7a458e8fbbbdcb4c78f9cf1fa69c032f47a958935bd0d2a6b9b6aac993983d77b0f0296356a448151f443bea8d8abdff64fd52b645887fe01f08fe
-DIST x86-debug-libreoffice-7.4.6.2-r1.tar.xz 8033940 BLAKE2B e49ce9b13a7880614edda845b623b0e111a077ab70ad2fa1800a5d152409e0a71304526b31adc026376b820216a0288a912e58540aa90875df25574a27a7bf9b SHA512 7eef12e5ac215ce4ff85f1176275e1ba11cf9f3d60fdca1e70ee70400436f54f8e609bcb8e05570e92e7070aafab2ffdc2da417c5ecb721bf8f89ec9a88a154b
-DIST x86-debug-libreoffice-7.4.6.2.tar.xz 8035536 BLAKE2B 972bdd33fa6ba802e2e682c63285a0219a1a65619c9e311a1df210c8162fd57f60897fa2ed9f09dbb507d8fa3860792d63196b5192100ff77b7d7326a2288a23 SHA512 9c61a9d29e77cffe5c438db86ba38423e46a719fa6842e05ec94344606a408177cc8df5bd633fd744188570acf57210ff57efdbbf5e23aa7b7ae228edc1a4b48
 DIST x86-debug-libreoffice-7.5.3.2.tar.xz 8094076 BLAKE2B 46a9a808cdbb58c95a5543c709b2891cd533c8900d63e06940583372c6cad415266bc319a590312b333f58f9aa2f4f1c8b3677cbd7a3215e81500adad6d21ebe SHA512 8b08e39535b4bb5a4aff35bb7e508192908907d7cbc9ce2712e0de4e3982643f0c22c2cd117046a5fa408b667e90d2889b47cac2e825a977aec966447fbe41da
-DIST x86-debug-libreoffice-gnome-7.4.6.2-r1.xd3 39137 BLAKE2B f0b80b64f07664ab47d3ee638344e9f62aa9ddc8e6e11fbbc5de61f00837ad7b008f407e093979b2dfb86f4eea30134fa289a3e19199c401d1bfdd7539dcde7f SHA512 bf53d16e504e97cf614e6e75d2eda320d77db80139fcc9b26df833af68051edeaf2771f25c1a339340d10a9954fabd71ee47c1c151da8eebc88c05e2466d0bb0
-DIST x86-debug-libreoffice-gnome-7.4.6.2.xd3 39249 BLAKE2B 346be25f8c1476829cb59408b4e8768540979c53b72549b8a7a08e1484aecc9397b15fc6777f313be4d168747ffc36effb940a6b787595e8b98506a25fe014b7 SHA512 360549e6220b7165a0999a61f0213c94ecb09d08fa8a09bc2705b87dcf6d5626d927bee9aeec5748f1c0db0c1fed166453d28b0d86678425855a599841e21c83
 DIST x86-debug-libreoffice-gnome-7.5.3.2.xd3 39572 BLAKE2B 674527dff6fe98c3d9ddecb62d41aba70ddd9013929f41fb7bbf50d1a846938e02b766b97532fddec8d8cc7cd05cd81af308f3ff29483dd7a384c08700fd228d SHA512 0791892e25c217a6ea6a89ecc66205605c228e142b2ee1dceb70b61a4177a7a23c327165b8bec9a0627c412f6436206c2ba0856df0edae0cd59aae6d9288694f
-DIST x86-debug-libreoffice-kde-7.4.6.2-r1.xd3 2737886 BLAKE2B cceb6db83e86b8e8fe59b36f852b9b95cdbfb37e9c9528b2b7bf4ab4e6824fdb8da2d4e8b8b23eff1464f7dc1ec829bc43853be8d729863e35fb752223fb97d7 SHA512 50a8669fb1c39fea343e6f9827a027371ae123d1c20767113e334c242d88b5abb31824cffcd836341e17249a15645a1d2507e739b38bcebdf38ef2c3e8836458
-DIST x86-debug-libreoffice-kde-7.4.6.2.xd3 2738141 BLAKE2B 9e872a15d8f9f387ee91e74d7acea7bbe0e04a109795c4fff87572d1c6e6f9845b78a406075bc7ccd90f364922d1e068ac6addbd8f5d7a6b73295593a265c4c8 SHA512 9f780682182b21b0e321dfc168cc7b6f6a41ccc0e669d703295c68811569774e8a923a53dc554ee2a3c0931f3653fc1b9036ea768f6d83b5046efac647590534
 DIST x86-debug-libreoffice-kde-7.5.3.2.xd3 2757424 BLAKE2B bf17f632bbd5d142ff3ca8dce14bab0775c016dc0d8803735162ac88e71d7ade8013ba7d9f0762a77c2fa0e8110aa10039d8b364e1faf7ff04cb41b47e164223 SHA512 015e224bcf27a7ea7e4493bbfa4bd3cce7756fd85ebe7bb91c73a5ca162701d6c331460ecb88a1ff3523568f3e608af9cac2acba8125e39ba7eff43b9556e89c
-EBUILD libreoffice-bin-debug-7.4.6.2-r1.ebuild 2536 BLAKE2B 4968d66bb8a4ad759c964896992ae58d89058c3c318aba1562ee1b4991ae9ea5a98fc12361e6201d2b0d8a8bbc708944a7115d49222618529e9865536bf112d5 SHA512 a9e7d0bc18d0856af77b97e42b8f40a36d6cf54697c1d6cf4f31f0465c852365faa745d40aa5215577a1861979d37fb4a770e91a6c5e4ab0f6ad5b3b8bc01b50
-EBUILD libreoffice-bin-debug-7.4.6.2.ebuild 2536 BLAKE2B 4968d66bb8a4ad759c964896992ae58d89058c3c318aba1562ee1b4991ae9ea5a98fc12361e6201d2b0d8a8bbc708944a7115d49222618529e9865536bf112d5 SHA512 a9e7d0bc18d0856af77b97e42b8f40a36d6cf54697c1d6cf4f31f0465c852365faa745d40aa5215577a1861979d37fb4a770e91a6c5e4ab0f6ad5b3b8bc01b50
 EBUILD libreoffice-bin-debug-7.5.3.2.ebuild 2536 BLAKE2B 4968d66bb8a4ad759c964896992ae58d89058c3c318aba1562ee1b4991ae9ea5a98fc12361e6201d2b0d8a8bbc708944a7115d49222618529e9865536bf112d5 SHA512 a9e7d0bc18d0856af77b97e42b8f40a36d6cf54697c1d6cf4f31f0465c852365faa745d40aa5215577a1861979d37fb4a770e91a6c5e4ab0f6ad5b3b8bc01b50
 MISC metadata.xml 482 BLAKE2B 94bf0468867227f0b085d6ca86359e9ae852fb874ed95ffa6d9926cfcdc7173d5db4dfe1a0ed86daec746a4f867d42534465bb03402c5bd4d9ac6bb8101932d7 SHA512 d4f6a8f90659676fa509690059e462c1755e22792efeff0a571d8f04f9f167cbed22d5ce34928a4afbf2fc01bf7ea2b5e8f1a70d4a652a3df9153ed0ccbe1905
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.4.6.2-r1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.4.6.2-r1.ebuild
deleted file mode 100644
index 057f88d408c3..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.4.6.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-# the = is correct, the debug info needs to fit the exact binary
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.4.6.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.4.6.2.ebuild
deleted file mode 100644
index 057f88d408c3..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.4.6.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-# the = is correct, the debug info needs to fit the exact binary
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index bbf5b56c33b9..0efe515232c2 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,32 +1,12 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
-DIST amd64-bin-libreoffice-7.4.6.2-r1.tar.xz 146899000 BLAKE2B 8ba568744ffc0cac43b32c5f2ab7eb702a995eab091e407dba1641c202f481451adcc20f51c19c5e85bd8e2aec7517404bca4c732a93bdaf716c759aad6e4d73 SHA512 0eb87b4f47fbda8848e943153bf1025ff8b723902615f6de9da57c427c4d0e3cb107094dc228495c7eaf833bec2b0dbb3eea50371ed5212136728613f2b0c65a
-DIST amd64-bin-libreoffice-7.4.6.2.tar.xz 146854072 BLAKE2B 29e89876ed6cd6b76c25163b934dd5a647c5314dc9a4968111e91afa75bf7551ec078334af8529d209287def46a2dea9e4e7704f7a71aa9a0288ce9265ae95ca SHA512 3089455406af2d5f6ed7a1e716a741ce0920c3475ce9b0161c0492eb4c19c9fa03c798a0ce6cda7a61bc653ee2fa324c3930551994b884de628fe45513ad717c
 DIST amd64-bin-libreoffice-7.5.3.2.tar.xz 148541304 BLAKE2B 8bddc855788229cc2f986b1bdeda1c3e1feb2233d1778b382dd839fee5b0c5e1d7f7dbf70927fe4e5a5e45aef480c9563f6bb41304708f9bb7ba31f2e61bbdf3 SHA512 719e09dc8ab3775152c3d80ae820d189a538769869795308875b3961f4ed70db496498a006364f222e6273e642ac57614e085f9a886cea485a35dbff78c824ed
-DIST amd64-bin-libreoffice-gnome-7.4.6.2-r1.xd3 1533312 BLAKE2B 0e6753977b39de0e3bed8907e55a86d64fa5040982fec93ddd05f2f053497227f2ca80bcd60c080d1eb13d09a301e6f10eece1dfdab2fb693f7b944b5de54e5e SHA512 7c903d2ef7c66017727a774ac9974a07688326b9a86ea941769ed2a19a6dba01f1e55ef3e553a890a83fff4591c82fa36ba33f72f7861c07e25a4145784f392c
-DIST amd64-bin-libreoffice-gnome-7.4.6.2.xd3 1539785 BLAKE2B 262962089f76d2f1cec1fb412432561c0645127ddb3656ca0517b58846134ad95a8d8863bed21b52a05dfcb34705ea2b8f017b5d45232adc879d9a218e0f84f1 SHA512 40de33e533590fe71ec957d7852ef196cb4e285f64b261a5e02edbeae67d7bf40a436e3730c992ee6697b70bcf5f8c8ee788d9198a3f5f10ed4f592d61da718a
 DIST amd64-bin-libreoffice-gnome-7.5.3.2.xd3 1807491 BLAKE2B 27be2b48c2838929f31f9e600b46cf5d58cbd5593c16cc0b476b1cda368701acc3405bb1ba4cfa3095fe05361fd234a373aab59824cbfb7f9901080c4e79af70 SHA512 640a3526e2c12deaa41fda7141c3c30646b9f073975cc073bf28354919dcdb87550c7e0f5530ac38b6b1830eae34794ff04483ad4d21b51eadd3bafbe0709892
-DIST amd64-bin-libreoffice-gnome-java-7.4.6.2-r1.xd3 31491604 BLAKE2B b0307d9b611948181cfb865fa1f121b7cadac3f494aca18333c6aeb1ed64c0cbe44766178484bc1a6632cfd8babd7b88b90f892318c6d218573981228d35c99b SHA512 7fb89ab0c0e13ab0f530b388e39cee4d21b0345a6f89fb8ef22dcf0c6b9f242fa89fc5026c58658a2ae8623ce49766fc62d17cc817b75a5653a95fdb2a2ee4c8
-DIST amd64-bin-libreoffice-gnome-java-7.4.6.2.xd3 31563743 BLAKE2B c2414806ace6e642dd618ebce863339627b993f7d6d074290b6a3af1aa4884b3dfa520957ad3726471f57b8d1bacba40ee378722508607e83c5a63193f89d8fb SHA512 dde7dca009f9117af54b011ce78fa52072eb6d5b241f110861cef28b3279d5e3f3ff74b92a1b05be6b9e13d4efa88a65c31db0e814aa7ab6a9de252f1ff5d004
 DIST amd64-bin-libreoffice-gnome-java-7.5.3.2.xd3 30946222 BLAKE2B 2d969c129f9073e6ce47c9ca23a33513dddc1adad8c958910e2aba157c978e9d7f7f0c7f94f18637a9a55be84c679ae3722a125f3eafb1ab1a477a2085417563 SHA512 a349d22f7c9ac0b7fd24d6a98ed5ff221758e35daa4869aeb56f821c84b15ad9f31e642506ffcdf1754b046410af4eeae156c5e13b6d362c7f8dbfacef4add97
-DIST amd64-bin-libreoffice-java-7.4.6.2-r1.xd3 31442564 BLAKE2B 13bc3fce200c38cd668f6600d1fd892c3b07732ac0f59b8ab97d8bf6975d2a1d3d9b9a4c1659bc33a225c8926170d3b3faa47d31b5f6280114cb4b4f02704777 SHA512 60e76dfbe86573fada99240117384da072cc76a5610d4f4abbefb01c45d41d8a518da84f9c6e64391f9e28eb9bb0414a8d5839f05bd0ed1cde854002b9e21d7d
-DIST amd64-bin-libreoffice-java-7.4.6.2.xd3 31446539 BLAKE2B a78fc1cdf252e6eda76f753cfef275984a4cfe61437f8fd60dcbf8be91748d3f85488930fc28586fffb776513b90eb256c91b5118ef65320db548d60b427dc40 SHA512 aaa691a5faa2a5f95256f3fedaeaaead60ec1d4d456bcc9f44fd9a2886e01acde114c8556ca6decf96ae3b63b7bacd0400b45b3aabd26edd7880456f21d2c886
 DIST amd64-bin-libreoffice-java-7.5.3.2.xd3 30773858 BLAKE2B 63f4e099f829c56950c20e236dd3c11748b4e33dc6d04506602eeff5224e77e210f224f4b663beeca3ccdd2c7f121066851cf4fc93560460650520b955a47be3 SHA512 afa39292e3a4b6c115ca8005244e4ff7fb04eb5c96609e1c7acb940a15e2b3a1bc0ec659abb73be6c623a7943d402c35386d95a06336c30eea98f5fd706ec353
-DIST amd64-bin-libreoffice-kde-7.4.6.2-r1.xd3 21615543 BLAKE2B 1ac20a6e04161cc87d07319ffad89d286a9002a12d696bae98ed790dd88f722a3a9942333a09485790f3faea5edad4beb92bd1b7ec76ebe774241281e19c0b7f SHA512 0e84bbc3a7786ab9eb8eea0d6406a2e0d0b5a986406e7a175ddb24cdecc870a659f2e2b2b139b2f242579b9ddff2c1d58e547ed05194f7f0b57ebb7002ba9b84
-DIST amd64-bin-libreoffice-kde-7.4.6.2.xd3 21625101 BLAKE2B da27e7a9274d5ed16a14d3a11333d695d77ea07a4bf078f52002da8c6a29105ac748fa03523ff2b9789573214f83123b4c13a1c54a60c1641609b7877d64a1e8 SHA512 7afafdcb90c1a31affdcba98e3f36a4823fd11b4de8ade5ea66b1a112729680eb3da88e8025caaae7896848ce78e18bbe14e2ee52f06f4154292b0310765b8ef
 DIST amd64-bin-libreoffice-kde-7.5.3.2.xd3 20280507 BLAKE2B 93dce73d02fde3afa094332ee936ebaf582f095225de6e7b6e812f2fe8a0fd9c762148009540c2c97c4757f93c73be24ab7407670a479360f6a9642cb49aab90 SHA512 465339b53ced60a652ee4c252145de0366fda42015c853420ebd5a18748e7e9e744b8a504a543ef71cc4e4353957065dd6044c872708f2c079de621f9588ee36
-DIST amd64-bin-libreoffice-kde-java-7.4.6.2-r1.xd3 32246133 BLAKE2B d6ed1f861781fbc16897e8e2f5b71116afc484b54d81deac216a9b7bca8262807b815796db57062492894cd9948d031e954cb794df4415979081511e9bcb514b SHA512 454fa85837dd6607be221146a20346689af89a691b1a997c0703d7b3b888a0dcb4c8f668b1a70eaa82433cf993045e4c8483fb2744ef273dc9c7e69b1ef29dad
-DIST amd64-bin-libreoffice-kde-java-7.4.6.2.xd3 32196626 BLAKE2B 3c85f884a11b57ad134ea5a5d1849a1b9f4b17962e734f4a1ec5b6920f323f24776db96527c8f59afaf2573388cfbde10fb36221ffcfc8190b10a6bdfed64802 SHA512 951dde7f83f283a50f68ee0b22d4ae95a1656920a07e6e34a4747cff7da672ade09058986163f5b9c21c6888c4b6e5e13cd55b91face31c588f0d5759c244f1e
 DIST amd64-bin-libreoffice-kde-java-7.5.3.2.xd3 31316714 BLAKE2B 571a44144b2c2adeab25db77461eae11b897a69be12e10dfc53aae9b0b24f9f5f2c56161c8e5e3997ab6e469770ff7d8b8a7b0591da471a4ce3fa89db3d4b2e6 SHA512 3e7e972da16d87c1c14073137f782c9fb5719f7d55f6b94a1cf9102a87ac22d43d3fcd6d45f70802011dffc31aeda1fa15dbb59df9d84c065c4da3e590b6dcb6
-DIST x86-bin-libreoffice-7.4.6.2-r1.tar.xz 147948148 BLAKE2B fdb9cb33a19ff7962faaff345dbe629f07834b568ca5bf29afbcf89928602fab85e17ed979340fb72ee70b0f8729f4760d6a221631b92c6947fa8625117b94df SHA512 4cfb49ac4c4209d1f0293dba83fe444aeaaa4e764d48d41ac500d2a3e5dbf9c0f338a537184fb869a327ce3785262103dde86efd3f3d1d9a9cd80150f5db1fa0
-DIST x86-bin-libreoffice-7.4.6.2.tar.xz 147928192 BLAKE2B 450ddd4ff96d96ec03102ef88cd20442213ebb83fac1bf5f4ba5637459dd318530767798b26566cd694b7a229f96d5a5346da5ddc06366e20ec1498068645911 SHA512 b5f636f4444ab79572c31ab2cd3de026ddc96c7daf431617de05b9e8b08d2b988a4c521c593e16b7f665032de89c710b164226f7a0461b077877c8add874db46
 DIST x86-bin-libreoffice-7.5.3.2.tar.xz 150673172 BLAKE2B 90d69a066ac9f7705bd5fd2067de89faa346b1cb7536d0f22658554318b34353cebc570b9507e542bb6160f9e295c48739a490965bbca2f85871ce79037c1d17 SHA512 cba8321696740404e9c2e81c05a1de8e471db24cd2961cb8f5eda241aeee17d4675eb109819d5ba9363268c646c2028e8c7b495d4a6e29383316e40d3e3c6a06
-DIST x86-bin-libreoffice-gnome-7.4.6.2-r1.xd3 1515008 BLAKE2B cae5b8f417b61ea29e0952dacb6391b308154ca55961f5f06a7683ada7296e2c88a805dd8b5d70a8adf5d021ae821ea63c318defb269cd7b6db5759cd1b1340c SHA512 2adf137fd8807a99c3ee42f4bb79d1b8cb276d1fc1259420b62886edf888b43bfdc83bd954e8428c2b7c1c17469bced31cdc452a987774bf0e9b3f521d6425d1
-DIST x86-bin-libreoffice-gnome-7.4.6.2.xd3 1533290 BLAKE2B dd9efb55044ed4d15ed000ef0edd0bcdff65b87e9abdd38a624dd7ce188e9c2b42a3320305eac048f60be0c5e05480b8771d0dbf11166a47c6dc8caf3793708c SHA512 0b86b364768a232b2eb14d9e4e84cd7201cc16064a3b0108f9605ffa5585007fd2a3eeb1e7b8ba69e7fc9d30564d63aa095a8d60043f60364edd6bf4fae99815
 DIST x86-bin-libreoffice-gnome-7.5.3.2.xd3 1749063 BLAKE2B 4cec2c2e7551443850e0a858b0ac7f1d0888f329d8bf402f28bdd15f861ea8c2e8a1fa4c8e0ac01731bc7069c95f89d08f147108fecc219cb470a3e1b66c8b3e SHA512 f196808233dc18ed42aae0328209876c61b9b556d6ea3ebe87a674e46bff4aab8d1f5ad2f4b0b8e3de05fe0b6aa2c6244dcad677e41d7b510e63d0d032216855
-DIST x86-bin-libreoffice-kde-7.4.6.2-r1.xd3 19581148 BLAKE2B a24c7f6c6fc4a89ca8c6597079b17294eb2b77519482b8659a55a65753efcca63f74facf98941abc69f5249e88432ce68d0f85c87b439ca5ed80f1e44fa58e84 SHA512 6c4481ecd02cc4364ed276669711040bf8a6f9b0c7fce13dc7bd72466f0b4aee087c6fc55a8d0b1943ae11e1714c058e3a714b38363ab1bae54d23a1495ebe64
-DIST x86-bin-libreoffice-kde-7.4.6.2.xd3 20590446 BLAKE2B c09ea5c79402ddb5db668ac950f2497ed390c55f30660c06359db73da397f85433fc5cdf4bd716d2326d9727b1c49dcf0785c4c58a794a91f6a7cbf48ebb51ab SHA512 facc20e34da248e8a6dd94caeb27587aa9236594f299cb46bbee9353e64a478198f0077e5f9a4c66b379cce0b6551de010f0dd927a056a8650937b34870ab386
 DIST x86-bin-libreoffice-kde-7.5.3.2.xd3 19989837 BLAKE2B cc1844c9312b47b397823af3a8860b03ab3690f3e5e38190df6ab5f0a9ce537d961a309aa4ec99fd7ef65a0bf99a505cc8eb414dcc958c73d8b1dde80b543a77 SHA512 b0c1a6906b322831c39c248c816e5b203ed2c5a17dae9cf4e25a0d7361818f2a466860d4e9eeb04132ac797c5d7798a8f3651d97d25a5c64c4c135297f092f4e
-EBUILD libreoffice-bin-7.4.6.2-r1.ebuild 6400 BLAKE2B 81cd630863031778631f914a841a723ec22ab1f9f3baee17f7b2eeb00c9780dd31099189b0bd03aca3d73d27a9e0c4932413a3bc96312f29f98ae3068752aa25 SHA512 8b01333c8c8c9732e25ac1b899f3ad8cea0e8632abe5bd4f8d47577ed9af82d0bff45f45197f30892109480651c264e7b53755eea5feb664e568b7d781aba2d8
-EBUILD libreoffice-bin-7.4.6.2.ebuild 6400 BLAKE2B e38037fb48f6d1aed68e45887d700e00fac41aab75acf2227961fe732bb6384c950af2afa87d2e9dabc2bcd9b6f13ad08d2e1f9b7ef61f8f0d1f541defc8d784 SHA512 ef5b4b84899becc8b81e798ebd21b60f65f695e0d5a33fd37938d01b7a72bd151b057cd809323e2e571964ef16a9d9be3a4abbe10df5d50e0beb0339c673bc9d
 EBUILD libreoffice-bin-7.5.3.2.ebuild 6420 BLAKE2B ad9fbbe2c798f2cec1f7c73b46ae7e3297ace71ddd39ccf0d17872f2f71f8b70cd85d0cb489b54d2166751db2ef66b0a47faffeea8805f006bd0b01eadb0fe82 SHA512 f98a216984b37c47e84bdf8caad599b63b37ece20032fca53169f7790aaf90a849d7a5587d362f65f85b1e04e34d93f74d1764fcc2e5a306fd36fc8026f0bc44
 MISC metadata.xml 529 BLAKE2B a789c063d4ee905fd36dd0192d0f2769e0eeff96e69b9f27a2e75ca47a7bcb0ec841e68cd0d5299152df2b9b626bcf301066aa251e1b4ca2b74290d57c448c8e SHA512 b98d77cf995e824efcc392c185e616219d35976f43c343a1cfb1737fb44556edbd47b13d47924e3195159d0ec06e40f4909d0e7cd9deed7a8fa10928bc47becf
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.4.6.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.4.6.2-r1.ebuild
deleted file mode 100644
index b608adb8bf48..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.4.6.2-r1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_11 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-cpp/abseil-cpp:0/20220623
-	dev-libs/boost:0/1.81.0
-	dev-libs/icu:0/72.1
-	dev-libs/liborcus:0/0.17
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/6.0.0[icu]
-	media-libs/libjpeg-turbo:0/0.2
-	media-libs/libpng:0/16
-	media-libs/openjpeg:2/7
-	media-libs/zxing-cpp:0/3
-	sci-mathematics/lpsolve:0/55
-	>=sys-devel/gcc-12.2.1
-	>=sys-libs/glibc-2.36
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.21
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	dev-cpp/abseil-cpp:=
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2-r2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.17.2:0/0.17
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-2.6.0:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libwebp:=
-	media-libs/libzmf
-	media-libs/openjpeg:=
-	media-libs/tiff:=
-	media-libs/zxing-cpp:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus[X]
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		app-accessibility/at-spi2-core:2
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/libreoffice
-	acct-user/libreoffice
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( virtual/jre:11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.4.6.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.4.6.2.ebuild
deleted file mode 100644
index 2f743558424d..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-7.4.6.2.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_10 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		${BASE_X86_URI}libreoffice-kde-${PVR}.xd3
-	)
-	gnome? (
-		${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3
-	)
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-cpp/abseil-cpp:0/20220623
-	dev-libs/boost:0/1.81.0
-	dev-libs/icu:0/72.1
-	dev-libs/liborcus:0/0.17
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/6.0.0[icu]
-	media-libs/libjpeg-turbo:0/0.2
-	media-libs/libpng:0/16
-	media-libs/openjpeg:2/7
-	media-libs/zxing-cpp:0/3
-	sci-mathematics/lpsolve:0/55
-	>=sys-devel/gcc-12.2.1
-	>=sys-libs/glibc-2.36
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.21
-	>=app-text/libnumbertext-1.0.6
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	dev-cpp/abseil-cpp:=
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2-r2
-	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.17.2:0/0.17
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.11.0-r1:2
-	>=media-libs/harfbuzz-2.6.0:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libjpeg-turbo:=
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libwebp:=
-	media-libs/libzmf
-	media-libs/openjpeg:=
-	media-libs/tiff:=
-	media-libs/zxing-cpp:=
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus[X]
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	!kde? (
-		app-accessibility/at-spi2-core:2
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl(+)]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	dev-db/mariadb-connector-c
-"
-
-RDEPEND="${COMMON_DEPEND}
-	acct-group/libreoffice
-	acct-user/libreoffice
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( virtual/jre:11 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	use x86 && use java && die "There is no build for x86 with Java support."
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [[ -n "${patchname}" ]]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6a5ce630e48c..0f1966018add 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 0ae6aa4cca56..a65bf36febef 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -7,5 +7,5 @@ DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984
 DIST dvisvgm-3.0.4.tar.gz 2970986 BLAKE2B 2a8cff58cc728c833c74a44af1139529eab433ec5cd8b82949dbad169a609e66069f38f18c046250da5c085756c1ef6d95247c133df1afefc92b1783d9dd5ecd SHA512 89105ecc14b974f0fc0a1684a3ce4c66444bc819d56dd43c517d6b547f618ab60a15abb18609c38ac120ac5990fcd0fa6599cb7b0af11c4f820b1f955943688e
 EBUILD dvisvgm-2.12.ebuild 1133 BLAKE2B 682c6f278485d685080c7cd998a0e55a39e52a8bddca2fd0ffe3a1964773a283bfaaf16771eb66fc850e5755842a8ad325c40bc96e6bb2cac8c4a8547e80d463 SHA512 74a88a33242e5f7b7511f97557b2f70afdb3e28d1cf51a53789e552a215671d58229378d65bddd342da3bf4cef6b6539674753fe0fd46970f4835d416bfe70da
 EBUILD dvisvgm-2.14-r1.ebuild 1649 BLAKE2B 0daec12b5203b57bc8be68160bed5cefb2d6228948dae44107d2b9a2a413e58d825b7ce294ae1d8bb9354b721cea43809b5e275236729694f6e97fd257a46512 SHA512 efd24da9bd319d3dba5792efd5881a0a90a1ca91eb7b312899181ed1073f08fe0df13888e475a56b40862ce3ba7cf9145b2dc1855093fa189202db0693d27abb
-EBUILD dvisvgm-3.0.4.ebuild 1106 BLAKE2B f8e6ba478a4b160188ccfb122ac10b2ae3178959e18e757fb7c473587175a3ebd34c993a4a662bf15d2838040aef988056bf5d70a93f58d2eb89cb1306038510 SHA512 fb59961ab0c434c0d630a88616bb4bd2c2943a33dc3a67db04495f9afb3363f33672d637c1bcf6904351ecb8aed260c5ed9565ab345d2aa9de13af60571a7059
+EBUILD dvisvgm-3.0.4.ebuild 1101 BLAKE2B e3d6ed3abd8591e0a4b393427163c337914dd4c02b7209cc792355e7b19f6ea7848b07fce8f3ab4de03280d055267d64b87764791ce39733dc3c124b6cf2ff0c SHA512 4c387175cef7c7c33a1af4c3336bc3870dabd051f696e1f1351412e349355e98b6436738a2363112a29fe1afeefdb4e03c15018cd56f1677f7776b9285d4d8b6
 MISC metadata.xml 383 BLAKE2B d4d13b1caf7ebbd81baf9d911434c0ca57f5b9c5d5c136c0ae569341c511e61fbbaf9211accff192d86bdcedca81ad9f6dab2e23f65778a0b2b7c4be0a286a1e SHA512 563b8459b11497c84145cd7dca5cfa38cafbd5bbeb2c2709080633e785509073b96d1ee999fa87b4263f2babefe32b030361fb537b9016cc3eb5ccf423639573
diff --git a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
index 17756b1b2139..3509962638c7 100644
--- a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 # variant: Boost-1.0
 LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 7b8418e51ef5..d147d3a206a4 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,7 +1,5 @@
 AUX krop-0.6.0-links.patch 2327 BLAKE2B 5bae0df80ac0e68845b5b231306bf1ca92452b6f43ada5dc539561480ea887542a39ba7927bec5b2b0b208a852d18d43da5c8a9d866aea686ac3ac01ff908386 SHA512 5e091d2381965d104b661273876b58ba2217be4d99d2d39b8ffad79b1909f2d84ff4b2fa829703d305d708282849a438f07dc55aa4ef7557b79fc5b7efac2ed5
 AUX krop-0.6.0-pikepdf.patch 5691 BLAKE2B 4cae2438ec89197616ab5a680d6cc1a391207c44396d0699fac264a39f0e642541e2c1047b86f1def842ef19d15158408ef6496a8dc956ec699db52a7b89c452 SHA512 c6a47582e8821d987e11fce3ae8de5e59383d1bca37328f8ab24aee590bf5f9b21dcc3d64cf20150026fd4a38beb653161804fc828da07b5bb265a2703ca86ae
 DIST krop-0.6.0.tar.gz 48331 BLAKE2B ca6a00a410ed4e18a401fab3a21bc49c86f73165f68b192ab83c8fad74111ba9a9941f464a2646faa5a3317bbb45cdc89bed19c901999c0b11db353ac2997a65 SHA512 51a988e4fcb65d11cc26cf5b0c808e79097a66ef8ec4751a6c051289cd77b3328ebc8ecd9829adc466f87330beb8bc715d290cc20be415a7b8f179378b7bcb4f
-EBUILD krop-0.6.0-r1.ebuild 945 BLAKE2B a3c4e6820cc0595dfbd61a2e76761b6f614c170bd2e990b51d3c55e9f1025ba7a4b9abab2ef3c66f200bbe032b4cc7908b79663082f1c5e7a7ab883e12c803ca SHA512 57beb5d0364398d4a3e407ee62aac125f1264c084983b6f7a851dff048577fd6644ffce0c0194a220484b1ef267ca69a1706d263e0ac31233f4d146420ba9e40
-EBUILD krop-0.6.0-r2.ebuild 1029 BLAKE2B d8e3dd0aa687a4f824bbdcca3dffe59d478b63cb294db016eea9e30a08e2eada007e01463c6d626483874972d15b0acb1f9b4e3693f36632cb78712150ea82bb SHA512 9867542b2cfa1f74158e26c89c46fae9a0a093e9b9010ec839ed2c6e180c4e6583c35712b94e29247452787ce939ead8ceaf6d8cf781896c02411af662e958ee
-EBUILD krop-9999.ebuild 946 BLAKE2B 5f71943de56f191ebf29d82e6249b5953ba390e564e1bbc820698cc4e04b83381fa8b44aa3912f05ad5088fb1c68a9ef2af9b2338d053d6e869bd52483805248 SHA512 6bd37e5c7b387563783d2423ac0de3640e668126134010f55cf0f7ff7da0998395bfe2a409a4b378f320c10d0cd4bfad5806ec5f73b06ebc70b52e26c12afcfe
+EBUILD krop-0.6.0-r2.ebuild 1028 BLAKE2B d4bb1286241cf0bcaa7a992a7bc206224cd057782cf5eaa9a69d32561a2d4065d3d19812b77c04688a5c47c3a81ddae1d0aee830e4a07faac1c282bf91f075ad SHA512 0bbb96cc197457df3bf9eacffc1ca26484960a3d40aeae9943ccc8368ba6dea028cb8fa38019ae779c5aa4532b3059c6929b11d5579662b20bf961452b9fbc4b
 MISC metadata.xml 412 BLAKE2B cf7adf888afec0389c32bf0ebbb83a0723168970203742a5564872471eb05700cc387ace750b0606deb337e9e0e3d109ff56e650c8c617e516d1196d6ef1f52b SHA512 bc6dd57f76f5ac0468e15f31062d302cc4a7815eb6bd323a610657f02ce46524520652b2125512bb40d50e18b37369b8e1911debd3116a644f3c6ed2c099d62d
diff --git a/app-text/krop/krop-0.6.0-r1.ebuild b/app-text/krop/krop-0.6.0-r1.ebuild
deleted file mode 100644
index 05b5670d6f04..000000000000
--- a/app-text/krop/krop-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit desktop distutils-r1 xdg-utils
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
-else
-	SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="A tool to crop PDF files"
-HOMEPAGE="http://arminstraub.com/software/krop"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]"
-
-src_install() {
-	distutils-r1_src_install
-	domenu "${WORKDIR}/${P}/${PN}.desktop"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/krop/krop-0.6.0-r2.ebuild b/app-text/krop/krop-0.6.0-r2.ebuild
index 4fffcf8b2678..e7d983914683 100644
--- a/app-text/krop/krop-0.6.0-r2.ebuild
+++ b/app-text/krop/krop-0.6.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
 else
 	SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="A tool to crop PDF files"
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
deleted file mode 100644
index 4f84c4f4237b..000000000000
--- a/app-text/krop/krop-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit desktop distutils-r1 xdg-utils
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
-else
-	SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A tool to crop PDF files"
-HOMEPAGE="http://arminstraub.com/software/krop"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]"
-
-src_install() {
-	distutils-r1_src_install
-	domenu "${WORKDIR}/${P}/${PN}.desktop"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index ba6a8356ab34..0a2616b1c8aa 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,3 +1,3 @@
 DIST sigil-1.9.30.tar.gz 26602897 BLAKE2B 554af2aa4c26994c065023839ea29b190eea501cac1183d58dcf2439ebca89e0a56848aaec1d668cfb84555c6830eaf6d32efdc82b08e0c94d7b6ba95dd7ff8b SHA512 80dcaa9dcee51c36a42bcd57fc87acda94002af74602d934c7e9bfd275339d9ac200cd1f141fb9e2709ac054569bc22f1869623498ce16c636a3fab8dae4e70f
-EBUILD sigil-1.9.30.ebuild 1902 BLAKE2B b4480d1e3c591c0b4e181a678483e712f0db5cd12fcb122786fc6fde7fb0032956fd38d703f45988d55b9703895b5ebc72aab00d16eedf9f722881205f49cc04 SHA512 d91ab0bcec6f349b3b577e8f70d2ee91c4b320bfd3d9813a9e9d7089ed0d9fb59ab06bdac7441435410283d0b3158d0e10996c16e586501d3e9fdc16bda9aef6
+EBUILD sigil-1.9.30.ebuild 1897 BLAKE2B 90e33470199cd108a48224cbfee10b74d425b2eb0d8a1a677b4c6b7002a635e7789cd6b933b10c8552782584d91374a39a5dea845a21d89edfd104d2be45cbc6 SHA512 f7e6314d0dc1d7970ae7898d6c97e6bb1c5393c8bd6b9300a8b34080132cebf652297afa8fce24985b35a90ceb55dae05fce685205d1958ec0b6976669c6ad9c
 MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
diff --git a/app-text/sigil/sigil-1.9.30.ebuild b/app-text/sigil/sigil-1.9.30.ebuild
index c70034c98975..621537704a6e 100644
--- a/app-text/sigil/sigil-1.9.30.ebuild
+++ b/app-text/sigil/sigil-1.9.30.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 3154c3330247..769250d9746e 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index 50ffbf2ce095..b3f717f6858b 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -19,5 +19,5 @@ EBUILD tbb-2021.5.0-r1.ebuild 1425 BLAKE2B 36fa0f1c44b38b04ab7e9b116d672383fbf2c
 EBUILD tbb-2021.7.0-r1.ebuild 989 BLAKE2B 91b110b6bf39cd9ba07930b6481cff9cc209df6b8a9bfba320924e47c3eaa64d8e0b4c393719af729cb26165dd84ca7545dd880210d854d72ce12f60b26c06c7 SHA512 e1a264a8803fb0de0f8d0b518db669ff6e6a860b2a95df5f2f456b7bd027442dfbfa0f52f2f324c5f6f4391bdc571b30b034e65b4d3a07278d8e4bc659a9c9af
 EBUILD tbb-2021.7.0.ebuild 1022 BLAKE2B e2ec61ba46aedb4187975b7e4848fac95fb167cdb803254e8b26dff2a367ab6d8c571e60e72b2e39dd49ed43bbf6fc1e1cb5e4f99fc7dfc13e2746c7e3f1877b SHA512 cfc2423728c85ade66c01b7d1dbbc7c6923e244581bc4b612197fb34fd03e544af2e7b597411b710c121e7ca5bfeff9fcd7a3e8d832fb397ce1754b6d8150438
 EBUILD tbb-2021.8.0.ebuild 1321 BLAKE2B a6e24a3ef058b0098a82dad665574d912454005c90077211856f61d028d8de3978e50884b8f58d659e3d56c2954c597ab216fc2ce110bd866819db18a4a7e555 SHA512 101786f2e9c1dc3f3b9caebb9434dbdd63d649ea2e97f63ff475bca1519c9c84e1c6d977e1d3faa3560ef1e8913ed47e232ce962ca0c7322ec9fef5c4087743c
-EBUILD tbb-2021.9.0.ebuild 1270 BLAKE2B 3e120fbc66d50a202dce6ffdf06e4542693966c13b070a9492be80efe815f3d5e5859c15c70fd830d7f826a4803d14eb52dbc7fc6fb0a9150344f783ac1c1c5c SHA512 f020063de2b4eebd591cf01aa99054630181ec99177b602d38a3e7fc817ae58d6c49854eda356f50f7791f2f5a91540c8456aae87fa3796c9d2c8784d5dc2d7f
+EBUILD tbb-2021.9.0.ebuild 1266 BLAKE2B e0ca3fa10ce61c1316ae2068a8a499ec67f379e83b10ba6cf68f976a6d005d7a276efdb1867afbb5a64a5c6a6565148e35e3805af99ce37240b0d5f03ceeae84 SHA512 1c7538c993a319b819fd4f5a0b562892119db3caa6759c4021d6ba72397e078d4fa64bd7076af9de1228e18baaab8f9410007ad03e0b043f8efa316c70cf439c
 MISC metadata.xml 696 BLAKE2B b8003afd9cf4ef7a07aab27f5a5263604fd32ca98ade51ed5a3872a53ea45c2151a49b0a9bd997219a58ef4e37ff4c969df716ee7e9987bf43c9fbc132dca245 SHA512 b95aad151a300ae292c519d7d792e2b4bdf471ef786c77904e279a203a4ebb24514177a1a8663abdf2ea6899c63e007dbc7a69cf1c0b53f6e3d3b486d66243d7
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 2e11233b7583..2b915f2be22a 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7921ac7f1952..741c7377fff1 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 8c13ddef4521..f332b9f6419d 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -2,8 +2,8 @@ DIST pgrouting-3.1.1.tar.gz 6133979 BLAKE2B b7657eeb88773773e6166190cda73d9e6577
 DIST pgrouting-3.1.2.tar.gz 6063893 BLAKE2B a371fb9c744b14072c65af5ceb1ea73d2cdb69821626be3ac79e08c9dee854272ce8cb3816d1de3eade06d50a7520846dd6bccda06934b9db926f9092719f131 SHA512 3cf3e0a4a726f6f11887d15ad71b789a9067f3bc5a675288f22730215aa12d12b94d75f9bdc8ab3077de8368c45c55c0dc27128d0453c4c30965bfc0cf118dcd
 DIST pgrouting-3.1.3.tar.gz 6057504 BLAKE2B 73bc5d810a2f7bb383ba4fef4ffa52ccb3f21dbc00c68f02665dc459c0e0a2810e0ed10ab73bb3099be5ea6dde86bad884d82039a50c9c4eb423b614845e94b6 SHA512 1051f0a91813ccb3c396c78a059b99839b3352e562372bcc459dfaf289e35ea08bdba8a159032a3df46913548fc717968c187b8c480187497a5b5f7327ca470e
 DIST pgrouting-3.2.1.tar.gz 5940439 BLAKE2B 01f4ec19d4cee9165a5aca946935cf4786a42f943602eca99414b536dec11ffe298f960e11aaa8b747c1b9c1839625ac9d3e7f67f1f606e941c9c738b4970479 SHA512 ead51de138950707008a7ea6b1a18cfe4d8b1885bfe92849464c2714e39f8e43ef3dbebd1c68279987a1321705fe33a598efb463078491d52cb90a8d1a0414c7
-EBUILD pgrouting-3.1.1.ebuild 1084 BLAKE2B 92383977229671f04aec4e327eb4c28fbf666af880bc4802520a13d2b999404defaf1d04fd0aca694b135ffea31d256ede5ffd957357d63aaecf17290c1a633d SHA512 1ae8d7815390459a1ecb555ad6be1a9420ad63fdd3402d34b0be9ee6e44eeb4b40f393f270c72fb6e1ccb64ad8d71566d996948f70fdb6d34720053b41e59996
+EBUILD pgrouting-3.1.1.ebuild 1085 BLAKE2B 43d04473c46ebae53e915ccae61d1ba49aa072b6acbaba6019b5a0b3b79662a0e47b698a2f33b3106fd8261c9f3c5288f5c224a0be62f731786b656f156124ba SHA512 54bac4a5e83e0f2fc077956b53b6bc477ad12f7708ec72d41ebb6e711bbc6930abc29b3738a2fac9f8b064e03684dd7fda27de9052741cd6249d0c2ab3730266
 EBUILD pgrouting-3.1.2.ebuild 1050 BLAKE2B 6ede8aa0bae0531871ec90516e933fa254d682ef42350b1c2ebae0f06c52d3463701bb0d5db20f32d21fdf655e74678187bf509a546ca800ed95fdbbda180811 SHA512 7d215dddf2ae2ef04f55961d9efa9385c908e986db250717b1d21baf516cf49513f8898d8522b3f729a50b2cad21a0f1135f05ba96a681202712182a9b6988fd
 EBUILD pgrouting-3.1.3.ebuild 1050 BLAKE2B 6ebcd194d005e86d945055cb24ce19a4b2d07d147ea901d5b5c229fb15fe2231651ed8fd326eebca75574f14d5b7a082eaf52d0573ca16302b5c2e11fe8e37a9 SHA512 d6da55f43c56c2311a9ca2db52c8704d7024fdee023870f52188a98e260cc5db7dc26cef8fd1fd74594b13fd13c99f47d352f7c4ce5745b1de29158b2855cb84
-EBUILD pgrouting-3.2.1.ebuild 1048 BLAKE2B 747b291c7d84f2e21f22314f39ee2d6ba0a4e11ca2024e80319720949ba817558f6a612b445bda311758d262497a7fdea4a245ca8270595533f6ddb5a2a01bc7 SHA512 66e52ebbb4a33512ba23a43cfe1dfb52cb8efa62a6ef21edc14ab604fc4d2cf4cbc419970e97ce3b8841f243a40f09839bb537c72da6f33b41f80dea1d10e31a
+EBUILD pgrouting-3.2.1.ebuild 1049 BLAKE2B 172cae1e873635b30f44aa7f81c500ca87c7ba420be697848e325229c92b670c78b70c1539736fa6256023498109e7ccd7748d0eb90635c2b8b445eccdabbb53 SHA512 0990fc1a9e48af10e24619b6c91620194483953c72ada8f5d6c0b9edf6a8417d17cd09682d4114bcf6e31b08efb9bc8432aa98c5ce3d6ed5ae99f23f138c96d7
 MISC metadata.xml 375 BLAKE2B e6c25b3d8331162daad5c8cf73b35340bb5092e219d0300be1aa2b36f6d73044b7ddb883cf15e633f8837ef12716a779bfc968112cba418dfed9d106a86ce076 SHA512 b01c3c837b862519087f831bf7ab7de2add4a6fee5b8c7e78b551fe6c4bed59d3f30e7871defe16c25271fdafa5e1d8bc6da250ed22bd1f2476e05fcd3a3d7d0
diff --git a/dev-db/pgrouting/pgrouting-3.1.1.ebuild b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
index d3d4fd21aa6e..902b7ecd655d 100644
--- a/dev-db/pgrouting/pgrouting-3.1.1.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://pgrouting.org/"
 LICENSE="GPL-2 MIT Boost-1.0"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 
diff --git a/dev-db/pgrouting/pgrouting-3.2.1.ebuild b/dev-db/pgrouting/pgrouting-3.2.1.ebuild
index 60913caa8328..e4dd40f0bc6f 100644
--- a/dev-db/pgrouting/pgrouting-3.2.1.ebuild
+++ b/dev-db/pgrouting/pgrouting-3.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pgrouting.org/"
 LICENSE="GPL-2 MIT Boost-1.0"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 SRC_URI="https://github.com/pgRouting/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 167dc792ed93..65474ab25fb5 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -2,7 +2,7 @@ AUX unixODBC-2.3.11-config-no-install.patch 794 BLAKE2B 561f90c8f72938a525bc1f98
 AUX unixODBC-2.3.9-clang16.patch 9332 BLAKE2B 8037f82286ae4a94698803530647ffb6d29c9b85da60320cbee27c60aa4bf6e004cba99abb5d5fc209be67a6fe016c6ed572fd179a75c5fe50b6403962fd11f7 SHA512 e1f92c192c6d441a4c3cf051fbb4929af403552c21a23adcf30657ad4bcbd4ca416322ea2e1bec6d1b1f0fb9883b243b1b84460746d56a8b28015f801af6b157
 DIST unixODBC-2.3.11.tar.gz 1752585 BLAKE2B fa1502d7b83c8c10ee9d54b23281096156a3e3ec893b81acf125cd95c1de0f4ae7657ab3b4c5214a5c6a0fc9209e53cd9acdf6f99e65840e0a05366182af5600 SHA512 dddc32f90a7962e6988e1130a8093c6fb8b9ff532cad270d572250324aecbc739f45f9d8021d217313910bab25b08e69009b4f87456575535e93be1f46f5f13d
 DIST unixODBC-2.3.9.tar.gz 1676145 BLAKE2B f4078f9266cea753b6f78d234290efe95a6fa9551088a6ce352b0b6ac5391bf2724f872dcc2df0368e98befd24f995ab4eb6958a34bb080b0f6d08993991a0b7 SHA512 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
-EBUILD unixODBC-2.3.11.ebuild 2022 BLAKE2B 6228e3365437f8fd04ef2c8881240c75698bf5c779a0c2f6ca5a3eeb6a8d2caad2a197db8f199a894564a316c757431ecc8739f4650d1c0e4a4d937fb20be6db SHA512 5ddd720b0ef61d7ec4f9fef9fb9f1d43bcd7d1031c912c66344040a677c3e135ccd0315848c0c46d83d9c1c654cdf15d9a46ffa72c6fac87ebf3f17a6cff91a3
+EBUILD unixODBC-2.3.11.ebuild 2018 BLAKE2B 57c577a361aac7f052260e572fef876d74165199a38977a1f9cadb9ff1ca0bc0ccca502b7a75f088f1e727920727781a2ce6f41d3833106bd19cbf7b8a6fbcc2 SHA512 6b55ab5a2c101d2e8ff739473921f4de2338b10850221b62a37ee1a2d2784e8d00b82b2c2bdb0b9f02e12d263f8c350f6281073322e0522bef60656bfdc4a7cd
 EBUILD unixODBC-2.3.9-r1.ebuild 1894 BLAKE2B 537606e377e4a8af4e325fc1d39b1d435ff2ab118e360546e9a3779632dfbc248097853f7f6ad97f066d9c43ff4778e057ef3a636d9d89ec8ef6cfe3f9f45e42 SHA512 32366dd52b3a6bc3a037bdb7fedf8e29bd49061eccc1919c33d5d1dddeaaa5e1447c11b41701ccc94456f97fd3a2bd0545bb8411ce26d7c82ba1ebc5197c757b
 EBUILD unixODBC-2.3.9.ebuild 1778 BLAKE2B e0567c8807fe6c67625e6a9bdf3dadaf9811693bcdec5f944020738965b9a44ef0ce9cd295440ed95e6b600ee12d5d8b5a831425e4c7ff737689237c9ca76af3 SHA512 87ed3464dbe4b3b575ed717bd384f5351e25dfbd7b9512d93116fd3d89b4c37c2a73676a387f7362c000052a981c850f26ef2728ddb59934d001844cf1723e2f
 MISC metadata.xml 479 BLAKE2B 298fd55d5c29508598a3e221f0d3b850b3f2e195885460c5a9cb9d4111d9246576d1ae0c8c586f6484931ea2b8b9a2e0127db5e4c01c456e66fb66436b62f2aa SHA512 a751b3121ce1298c50e4f66ce8c654d578be088fdf52490a4149d380053bef287736d27ef1b430fef789019cc1e0f53904cafc6c292d984a78da105a493be6a5
diff --git a/dev-db/unixODBC/unixODBC-2.3.11.ebuild b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
index 3394fdad1356..527a5f9db0c4 100644
--- a/dev-db/unixODBC/unixODBC-2.3.11.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 36a7ca60c268..f2e5be5c911a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 95781c869c57..f46dfc564a7d 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -8,6 +8,6 @@ AUX R-4.2.3-curl-8.patch 1796 BLAKE2B ee18b8f00f5adac4583834a257799652b167c7fa63
 DIST R-4.2.3.tar.gz 34010655 BLAKE2B 688403c693de348bdc404c0ebc2df08d3415db216f6017beca8c0408dc70830239ba26ff89f020a249c8af6471363ed742f52c816da84aac8161ec4a522df405 SHA512 060bb4e1d1f1a5a0383a3b4372ac9247c0a20285020da17cebeb40ddc54da12d5f369ea243ea04d2c6970986fe22b3f9c37fbdfb3405cd8aa4f2353091ea9c5c
 DIST R-4.3.0.tar.gz 34821768 BLAKE2B 3505c8357419355fddb8aadbf0952c492e3e38d649d6261478d6187c94ff71110089ec0933a31dd2f7258e58a1d0864a68cb4d7b6cdefc54e5add55d0d62db10 SHA512 7f9bc8360818d7fdf05e26a4213df01468669514a4c2ad62dee358f53dcfa05a71ee72241db91fed59574c26d7caee5d3e0717637e1666daec99446e42c07813
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
-EBUILD R-4.2.3.ebuild 7197 BLAKE2B 35806db3670bbe2a28f1877c2b6d9e0cb94d356c39921ef658fcf9e1db6c976369921d2730b49d905aa7971818ffa6f1d32038c30644ebfca9b3e5cca92a5cd0 SHA512 c7783bc2ac41c1ecd84b6cfcd6ee711298588fb365b02995875110c9f49885a9443672b2afb83744552ea7f504019f0e266bdaaba84f445032373bda81962c3c
+EBUILD R-4.2.3.ebuild 7198 BLAKE2B 62c47daea550f16633d5dc89d2cbaee3c5b72bd3cbc0e358e1c05b18c93ec4107c315c95de1a14ceaa556e5da405c0b0042abbaca55bc76df56e7e4690b5a7a2 SHA512 ded98d0aa2eb7f361b91718ce67ef5fb8cba0c8b1dcd2aec4952cf604c5b9b40fcfa10d87e0ba2a351f81216f6bef65a945b5bdea6c095041521e94b7a6ed8ad
 EBUILD R-4.3.0.ebuild 7010 BLAKE2B 0a2aeac841bbb2b887a2bf7e03753b708702fb265fb8d7ce600e66dc5b58739201bd807a6f7168ba697014f4a1c8a5b0af3044953a7ff4cdd4b99ec606f3c767 SHA512 c60d0694eec7b3806c90c2cfeec564fc78ce7d27d46ce3cabd85870f2b8ab00552467ec36046ec2effd2eccbbe75937336f14dbed03c52523b01875f0f46f757
 MISC metadata.xml 1344 BLAKE2B c47085197e990eecc6d316980dddcd2f6b2a5f5cfeae4a92b2de2ee5733de56f1aaa182f0c4e8b1b62207518123b60150685edb2ee5b734098121f09e6d963f6 SHA512 d959b84becffe57ac8d49aef9d2d7a294a7428972a8e4e438e26f99c09b4515db3723a09f7a75a6c5649c5cff38898fa13d2f894181060a8eaff1ee4a12dd07d
diff --git a/dev-lang/R/R-4.2.3.ebuild b/dev-lang/R/R-4.2.3.ebuild
index 352d1b8e7f62..9f94b563f46b 100644
--- a/dev-lang/R/R-4.2.3.ebuild
+++ b/dev-lang/R/R-4.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~loong sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X"
 
 REQUIRED_USE="
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 166563536cc2..0b829eafd4e1 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -2,6 +2,6 @@ DIST yap-5bebd8e3aae655690ddf33dfb32289766910fa25.tar.gz 17378041 BLAKE2B ff474e
 DIST yap-7.0.1-gentoo-patchset-0.tar.gz 2390 BLAKE2B 2e7dbfe6dc8ea60c8a7ee056707e87f205076a7413d48b04f2ce1a997ce59b87d98f3f2994f93c6bb1e9933f94a02823cc729a0954739b9c38502a03894b05d8 SHA512 3f4364ab4fd887b8cfde6916257a517e7632585df9e501092ac1abc0f7f3fd7de97770a840d7279b5e89e1930b3dab0569e25636c1fb1acfc11f810c56681b45
 DIST yap-7.1.0-gentoo-patchset-3.tar.gz 4353 BLAKE2B 90c4750517189b3492fde0afde3da587a60f5aa98138a9b0626789dd79ce76981a9278706c510f0870595613e51c7c7be296fc9195618ef7ed6d3c4977191be9 SHA512 2effb29eebdf25996b10dacb625497159c880dc3c5e58e99cdd215bf3df744e3c504262b4fe4fe3e1eea7ec2e132c68b8dbe4633ac3c625efb6343f3fe5b87c4
 DIST yap-77bb2ba5eadfb95b67abccd22b298cfb75dd3328.tar.gz 15121857 BLAKE2B 0a38a1f302108a93cdc7b31fadb44823f1660e65bf3bb1910988afe81e313e6690094550c9eb4a6cfba322cd40b0cfb5ec853b350988ca123507fda362de118d SHA512 56da8cb9e56cb23d2592ba92b0b4cbd323e491767a121ca88896d2744737bef9d4a63f3b80b36fd52b1ead84a075d270060777fef85dff3ef36403a84c96b9fb
-EBUILD yap-7.0.1.ebuild 2443 BLAKE2B 9da6d13aa465c651f5a8cd7e38cf5066ea844135ea409714d7644b220e0f778f856b7530ef83636db10421f1ec21a98762df9f364efbd060a98fa603c169b8a8 SHA512 00598318bcee11bc47ddc3dd34f334201a99bd813cb6ac9f39cf71f8c6559125598575d0188a6d1373f803263ccebe6f0c28f63f2429f69ab0b0096690c8589a
+EBUILD yap-7.0.1.ebuild 2444 BLAKE2B 8403c0963b28485e99176034dd1fbbb16f00d3835009bd7431f1064edb03637df6ffd347e296b6b846797b431f03177eee3e31c03bb0c34f89ffdcbd766ded8b SHA512 dd58b5e2f01431906f0ed5ea9816d5f92aa3d6347c11fda41f5cd503baf3c77310dd6b3bea06ba090b78f92ba931c3793229258d572a54215964411f77e7e2d6
 EBUILD yap-7.1.0.ebuild 2459 BLAKE2B a3337b49a7654bdb14ddf7cc4f685e802a9ef1c9e16c95c01b21362391a0bf0ff7a4fb74f107ad5f5d5ab01375045e6b736ac8e3f8c064283cab802055c87170 SHA512 c249cbdb6e9c828fbc38fbaa3b2066c0a3f96caf254b032788ace01cd603b8f62276a648eb2384a63dbdf9cda72d6f395e74282f347e9451eeacce13436b61a7
 MISC metadata.xml 389 BLAKE2B ac9f98ed97d411c1dadc014176d7514d6c4226d80340f2a0f801832f574eb78a319f7444eb2a815f5d74b6435596f5eaf2cbc3e94159d1ab4e5373f7857f2222 SHA512 6b40c043d0a685349a6cf865e6ddf4c5ad16b5a8fbe56332f5547784538d54e4df35eadf9d745710c5664bbe41365415784143c422605e8aaddeb3dd6fab163b
diff --git a/dev-lang/yap/yap-7.0.1.ebuild b/dev-lang/yap/yap-7.0.1.ebuild
index b132001c0d2e..8bc465f1d4c5 100644
--- a/dev-lang/yap/yap-7.0.1.ebuild
+++ b/dev-lang/yap/yap-7.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/vscosta/yap/archive/${PV_COMMIT}.tar.gz -> ${PN}-${P
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="R debug doc examples java mpi mysql odbc postgres python raptor readline sqlite static threads xml"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9696396fbe4c..44c2197302cc 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest
index 3c69d5886a29..7e2fbf7cd946 100644
--- a/dev-libs/argtable/Manifest
+++ b/dev-libs/argtable/Manifest
@@ -2,5 +2,5 @@ AUX argtable-2.13-Fix-implicit-function-declaration.patch 400 BLAKE2B 1d6efef6be
 AUX argtable-2.13-Fix-undeclared-library-function.patch 636 BLAKE2B 96d223ee64f057ea29506c6d2e7002e16ba4e691ae4cc4d32abc1d64ff22fda91b0e61879c78807930f65f957fa2bf1900a15232d146c495acb6ea5d4e16430a SHA512 7b02b1de15f98ab2f5c61697e6e5edf2cc3beca1a0c3cd014431622fe356ce4cbe400a5aeec75f5cf14c0baed7b49f1b6b0abf1ba6d05b27bf0c2db5b3c6b4b4
 DIST argtable2-13.tar.gz 3326444 BLAKE2B 8c78d56c2e1a53747cf480808064cb006644db50a2cb38adddd71eff07d4d7f6e5467c54eec4e5cbb729a7f639927b2d3283c6995bde54134d7a85e39788b87c SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
 EBUILD argtable-2.13-r3.ebuild 1023 BLAKE2B d86b5003c912781a9b53e03bb5ebd50e22ecc596cec9a6fa12c80c74fc527c2f8dd0206bdbedac73e47324bc4734a8386ff8a16c71bb63be37fdd8b442795b4d SHA512 49479c97ada665f44f5ec586c9d72635774a971b02e065c7a59398b2b5111de2ed0fd12a89c90826c8470fbbbe23d04bfca01870da540b40e1973d2dea7d7c78
-EBUILD argtable-2.13-r4.ebuild 1092 BLAKE2B 9b40d94e200cad8856b35ff3be94255825c27e95447e8eca0f66a496fc3379e63dc5e56f45365425cda9ea3ad9fce3323e107f166b3eac64712494269b8867cb SHA512 993db603dee149c238f310ae9be866763a0f5dc95454f281b378d968d780a02468a4a8b94d3abb0b85b68cb812e29a820c3ea7813822ff544fcc2abcc8ba80e1
+EBUILD argtable-2.13-r4.ebuild 1090 BLAKE2B 95d05192d907d26eac9ce91d830f95a23fcd7a94a16bd1fde2b3f9e8c4f010f67bda27dd8cc321a13600a551794759a651e69586cd8419083e14a293d1845dc9 SHA512 64e5076cbaf9e37ed2d4d41fe8838723f9f24348c61a758bef787a7a4aca87c1999e60e00977b41f5636fab41fb0a9414b1ee21f59d8b0a0a342ae3a0ab7c917
 MISC metadata.xml 244 BLAKE2B fad63c2df07a5f9df8d76bdfefec496412e15b28921c5928e66d2ff1a4df11656d9b9a1e9e54eb35cbd69b7c46162236ca12bfb664540777bcfba27c04e5edd8 SHA512 fa47cca1b7f704deed476452a6d37d764d727f10039e8bfdfe62ce57b92e37ea2c39c1b2a26a97057ce14171f55e0076d8034e9520f13f481f29bf620863185d
diff --git a/dev-libs/argtable/argtable-2.13-r4.ebuild b/dev-libs/argtable/argtable-2.13-r4.ebuild
index f5b108d4161e..eec319d0806a 100644
--- a/dev-libs/argtable/argtable-2.13-r4.ebuild
+++ b/dev-libs/argtable/argtable-2.13-r4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86"
 IUSE="doc debug examples static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index be6583880e37..2d21e7361f1e 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -4,6 +4,6 @@ DIST libbpf-1.1.0.tar.gz 2337951 BLAKE2B 70bee4e94c3b372501e1697cec6573fb3292e61
 DIST libbpf-1.2.0.tar.gz 999623 BLAKE2B cd10fd9133f01d3f8dbd5ed4585e5605c3b9fb0d9f6ee76a49dcb61a0555edfeb85e333f7b8eb069f47a65d0ab24dcdc33502bd660378cd662a366f10de627a4 SHA512 b5291e807a3c83cb80a47e3518a3ab5ad0b0e6157842117c0684c32e525dce0cca199c3c9028390b94a73ff968391aa023312d3b8bd7472aff1c9ee5206c424e
 EBUILD libbpf-0.8.1.ebuild 1153 BLAKE2B 98da8cd35ab316a4bbf9d4e6a9c40b278ecd1385d8077a16e4582fb9a4209c40ebcf4ec9e24d3312334ace6c2f99da9732e7a9379a0dd478baa66bdd790a4793 SHA512 16a7e9a08fe9d782da9f57727b50592d42c7cfcd5cbf407197c5764e2a7175f0277a116e25379092e0f67adac353513f614d9bfe2edac2990d0fc91d5adc9a26
 EBUILD libbpf-1.1.0.ebuild 1185 BLAKE2B 57c4bfa90f1601343e66e0233c30af684c47688eda103bd2672472cf6a199f8849f0821d2e889e583dc09a4a8e36b9a9f92fb3d1abb6e2db844b5f57c3566489 SHA512 ab6998bfa3a4674c6df8ccfa0b46216779d6ea48d22f33a45836f233f3c755b714aeada2f8950814a083a1a490ca10672df60351b9c8ece555fe98a3a1bb5c27
-EBUILD libbpf-1.2.0.ebuild 1192 BLAKE2B bd3087d68ed1e96220a836e005d3d5e82c7322159e79d3e43c2ed2d14b02d8103c024f0a43dee77383e2abfc5fb7b12bff2a7925cde32393e9a7bafc87c4c5a3 SHA512 a4623adfec492b597089d4d8a3a30e56d6ecee6065a109d3488ca2e0e719ee72b21a2acc37e75bb9acca0d28e91686b9b904af090aaad6cdb82c992cda877442
+EBUILD libbpf-1.2.0.ebuild 1187 BLAKE2B 0e21d28560cab7cc4f356d7325d635fbdb5bd006561cd6d2e8736c5bab5a21e4a8aedbe77617fac5d1292ad47144d4cb6394014c67b8574f14fecd588047013b SHA512 7f2e7a789a5cd8d11d2bcdf34364160cfd875a94899efa1391a1921686360b44d4cd489727c42a68058e2a2076ac57131d09a78c05cbf3f669bad830dfd23e11
 EBUILD libbpf-9999.ebuild 1192 BLAKE2B e26a265cb13392e4e90e48ab96cabad38188e9b28ccf40e8e7b11a08117193dbe025f5ab71c09da29a7e3ab2561c154389e87be9b1a1fba8e7d57eb3105a07bb SHA512 955be1dde34476c2b66014f9b3da584ea38459105f49980e29fd943198feb3ee228a6ffb121c9bbce7c109712c37bbc8996f8cc4715eba626bd08aadaa23d7e8
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-1.2.0.ebuild b/dev-libs/libbpf/libbpf-1.2.0.ebuild
index c444170afb0c..264127233396 100644
--- a/dev-libs/libbpf/libbpf-1.2.0.ebuild
+++ b/dev-libs/libbpf/libbpf-1.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 S="${WORKDIR}/${P}/src"
 
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 62033524c644..21eabca41be3 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,5 +1,5 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
 DIST starpu-1.3.9.tar.gz 12961635 BLAKE2B a6eede7c369cacaba5b7330bd6a003f624f58972432d43619aeaf47c1e9e16da871a18c24f8f511f002cb7667c247c13562b4fed2348e2af4f8e402418e1801d SHA512 7150fc11828e8f9ede036af782ff0f89946d9aaed341771436eb8cbb91be7b0faccb6280a5c3bd63800d1a73ec8518a45a02d9f3e137007751cf1c5979678295
-EBUILD starpu-1.2.6-r1.ebuild 2243 BLAKE2B 5643ae7c799cb8c8beea365b2ddff23312bb3d2f15ff7ce022151407603a710aaa95d43e5dfb004d80d2ae07ef349feb7b9b12b39e368231ce6dafe36d2570c9 SHA512 89618af648a1095b539a491d77c3bda90843dac5f21c0227c32130d22fb5549348b9926ccc1eb9f3dcd1a7cf037d3c1d500d77729f03655a125c3a093ccd5af3
-EBUILD starpu-1.3.9.ebuild 2833 BLAKE2B 47627f1c85846cc10339cb89811d77e19c92be250a5d18f5125a144e976133062e028cb3e8cc19f88aa5250159c08803ef1d747429562cdb50e5bc07224754b7 SHA512 6bc700eef42335993716c7e48580c476053ec96327add97c831b65eecc968da5e67eebf79dfa06570bd54e33cc6b37ba8cddbf163aea9abbdd3e1fa1f613fef0
+EBUILD starpu-1.2.6-r1.ebuild 2244 BLAKE2B 51923d79bc7fb0199938a99aa6c16bb8f86c2d13298cde93305fad6c464ed68c9637782b514ef814f77f562b8ba78a19d5059095564b46ba48d489b062be0181 SHA512 8ab4e02a4c7b155849ddbe1fd7240c28342bbfac7ed0e5b23bbe5ba2f1f194cea80a43821be4f82520366f5975110e4257df8eb26fe917b7f72c5e882209f210
+EBUILD starpu-1.3.9.ebuild 2834 BLAKE2B a6456d4c723089766b056053ac6423680b30a44308caf6f35bee44fc4c91fcd6e566f9d645cd9bbbda67974fe08b8d4ccdb31cc18e9bd50d8e852a40b0ffe8e3 SHA512 6cb3a600de5ea298d7dacf2ee328e88c6068d4ac6cf758cf6c842ea418125285556fffa3c9acca31f9e0a84c17b56e7cae9692c41e0a1f02b64abd12de02b451
 MISC metadata.xml 913 BLAKE2B 5bfa8abf72f9639a2bf7cd412acea724abe96fca7189ef22256f00333694f27b0cf83bac53a5455007688a393c55088b2a17135af8ae87beaaec8f82f1db51de SHA512 a8918a1da8257c76d437e31d62e7a1984800191fada2374baa5382664a0334bf84676da969e98eb071f7f7de5a92d34ea5b3c9a1d07db5d5dd84a98309fd9848
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index c90a64a8b1f1..56f8eea1c283 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/37744/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
diff --git a/dev-libs/starpu/starpu-1.3.9.ebuild b/dev-libs/starpu/starpu-1.3.9.ebuild
index 03d1820c29ce..546f827d6087 100644
--- a/dev-libs/starpu/starpu-1.3.9.ebuild
+++ b/dev-libs/starpu/starpu-1.3.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 6344c4c3180c..1c83e0cfb716 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index 9e048e20e0ae..2d8ea72eb371 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -8,5 +8,5 @@ EBUILD alcotest-1.2.3-r3.ebuild 690 BLAKE2B 1535a3c750d25790caa16161acce1d7e4f67
 EBUILD alcotest-1.4.0.ebuild 683 BLAKE2B 8a68c40e09420a5f356c90e68aee270613a1add05f3af589bb9baed08106e044b6a391473c60792c9b59d270fa75aac35ceead3639381a3c0413383b36c0b30f SHA512 5dae076efb87b7b2d02d270c50b20dff8c06b5c4d074b33b5371a0dbd1fb2ba5fc5fce4f7b932e88fa5ca29ac1ee6f2f3dd4054076692043adb8f6f0800c2e90
 EBUILD alcotest-1.5.0-r2.ebuild 935 BLAKE2B 3a3235d2f1e61b3f5e165d97409967b8031dea18bc5e8c30edd86bb4c8f48d66c04ae92c1e993a4992c077b125c2888882e23dbf4977f85ce1c5e97b4d4c23e9 SHA512 28e8960e599f9a430764915457862e88376e3f63529785812efd8ae5f366a4719473472beb4701dfb2f6e012c163d17a07e3185f9ea38187e2d1fd9d063aa71a
 EBUILD alcotest-1.6.0-r1.ebuild 775 BLAKE2B beee62e6586ea19d34d6ca4ddc4d26d41c1efb52d4290d9b678222a9f26a0b9d5850162e4beaa0b3135a7d0d1fd0dfaba5224fe16510c8e11a67c9da79bb1526 SHA512 1d02cd6a917dda560b146cba87a834f22609fa98099f4bcf2843aff91c19da25810f38ff6ac902264fa534d6271e1cb40dfa2ab236af27e5c7955895b62b4303
-EBUILD alcotest-1.7.0.ebuild 776 BLAKE2B 8647248b22ebb850ee006b8e8af2ac379603a9705e0d50491bd12894e17ab9dbd00229feb459bedc98383f97c530d5b2ccb5bdfcc77e9043675ec4e62b72b3c9 SHA512 a22e0226ee9925ee1d8b8b9d3c3ae1fc2ed25ca34b34a746c58a3cfa2ca982334f59bb766de6fcd5a6f9a165684de71752537549e21ccaeed20ab1dfbdefa895
+EBUILD alcotest-1.7.0.ebuild 772 BLAKE2B c91b35804dce088d2fa5b5b9a6b7d1810e27df17b057bf9e58322f19d8b9b68a6293b4b26bacb16090cff475476a1b5b369471ca6c9f56732ab30beab968b253 SHA512 504a6c4c1f0819afc6f4e0857576fe1eab3375b9a2a72d8506bd0af2ae909fc3c5f5ed2fe06d1ddd7a1ba9bc648585f26f7d49562a68ca00f3b5e6e0b2ffd8ff
 MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
diff --git a/dev-ml/alcotest/alcotest-1.7.0.ebuild b/dev-ml/alcotest/alcotest-1.7.0.ebuild
index 02bd046c8bf8..a1aefcf62782 100644
--- a/dev-ml/alcotest/alcotest-1.7.0.ebuild
+++ b/dev-ml/alcotest/alcotest-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async/Manifest b/dev-ml/async/Manifest
index faec306177bb..dfcfa3d7a253 100644
--- a/dev-ml/async/Manifest
+++ b/dev-ml/async/Manifest
@@ -1,5 +1,5 @@
 DIST async-0.14.0.tar.gz 65025 BLAKE2B 39e2bef8df12a9733b9ff11ce1bba22b095f79532ff27999e617db5c145e57ab2e1f7f9435a5952312a84dd75b24d76fd4279c524be933e8ded5be7b00d6729a SHA512 3e57ea742ab28d008e1c0b39a6fc6d0ac3ca78b644f678f79b9ceb8d9acb23fcd45fed52f744906ab6d9b87955a27a8e4512043db45a7c836323d96433124b5c
 DIST async-0.15.0.tar.gz 73958 BLAKE2B 696e175c9f67760da7723ec93670a7360ffb59bd192eb2632172c76018b9964cfa005878af9a00a6adc09db99ca7d1cfda2eb286a2e4337e3d4986cdabec5d78 SHA512 61d83e23394f819f02df0e4702a7cd6f82418da3a8ef62513d99fb7c9c1052fcf80f90f95ab41977aebf3b54e09a0595768131a9b61a5d28f47a920492bca0bb
 EBUILD async-0.14.0.ebuild 637 BLAKE2B 5b28fcc9099e9da787e8c6c739aa0c422842f28c83222853948453f4baf661a99b38cd0e994c852d260a546572cfbd6431721b363f46e97e2f74a31d86b762ef SHA512 eb985440aa530ce493edd474486713e331017ab88642fe05795b917f7acbdb843534472e2a5488c793b922cbc858b45edfcdfe0d111b8fbe29fb4ba3df13cac9
-EBUILD async-0.15.0.ebuild 606 BLAKE2B 6b52ff354e79f5f007e5468f5491170f30e0bc062a862634b9d8ae789068fc323afc44656525f6444993098f91f2e7f181e5361b0d1505295bec8fd22c3c9435 SHA512 4da9abaefd2843417e214fc918553c1bcdd4f73d45afc91ab014cde08296151e40079b7ebb0a4300e2b0d4ab7e36d0bc9e904d10231194a724dcf395b985c2e1
+EBUILD async-0.15.0.ebuild 603 BLAKE2B 83ceb8fe5fff7beaf9f17fe999ac4a74ac25b5a850cf6168041828e120ed18e7e835f56d1b88197861772d47d03bf22081f34067101c8b63a5cd03f3787946ce SHA512 ec22f20a27c645222c7f529f4985057928e4a12b82bb3bb564fe9c8c5475640ec5ebce4e3e9f231ca811d725471e20fd8107ccd045a488ea6a9940727348667e
 MISC metadata.xml 314 BLAKE2B 4e488eb542735172e67dfca50aff77434aeb57566c2c14672d48c239971ca3ade8a2823a526cdcfe1a2a6223434cbad6e0e84dda2ed8c43291e508cd37f060e1 SHA512 c7cab663cca3714f9f72c814f8963a1ead84c70c229e417bdf7a1cd81be4098c07c2e9567ba58487f527860e04bff2ed2bbba4f65cb18ba4c08681fba19fed94
diff --git a/dev-ml/async/async-0.15.0.ebuild b/dev-ml/async/async-0.15.0.ebuild
index 88afef0fdf47..b4342dc133c3 100644
--- a/dev-ml/async/async-0.15.0.ebuild
+++ b/dev-ml/async/async-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+ocamlopt"
 
 # Need qtest_lib, netkit_sockets
diff --git a/dev-ml/async_rpc_kernel/Manifest b/dev-ml/async_rpc_kernel/Manifest
index 79a9cd3d8733..551a7f207356 100644
--- a/dev-ml/async_rpc_kernel/Manifest
+++ b/dev-ml/async_rpc_kernel/Manifest
@@ -1,5 +1,5 @@
 DIST async_rpc_kernel-0.14.0.tar.gz 61643 BLAKE2B d80159c598470718196fe33893a3346d4ac3f7a781ef453e9eaa90cbeede83c97b9333625cd3d0552ea5b14ae039f98c204c4f658dd7810ea4ae449b967f755f SHA512 991b7cdb71b0363355a93fca009cd5d982de4d749c356b208987d1ae9c9b48fce5c59c4b4697042034135ad4c1a9467eb1a5d1f43237c5b081ab3aba2d72bb10
 DIST async_rpc_kernel-0.15.0.tar.gz 65182 BLAKE2B bd809bcdb17de6fe2765bc536b26c6c6daa9125c64a9dccdc80417136000624c3eeff36fc404d1e3f04535fb6f256af8ac7eec5e5547147f2f343104095e50ce SHA512 29ddd5cffd53acd02de1dfac2291d74e69673c6fab6586e8ed2d0edff98b176dbe05b80da0839d394e7601e1a33aec5bafb9678a46665c847878567378e2e648
 EBUILD async_rpc_kernel-0.14.0-r1.ebuild 525 BLAKE2B 20730fb7fb510515328b2654de55bf66cbc707e156c4eba7dd18ef11d02f11ae7b06d8e378e06320b2c87b6bdf13a7752b073de3a7f4f68bf20dac6960f6ec61 SHA512 192f3d74c4cf1ef7b0df514b02f4ab96a8c088163f12e9cbe89020506d5336f840488344c03d635dc55759edc056cb53831d0c626f42c77e36b4bd229ef75801
-EBUILD async_rpc_kernel-0.15.0.ebuild 528 BLAKE2B 2122ac24584c22ed129b2b134e62a1303c4084ecfbd3dc7c5cc6444d86d19f9f59f0ef938cbaa0669de809387e32b065f8ebd1892c8184ce10a94ff1dacfe4c3 SHA512 1ea7b9c419f7619aed4d1bb441561dc0a0ebf46f460004b08a61d9939c7b5ec8e9386bf2c7cbb266882884db948811e44995095df97599256dc2706f88fb72fe
+EBUILD async_rpc_kernel-0.15.0.ebuild 525 BLAKE2B 6302bcb13b4926f78ac210259cfeb79a3b8d95928dc10f3d3b0cb2ff5adaa529786410fb597c2feb70a70aa71dfbed3dcfdeffb2f8fd40489a7df8251f353d1a SHA512 c329bd3fc4c91bb48e259ccd76afe6695c51d8a4e365d501115ebe3be4b84ab55e0deee4399cac30cafc3353d325dd70c77d1f433d41e29d91df256f57a517ed
 MISC metadata.xml 386 BLAKE2B 9ff1fe9b10384c1f1a3111cab449a667f77f3a64fc63212ac01563dcaa87b6cea881f6883a64c7d43396179bb3bc13627c719a56755ed734d92d84573470103d SHA512 f7b74045608712598c819b395e7019f9ded93a38b256183cfcdd4fefa31b26e20db8321f3376bd519157625a1dbb9d506f93a38413f1d046adfd2c1d9246120b
diff --git a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
index a8a07103d256..c925ccf29cf5 100644
--- a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
+++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/protocol_version_header/Manifest b/dev-ml/protocol_version_header/Manifest
index e30e107c128d..a16342838c61 100644
--- a/dev-ml/protocol_version_header/Manifest
+++ b/dev-ml/protocol_version_header/Manifest
@@ -1,5 +1,5 @@
 DIST protocol_version_header-0.14.0.tar.gz 6524 BLAKE2B 3463cfbfa2faf0573dec57e8d1eae5ed47f2210c7eb3872fcb5a9206bf65cc22f184944f4c624a17e44e267f3b0443f8e4fe33e8d40157e9f5afb68f0b7b5e4e SHA512 50f58d79a2c92a2f7b9f1cd54b548ae53649bd876f77a017b1483fda53cd1b398dbef7e992dcb283796d035fa361424c9529244b73d33d9ff2699dae70b6410a
 DIST protocol_version_header-0.15.0.tar.gz 7704 BLAKE2B 208254706a2d8ae9f77a9c9c40bfd8af34585a7e1f201338d888b12f804139868987532db9b4f862c659e3101c5ed493bb782f64ed251030e235937beb419d65 SHA512 1c28fbe26155dc5d780ce111725b21b95773d0a0bc3219a37e94b7c920c18e55fa33b31156f3ab3c02ae403c7f667f009f3ef7a965cadf7177c857bd71bd4956
 EBUILD protocol_version_header-0.14.0.ebuild 473 BLAKE2B eafc19470e9b6ffb5dabc7fd01336ec4efb94889b87943e6016977a5951ef9bba447b89b868a68d806ce9cf4dd94843de07a70bc655e3a77fb84ae0efaa546e4 SHA512 9259ad472c822cddd09f352e821de17fc412ea302ff2d8c5e152e28778dace239615021cc3838f833f60426aeed6f61ed71803f816c27ffd66016adf8a9abd71
-EBUILD protocol_version_header-0.15.0.ebuild 482 BLAKE2B bf3c69b19dd78d3b3efc6b0f3533b4a18349e23be8627930be0e204581e5c11608cff1c0991ef2fd736be94eef3f15ff700750c7435392fc191519e39aee8d16 SHA512 409e1687ceeea96a309988c5a6cb0481a6a015d0c5444a3d7a26166cb2cd07e14d5e3e0d9bf18475dbcc7302107361452d2d42b6c2fe0f3605d596fc81b05076
+EBUILD protocol_version_header-0.15.0.ebuild 479 BLAKE2B 846a1d5cc1d111da5228cad817c5adbbe2e9509d0625806dbf033e0e825bc3ef2bb19c99fbc61445946e3feb61c475f92439623d71410a8fc908340d63b95a44 SHA512 e8da3e56c831f4784c86b90829e289f5f8778e6bc10b44ba9a51fd7f114bb559407f3659b4e8136bc2f702e1fce9f922c6eee6288f1e8b4c1e7c63f5673836d1
 MISC metadata.xml 342 BLAKE2B a7b48596216aa424b7230cd1fce7d24599e3699e832c8a79f01a9d93d806b136c908a20457e2fa5409f26ead689b3ea040b2f5568735c4344b77fd0eda3c7608 SHA512 1d69289bb0d37de7a0e778f5eafaa459c2a29faca5096e13b87c0ece8dea6fc388a785e8b69814c01646f59f07ed43db807eb55783104600aff82fea7ce1eea5
diff --git a/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild b/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild
index 9f20b1efb6ce..e25222b0967a 100644
--- a/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild
+++ b/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core:${SLOT}"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index ad81e92de012..dc5334219a71 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
index e9f34c1096e7..980bab281a29 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Manifest
@@ -3,5 +3,5 @@ DIST Net-SSH-AuthorizedKeysFile-0.180.0-r2-extra-keys.patch 35614 BLAKE2B bca23e
 DIST Net-SSH-AuthorizedKeysFile-0.180.0-r3-extra-keys-v2.patch 41851 BLAKE2B 0d3679ffbb48c84141ef80f541bf965ab5b007b7c9ddff1d5518458e2fe781114f7269928a00e5f8e7aa40794cf2ef4a4852b11ba374b167366d7ab1b27cf04e SHA512 7b941d2c58c1cee1684742e7d2fff09f3d934679c070894d769261e176f0cc9989915f4cc3f4af535c50afe5dd7aff17bad1418cf4c89496a238a95f88040cf5
 EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r1.ebuild 504 BLAKE2B 2d3c2357948a8f914a1557a352f831cf2e83412853183937ae92a4accf986898fdeb7c9ec881c8f2282734d4debeb45492e0d78144da95ab872a72417e63b3bd SHA512 bd5068e5b255688331d05e96eb1fbeba98b2ce2f50e0480b0f3612c95b5819727e91a45af96ef3ed7c342ea253a2cf826ed6a520fdc868e7d365ae8c1bbe0bf9
 EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r2.ebuild 666 BLAKE2B 1e91e34a31d647acd204f6d1038b2359b10be5c21f9473a3734cf382e6935a45072bf6edd673326e59d60c287813a09bd1a5f28857721955e8afc50006631d7e SHA512 48b8d39263365d79e0ffd255b19da73481b73a017ec4b3b09d1597b4bd2672e04a0e7d6d3bd62b167aef7c73da0eb83d20b8e9af4e7a87b14f2233ebe56613f4
-EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r3.ebuild 674 BLAKE2B 10159dbe3aa077ca378f6a5716491ca927c974b261c56bd3ee6e7bbef958eeae5f3a135b47f5a14b3bc017f0c06fd9d42d69dce5d19d4b5226bdd0d75a668c02 SHA512 57f8dc4867c19c9504dbb9b4bd3d98060fd0d94dd3bc6ca7e8abffb7c5a5e03a852e27769df771ac08946086ec2a84792c9c0cf942bc010ff7fe23cb7a23a5b6
+EBUILD Net-SSH-AuthorizedKeysFile-0.180.0-r3.ebuild 673 BLAKE2B 8ab740ac214ed400f2312d81370f57392668448c9ebc7fef22fc0d7b8f55949e8d1a493503893a03eb46d98ea420baf4dba8dce59ba883a4259b833d2e80e13f SHA512 6d362565917b149b229b994b022c315d0c59ad47c1bc789c0a18d53936ecf4cdd7b228cfad93e3827a9ce7a5bddcd054e7c0a5ec1ab38253366a6e72e8c13409
 MISC metadata.xml 724 BLAKE2B 4acd576af0a24191b388b30d41d5a14caad2972239711dd564de7e7c4fd1e6f9676fdc5ba62ffb7f86cbecd8fc17946a6479f50506045ebe12a26f5d263f1070 SHA512 d28736842f36c4c6ff6816bd1a155c177036756ccfe8656e1aa7e63ba77dfb17b11e9226bb6392e032ea850308f3abf37aca97fa7e4dc5e3a7108cc861028b90
diff --git a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r3.ebuild b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r3.ebuild
index 2ee2dd098c57..5cf26e047c3c 100644
--- a/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r3.ebuild
+++ b/dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read and modify ssh's authorized_keys files"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 SRC_URI+=" https://github.com/mschilli/net-ssh-authorizedkeysfile-perl/pull/4.patch -> ${PF}-extra-keys-v2.patch "
 PATCHES=(
diff --git a/dev-perl/WWW-Curl/Manifest b/dev-perl/WWW-Curl/Manifest
index 6e85ea12141d..8bee4487e061 100644
--- a/dev-perl/WWW-Curl/Manifest
+++ b/dev-perl/WWW-Curl/Manifest
@@ -7,5 +7,5 @@ AUX WWW-Curl-4.17-networktests.patch 3938 BLAKE2B 7f2af37af8c1cf619c9c444cc64969
 DIST WWW-Curl-4.17-Work-around-a-macro-bug-in-curl-7.87.0.patch 1375 BLAKE2B af3809b0933d127e7f3d9b7992104cdd1334f05d94a0650f60965669c6b750253dc1b936cf7570cb2ab9ddde1820e32fe9553f8f40dd1055455d33d712907e0c SHA512 2d8a32258c12cdc894da31374c751297e0875dd3469a5e9ba2b11efd96a7df3c39e0369eac5749e5f4746d37199440cb1c91e97c51c63c0e9b84850892b3b52f
 DIST WWW-Curl-4.17.tar.gz 50917 BLAKE2B 6f07570fb0db535b506b8e4a879a05f1901d4c1a2c0fb8c775ae330fb3ea44c523d921494d30f9e02b8eb84e4a006eb53e8594bbce6615ad162090b0d422edfb SHA512 bc7a75d0e23f5a77578fd7244b56a1e1b81d814993b90ac7132926f0d571232c4c95875bc615cb6239e424ae1d5481d27796efc5376bb0845d1da0ff1137c0d6
 EBUILD WWW-Curl-4.170.0-r2.ebuild 693 BLAKE2B 3e2014a2a86a13a98c328fbe1329d3ab1888090d9b42949ec8e759e6e52a8d2c67ed40600adc3cdd881820749ba2311c9573a3339fb462df61b48c269f3dbce8 SHA512 1463fe73ae9dc663f854017102ee78619b107660566bb596da019c9009aca1c9764a19f1997d228e8cdcc4241f9825ea82d447ee842ea7f0756f5eb63bcf1843
-EBUILD WWW-Curl-4.170.0-r3.ebuild 2776 BLAKE2B 3098f02b94f34138f0d2483c06bf7c85179ad5df0342ef505e89323914fcfabf3523acf5c8d880a1059767f1a7fbef528cf8865283cf846b74559f5e88c8762d SHA512 302244cb604d7f4229735e527d9d0616b8db4fc4988ebd064a6286090259fdbd5f41dcdc790f250d90f214ac407935a7a983b66e2cb01cf274f5545ddcb8ccb5
+EBUILD WWW-Curl-4.170.0-r3.ebuild 2775 BLAKE2B 4f0c270aeb64bb7f43fbf07f183306c2ee394526e8881a375a685b4afdc2006ff566f33ba6958e58d3e49900e0da9b8c80b8261317e22c7880398b98b62d86b3 SHA512 43425801197aa94a43064ae025267db561a097e57fbf198de35b726c9042ff9141b556cd95373c5d278c0a65626532955245ef63463aeba7ab38b6d940ecfee3
 MISC metadata.xml 639 BLAKE2B af103ab5b95f47bb1d0de1b70fb3b50c1872d8bb71b66ca00cf0c1b9b12a0e7a5701f808289a38f563dacc8d3fc5918869bd93529241f8a58567eb81d91efb1d SHA512 a483050197bf61cde5d807a9a1ac8a048f61ebedb89df65c61fd8be6aab26448ffaecee04bbf428d1f77a196621401bf2a48a81a4fd3ae76a370397802ae550d
diff --git a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r3.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r3.ebuild
index 9a0567845594..1a274d6215a0 100644
--- a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r3.ebuild
+++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl extension interface for libcurl"
 
 LICENSE="|| ( MPL-1.0 MPL-1.1 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="net-misc/curl"
 DEPEND="${RDEPEND}"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 0db26da64699..187668c22bf8 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index 144d51e58394..78b867f3b259 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -2,6 +2,6 @@ DIST Mail_Mime-1.10.10.tgz 40520 BLAKE2B a552ee3e374e7af078ea1a266793aa88b74cd98
 DIST Mail_Mime-1.10.11.tgz 40930 BLAKE2B e02f5f8fc43949a32edf4a8fc835e4a6b4f44b509f3066b35ca0822a4cc723eb5fba860161a88d10d788811e5ef34d72e845fbf9b2768a83d87bc95445e8a967 SHA512 405873f92542f6f6d4433959ed3c741d64afe70852ddc9582d995485f327f662bccc82af0dfef3ccca61ec6497d67ea8f9d04d95f25443c57e3a319f96f7ac30
 DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
 EBUILD PEAR-Mail_Mime-1.10.10.ebuild 653 BLAKE2B d8a360a6ddbc38e516db04f4f20613d71436e5635bc555d565e86adc82b58a962226060f760ef45560c256b6d5266d40f9ee89885f711c462ed1f0935b42eb6c SHA512 17068a771d5aefbbd47fcbf9b40969fcbb727139bb2174acabea063ea54fd8a8321a74066cf32bfa603d0dc49948d7b1835996861c96836ae0f6b4f2b0155b12
-EBUILD PEAR-Mail_Mime-1.10.11.ebuild 659 BLAKE2B 3e7e6d8ace1b8eafd6101f106c48e213740e8356329a8a99d9e2f2eace96a92d70768aa6344b9c8e863c9d4e82d3f85696324246214e23baca1d7199da66331d SHA512 ab47671b4f78c3db55d4d80ff4dae3505cd1ebb5b2c90ca7709ee8c1954188e31ba32eb09abbe68d7f4c7ef09726ef0bc08a356d1dc95b7403ac16a050695327
+EBUILD PEAR-Mail_Mime-1.10.11.ebuild 653 BLAKE2B f699eb4b6ba8a2fff8b6c90278f41f1d805989611acb670448c2a773cae6f90b516effd98191557aca2a64c5b093f6addb48814d107d489c244485846510d34e SHA512 4fa5c6a3f8a6915f3f84098c558e55f6ec457d47d1b96a90db52c50d137feb1931dd5a8a573d9459c3daeb3e8b33ee21e5ca4bbe6461c3b664a5dde3e34f62a0
 EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 649 BLAKE2B 3af0a72db5ef167fb918774ec68344b8ad8e57d62ec1741cc5344485706ba67e587ac79c13d9887c9e64866278e9562002d60eec3a265eb4da18cc888083d6aa SHA512 8ea3c793c29ec20e6bce3edab106a3fce17256f6b9d4688bba432ff7284f6886093382f3b4a69f79f79fd48718997f2598cc31fd8d9541048b5e4d0638f4dcf2
 MISC metadata.xml 384 BLAKE2B 4ea164acadf8559501b9da326c71d95a6b3b72269c6296201e40b534b63381d1af0d79567dd204786534fb25f9d8b6fd7d3533021b7b58574494a798be0399f0 SHA512 9b85b4a5a71106d025caae053ab78089bc8f3dc656f9c5bd7671386e6b09e57a2a0ef751465799831b6beba1ba9712c4781b24c402b8a5a34b6efbd9729cf53b
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild
index eb4747a42cf2..34ef06029ba9 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index e590e37c9bd5..4d29aed9c5ac 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -5,7 +5,7 @@ DIST Net_SMTP-1.8.1.tgz 14931 BLAKE2B 9194e46d1987e48f58c3b851bf6921b4308d39d17b
 DIST Net_SMTP-1.9.0.tgz 15135 BLAKE2B 9413daf3741a0dd50e19cff89f501c57f442fda38b69c8dad860ba257ff7333fa4f50e2530d86599d4f38c6e3dbc67d7a401fe8be3bf85266c76701038f63247 SHA512 fb28bbf07e54d71d1a82d59b137e4905c77b5600c10cf7760890ec708fc9e6df9d47715cf6808569f88603fac80c1cfdd7c4f3893efe7ac7aecaac47ba849ec2
 DIST Net_SMTP-1.9.1.tgz 15146 BLAKE2B 1bc1a837cc658f68b5ff866758d624f4d916e1b97166b0fe1b3257200ab3fbc76c52fa567eb064f82e4dbed38ec1e2364962bf2c4cf7d60c3c6f2a0a45a0ecc6 SHA512 6426ef18203b93960bd85d346622fdb6a76cb3f2182ae6c7ab21c9cfddaf779a7fdd02b0ac5425443265b522147f54ca9ef8ff7eef4a17428c7c664d8dab5993
 DIST Net_SMTP-1.9.2.tgz 15132 BLAKE2B e7d3d23431303a016d802340857ca13beb8863e9ba7612070487eeb3fa458a283bfa66155cc445e9aa3ae53b285eeb8fe8f203db0f98a4b8963b1cf3e266712b SHA512 9477926946591443d2120d1289fe01706d2fcdbfb84f46fab68d8b6313d1bda3f8d272580c3aa51cbd2a98728e7eeba93299c2069df6c130c70dafc280226556
-EBUILD PEAR-Net_SMTP-1.10.0.ebuild 730 BLAKE2B f98486b0524034e7c067deebe3f2978684e83baab115f6af5a7d862479d911ca867f76b554e88593101c1a0010de630c7e93914c390ade9c2922d61fc610faa5 SHA512 df79f29a3511838fd8590465eb1e2d9ca309ae7836ab4dfd0002142fc5b67ccfb4bd04d6e157275f729777e581e22746e14c1855f5782d8467fbbbe8bde4bb79
+EBUILD PEAR-Net_SMTP-1.10.0.ebuild 724 BLAKE2B b259d91d7e1dc35c17ca971f1bd64e8b8f351056a292c7ea29e0fe33520e1861a755bc1f898361b2d7c0cefe6836a5ba6a899174ec480f992b3c2d688ca3888f SHA512 81f780394ca3110ea81adf32c3e6051dbafa67e75a8e807357cb0f3a8d91efb888c4d7555f3a48d848c24f4b7d1a09cabcf98f28bd01cd525360023faf2a1bdc
 EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 688 BLAKE2B bb57c2454085a2e6ddded64439da917d39a8f8090a8d72d23a2303aaf6ee6d5535593ab60f19039a295e9766963172e64ca2c318c363669bb2abd5e59052780c SHA512 5f2a3f952a10a4655419e6d1c4f62c05a7b9e31db69d016d614bb7c64e59a344476bcd33d63903a66674634bd7ddf30e2c8dd462b0b38d1cd60663ba1b4ae6c9
 EBUILD PEAR-Net_SMTP-1.7.3.ebuild 694 BLAKE2B dde59da780a90922f27196bb86821dbfd50f4735e86192f4052db322c5f0bef921d2e85db403f8882c0a70ee974481043c0e9a069100bb1339a68a028c32a6a2 SHA512 c1d844784d9f311739f0b8dcef424fcffa6a5114ae62b1a34c660cc3e77f13f71fcb5eb78e55514dc6341dea9cd84beec7d8e2f6b673aba59435c66f2be7e3ec
 EBUILD PEAR-Net_SMTP-1.8.1.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild
index dc271c8d2314..1bc20f1987f8 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="A PHP implementation of the SMTP protocol"
 HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples sasl test"
 DEPEND=""
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
index 216e03a610fe..6db856a4f939 100644
--- a/dev-php/PEAR-Net_Sieve/Manifest
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -3,5 +3,5 @@ DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 24d385225fbf3c4bf5612927826ced468
 DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d SHA512 c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353
 EBUILD PEAR-Net_Sieve-1.4.6.ebuild 467 BLAKE2B 7792d8090bfa4a3c83285652f3c0981af7caddee39ff667b0bea4738c21a43e7702cddc03f29002b002345d92f2de729183d1e4a14864c6058a4d81215e48b89 SHA512 ac63885fc51e990715c018aaa52013023a358806cbb148364838da8bda7701a8e5523d8b8ae0cb39215a50fc0aa36e7f371213391402008368e9e31a8e7819de
 EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 723 BLAKE2B 8c50a607004aa1b3c4ba473cfb47ca1a0d7e532b0675d23a07dfbaa64682ecaa9a4fda0aebb12752b08cfff3d5461eed498708020f203a06b327667279468adb SHA512 1e63339987b0c29caf358ed5d1e398efd7da0be57a1e8abb48e362e1b92ee174b49fbda6265f7191a5965d255ac8d6b8a2834abcd247210514cff5648ff10c75
-EBUILD PEAR-Net_Sieve-1.5.4.ebuild 729 BLAKE2B 8a2bd4a02b28576b608596f3314212146aadeab8aaece945929bd4eca50390d7167b34e82cb58e9cd44da5e5c2863314864f388a853c5ca0365262811fde4161 SHA512 0e85a475f61594d2e38ecca7da2a699fe72b610f14959a6d3c094f236e90be707ff71857b24ae03519da84e4077f2bd536d0dd8924d8923f14e56a3ff833b544
+EBUILD PEAR-Net_Sieve-1.5.4.ebuild 723 BLAKE2B 7f44ced499923c9589493eacf261dd050e38dbfa193a4b15919584915d1e1c2d341156f4cb1add57c87cede0c8b2a40d4fbf9519901b3aeadf3d1ca62e7b6d44 SHA512 646f11118fd63610477c1ad7b487319cc2aa6a3427cd3d4ee4e9ba25abfe304172ab5206b2e6dc0c686e1cf45eaceb95316b0c491fe75ce486fdb28aabe06c5a
 MISC metadata.xml 447 BLAKE2B 6abb054bacf18404f567ac62bf07cf2e5234ed12397a0cfecb1b7196360dd5a7bf364c53ad8d66eacd35e6e7f94af237627423611ef1a1050caecacc9ab634c0 SHA512 ee5d7dd2a31222661af85d2a8cd3f4ccf20e5fb860a19545b17f37c6e9f5feb27c023bb2ef367037147cac38435a1fafa42619da301cfeb886c4a154614f9b31
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
index 42e647387538..2d293f99bd59 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/roundcube/Net_Sieve"
 SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="sasl"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 62caaea74d60..556f2fac0ed2 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,5 +1,5 @@
 DIST adodb-5.21.4.tar.gz 435699 BLAKE2B 7025a7ba322840d62e5b2b3f9e5933d89560a0eff52f0d77976ca442080e7a6a6d778d4fa106357ab68b4f207c98503854f601f579c0c11ee27fb52da5f53519 SHA512 0142ffa0dad1275780aadbc1ad702870b977eb141321f19c265310284d6d4a0820653e77fb3b4ce002dcc42fa952546e90428dff4f931a2bb2a83031bd818f01
 DIST adodb-5.22.2.tar.gz 443988 BLAKE2B 1166c7b53a5ff39afe8d0a77cf56d2682e7f68d8f52f12ed9bf2519f4a15c626e26b590c7df3066f65bf6bbb7458be502d5a9e9b1ed2663286c51761fd58784c SHA512 50c2784f92e9ac372b34ed32d41efe82341dad09f269603359c50a30c9c301b7e65b2dfa75ae02cc7f12437ef57d8a9575e5a36e68d5b6e225fa1073ead3e339
 EBUILD adodb-5.21.4.ebuild 1453 BLAKE2B 8301c61fd33b4e86d9705e02054ed195b34b0c3eaaeb071c73e5c07041593abd83407110f0fd3eafa265efda9481d98fa19a46a3e72f48bd32a7ebb278764da3 SHA512 0b77632e9005d75b106630e0ce0621a37dc06fa6a4f0f03473f96ba4940983a55cc6d90c2afda1387611c9006f00ce4c9e1514652a0135998255282983919ab1
-EBUILD adodb-5.22.2.ebuild 1459 BLAKE2B 2a9b9d33531f6bfd4fe2daec9b832611f52524e87a6d937c300d8458f1aff87cbdf8f35c8484aac3fe34c3beaf63d4680d5d907ebe312ce14c575233d076b888 SHA512 eb52a0ca58207b1c1614a90f7199cd447aa868a3143bccafc80aba654588b0533e5f2a54a30e4e6d353fcd29a157206f9d8e0b5f3862e9b44c25a0df4a62c874
+EBUILD adodb-5.22.2.ebuild 1453 BLAKE2B 7c8e7820764c54eece5961560c68969c61a449573919cfe6d3e32cb52c1719d7214e695d143f355d4a1cc1cce1e2eeb48015227300bc1071a10d20e8da0b2170 SHA512 ffce664c1d66369046af0e71681a10196a71f28b4b05e56a6d185e5e0534e693110154d1c4f5bece61497e2b468ed1e2d6b552ce308f6066d13e2f69f3de0530
 MISC metadata.xml 491 BLAKE2B 179eac488892488692b56a5dfc6e8cf081da6bf9bb4c450d872e27bf39bae408e14529b5706005be8e6c3128996278a11c8793eba3ce23562e8783d3e907fb07 SHA512 0bf91e5c93e9dbeef2752d84f3a6860c48e8ff84246c98330623aa4d3e453fd29c560c3a1115e2a1906a255d04a81b79917ace2fa1c426dce1b574a2861a9cd9
diff --git a/dev-php/adodb/adodb-5.22.2.ebuild b/dev-php/adodb/adodb-5.22.2.ebuild
index a3135caca47d..df7382d87356 100644
--- a/dev-php/adodb/adodb-5.22.2.ebuild
+++ b/dev-php/adodb/adodb-5.22.2.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # If you want to be picky, we should require that PHP be built with at
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6cb330616502..086d7b9e56f7 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 0773dad2d6e2..3af4888e9cc4 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -2,6 +2,6 @@ DIST elasticsearch-8.6.2-linux-x86_64.tar.gz 581745209 BLAKE2B c5d76e8fd2b7b28d5
 DIST elasticsearch-8.7.0-linux-x86_64.tar.gz 596104472 BLAKE2B bf2d6d6f810abd6e586681882f7eb01728167c6fd56ff927b08388bc3f4f5d342f0d903db1306880d70efc27c1ed7c53ba25d9517c55f4fa228744fdb7e3695b SHA512 7ac6ee5e2e2ccee1ebb20a1c94992b90e879b8b37273d59ae1496b1e8ae5499ae1b6ddce8cea7dda3b63e7e45352735b2bd3328ad0fdd6d6aadb020de21eb894
 DIST elasticsearch-py-8.6.2.gh.tar.gz 517674 BLAKE2B c498f1e1efaea4c24f595f7e496f576372d6075da107b2f84a7d4a42c02de4e00d1459df6f965384f5880b4d8f910c4a7a49a773cb38361618ca7a74e5c4ec5a SHA512 53c03c9c8da4eb303e8f9cd5752bbef5a360d1e1a6fea4e98a8d576299f2ae4175c1da09429049cedf53a78bf86a4647fe4f4f9c7735a5a29977ada7db49e5fb
 DIST elasticsearch-py-8.7.0.gh.tar.gz 523141 BLAKE2B bbc6c59e921c5e8db3b7815a3086abe42690733d6719dcf3e167a521b1e7b38e68bf29ff2b1e0e48839be36c11feb9cb5bd9da507c35f508063ccfe9f3c24c59 SHA512 8f28d51cde600069692c8bef810e7949165a5f7a3ec440513a5f69e5c392ecb928dbd0317a9424d1845f523230a421e7d53db41a03b1bd3cc232c4b04ee0c894
-EBUILD elasticsearch-py-8.6.2.ebuild 4273 BLAKE2B 1e006266e0925dc456e7bb55a61bc27cc0dd0e80808d65936a8063e6a7b3ae33d6802d941df070e1a6d15e66647f06e73549a486da070053010d195e5123cb76 SHA512 28be9efe0dff0c0045af802dae8bb0cf77478c6eb60e107d59613ac0608b3f5bd89725a9738d14f9cd04e8ce2baa3859a1637620cd5187a2218630fd617b8207
+EBUILD elasticsearch-py-8.6.2.ebuild 4274 BLAKE2B 340b7cd594ceccee7c511a61f35527c35f4dd75decee890359e564326296308eeb992f777afb8a6e151533856888c413506b6ca026ae323346cf581de11759a6 SHA512 6742f8c972affc58f2c5545c70ece701e873ae75f61afc02c79bc2de6036d653baacad50fecbbcdc97ead429b86a6fdda534f7838861b0418ad77d17f3a7c191
 EBUILD elasticsearch-py-8.7.0.ebuild 4275 BLAKE2B c3872d6b7a21fc0834c8850ede2976e97618df6119c73be96d6c1d3cc69681f04c4cde4568bdc2875a07f890d0fd64b72d0cb00f506d51dc1db4f7681b3a9d0f SHA512 05a9e647b382f54ba56845b95b56e502c46d4d6e9b504b81d972d4aa63aaf3f66a988c783e18b608dc2cc170f45c9e760656864b9b19ba33dde4417df423c00b
 MISC metadata.xml 539 BLAKE2B b15f1ab67ea9d0f0d9c3f980751c01196eac3a7b33c14425710d061112c5cb58c5b9c3c5a9b45f6b40189f58a6f708afc5d038c374ac679b5b4c485a60333c12 SHA512 b8730bb4338ea38108cca19919cbd2f2e03ffa0db9c7f8070bf04053ffdebc7fdebcf6460d10f5fed29e6f317f88854bca1a7c5fdb194d643cb8124848668e14
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild
index f39c589bce66..ff55489a0cd6 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-8.6.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RESTRICT="
 	!amd64? ( test )
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 02ac7dc5dbbf..53cdf84d34e1 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,4 +1,4 @@
 AUX feedparser-6.0.8-fix-py3.10.patch 555 BLAKE2B 20ff9ae0e540bc2dfbb2d336a12804c444f99f9249e4a4f4aff241cdb3e927aeb8c64ac5eb410b273f7628f5fa4bebd19dc26776ca0ad65a591e493197884c25 SHA512 6a663180a185e5ff915bf5f45220e08ef58c2bc8253e7d943cbb065c202b611dcd1cd6baeef26d9ea6487679d69b3449d2c5f7d6dcc6044e19df52650190c1f9
 DIST feedparser-6.0.10.tar.gz 252872 BLAKE2B 5c3b32d264bd00225de20c56c664f369516ead06b33ed1f2ae4123002297b12cc78c2680366e125af1762e53cd4452f2070e5e726de2f0c9ccd71c78cc5ab3a2 SHA512 92f5608d1a12172bc1524d5c8caa75f1cc1a6d7d3456ecd585e6715209cdff469b775c677b8393e1d1e1a895b857fc3c048c36fb83b215308b707a1f71c6e9d3
-EBUILD feedparser-6.0.10.ebuild 992 BLAKE2B 8b8c2baaa3a5cdd40a6940fc4673a6465fe3e10586aa9c6b5b646635115ee2bd5f7825e53753b412cf1e704cdaaea54b39602155bb50c344c15b2442c7809964 SHA512 4ecec69723f2eac3d293689b593624cbc47b4e2342b0736a492426c75a2c6be6a373febafff8ffe5f9de2329b9658c556f398524e8cf9e1457d464b7f6663bf4
+EBUILD feedparser-6.0.10.ebuild 993 BLAKE2B 89b39b69263d90e4f8f7e07405a889997ce197542315e1a31c8ef4425c5ea79c5a733c42c3cc794db534d4babebfd4159ec24777689dd1442f117107a106893c SHA512 78076051c100be2c0900608e820f358144414c18e3230ff362b9f9d28e8f4079c2d563c706d71510bdfb082f0a8da1d9092f5796a8ce943bc77c4ab1fd8d3181
 MISC metadata.xml 468 BLAKE2B a0ae044ea5e9b15c43bea0cd38f3641522a2e911193fa8452cb2919e299b40d4410bc23f056a2070e23929610d3c4dedc2b20828e018a031e079281ced62f753 SHA512 a03a6e5a92cf9e18552c9c3a753f4560add583579c6c8bc912732f4c0679a417b195db56e5224927b086f84d9c7eacd8e16ee58f4017dc014f8a902d1a1ea2e7
diff --git a/dev-python/feedparser/feedparser-6.0.10.ebuild b/dev-python/feedparser/feedparser-6.0.10.ebuild
index fc1633d6fe2e..dad64e40204d 100644
--- a/dev-python/feedparser/feedparser-6.0.10.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index e777b1e48b65..448f6ca08996 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,7 +1,5 @@
-DIST ipykernel-6.22.0.tar.gz 151303 BLAKE2B c3567066375099d388c65b43b5b8c8059a823f4185855b6131fd90f42624a71c08d839a3c59c41cf83bb51ec07d0c0487d7bbee573eafa7e7d049dbeff8e59a8 SHA512 e109a2b771ffa40e05416bd925f26a4492c65a44a1acd8100e65ae3e779da9a0eef7222566e79cdcbed4b0fc3224fbd0722728d3fe953b16ab1a14090d0205c2
 DIST ipykernel-6.23.0.tar.gz 151969 BLAKE2B c41aac053b27a2e3618831f8d6458b21877b4510062019576fe98f921b9485fe180f2bced09c0a8ddd930af5a386a09d4d13a2ffbb78e58d71bb7a7cea1c91c1 SHA512 d852742bd858639d150864d343da23ee915c2034b8fbad7875755ea580be80b5faf553c16af65c50001f214979cd4a80c89fe08e4db7198754b554de0101a1d1
 DIST ipykernel-6.23.1.tar.gz 153370 BLAKE2B 654998d46851bcc55d3c0c9c6134f3fcf8c81c2552d5af6dcdbd791e1ac98ed223a59aafc9b7b4260345f8730d243d3c82d4e19e03935a368a0a0154de547cb0 SHA512 8f3921789c837f7c046eed4ffdaade2273b6491cfd97b9a192a256966a66d58c1ad93cbfa69a5e933e052fa35c2c7a4671a652ee9f2bb2cca5a156c79df0f14f
-EBUILD ipykernel-6.22.0.ebuild 2303 BLAKE2B 18e522b59979e57d43eaa1e37cd6e892cb89a1748246c4218967fecf4c45d803de8729ec5623a2dd81b003d7b8e525b25f25d1efce90b2d2ac243aee5c433a13 SHA512 1614a58773264d6bae24a84375d9f1dcd658fadbfccbe187f8f60968cf4b289d000b82b3d93ab6b8004c5922aa8c97f8f1f60994fb69afef105cc8a4a6805382
-EBUILD ipykernel-6.23.0.ebuild 2312 BLAKE2B 9713aa23c05d561f240fdb1a92162f14b7861fb977d45e4cbe7c8ae280b9143775cedda780e78d03e0d9a7480934b9b1eb78c989a0920d8b56ac452ebfc323fa SHA512 ce4d9d500bb46d60283ea645ee80df8444149984eb38fd8b9b1d1c14ca11fda32e578c68e2e44f824d714d780b3c8152cc9f222a61dc11c6960631ef34c2c10c
+EBUILD ipykernel-6.23.0.ebuild 2304 BLAKE2B 1b483c39af4a5c097b3694bd9b9d8ca75641206f4c209522475fd76dc5d5c68f299e6f6d9f458a2811734c2d31b14c3288be0af60ad49341e6a1a005f90b76c5 SHA512 4b50e459e4ad311f7c74fe1ada9f4be0091a881f0f1409b749a29d17d0c282067ad305d8637d1d0ebde420751c0aeb8425fbcd9251ed92f3a24a1137372ac50b
 EBUILD ipykernel-6.23.1.ebuild 2312 BLAKE2B 9713aa23c05d561f240fdb1a92162f14b7861fb977d45e4cbe7c8ae280b9143775cedda780e78d03e0d9a7480934b9b1eb78c989a0920d8b56ac452ebfc323fa SHA512 ce4d9d500bb46d60283ea645ee80df8444149984eb38fd8b9b1d1c14ca11fda32e578c68e2e44f824d714d780b3c8152cc9f222a61dc11c6960631ef34c2c10c
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.22.0.ebuild b/dev-python/ipykernel/ipykernel-6.22.0.ebuild
deleted file mode 100644
index a5c6cc062f22..000000000000
--- a/dev-python/ipykernel/ipykernel-6.22.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-20[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		ipykernel/tests/test_debugger.py::test_attach_debug
-		ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-		ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-		ipykernel/tests/test_debugger.py::test_set_breakpoints
-		ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-		ipykernel/tests/test_debugger.py::test_copy_to_globals
-		# hangs?
-		ipykernel/tests/test_eventloop.py::test_tk_loop
-	)
-
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/ipykernel/ipykernel-6.23.0.ebuild b/dev-python/ipykernel/ipykernel-6.23.0.ebuild
index 3ae331be622c..17dbff17679b 100644
--- a/dev-python/ipykernel/ipykernel-6.23.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.23.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mapbox-vector-tile/Manifest b/dev-python/mapbox-vector-tile/Manifest
index 7b8b6f2b7a89..54c1ca9fb446 100644
--- a/dev-python/mapbox-vector-tile/Manifest
+++ b/dev-python/mapbox-vector-tile/Manifest
@@ -1,3 +1,3 @@
 DIST mapbox-vector-tile-2.0.1.gh.tar.gz 229202 BLAKE2B 9afa12583f1f2697c8fd3a7ad540851c2b3ea7bca26bf7945aa52ad9c2486f4b6ec0a0bc84e750e18ecb55a51558659284d52efedcb724ec5de98f965d78b954 SHA512 67648c27792557a5e011732c31f8a0a3e6efca8630086e55e6fdc433953b820ef6405031d10692999026c604f3977eb00bafa9a1a7015f02c3dca87ca91eadf6
-EBUILD mapbox-vector-tile-2.0.1.ebuild 882 BLAKE2B f6523c8a85518a798f7b00f90f3c80ee59a9827264a38dcb6d9e5020e784ce91b3992ccc6ac213c3e091adeefc60913bd01ccc389781a62c7ac5fbde451fc3e7 SHA512 3dbd738e03baf0c03ee4721d500ad9717913d066fc97175b632ea9ca223ed6968cc6c3ea46c1455cc64a112ecfeddfbe0aa2ea7377d7ad564fe5aaae0ea82fd4
+EBUILD mapbox-vector-tile-2.0.1.ebuild 883 BLAKE2B 7b1429b44d0f17f54c48ab99d9c45b458692a84492e0663c12cc356b4a26ef5f20b5f7cbb8b5405837fce6677bcb568760f3eb86fbb744512f74a2728c22a668 SHA512 f3398cae0a32b7f638a30b795c42465ccaafc58d607ac452c9ff0b4a17da0663053ebab63d8f45d0a9a671e180836db8b285cbef82547792ccb8a8c4a57bef60
 MISC metadata.xml 564 BLAKE2B 48abaac3aae8007371f0fbfbe58910d820857a2231161c4ba2732509f3b1143cc3ba34094222ed7b8d45202b7f79ca36b5a2f24eaf572fdd1f949caa4c972a0f SHA512 09debdc5a9d7e80b19e7f64bbb4b560482efe294761f5d15b582c144c02b385fd2dfeefe912428d692ce5da916528f099f651a5be9f181435524ad066bb76e88
diff --git a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.0.1.ebuild b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.0.1.ebuild
index f39fead14a14..35df9d2cd0f7 100644
--- a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.0.1.ebuild
+++ b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/tilezen/mapbox-vector-tile/archive/refs/tags/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
diff --git a/dev-python/myst-parser/Manifest b/dev-python/myst-parser/Manifest
index 79aeb3e3c625..13d0b074d73a 100644
--- a/dev-python/myst-parser/Manifest
+++ b/dev-python/myst-parser/Manifest
@@ -1,3 +1,3 @@
 DIST MyST-Parser-1.0.0.gh.tar.gz 813309 BLAKE2B 03bc080e0a5103b9fb239cfbea991012b1fb5f411a5a6a121b2113ad7172a1130bf8b77d20ce84a8aade4148ffba36788eb95b15ecd28c53ed321226ae8600f2 SHA512 1f0ecffd2c84b0db5d251dbc771457cdf52a8e6e540d3acde563115af24ce30d43e01223f172b3e72b2c81862052bb05ea5d7c6091f933afbda0a859d1b86e83
-EBUILD myst-parser-1.0.0.ebuild 1616 BLAKE2B eb361dab2711ac1e0df3f2dbca0e2d17f7d0849c926b0ba7b8a20d36623fcfcb2f7303058b5f27fe21b99e08065d62c3daf8187aad9e1b3505ec6745de2b9880 SHA512 62d1fd9c9f721c26f96183869435f514641958ceebf34094c82da96c4897246d655cf899619121eeb6d4e4edb9222c63c0efd2eff4af812b4f790283ce8df6ca
+EBUILD myst-parser-1.0.0.ebuild 1617 BLAKE2B 19e6bf03c24c2b8087e762fd1438f1abca2b594b3f89d40d45d0334cdd02eb6087bcd09c047bc14808dd62cbf8264ed9ffd10e1977fd128f953edf93fca3a857 SHA512 99f884a276a6900fe7ad9c407cb172f2cc934fedf184bcc97cfe05a332c8e2030cf05a27f0a700366232de39512a3d63c43e7eb3f44cd72713e2be1548d218de
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst-parser/myst-parser-1.0.0.ebuild b/dev-python/myst-parser/myst-parser-1.0.0.ebuild
index 13c85c2591db..f6e2f9f396bc 100644
--- a/dev-python/myst-parser/myst-parser-1.0.0.ebuild
+++ b/dev-python/myst-parser/myst-parser-1.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index 07f858a1f6ab..5d84289064b4 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,3 +1,3 @@
 DIST nagiosplugin-1.3.3.tar.gz 3119586 BLAKE2B e1aecd6f69fc7afe5cbba259191d2ae540efa513ea8f61a263a453ac2b1f6a5d91bbb209d01fc83c72080b54540f7661c04b3485b5cc6c1f9aab44ee2e8fba67 SHA512 edff09b689fd767b9c8ee2ffab30fc63cb740234c830f2f8fef5054e5bc44e945c69858e2374257433b758fb33943a8b148c023a8fde75edbc188da7424a00b6
-EBUILD nagiosplugin-1.3.3.ebuild 550 BLAKE2B 9b3b99d2be66cc7f44aabdaac3502d3f23c2f7c45e5c975b225d25ef6d9d11937fc39b4857942fc6faf3107503da7983fdcebcfa668bebc5b66418c13f8c1671 SHA512 458c4b69ab7047f47659e73a74f6c62bf7f0700434403e08b8dfbe3f51c4b318e494375af7483fa133356f2817a2417527a768b0f1e225b2daa0f8f5785eaf6f
+EBUILD nagiosplugin-1.3.3.ebuild 551 BLAKE2B ae2925d6bf02c456ff55c5beb4cc5b01c0ef18b7ddb13819ce1e463d7b15bf4cb6c978d2f995533a6f1fc437a5d5fe6288181ddb03036487fa55e8d894e6a436 SHA512 527b4f419b2cf345df2a86c1a443a95fbb3c7358d4e4df8d3fba8d6e553d4a1330cc20bf06e8a92f31064b53d960263f7ff812230fdf1097791128d5548459d4
 MISC metadata.xml 554 BLAKE2B f2be163e7fbd5d95a502293d86a506387f0101fa2d68f7d257e4a95a8a40c8ba37df415f598ff5eef3529da03fe1e2597e67fa74dbe1e46783889648cbfa6cf4 SHA512 53935c83a9edc9be4a8a692196087c243a74804d84bdc1857b9c1bb9e99c253401a0c9a9239deab5b27fdd2e236a424e69a5bf54110f8e0bda675eb702b30c16
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild
index 307243ee66ed..f077fa77391f 100644
--- a/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild
+++ b/dev-python/nagiosplugin/nagiosplugin-1.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 54785c505a17..ffa93e883bef 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,3 @@
 DIST pyproj-3.5.0.gh.tar.gz 237380 BLAKE2B e401998418efb79be496bf11be904191fa43e004331867415524508c8766ca9f4ae390ade1341ab6508e6d7d92c8875357bad2b1af159b642345065f8c28ebf8 SHA512 64d1eab54fc5e39d6403fcb0ae3e0b5283303471431894fa6fa94c118374c4ca1a9a418a7d0d1d8bbd2a6a96a5a2dbaf3d067417d6335174c8911db796fbd0a9
-EBUILD pyproj-3.5.0.ebuild 1133 BLAKE2B 811018c0a5f1917bfa3a316a49a173469dbba1e18df9cc045fa8a311582bba190d52994fea247f1a306cdb3848d609555968a56c907696149d74a8bed1658267 SHA512 8f83d9aeb7b547fca30f3ad787bfb549fd72a645354e9dd1e3f21c1b6728150374f1d7aabb8f4b549375b58d6eebe8f97499a1c549422754dcc49d3e695c335e
+EBUILD pyproj-3.5.0.ebuild 1134 BLAKE2B 1bd285f435a1253abbc4f42d277fc8338cc73538947a6d4703041ea65422f9f694c864a2eca80330120d163f0ca2796df093697fc501fa7823aa22caaf47282c SHA512 dc3c59fde10642cfed3b96a2f7dfc5f83329b812d469621fa0cd6952a7f4fa76eb46a072d49a109cc15eeccbb939cfbf9d6bb28fffdcd2cbd13775a38fe2fe54
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.5.0.ebuild b/dev-python/pyproj/pyproj-3.5.0.ebuild
index 509d0c64f0f5..e9677ac5db55 100644
--- a/dev-python/pyproj/pyproj-3.5.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND="
 	>=sci-libs/proj-9.0.0:=
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 46d812951678..81fef593c752 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,5 +1,5 @@
 DIST pyqtgraph-0.13.2.gh.tar.gz 1420684 BLAKE2B da702fc16e9dadc55382be75528147bb050ebeeba0aaf8f87a9592125058ffe9b0049cf7897d297e7408ebd78a20c31f9a47ec8058025bf5b1653ed1fb2fdd6d SHA512 64ae6708e1a44bb69fc159d1cd23df47075eeb1d7daa03c4b27a147ea83a25bb5ef03d28892b20b144bfa4ee600622ef0595494565d42fb861c6849ca3f5c7b9
 DIST pyqtgraph-0.13.3.gh.tar.gz 1423224 BLAKE2B 6c054e243a95387f18c7f18a1d4375fac3a7ae3794902f72e8d75eaeea01e031422abb7bbd84bb94977c6ce14664fed4f66ebd9892f4200c3b3ccdd598ccbfd2 SHA512 a397fcf8fc2fcc5a212df9f4cd48dc07bc1ad9eb7a9b1283488eb52c236e054b01df02d04088a9d91679c4ae3ab7796cdf95cdbad06a6a585fbbcdb921f33617
-EBUILD pyqtgraph-0.13.2.ebuild 1761 BLAKE2B aa8142dfd704a063e05a4f4123b725bb6bd2006e2ab2492d6ba8a04ed4cb16076574ee734b6fa81685e09631c624196b7a56daea13589b050ffb32fac2dd4b9f SHA512 c6a8eebed1d0bcdfc341531a7d21e83e45067408630934cb6dfc623f6d79117b429bdf18ef4031fb08c682f3e4ba1ae1c675a01304d5d69d85291825f4553eea
+EBUILD pyqtgraph-0.13.2.ebuild 1762 BLAKE2B 4f0cc038cb2e6e018b369473909375c6377ebd7fc31562975f7d0da2d44c8b53a6f3b1aeac640d1ce3c2ed83a0817f82316d42594b9a58582c71b190bd551632 SHA512 b50f6b6586452fa5e05e89f2e86141522e604728df456107e6f62f7ef228a8418d159e2c74b67491d18740f99bb9852f588c80c67d46fbb1a4ef715bef300a63
 EBUILD pyqtgraph-0.13.3.ebuild 1763 BLAKE2B 37f1287ec8cba8cf7eb0cbf1aa3bfa3cd39b8166ff0cf82499111127c9163607db3936d93628e496a91a60408ddc0f59ddd822dd6bfc564fc89705e592063bcb SHA512 bbc06b212152fc5e868d8c93ab239d5d63f5dba3f18984ff5359c2fda1ed6f99a7465eb5370f5f21aadbc3eefbca8bfbc857670cda29d634f1ea80625c84f1cc
 MISC metadata.xml 775 BLAKE2B 08f1417793ef0b57d978cab5b4c03e43e756a43625d8e6173a8b74d3c9dcce0547934485d192546cf81b8da03bdf21e4c800bb25e0bec452fe092ab3772a518f SHA512 b03a0aa3f6e6183ef2d81b9d0bb22f576661b353986a802f01cb670f9ae0487d84d3e91fd0a4add41e3dd830dbbc0414f4d556bc05bb89a768be9e5c2cee4ce4
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild
index d05ff9888ace..05fad8d492af 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.13.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="opengl svg"
 REQUIRED_USE="test? ( opengl svg )"
 
diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 2d6657cab163..765063a97115 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1,5 +1,5 @@
 DIST redis-py-4.5.4.gh.tar.gz 4739418 BLAKE2B a02a581dc12a09cedd0f5158bc261ffb0efcf0346d193ebcb060f50fa95dbaadb7322446c242ac68094bbfbd80c9879d8c9a9fc8362aa6a6e9be85d7e46d9aaa SHA512 55c4530ab715c4bddb502ce58ae3c62db9c27d16ddbfa8f87c88e9425e0285d9fd570338428c30d0a3f1fe2d81868fd8385da0255d58c3dd9b9813f9454eeb30
 DIST redis-py-4.5.5.gh.tar.gz 4748642 BLAKE2B 6e924477be81af995190328b8747e2eac3d905fcff8cd97c6f89702e3888a4185918144cf11b9173b25dd4c2e62ce988e2f1f5b2c1261bb35e64031772a5a81a SHA512 f1d8f1b009f30613776904cef42a090a51da2833d667d47f9650c9a35187d11911d5b23b20f2ba2279714758963830c873473028775f39419e4d996da54eee83
 EBUILD redis-4.5.4.ebuild 1825 BLAKE2B cfa69df7a6e0a591bd4795cb4662dfc3db348782fce84f4c8c20ff9917717635843c54ca8168affa451cae1ae0859231c0ce37ec666eeaadf55a2599fbf6c3f1 SHA512 aa5b963bd244f845e783e493db321bcfc489754253d5bdb0d339d19f59c8b6e065f4ddd3c4ea70004803d9d412f1774eca39893e071cb6506faaa201475d57bb
-EBUILD redis-4.5.5.ebuild 1912 BLAKE2B e2d3b2cf7e73d87f0330682fdce7e83e9a1bcf1deba664605a758c1ab37401fe278bff5a870765da0b2343491828007cf33948c45444e87902af473e120a9552 SHA512 68f40137ea6e01c22daf386b7488b69268a291d6e7daad1539205642f35723def2d63e148af8af8af1d145768819bd4d2238bf470d762705c8e47e226c511a29
+EBUILD redis-4.5.5.ebuild 1905 BLAKE2B 42ca13a233cb4fbc6e5cc72e1a519a143d6846c16e3082953e8b6706524a3d4442eec01dc3e60a150f47bc2040fbf1fecdbd621108c1c03674a6ed1a3ed11855 SHA512 f6d2b8f8d45f426807256e39f43517cb6736ad0ca7b96b0d617f539236811ba93a0ea46688f758675cd931e0e8677e76b2ed6bda97ebb985819d1cf06b8bf635
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis/redis-4.5.5.ebuild b/dev-python/redis/redis-4.5.5.ebuild
index 721f1f890ad5..54cd0ebf54af 100644
--- a/dev-python/redis/redis-4.5.5.ebuild
+++ b/dev-python/redis/redis-4.5.5.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 54f42282bace..c447442424a2 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,5 +2,7 @@ AUX reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch 1502 BLAKE2B
 AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.13.tar.gz 4035524 BLAKE2B 638b670b76b4cfb88c0a66db484f5b4d042fd935798316d02303932503e353a6035419d7ef1c4dccd8ef94b3cc2e13a576fd3cb5461fca17122a800f1140945a SHA512 059c3acf2c995ebdd3ffe005bd98640bc9c063c2fb9b3115351b9c1a4f7cfdabf4ffe61123342de2e84773005d46cf6d44410042206222df0700259e31ec7aae
+DIST reportlab-4.0.4.tar.gz 3132866 BLAKE2B eb1791b248c8c0dc194781ca09dbf181dc20f745ce2fdd3a4627ae027b21baddc0bea56c6e5eefd5905f7656c5a3a388d90310ce53a948ab0a3dbaff569f2d63 SHA512 7d79f6258672523bee50256b5b15e336801fc42f290fa2ed5ed0ab355c9f2903c9210bb935c9c00fa74174072232402247c923268ede5d61ca62493d0faa2844
 EBUILD reportlab-3.6.13.ebuild 1294 BLAKE2B 6400ada3b9c7344574ad60d114510bd7a18b122f49e93c296d3f72682228ba8c62a2c29748da736a385dde891830d72e66ec73b9719e41c13ac1ecc9504fbd2e SHA512 f2ef62bdeedaede42266a6a51e48ecc8c9980255e34a8ad6b5b78ed495c75a59ae7446f77be92ada6d7c92c21e6940e6607c798e3d48b6a6683ffb2909fbf56a
-MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
+EBUILD reportlab-4.0.4.ebuild 1096 BLAKE2B 887c9655f9459a041196a6313fb451e04b1a5dacbfa650a30fcf2a610873e6c92991715992d978c1f4e3bebfd8753e1ebbf6a805847136a05dae6f92f940ba88 SHA512 b084134d0747b486dd991ba684e17ec9286b2f07a51ef9c05c12f690b4c96766d17854cfeb4bd11871a23c9ee617da4a0b63d19800d49ece864d560072f64ed5
+MISC metadata.xml 1913 BLAKE2B e088a4a5ee1ca40351c04d8ee825fb783679c8c4ac5ba7c513975e546f7f90f4777a7d9b312a4bb2ce97db5695fcfcf913610b02a9780ffc86143ee1845ee281 SHA512 84422b0f54f169b4342bb5842935a57dd7721d8d6e41f4fece4ce0cf20ee70a764fa1914371e47ed9437bd40243ec22c93f20c167a48ee6ba9d9cfbf3e7c1fe8
diff --git a/dev-python/reportlab/metadata.xml b/dev-python/reportlab/metadata.xml
index d64d785cee0f..9419ae6a16e9 100644
--- a/dev-python/reportlab/metadata.xml
+++ b/dev-python/reportlab/metadata.xml
@@ -33,7 +33,6 @@
   </longdescription>
   <upstream>
     <bugs-to>mailto:reportlab-users@lists2.reportlab.com</bugs-to>
-    <doc lang="en">https://www.reportlab.com/dev/docs/</doc>
     <remote-id type="pypi">reportlab</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/reportlab/reportlab-4.0.4.ebuild b/dev-python/reportlab/reportlab-4.0.4.ebuild
new file mode 100644
index 000000000000..0826a91d23ce
--- /dev/null
+++ b/dev-python/reportlab/reportlab-4.0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/
+"
+SRC_URI+="
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+distutils_enable_sphinx docs/source
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	cat > local-setup.cfg <<-EOF || die
+		[OPTIONS]
+		no-download-t1-files = 1
+	EOF
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py --post-install --verbosity=2 ||
+		die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index e5e52c8d76d5..ae6979e9123a 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,3 +1,3 @@
 DIST rpy2-3.5.8.tar.gz 214245 BLAKE2B 70d6b1e07df3fb6936898ab1353f134a4184ce611486c3da875ca7b562ec9a60bde9657869807aab969ccf515a32cf2a3767704e8ed8ab8b8977b9ac15745033 SHA512 e0781aeea4e483e60c2e54322bc577e5314627c6ef881387af6011e5ef3c08b4ee1be16bcbeba9083dcd0758655fc83a1ff474a3e05291745f85d94a70437521
-EBUILD rpy-3.5.8.ebuild 1031 BLAKE2B b17eaca30fb81e858b9666079d9cb494b560eadb6be47d44435d04a3f27890ad965978d066cbf64b750babd9c9d6f01bc8497e9ce9f039bb22b2d2b1a7daed4a SHA512 353e6bf123e1f14ae6f7ceee611294f60fefab132eaa3e62b1333d835db5d1e20b5308aae166843db45e0d3e5c4001a02f47d9fe3cc495206d74effccbf5d0c8
+EBUILD rpy-3.5.8.ebuild 1032 BLAKE2B 04d3ee425d8758272caaf1dbe376f45be3614a7815dc961d8dab292e2c9225280acbbdb4ae25d6e43d5628f6da4a09e70a6f9cedae2cfc66cf84e640a5eec3fa SHA512 01fffcf8bc7ca9c27aad2b8f41b4884567c20f27b73fb104417c449dc506a03360e8d2dc34e3c9d59419c9fc7401b494c198d0bd5a903125a7f6d9d8c28ff91b
 MISC metadata.xml 644 BLAKE2B 0a3381a277d867c75750b917fc2901854313405d4926aacb563c3c51220e15a0f75abe490feb58630a8ef99059342cbb2b3a2af8f2947efa1c4de31efab24574 SHA512 58ba6ac59b1fdc7ad74110c6538fd970b0e5812803ffeb10cf81e937e5de03431918ac41c53fe05756e04318c4fde1bf4e827327677620b954ab166f0492fe1d
diff --git a/dev-python/rpy/rpy-3.5.8.ebuild b/dev-python/rpy/rpy-3.5.8.ebuild
index 420484defc01..45b6a9c9404e 100644
--- a/dev-python/rpy/rpy-3.5.8.ebuild
+++ b/dev-python/rpy/rpy-3.5.8.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 # ggplot2 is a test dep but not in ::gentoo atm
 RESTRICT="test"
diff --git a/dev-python/shapely/Manifest b/dev-python/shapely/Manifest
index 71b28cd85480..ba7c461ed633 100644
--- a/dev-python/shapely/Manifest
+++ b/dev-python/shapely/Manifest
@@ -1,3 +1,3 @@
 DIST shapely-2.0.1.gh.tar.gz 325843 BLAKE2B f6ae72c8544c236f6761be5bbc358161232319377a76d297eda317e61b97185ae62126b27963cb83798593ec2ce3f29d99bd74113e356b69b54da7586927d43b SHA512 878a4857f5408e2f779566f4885b3336eecd2ecfd685e9be3e306af2720ca4da3f7a1159ae65ad1eba441e0f9b347176d6c144563a9562ed8213e6f964d183c7
-EBUILD shapely-2.0.1.ebuild 837 BLAKE2B bbbeb5c4fbda4ac0a00973b77a13c7af85c52e63f689bdaf9c98e2aa016346815a37e39b9bae2b7397044a4db3d63e1d6e1bba20d2c76789034635a441383607 SHA512 35f77772b492c83dd487271144f486e57b651b5602fc77353dafaf5cef36d89c7fff5e5ded3946cc882e9711f2c2539bcab3fd4295120afe36d3e22a10d2133e
+EBUILD shapely-2.0.1.ebuild 838 BLAKE2B db0534c88a06600d58db694557367efb34d033a23665da8be8095c2e7fa277d5d29cfb5535ecd269a52c7eb8e42b6aa08a50df3cec6da2d65cff3ee469d7deca SHA512 0ffd9325eb27e3db5a6d9a6685ceb079a839bdf11943c819a5a36398ac3d20020e272ad748b7213b6c1c6bd4de9d515a6c60dd942aa2af444fc7595a97b8a02e
 MISC metadata.xml 1000 BLAKE2B 9be4c31c417a5660338f479aee97ec224a420cbd1ebd665ff4269a9920e16a5d78b494790bd1450ceb8be0d1228666cb5f7559b76abc669b8a15e61fb683a38a SHA512 044961ebb0caebfdacfd130fa5ed132b3ce59d0f3343c76d394e2e1cd5544bc23d3013e5b206597960f514da0203d59759a115daeab1291b6ce40ca5bdce6c8a
diff --git a/dev-python/shapely/shapely-2.0.1.ebuild b/dev-python/shapely/shapely-2.0.1.ebuild
index 5d5fbfab4c49..c8b0e93f1ad0 100644
--- a/dev-python/shapely/shapely-2.0.1.ebuild
+++ b/dev-python/shapely/shapely-2.0.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 DEPEND="
 	>=sci-libs/geos-3.9
diff --git a/dev-python/sphinx-basic-ng/Manifest b/dev-python/sphinx-basic-ng/Manifest
index 6adb71c5b027..937c84ec7310 100644
--- a/dev-python/sphinx-basic-ng/Manifest
+++ b/dev-python/sphinx-basic-ng/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-basic-ng-1.0.0.beta1.gh.tar.gz 24059 BLAKE2B 319f27b7326acf0ad1457fcb4d9b6257fb420eaf2bf7d4ebd6e9333f992bc5d0a5fdb518f196edc342c023f3a1c9d1258de2bac5f263d35226ac3ed62d747f23 SHA512 177da348fdb2af88bbe3a269f0d468f4d8cd5710a3102ea0fdd943505bc5251a73783a12e5397750fd7bec2df7ecce6601e82a95e777cbd40540a7833982c998
-EBUILD sphinx-basic-ng-1.0.0_beta1.ebuild 891 BLAKE2B 2ae8db430495946a305f20c4956167bc4fc3da5303fa081055a28c75af9c265c07f8ced5904502cb826ae38100da606bc561faafa16a02b107c6466e22d839af SHA512 9c8c0cf704c839cfe829e3da79ab3e59650e845bf5be041e9a8a5ce26ed42882a0b662d197d98b88caa38a30e8ba6f3841e97e20c707980232f1117cb6bb420a
+EBUILD sphinx-basic-ng-1.0.0_beta1.ebuild 892 BLAKE2B e042d436d5179632419c53b93a369916638d5f41881e962599cfcadd8a8d6508194f15a8427f40d1a93abd42ab05843d71a25cb050a21ef1dea92510f342ed47 SHA512 e2ff1dbd3ec0fb500e0cc1ee0047787f131e735f3c3533052c82251879ef11d52472c6943fbdb4c40d164b5d9b7f5a72656f156c8f9c10fc6f30cd32c009a980
 MISC metadata.xml 362 BLAKE2B a93dc662c8ab618397c8d0504342e8f1bd74226b131ea4ca07771cdeb75eb8947451b4353c0da16760f07f935ebb75adcdef4f189ff39e0cf707d03e8fa319e2 SHA512 fb27130b3fcff9043b3ad33e34c92f638cae46d526dcbe77cfe088abf80e6b89992edb1e0b571a5a2447bc6c8ba31ae84776d153067a33b5d6d14326149e7f46
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild
index 37a6f2bda819..863ad5d67bca 100644
--- a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/svglib/Manifest b/dev-python/svglib/Manifest
index e7efb6892660..46ec0c126916 100644
--- a/dev-python/svglib/Manifest
+++ b/dev-python/svglib/Manifest
@@ -1,3 +1,3 @@
 DIST svglib-1.5.1.gh.tar.gz 1265304 BLAKE2B e147df6c5326f0ed27ffa56a158442b7727946cd9f51577df36b05b04ffa7ee6b8112736eab92e214ef26b7d055506844820b323e5342e04efbd615a7b8f982f SHA512 5cd93db39078c7598a51e08afee08b689c4c95e5ac6340d1a51f85b6459fa4635b8edf45add3b39d0a079f0177a99b3d4786e40fb6276aa5ba80c9b5513e6d4c
-EBUILD svglib-1.5.1.ebuild 854 BLAKE2B 56181a882b0f85fe32138c4f30630197d359ac84299e88218ad0c12d66239ee8a1bbbda36991dde39df861865c0f42c0da999d0b43af417c7de29fa678db6a91 SHA512 08c955e4b891a288291bba414fc3aae5ccc162bd20998973c7230e99fea0d2c64b3f859ddaa60705235f24383912e113d699f5bf6cec09d214c381c5a32f7f07
+EBUILD svglib-1.5.1.ebuild 855 BLAKE2B b1bef5d2f16e498f74640da0be00ae0310043a96007f8c13277db60f28cf93445abc5584318b438e306a426b11044c8f7a661e32116b8b53962cf45e83f00f46 SHA512 eada16eeaafb3f96034db03d878b8c582318ac7d90325b13ac2a7607f9bf68880825ef710b523a3e6c70c7ea1ecb0a772059c3b154a8a1eadf1b999858e143f0
 MISC metadata.xml 389 BLAKE2B a63a478393f24f78e31793e4ec841749fb600c0d4ae0b71dfb0f63dbd23fdeab7cb531f4e287d97c1b5f65decd8668cabe42eee6f1fac92f40f203a8cc500a70 SHA512 71a266a3fe1432a966fa52a691f1472f269a04e413c52abc7c7264f9acc233abe6ca86c44f35051fb960a7805c62e2ae12ec6e9799e25b2e89f401c6972c15f6
diff --git a/dev-python/svglib/svglib-1.5.1.ebuild b/dev-python/svglib/svglib-1.5.1.ebuild
index 00086eb46ed1..40813f7e5009 100644
--- a/dev-python/svglib/svglib-1.5.1.ebuild
+++ b/dev-python/svglib/svglib-1.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index d3e66122e83f..b55c4711e991 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -3,5 +3,5 @@ AUX symengine-0.9.2-setuptools-61.patch 566 BLAKE2B 362c880be08c98da85b1ae2a13ca
 DIST symengine.py-0.10.0.gh.tar.gz 112272 BLAKE2B 8d8262c1abc48e3b84e14a5c825f0c19335b7374ecb8f641b20140467709c199af542a7e15036a4264d885ee0e425665faa97a2b320bfaf45e8de1ba469b53a4 SHA512 7e3f2554ab79d92d7247b573c383c2ac0dda421b5421d088362007f70b055bc59d9879b8f6d4c5788ddf127ea0974ad9305d23db701f3b9b32a17d6b03000e7d
 DIST symengine.py-0.9.2.gh.tar.gz 110856 BLAKE2B 11330acc04970d367fe66787521776dbd803929d91802ea09d1bc54a96c8fd87e85114042f57fc8c007de2dcaa1b0503a8389ac677797cc2efc866d71d76d1db SHA512 ea9e8cb7dd789b551f5372c32b98365ab251bac838204b5c832783f9866c2774f5d411f2f59e5e60f17939a1c341702acfc3e3f7e77246330ab3cb74f5ba7cca
 EBUILD symengine-0.10.0.ebuild 1102 BLAKE2B 785f607e7b1321485ec39a0a3143f4b15681da3bd5d87953980e6a3d266c2405bff6e77c76ae8e3d97d336692a98b6e5d17a580cc692fdd561d2ea99423ba84a SHA512 02747c9bd87f4395f9c24932f6d21e260c3fc4ec4955c2f87ab9e703145272170e98cc053df5cde5573098fcc1d58726eed38f23505756284b8e7ff60f7a5f88
-EBUILD symengine-0.9.2-r3.ebuild 1180 BLAKE2B 40b69594e7ec0eeb53b1e71be853c40bacdf5692baca76b5739a1502d9bde755c2274a6ad00debc1eca1a5e3edb063ebfd1864a536f53ac9d07cf6b354b1858d SHA512 d0b297e39e4e880f801306b693d995e368833c12e42e678cefb19da3f26ba6b0cccd7033311bcd4b89cef1e30e3acf74139cf399275321f3fa2a0a882d51c4a7
+EBUILD symengine-0.9.2-r3.ebuild 1181 BLAKE2B cfdc073590ddf4f861666bb5a7cbe5964b4c5510701ac136e0f1014ec49f0a0dece6b08208710b6dc8003df355f386dcc26fea9363f658d16cb8d643a82d257b SHA512 6463cf13871325af20b16c625935df61b3e5a886f74202cd2b0f841559243c692cb67dc09dfcc7ea3ff42205e619a306181b457fdf1d5d4c97eb174139114747
 MISC metadata.xml 505 BLAKE2B 9c9b44455691ec31e5eed2f355dc4633ba05548c6e00fe49e665ad7fd1867bd6a7345f84409ea14049cc01818ef67d7795afff4e01fe88c25b1977f4d6f0fbff SHA512 6a774984cef49d82908bced7cf61bb5550207503335ae09abd9c08cdde5396cbf123d7ed5d49934ccf7dbc5167f0c13f2e6ecf31bca9f5af0a2f7c46f22bf9df
diff --git a/dev-python/symengine/symengine-0.9.2-r3.ebuild b/dev-python/symengine/symengine-0.9.2-r3.ebuild
index f98f2ae91aff..24ee3e4c209d 100644
--- a/dev-python/symengine/symengine-0.9.2-r3.ebuild
+++ b/dev-python/symengine/symengine-0.9.2-r3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 
 BDEPEND="
 	dev-util/cmake
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 844f0a3132be..f44017ddabe3 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -2,6 +2,6 @@ DIST websockets-11.0.2.gh.tar.gz 347575 BLAKE2B 1d609298d072dbd986fa2adcac1c8f80
 DIST websockets-11.0.3-python3.12.patch.xz 4328 BLAKE2B 6ef94255ef5d95de8015eca14a5110373ab9ffadf4d1c86a892da1aac46caa2755cafeb643a222000a03262c1b1b1aea58132daff36981c00dbb68ce05484058 SHA512 421a6fb5a2a801850ea1fbaf890c11eac0f55ad288185f16f4244f316132591bc5a814636141ba3ada67aeff340f41de61d06c8db87010c858c1b0b02fd9b5ab
 DIST websockets-11.0.3.gh.tar.gz 347652 BLAKE2B b7d796744cb4c7b944e98644dfb9c0e44ba465a6dba71b9e891604f3012b025557dbcd5b7eeae02e71c84350e05b334f99404ddfda814a8984b7a893d3f092f7 SHA512 37a84d7c57da7a3e48870abf992ba96ee454b342610d51c06f7dfc7ee082b7fb51304518c208379c3dbd039eafb1a85444c257fed20b4605a52dc8fc938a4cca
 EBUILD websockets-11.0.2.ebuild 1005 BLAKE2B c2229a9c6c0ff0d0d6c9a28d360d88c6ea3405b090faf44cd513b00cf52d78946efd068e033d71b6ba5c1ff96b791c3d6d157d22888b8724c898093fcdd594c7 SHA512 2764a495ba3d6b14f27f5d845d18454a85b8f0628f7b925a4a1d0c3fcdb965b39e22346363ea5ff33403c92c1d5b3eab43d6a7c1ec9080420ecfee57f8f35cc3
-EBUILD websockets-11.0.3-r1.ebuild 1153 BLAKE2B cd37c008d3812585493428ce9c846286c9663fbc721210345677b5458ec659beb821a406d19a2829b87795b1a2e3fc80ebac6366c9962a49b70e82cac68a302f SHA512 10491c4a257db96e981dfc39c4997c7fcc9237419fe5b8d74939587c3425268cd548b07df08c055d23e0511c2f029a8957b953d6317b26ec7e039abfcf1b5d6e
+EBUILD websockets-11.0.3-r1.ebuild 1152 BLAKE2B ab295d3cc12715a9e19af1cd7d8f2ed1d48459694bb58ba7c31badabfaec9d3948aac19d4068ad88d38424c7adcff9c9aaa149f3a14ad371c6b0c0d72765064f SHA512 9cee7a7d2ab718de3a20a0fe6c4f77d24813dc28451545c2cac33b9f616511740021b2fbfc61e790e308fbeafd871aa0ebb2280240e81ebdaf274fa2ca64e2e8
 EBUILD websockets-11.0.3.ebuild 1013 BLAKE2B f8b2d509b466a75cd17c15201088f4e1fbad9e8ddc8ea7f42462de22d605fd6cd45166124ed304c0f0c4223ff0cd04824292f68e6ff8f0b7907f30ae1dea3ca0 SHA512 a3332e0789f5dd0db76b4bee90af78920c2a78c60c242314cbecba2a6ec032ebef0ad96cf685daa4bd6aa5260a16ed9fc2c6e0affda14a98cd537bb2a8e91053
 MISC metadata.xml 580 BLAKE2B 66a318a73b2a9e37f44a28dfc9ed5f1aa7193edb05fa295bde27fd7a1c429cae1d875289ac5bd8ff7b579be2cfc5671d27dfb46ba959c47b2c1074e8e549e9c3 SHA512 c4ba79e5ec539ffb6f0338e6e161132dc8dd0e6c7e7533df1c32731810126b728076703a542bb28abc159842ad71bd42e69e36f4fe17dc3377d054d21ec53dbf
diff --git a/dev-python/websockets/websockets-11.0.3-r1.ebuild b/dev-python/websockets/websockets-11.0.3-r1.ebuild
index a6f179e672f2..16b24be6c9ef 100644
--- a/dev-python/websockets/websockets-11.0.3-r1.ebuild
+++ b/dev-python/websockets/websockets-11.0.3-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 96f43c50d44d..8bd47b97c0b2 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index 76d0bd9038a7..dd4780fde3fb 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -1,5 +1,5 @@
 DIST asciimath-2.0.4.gem 60416 BLAKE2B 9a5d6bf967962d37e620d0b49204ba8dafadf65e95a613924c7c169fee98f00203861fbbb1c06db1ee833e401f9a2141566dc693237e1cb7e797e639c63dccfa SHA512 28ab7fd7f43320112c0e7166fb2a6ef269eb91314940deb88606443bec055792cf3c49bc2d9b75c1e5ee5690c3071e66f15f817c4539fc6246da7a8d792f1803
 DIST asciimath-2.0.5.gem 60928 BLAKE2B ba81e68f4ae529dab80a40e5d268137af743d8c01f22c84c39c91102bea0b2293871158d157f19bd4213a59b5808a26a5d99697d79750b8a3fc39436426979f2 SHA512 05328306e0b750baf49eb090b02d3e840e58a764ed96dc511fc9fd1b7c3fd0b49e0be0d3300acadd809c0b2860fa2ad873e979711d6725e1420782395c5a2185
 EBUILD asciimath-2.0.4.ebuild 518 BLAKE2B 884ba7026c8503c88e95ac38e331c1d851eb61745d16c31a49e1c70c98c0cd0af3de88d14f801b13e2ca7d00dab94d2b699ad8c6049cb4f89573dbf007440bb3 SHA512 c07d2b2c3a2812b23d8b985ad1bccfaf4d19bbd370013a0c7ede78ae84546b32a3721d81764419ce6939edbc93b360f3ce821abe8790cbd05bbfa871f75693ab
-EBUILD asciimath-2.0.5.ebuild 520 BLAKE2B 4f76e1337c7fc7406979915d7b35e309e649d0184a08a975309ce885cd42481ff16543001ede2ec5a7eb5ac51de0a30ffc78fa69bb23cd40b603c6aa71269297 SHA512 d016c95de2004d91321cf2325f08a0bbf5348ff6240622b36417e059eae8e46fcac3d8ea402721e69b42d4bf8d904547aad074cd0a67e8ead8a01afe246bbe78
+EBUILD asciimath-2.0.5.ebuild 516 BLAKE2B ff6efa1adfc3449349465d55cd957ad8992a64408cf23c4c09ddf4befae851b88b7a9babd2aa1571fe8c966d1f043b67a146fe584899dbf734f82d4fecccc92d SHA512 0570f025e289efd18d8fd2810930e2a822ac2e398ad1808282def05d2e62fa549202ed53953af989491aaed0b0a789764f3bf344dd3dc32d817f4c3f61942de9
 MISC metadata.xml 348 BLAKE2B 56b9dce393fdca26f75f3e103ded1a505dc847841e447e13270ffc45f5a3037cf29ae7a9a3d9ae244aac56bf4ec98596d5970212ed244abf36ebaa0f9f3be7c2 SHA512 2dd2cec482ebe7ed13f6fcd0e8ba0b5be0c838ebf780bcd4c936c441eb4e3573be9049ef48c78e8cc5ffa5f942039bfeaafcd5432e041cf18e6ac9c522ec3fdc
diff --git a/dev-ruby/asciimath/asciimath-2.0.5.ebuild b/dev-ruby/asciimath/asciimath-2.0.5.ebuild
index e638fb7ccf5b..b5f7a88392f1 100644
--- a/dev-ruby/asciimath/asciimath-2.0.5.ebuild
+++ b/dev-ruby/asciimath/asciimath-2.0.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/asciidoctor/asciimath"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 73da82cac5dc..0b413fd69af4 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,5 +1,5 @@
 DIST backports-3.23.0.tar.gz 181501 BLAKE2B ef9841366b27b19837e61177f727cbd0acd58650cebab03329c174d699147fadfe51b4ac404d11332e681285c5f0ddcf387bdf6304237ff32c77048a1f5670b6 SHA512 b5b16b78c4dfbadbd60735b29541268cc6446f283ad686add208974fb861b270ffc46ec3cb6702c2ecf760e0de83d31025dbeba90e79383ffda6b4ca0b52a06c
 DIST backports-3.24.1.tar.gz 186050 BLAKE2B 5c4f22e12ff4b436c356796b1d8af4cbb8ea038536818bdf97b6c42c57c809c01954147240aa250ee7fc26abf5f9d775d3e0f9b73f6db323aec2c8481d15a68f SHA512 bc29c9eaad86ae99f4a22d6f797bd8a93769761c4bc728539a798e7d0c1fe72cedc665673607d4aab8ac0e7e890789f213842a927eac738674b6089b9961ebf0
 EBUILD backports-3.23.0.ebuild 792 BLAKE2B 28c883f7289b3fd8de077287d5340a3a32b4c5cbb5c3b619695198f1795b49db45981836c15fa9a2defa134c6dcc38c880d4d6b71d9655b775154a5b4871c2a9 SHA512 96a072fdd8b5f29baa5ba46967c39d8501cab6770a2ac6fe4d26686cb8a87a09483b4a374b3fa3b696489cfeaa9a99bebbfc2876c3e1ca956cd1a73e0b4c8e9b
-EBUILD backports-3.24.1.ebuild 792 BLAKE2B 00fcf7944786bcc867a1dba9e366db8c6f66e0c99784185287afb16c2a2aa45611bf20b9dd303ca7406db21302c4797ac210cc10f9f1ac6e90050d5e753eaeee SHA512 01ab1290c3f58b3d564aed212f22a547d1aeab4bd994d203fb154c0414d73c430311344ed258ce11e8d9e42768ad09422d59bf115c6164d9aa863f72bd0ff966
+EBUILD backports-3.24.1.ebuild 786 BLAKE2B 732e841560523c246ef1307af8e3dc199cee6b522263c94d2c553aaeba607312affb82cfb754d7774f27e83b283f10738fb928df9ea8134638658a93bf1fe4f5 SHA512 17289481189143de372a6d0611d60c36bba9a264eaba4b12fea6273d669a3aa1b453aa4e4aec828f2514c9c51e65fc1ddbe164741a654c9b384867ff293a98d1
 MISC metadata.xml 336 BLAKE2B fb9482efc94ceedae0a44003dfe8a539ed8f728b93cd5e924f5e44778049598f14874908e3ccf0b393809fe35eab9027533ddb0407c16a767012c6f04962d8ac SHA512 848ee492c5952bbc00d5cce3f17f5d68e56ee0235c23f0eec19cf0a85cf097e20484ce6ac209d4fed6fb0dcd5323b45bdc662cb9ed6fd9a9bf50321724df3c5f
diff --git a/dev-ruby/backports/backports-3.24.1.ebuild b/dev-ruby/backports/backports-3.24.1.ebuild
index 60fd239f37d0..afda85914899 100644
--- a/dev-ruby/backports/backports-3.24.1.ebuild
+++ b/dev-ruby/backports/backports-3.24.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/kramdown-parser-gfm/Manifest b/dev-ruby/kramdown-parser-gfm/Manifest
index c5918eef3750..f5dd4f40dccc 100644
--- a/dev-ruby/kramdown-parser-gfm/Manifest
+++ b/dev-ruby/kramdown-parser-gfm/Manifest
@@ -1,4 +1,4 @@
 DIST kramdown-parser-gfm-1.1.0.gem 11776 BLAKE2B 99a77ea02d0f48421cc6c582629f6cdc7504174867cac8927bdc26fd50f851e294c0f71ab985e9d0d6e595906c458b1f96d06903d6765eabf8b6f617c6303f14 SHA512 5662c1a50da7c8e50fd50afb5fe1dcd3bd63f4282d9940f96bb56266b63841c0b09902ce90eb3162aa89c54047970667b17299b3a7cf475bab2641604aa15d8c
-EBUILD kramdown-parser-gfm-1.1.0-r1.ebuild 793 BLAKE2B 1831b4b893e0aa0cee156da165901ae78d38b9ae71bb9eeb9a722126164584f784be338d8c8a13239da1d317c50d6ce37897a009edb222424a0e97c0dc8dba14 SHA512 5d1642befcc5f869aabc362beaee9b207edf0066c3fdf3956c1e7a7a3c28bf36cda6fc40453c114de19dda32c626d3d9298e26714faf3c7bb83f8a466c2d7aaa
+EBUILD kramdown-parser-gfm-1.1.0-r1.ebuild 792 BLAKE2B b7f83f6951a74ec7c62bf2ea81218b7b03890954bb31dd51ecb8a639ac6d8f59f60c6cf8c2a0ee4de1f2da97b36af679fb827ad09a284e04bc50c442bb10d299 SHA512 adec9fdb601135f73e3f51e91945ed5ff470574232bc560a3831e58afa5ae4bba0ecd804c1439bdb331ca9dfda15f99e24d330116f3b9157281b5106b6641f54
 EBUILD kramdown-parser-gfm-1.1.0.ebuild 784 BLAKE2B 6ecf3a6a07fdd79a3fce642b91206e6733b979e6a0d78a9b3dbe8d8bc3813bf479f6e1c9ae78c1c07e3b837327492fffca76b7b9468929102b0c0cbe09ad4a82 SHA512 bbf216631e01daf1415e760fea936175cfc0773026311983d5dfe4d4e14cce5e765eb2c0d822ae3dc21b5011be2fccad9772ad11a2ff622e6b688b16ccd6e243
 MISC metadata.xml 346 BLAKE2B 0908f3e6cd648692e82059b2985581801c675dfe6388de7795c3d16ef3596d243d5cd40164deb219d2d628383338303909fe474fdfbe8d7fd91ac956bef6ab1d SHA512 e75d6ce31c31943a0e1891f34308c4766455bc190ca33f11e16739ee835251d3b62a11ef56d4814eb91aa20526f1fa6c7cf709e96b13bdb2958b059129b958c2
diff --git a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
index 742b70349aba..9b5a378f292c 100644
--- a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
+++ b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A kramdown parser for the GFM dialect of Markdown"
 HOMEPAGE="https://github.com/kramdown/parser-gfm"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 SLOT="$(ver_cut 1)"
 IUSE="doc"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3c6d34850996..da48266f3c93 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index f85a651913f3..636f00217e8d 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -4,5 +4,5 @@ DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf2
 DIST patch-6.2.1.xz 5688 BLAKE2B 383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90 SHA512 e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
 DIST patch-6.3.xz 8617176 BLAKE2B cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3 SHA512 4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4
 EBUILD bpftool-6.2.1.ebuild 3002 BLAKE2B 8f0afdbdb41176ff1ed27224b310c88b67c44214d9ad82ba4bca353ba02f04e666b2c19f16e66d68e4cd7540412d7f6ee0eef3ce71048dcadd75f4594909c681 SHA512 604498cf1ba5b83edb808480577395f1d85b59644f06bd3d2d21a843f3062ca3d85f1390e09bc917c8ec2324c56cca4a45b79ee3b6c57311a85d4ce979c5751c
-EBUILD bpftool-6.3.ebuild 2885 BLAKE2B cbeedf9c25eee1e7231c7cfb96fd2d3a50ad6d578d38c304abd4690cb11e08e0d1258cd12212921e02ae91d47db67bde02d2091a0e1194ddf5a75e3da1c4e61e SHA512 c9e7d758d5524709b089af387346ea1f93bbc8932a534fe1f66d547d019899fe3c32d8c848ad34ae77a79ae7b16187140a9e1c4d741edd8aa54ba8f6f1e396d7
+EBUILD bpftool-6.3.ebuild 2884 BLAKE2B 252a8c4a83c63adc886c8303bc6879abf93f78abc07ab062513a5fc9ec9d8cad1f03cbcb83e65af13d27a839045188076031822029198e2a480d620fa7de2c55 SHA512 4607df1082ae897cb798ec92fe635bcb536520924611b46e93a6790449699a4415a36757aba7b09d65ba9984ce4ce2d51a54d7b94a054af3dbf198f51739377f
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-6.3.ebuild b/dev-util/bpftool/bpftool-6.3.ebuild
index 7df12a6556bc..6d380fce5a6a 100644
--- a/dev-util/bpftool/bpftool-6.3.ebuild
+++ b/dev-util/bpftool/bpftool-6.3.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 51414842ead2..1f8ec4e19925 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -2,7 +2,7 @@ DIST diffoscope-238.tar.gz 3287285 BLAKE2B d745c0b279ce6e29cbe9c6655c48d2fb4c8d2
 DIST diffoscope-240.tar.gz 3167743 BLAKE2B e6eb9f7499ea7d82d9a98de175f61c044051c987061d740599f490361099ecc568d8e557f9473404ca1002c4b91939b768dd7577ba45705e9880a3e17e3729ac SHA512 3d31e19762e9f5adfe12c16fc52bc0156f3036541de01cbc260c07ebbcab54eaa23b4b9f9c2afc3c791137f7e6cc375de06528f64e0771cbebd9e23f310a6e2b
 DIST diffoscope-241.tar.gz 3167718 BLAKE2B eb69f65a63e764db886c6057a19746a5ae7f4f5cd760c8a568412084dbf03da368a584d7d5b1f637e1d2e39b6fc430d077be526fd3199d5583e3f9026f897490 SHA512 82526a4bf3885b58fef74143bc75193fc9af2692def097835cc3c820e5055b22544872c0e1a8f13fb1434172cf1cc2b3664b2d2776590195b0580c5c0b3f4d57
 DIST diffoscope-242.tar.gz 3167814 BLAKE2B d6f63f94e312cd9bb48858dd82e50bcae065cd25f332a08940b22d36df75993cd43614ae44cbae3360c38ae30b7910a062ece294680b58b2a654ca3ead078795 SHA512 3d724a2349d2040d7072b81b8a77bae75aabe3f39c661c1d68a9f6e76b75048225262b8a9932c39e56429ec4937a398ca45e9f9abd23505aa511a7a8a81f3ab6
-EBUILD diffoscope-238-r1.ebuild 3574 BLAKE2B 799326aa1c446368fcb0d4374a54c1cf8b4a010ccf9379ce62a8dfb9dfd5c634f1427a9eb3ff37e5fd13fa6d914c6186d2977571824f8e2c80de1738933f2105 SHA512 1dc6559cb5d140b629bc22373f318e305e3daa03d550268a84bc99e43826067338cc82a81923e2bf823dc048b6289f24196f57df984df1a21685820739493965
+EBUILD diffoscope-238-r1.ebuild 3575 BLAKE2B fbc8c76a414940cd2532946999b293abc84ce324751dbbdafe207c586b7317238d3589482e72f3cb9cc0c797531c92726225d3365aa2fdd2c7adaf2eab920f33 SHA512 ba3c3e3285ecafb5fa72bb92e4b6ef5174f4991dba4fe78deb4858ae61e002d168e46d610fee1dc14ab51c2b1e5e9eb0a34bf64c3c680f23e71a0e49580bacd6
 EBUILD diffoscope-240-r1.ebuild 3576 BLAKE2B 9ca0b96b676968af02315e7fed3c1f636adc0c529c6491a8a1d91726af515d02ff9d5972669a370773ef6510972fe602533d9db5ba4417fa0d8944fb6a849f38 SHA512 c131de19ec67bf7de1a636ffdc0ac97c41c5888574f3b168a7f64ea50fb896fa8d1fe3af21aba8ab3933ae6140aecdff152abb411e59054c6dff5277ef97c784
 EBUILD diffoscope-241-r1.ebuild 3576 BLAKE2B 9ca0b96b676968af02315e7fed3c1f636adc0c529c6491a8a1d91726af515d02ff9d5972669a370773ef6510972fe602533d9db5ba4417fa0d8944fb6a849f38 SHA512 c131de19ec67bf7de1a636ffdc0ac97c41c5888574f3b168a7f64ea50fb896fa8d1fe3af21aba8ab3933ae6140aecdff152abb411e59054c6dff5277ef97c784
 EBUILD diffoscope-242-r1.ebuild 3576 BLAKE2B 9ca0b96b676968af02315e7fed3c1f636adc0c529c6491a8a1d91726af515d02ff9d5972669a370773ef6510972fe602533d9db5ba4417fa0d8944fb6a849f38 SHA512 c131de19ec67bf7de1a636ffdc0ac97c41c5888574f3b168a7f64ea50fb896fa8d1fe3af21aba8ab3933ae6140aecdff152abb411e59054c6dff5277ef97c784
diff --git a/dev-util/diffoscope/diffoscope-238-r1.ebuild b/dev-util/diffoscope/diffoscope-238-r1.ebuild
index f4934e958eda..32c15ca1f544 100644
--- a/dev-util/diffoscope/diffoscope-238-r1.ebuild
+++ b/dev-util/diffoscope/diffoscope-238-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
 find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index b1c0d64ca5d7..4fda23d7d7b8 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -9,6 +9,6 @@ DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919
 DIST valgrind-3.21.0.tar.bz2 17449484 BLAKE2B 1f7306d288eb5ecfb2b2f0b2dc68960ecd4a7213b96a2e4ecb9990a755e8c233b0e9d190c0f807019bde669f44a631c8dafe9eb521d739561e6f889f7bdaca5c SHA512 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
 DIST valgrind-3.21.0.tar.bz2.asc 488 BLAKE2B 6297bc925c16526a51de4f589232a8d5bcb8d54bdc885c145d329deeba45b42d3a5a8a3f59d3fb240d3bd78be7fd30d95ceb33c7624afd3c99c51833d0fd16f2 SHA512 114e5cd2f7352e56099efa3b2c42d39ed24e42419bbaac1af5e2b5c4fa72a2ba38ac6b0c60b93460a0cce8819ca0c7fae6618599b2af809ac0ab4fa30fdb25ba
 EBUILD valgrind-3.20.0-r2.ebuild 4300 BLAKE2B a7c9b1f23d8e84375846633c1f91e48cf12ac40b9238b2f0d0edd3500c28706837ec1733f7c81e81c2469ae444e8153ea64670c1612e696205629171d3578019 SHA512 7ad54251e9ae5ac05dbb7bc5d59113d7c74cd3a98e1085e6c907672fde857ce2f5acd4ce02aa616db3e4aada01ad3e0923d5695b7e14623e3537dc316b27f823
-EBUILD valgrind-3.21.0-r1.ebuild 4091 BLAKE2B 0f0f215935aff6fc3a6e2ee77670f15348ad0de8733d929a47ea7a58ae06a0ffede43df2e9f333af5b91782623bf629de9073da04b83e1a627f82edc383948f7 SHA512 fbdeda95b2ac0b4bf4d3371249198877802a8e91d742f0e86b285c71a5a9c5d64d2b7c7572378cb479a57ce256c4507db22d99d488e64427d3b16ee097db9e5e
+EBUILD valgrind-3.21.0-r1.ebuild 4088 BLAKE2B 29e7b8a46241c6da7338070275bd8f3fc98ba153a10617f2f48a541493bd1fbce6f93492bae0e0c4dcc5bd1341d7db9dfa283c0c84a17df8b31dc4ebbebb381b SHA512 5dbcb7c4cfe602443427fa5394d0cfffd891a7a632a16a530aa87b4eb009d99115a9020f6e99ae02918c077e02c045f690cdbc14a07fb570212a9df57e6246a3
 EBUILD valgrind-9999.ebuild 4154 BLAKE2B a97cfa84b586051f943d3793ae227aa077e197da9c645bacabdb79daf061af5fee000e63d5c7766cc79c10458db240e26160384c07ca6883fee80d84a89c8ed0 SHA512 6ef312def3f5cebe6c60950fd7bd56699c1c9ad29c9deed138f90b2774dde7fc329c83c6fed66607d60fa1fe01a4534aca54864e7b0eaeb1cd0585904cd9498e
 MISC metadata.xml 1037 BLAKE2B b39708a006ad3ff24b100c702382ec8c45f6e300f3497ccd06199a6195abfa936c8f71ebd3223e0f7299e6644e378ef1d8d2c95a23059b66757d8a91bcbfce15 SHA512 4398f60fdacedbd92881dea016e60c5def5abe8989b56fc450b71b5c65b0d9c26a44b8ee89d0dcb71ab376d987c8e22d12031e9fb2a17b126e3223adb12e0f2f
diff --git a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
index 7b6c9f5f76e8..7d3dd4bfcbbc 100644
--- a/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.21.0-r1.ebuild
@@ -15,7 +15,7 @@ else
 	inherit verify-sig
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 02ca2dd29f98..fedc63bb985f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index f04b7cedac64..70eee26ae567 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,5 +1,5 @@
 AUX hugin-2022.0.0-exiv2-0.28.patch 3460 BLAKE2B fab4f433b7a5d0959fc68ee0affae81ba989526713a9b711da8553cdbb9522dac80f1ac52007ba90cbf3066eddd3745ec567d4db9b508cf4e944b1e2c627358d SHA512 b5170d9f3b62fcc2e4e5a51d8766e8db8f1df1dcf6e198dbd739f3f960103a9f5e97a8960fc7d5c9b5e226c74c60762b639b5fb677e38754ee597626c554a10d
 DIST hugin-2022.0.0.tar.bz2 10374360 BLAKE2B ea77614a650f832f39583328767a55ebe888a003fed117e73b22fd29c641fc8494b190b864b7ccb05f996ceca5d95c5391597333efdc19bce0eba93af14543be SHA512 752bdaaea666a24bddc72b4aa4ccfbf366af30022102a2e74fad9c86045b3aeae50929a8a3eb27e296b27bdb487ecd60b6e363b23413e08af6ed944686569c97
-EBUILD hugin-2022.0.0.ebuild 2180 BLAKE2B 9d5965086fd8d95dfcd628a7fdb7234ff8e82ca6744ad2cdbe9620d7bc5e8b68b1f2f6a25f3aab789a1738d339bd1360e954afd6f7776f1f9163d120b3b49994 SHA512 5c95a6c4df8983f5fc714bdb9fe74bc75765df145438c2cf21daef1b2433ab286ce9c81971a3d3840717f53f7b7de103e7121705d37c023612541313b35c26cd
+EBUILD hugin-2022.0.0.ebuild 2181 BLAKE2B 3377bffe29b67fcef72a8b0293ab106ade79d40620a4906531863b5639e2c19ca1b168f874181569d10f0958a2a87f51d4e8081857cc62a36400508c5ccbd690 SHA512 c62f921b2d77c8ed0c04887013a29689d0927847b29b23145a514e04e63f6dc0cbe8e113fdf5e40695dcd8913ddecd4e1566fb44097b7a69117e0adbdb30b923
 EBUILD hugin-9999.ebuild 2058 BLAKE2B 13f52f224c492d093c79429cfdc05b81c8a4c5c5297266107c55f20bb4278d4e4664bc183ee0fe8c210d657a0ac5b51bd86ed0fd7d02c3668551753f0c7a5178 SHA512 b6ae419dffb76575973fe91feef2b578a75d5350e935f9a1da73451030878d3ed7eb0945f6745a8467b5f3c9973487d5e08c37d5a0df47b5accb4bcd4a0aa22f
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-2022.0.0.ebuild b/media-gfx/hugin/hugin-2022.0.0.ebuild
index 3c0dd61f7e87..5ffa06386d06 100644
--- a/media-gfx/hugin/hugin-2022.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2022.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/icon-slicer/Manifest b/media-gfx/icon-slicer/Manifest
index cb1460c89bea..8a87a3de437a 100644
--- a/media-gfx/icon-slicer/Manifest
+++ b/media-gfx/icon-slicer/Manifest
@@ -1,4 +1,4 @@
 DIST icon-slicer-0.3.tar.gz 112429 BLAKE2B 4900e7d702bb45a209c165476aab5604f1623ea48081f742ce36115bde0a6a153aa5540c952013841a4853b827d1b718892006827105dd06c04e7fa892e9ee58 SHA512 09e46dca933a7c647b232d2ae8f589526e5f1cb43e07fe7056f0449cfbe812becc3a171c4f7c716bc65c0f95dc4de989a99b4f1b3566ac52e7ad67965f5be4ab
-EBUILD icon-slicer-0.3-r1.ebuild 521 BLAKE2B 1d1ab1f91e184c020c327ed8ea3c6dcb9614b46de5809ce90e1af61ba6495e20a9fd730883bc1bc21dd4d7600dab40973e600286b91b771a8175fbdefb5b5d9a SHA512 43600b4df3eddbf9169f1449208e8b7a93ddf8696f43018af959348131c9a9cee2ad90954027921b9259a15fd7d2573a385ce06ff11c750003dc5fb9e6ac7cae
+EBUILD icon-slicer-0.3-r1.ebuild 520 BLAKE2B 8b25d60f0cb0ecbd64dfff1085399e7d9e2f6d85dd935917b29320d18b6e5f794b3223861256aed67cdda02561e281a6b5b2316e91070603868024fdb5b5e946 SHA512 529fc60a440cab7de6cf9f1c71cf5442c04749dda58385338487b808f5aed542599bda5059a27fc13adadc557e6e27aac6c4ecd54daab4a429300b21ed10f906
 EBUILD icon-slicer-0.3.ebuild 508 BLAKE2B 73ebb8592f4b43fed4155da91229bbedeefa99ec82996175ba68a084af33f86a471094349e5f97b0ff4241d92ad185e4feb9f37106379559634bcb2da543258d SHA512 9790598fa528bab1c178cd9aff927a1d1c02cafe04ae173fba8d16f6891755fc6cde2d4ef584449106cd6304650939ce60e93f53e4abe4392f6e4ecc7b21ecd0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild
index 12148b7f1a15..b676a257a41d 100644
--- a/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild
+++ b/media-gfx/icon-slicer/icon-slicer-0.3-r1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Utility for generating icon themes and libXcursor cursor themes"
 HOMEPAGE="https://www.freedesktop.org/software/icon-slicer/"
 SRC_URI="https://www.freedesktop.org/software/icon-slicer/releases/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc sparc ~x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 52d3bcf4c591..243fb12d0509 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -9,9 +9,11 @@ DIST ImageMagick-7.1.1-6.tar.xz 10392592 BLAKE2B ed02f36d0014f2699db5df0eb1cf3b1
 DIST ImageMagick-7.1.1-8.tar.xz 10402336 BLAKE2B dd2f2b1fb1a42ae2da4d02cbb7d0d4c4afa6877f5b98a3b7d6cc2d3ce74fea5a2a30bf1680cdbf44fd3b37d40cb1957aebb12cf5f2dcc88b4ea90539218ed4e3 SHA512 99e786fe72465e414766cbef4f26fe48d89d6ea7a996197f9cc6b96492eacc8a9873b5440a7cd96bf097fafef6ff4765674d2295f4743b3c32eb2ff2dc9348ea
 EBUILD imagemagick-6.9.12.84.ebuild 7398 BLAKE2B 8d008c24c598beeb0310fc20fb15191e46ae6f9201fc1377ef42aed6c982f38a498faac5dffcad016d924c352bdba1113aaccb65a16e7f636e1b1a8bc58bdaf3 SHA512 44437431485556b35d046dde691d723aac9d79ea023e4f4dae2eb59c94c382f619f4d3c086bb4e3dae41ab9cf217c9a6ab289e6e3ebcc7b7c983176f384f5b93
 EBUILD imagemagick-6.9.12.86.ebuild 7406 BLAKE2B 8ec5b53905aea991534d854fe060ed4112885fa49928da5eb94bcbf06e3a84faca7748a811f5a9381721848563b0fe0a1d41d0d6abee004a252246497d56fd1e SHA512 a96b9ac902a34e507361342c4a17469e681da09bd8cead4c254b4a5a5ce3909d5aeeb6b5fbd296b43c23cfa86d95c9a2a168daed410b5405a0cb378a44ef6d37
+EBUILD imagemagick-6.9.12.89-r1.ebuild 6444 BLAKE2B 7585630a40907f09e5216f96e7e41a481ad29bbdc8a34cc60f1f5e5c6a10a7ba4d2c9c1240e6f24ddb6be9fb0f441b03bfccdcb5751dcf059fad52b86a8eecbd SHA512 7a5ec731808e700e828b56968ddc761bf8295d16b2723bdec58f80e8e5a8adef5a9828145497ce8a3072163622ad8e52af026c2869fc979a0057525b955a4960
 EBUILD imagemagick-6.9.12.89.ebuild 7406 BLAKE2B 8ec5b53905aea991534d854fe060ed4112885fa49928da5eb94bcbf06e3a84faca7748a811f5a9381721848563b0fe0a1d41d0d6abee004a252246497d56fd1e SHA512 a96b9ac902a34e507361342c4a17469e681da09bd8cead4c254b4a5a5ce3909d5aeeb6b5fbd296b43c23cfa86d95c9a2a168daed410b5405a0cb378a44ef6d37
+EBUILD imagemagick-7.1.1.11-r1.ebuild 6804 BLAKE2B 6f33891f69fa5996457d4dd4c8f3282a5be9a59e95a3d6522af0925f52467ab20a0effd9eacd6720913e1d37ee794523eec5dc135f755d25d87e6a6141345ffd SHA512 f9ee698c763a68ece549146b450d78b57dcc1dc9eb2d271d311f4c451d6c6571ddd2d4adfa1e65e8b37dfa7dd0de0b516b219f04cf6b904d30dcb12b3c3136cc
 EBUILD imagemagick-7.1.1.11.ebuild 7765 BLAKE2B e8c7a695b1146ed85285b7101de2bbde79656eadf2e2787922dab218354f70d31bf355d5c50f26eca9fe06773e9ca21a50542dec9f154c761e268c0449dc336d SHA512 76c10adf3a68df1e9663e9b7acb6269165508f0b0e0c9b7eb7ab5a26021218bf18b15ceaac1bcaf737439efea91b8765b204aceb61abb35ab93f512d19ae2e5e
 EBUILD imagemagick-7.1.1.6.ebuild 7744 BLAKE2B 1111c6eb68ebd7dfa390ffd6141735edef84fe0f1f8c911d288d6296986838d4c67535472724ba7ffe4fae5bfe22135a2c3fb1e6f21f7b8b9709d90a3a490d71 SHA512 ffc5d1b0a73c24480937522945281f316841cd800bc5086f4aa53a282d970092278b89d03badabd570dc71cec23240b1d370739e5f4f59952b943e988daa4c13
 EBUILD imagemagick-7.1.1.8.ebuild 7752 BLAKE2B 1c7099ff24e7881478887242c49b42217a9a3c9014af15c96ab0525b468bdb2182ce4032eac1b61a8b6a2b6f36b810ef5332264b14e6812e3296257584e49f2c SHA512 b16e3254e9d7bd3083f5198b3719c9a4ca0982eed25f60a1c559a04f765d6d73a352b02ea35ea8d391e18f5df12f5b87937f7062b3a21b0a4ddf53a29aa6bc0f
-EBUILD imagemagick-9999.ebuild 7752 BLAKE2B 1c7099ff24e7881478887242c49b42217a9a3c9014af15c96ab0525b468bdb2182ce4032eac1b61a8b6a2b6f36b810ef5332264b14e6812e3296257584e49f2c SHA512 b16e3254e9d7bd3083f5198b3719c9a4ca0982eed25f60a1c559a04f765d6d73a352b02ea35ea8d391e18f5df12f5b87937f7062b3a21b0a4ddf53a29aa6bc0f
+EBUILD imagemagick-9999.ebuild 6791 BLAKE2B 910d0a94a459970fdd35e486bae9fac8dcb6d83c22d4ae7a9bac3e033c8bd34c13207601c0d91990a7d1a451e4f5072187eec6c536a8fdadc1eb71a1544b3764 SHA512 b48373dbc46cd99b3a7b336a1591132e1d19fab82ee950633dd7b4e607ec4f1ce4e87df06402e52079fb3d3bde1b215a2db485b2b8f4128e34d710bb5e37d1d2
 MISC metadata.xml 1260 BLAKE2B ca25d6d7f6286db6fdab38bbbda7c519b28733923a6f2a3f1ddcc79436d149111dc853aa1e44d805bd9e0f97c0e76496bfe815c4065d581390ceec849610d67a SHA512 128ed34ce2e6ee36977f4990bc2be2ded256b3516bab9e91640f29f985a34f59de7835414aea4752257f6228c8b1796bb68b51ae9e4453ce078cd63cb383c2d5
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
new file mode 100644
index 000000000000..564d60496adb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.89-r1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit flag-o-matic libtool perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-58"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# for Darwin modules
+	elibtoolize
+
+	# For testsuite, see bug #500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--with-gcc-arch=no-automagic
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in ${HOME} for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		# bug #472766
+		doins "${T}"/99${PN}
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild
new file mode 100644
index 000000000000..7ebb6810d720
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.1.1.11-r1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1-3)
+inherit autotools flag-o-matic perl-functions toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+# Please check this on bumps, SONAME is often not updated! Use abidiff on old/new.
+# If ABI is broken, change the bit after the '-'.
+SLOT="0/$(ver_cut 1-3)-43"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!media-gfx/graphicsmagick[imagemagick]
+	dev-libs/libltdl
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:=[x265] )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	jpegxl? ( >=media-libs/libjxl-0.6 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+	)
+	tiff? ( media-libs/tiff:= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+	)
+	webp? ( media-libs/libwebp:= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zip? ( dev-libs/libzip:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	#elibtoolize # for Darwin modules
+	eautoreconf
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		$(use_enable openmp)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zip)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with jpegxl jxl)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+	)
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite, bug #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == 9999 ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index bb71c03ea1cb..7b351a60af4a 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -101,16 +101,6 @@ src_prepare() {
 	#elibtoolize # for Darwin modules
 	eautoreconf
 
-	# Apply hardening, bug #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
 	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
 	local ati_cards mesa_cards nvidia_cards render_cards
 	shopt -s nullglob
@@ -247,35 +237,3 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins config/*icm
 }
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 530221f1b62c..f3fc5cd185b1 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -8,6 +8,6 @@ AUX openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
 AUX openscad-2021.01-Fix-build-issue-with-overloaded-join.patch 3336 BLAKE2B c92caab0f33551ee7e66c6527dfa61d5ae70c3820d51188b6b4fc042a66cd58d207d4dbcdc87641b79733784d1c088af34a85078899fa4468522b4653fed7ab7 SHA512 f8860ec827efcdf1e0037c22ec0c1f8364b5f9554d264d2bac5be57c1b86e79f6ab284b65f1763c1548e8e3479c0ca510954937907f18f0db745826338a4f2f8
 AUX openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch 775 BLAKE2B eed37277c3e7ea84635c0b8cd02cc4ffde7abea78400ee39e67bcc782800197c57dae07a82084df47705951ced8968be78243a1d0e14a551783b8adcb669d43f SHA512 94306e68e53b01e799a5feb6f16a8f44c965a4b653b60227833013712f23648d20ac8272a7bfe38bde201af42946f91fe17231f120adfbe5b16e42b07d9f8d10
 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
-EBUILD openscad-2021.01-r4.ebuild 2748 BLAKE2B 46c396688866709ff0cafa95df8c20a8d89e97632d4b18471605d54d2016ad8f4fd72771e1749b09f396b60150617ab1a1a4dd37a04c79fb6f18f720af603011 SHA512 cbdc31e4d7a58941b5ed62c19626613d00e113a6da8f2e41fb141603174e502b0ff3f642dce1dbdf4fadf825e982fbb3924657735d8c36dba5c4f66892e7bb1c
+EBUILD openscad-2021.01-r4.ebuild 2749 BLAKE2B 3e55a465530d6de9e2934d19ed3dd7eb3a93fe01e59ed83c99165931eec6f71a5ebcf684977b11d69135005bd30cc26979a5165a9796710ceff321f69c52746c SHA512 7809c8bf01e6a059749f51645cfcfa35cbf938fa3d59ebdd265d4b2c60fc2cdf5f87d3711c48e4db14f78037e55595b9222b5b3f54310435f238f9a617b2d27f
 EBUILD openscad-9999.ebuild 2711 BLAKE2B e836553ad436c88b6e71de09096c449afdf9fd22325558ce8613e1d9b5bac40bf5148489759bb504c51d82fada67a6c73f6a4ea82bb4c4ef6e9b617b9bc94059 SHA512 ddcc41204563deda20cf96bb66fa8de70d69c65f8d6ff2fa7605f38713a396800ca0d55fa25a5ea5c7fd8864447b9fd38e5572c84534eca4de71ff5e13cf5e3a
 MISC metadata.xml 1684 BLAKE2B aad64157a479a4267e8efba1d310f26505535450ced650526c357d11472a2cd922861eaf063451fff6283a16691b074c8a390963fff46589cf1c0c3bc25e22bd SHA512 d86f2d7b5ebcfe71a6cafffc45f016c2ed8da4a918855260f8dd67ca0779f1feb17e5c58e170e8f1665d0e02b7566f0f38066dc2c69f2cd0049115c6747d4b6f
diff --git a/media-gfx/openscad/openscad-2021.01-r4.ebuild b/media-gfx/openscad/openscad-2021.01-r4.ebuild
index c7456da4cd38..3098b9593364 100644
--- a/media-gfx/openscad/openscad-2021.01-r4.ebuild
+++ b/media-gfx/openscad/openscad-2021.01-r4.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="emacs"
 # tests are not fully working and need cmake which isn't yet
 # officially supported.
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index e33bdf8ea7ed..69cc8d532f41 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -4,8 +4,12 @@ AUX renderdoc-1.18-system-compress.patch 4699 BLAKE2B 4f37058deef1773a4a35b64415
 AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999beefa04e2105e6368305bb89359806fa99f4b7048c3d6c30a2787a3125718d3cbd7c97d3381f61f4f98a2e08730b5a22db02 SHA512 bd2692f14729360983f5ca4fb8af87085ab5bd209d82f3cfd99e7753d0dd406905a6280051aa5d1476b863566b385cdc28fbe9120d0d6f5efd78411af15b68ef
 AUX renderdoc-1.22-r1-system-glslang.patch 9341 BLAKE2B df5750dc7a6bf026d3cdbe9791bc270393ef7229b0a314b97350bdeaa5bc26011fdfa671ee8594549c46ae268cbe4563ebbcb1b964da21400cd8852382d3233f SHA512 2dcbc06612533f8266c2b2214a552adc4bca37f4ee9b9c53b2d5245bc7fa75f7e8252d7a35cea04fc418bf55cfa9a239588a062c98f1bc79c4eb6d1a7cf78034
 AUX renderdoc-1.24-env-home.patch 377 BLAKE2B 78f8cd1b029b13cf53921ab55f2a6880e2d6dbf5349114ed12231088d484e6441eb1c4f50379654a9b0c056b04cddbfb6effb3f654317385b475b567c3b55698 SHA512 30d12139b3e0c35c2fafa021fded8708692320322fe5521f01f5d722deb548d853192a13ef3b559439c150e7139d6c8f6560c6d38ea7c225c9142925ef67c6c3
+AUX renderdoc-1.27-env-home.patch 438 BLAKE2B a42c86648314382bba7b93ee544fe6d82b4f1ec122c57d7b989475bd442dd7003de8bfd7f467e88693deac6212846103038f48501ffef9eae7d0c38100669eac SHA512 c0b340582de7c23637afa7a95dcd2f3f4c6f28ad9c244c92235e29e428ba40a991cbcac83197a3b52c1c689f4d07ede2fc0c96d4b1b3c67dc94866137a7ce4b7
 DIST renderdoc-1.24.tar.gz 46998687 BLAKE2B 34316e81da94eeeb0aff2291563e9bf5c46089746f7dc53f8def2b047d0d377e5c26edd8fee23ff97d77037bcfc8468b7f27f2c82c7f6e80f20cd5278b026d75 SHA512 07cc35800c13893bf1b8f8635d5a819f546e458be6a8111d1b40d54e25977c0b88d7c7bc6a89a813dfa353e0fe0a84a334d3796e04c327bf2f42c65a172f9027
 DIST renderdoc-1.24.tar.gz.asc 833 BLAKE2B 0649f4437c57fee9cd69946cff3be0b2b156656fe648b56504ff241dbd43d37d4f3d6a89ea17bd006a7d4778f3d901e25756c069baeb3d55283d9046d19b3cb0 SHA512 fad7ffd3a9538d26b38a9a32a22021063cf9b457cedecb1e40cb7cf7a55e86c290ed1776877612af02205b0f8d35f5331f05e7b2fcdfc00469be21831b62939f
+DIST renderdoc-1.27.tar.gz 47445907 BLAKE2B 58be926cb1282fe5bb2ba195cf71fabd9a5fb5562b5d51a600a98818c8f8bbbd576d8e9c331d3f107cb5db427cd35d242fd3f2f28385a47817fc805f26c47bb4 SHA512 1a6fb0d1942ec403ae1393d6121727aebe6b1eef42e795b03c0e0281bd9ca52fa30b28889a9fe80186a41a1dfbc79f38789b47296bc9b5ba185a19bddd47006f
+DIST renderdoc-1.27.tar.gz.asc 833 BLAKE2B fdfbd1ce367e9757e080e1263651444cd4001fe3d8580672a476923e2cf56b030b568c90566f258b1fd485c15c9d6c5a0b91cfb2c72c831677aa088acb9d4c15 SHA512 a74517747bf19a16d8db241a795e16d1213c745d3ff29236844433937202c91da1e580daac6ec7a54322b215163b0ebf492bef9b77eb603720503e4d3a4849df
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
 EBUILD renderdoc-1.24.ebuild 5529 BLAKE2B 849f9588b9e5f018820b590b5e1a33cd6e7be8807b4e1d69004aa89e94d7a2ba37aa161266529ae47b0c5f7f0d96ffecc3372799b0c6c00383559b205e83fb8a SHA512 4a4c85bb79ce482223c38390876035753b61a19a4e6170d10927ed4787e281f05833b20a48147b09adbfa3165f64a20b120ceb4eb4d5a031eac94e240c651f35
+EBUILD renderdoc-1.27.ebuild 5458 BLAKE2B 65864387007b608fc68acfbb28bce55a665ac514da4cd4e61f51d9db812996b2abd795398791c61e49e643ccbc8ed2b504d867c5a9568e4a242e35306ff2ed76 SHA512 258506778227908956ce60a00be9d8ade6b28ff81bfe76f8a41d6041015d8e242e76078109af27bf89cc9241208da6c8cb335ed671172464dc4d31a4c2f7fc21
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/files/renderdoc-1.27-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.27-env-home.patch
new file mode 100644
index 000000000000..09510318c5a5
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.27-env-home.patch
@@ -0,0 +1,15 @@
+--- a/renderdoc/os/posix/linux/linux_stringio.cpp
++++ b/renderdoc/os/posix/linux/linux_stringio.cpp
+@@ -595,11 +595,7 @@ rdcstr GetTempRootPath()
+ 
+ rdcstr GetAppFolderFilename(const rdcstr &filename)
+ {
+-  passwd *pw = getpwuid(getuid());
+-  rdcstr homedir = pw ? pw->pw_dir : "";
+-
+-  if(homedir.empty())
+-    homedir = Process::GetEnvVariable("HOME");
++  rdcstr homedir = Process::GetEnvVariable("HOME");
+ 
+   if(homedir.empty())
+   {
diff --git a/media-gfx/renderdoc/renderdoc-1.27.ebuild b/media-gfx/renderdoc/renderdoc-1.27.ebuild
new file mode 100644
index 000000000000..ffd0e8f0e5c4
--- /dev/null
+++ b/media-gfx/renderdoc/renderdoc-1.27.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# The swig fork is required for compatibility with both provided and
+# 3rd-party Python scripts.  Required patch was sent to upstream in
+# 2014: https://github.com/swig/swig/pull/251
+MY_SWIG_VER=7
+MY_SWIG=swig-${PN}-${MY_SWIG_VER}
+
+AUTOTOOLS_AUTO_DEPEND="no"
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
+
+DESCRIPTION="A stand-alone graphics debugging tool"
+HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
+SRC_URI="
+	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
+	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
+"
+
+# renderdoc: MIT
+#   + cmdline: BSD (not compatible with upstream lib)
+#   + farm fresh icons: CC-BY-3.0
+#   + half: MIT (not compatible with system dev-libs/half)
+#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
+#   + md5: public-domain
+#   + plthook: BSD-2
+#   + pugixml: MIT
+#   + radeon gpu analyzer: MIT
+#   + source code pro: OFL-1.1
+#   + stb: public-domain
+#   + tinyfiledialogs: ZLIB
+#   + docs? ( sphinx.paramlinks: MIT )
+# swig: GPL-3+ BSD BSD-2
+LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pyside2 qt5"
+REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/miniz:=
+	>=dev-util/glslang-1.3.231:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-keysyms
+	virtual/opengl
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		${PYTHON_DEPS}
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+"
+DEPEND="${RDEPEND}"
+# qtcore provides qmake, which is required to build the qrenderdoc gui.
+BDEPEND="
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	qt5? (
+		${AUTOTOOLS_DEPEND}
+		${PYTHON_DEPS}
+		dev-libs/libpcre
+		dev-qt/qtcore:5
+		sys-devel/bison
+	)
+	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
+"
+
+PATCHES=(
+	# The analytics seem very reasonable, and even without this patch
+	# they are NOT sent before the user accepts.  But default the
+	# selection to off, just in case.
+	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
+
+	# Only search for PySide2 if pyside2 USE flag is set.
+	# Bug #833627
+	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
+
+	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
+	# built.
+	"${FILESDIR}"/${PN}-1.18-system-flags.patch
+
+	# Needed to prevent sandbox violations during build.
+	"${FILESDIR}"/${PN}-1.27-env-home.patch
+
+	"${FILESDIR}"/${PN}-1.22-r1-system-glslang.patch
+	"${FILESDIR}"/${PN}-1.18-system-compress.patch
+)
+
+DOCS=( util/LINUX_DIST_README )
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
+
+pkg_setup() {
+	use qt5 && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	# Do not unpack the swig sources here.  CMake will do that if
+	# required.
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Ensure that we use the system glslang headers instead of the
+	# vendored copy.
+	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
+
+	# Remove the calls to install the documentation files.  Instead,
+	# install them with einstalldocs.
+	sed -i '/share\/doc\/renderdoc/d' \
+		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
+		|| die 'sed remove doc install failed'
+
+	# Assumes that the build directory is "${S}"/build, which it is not.
+	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
+		"${S}"/docs/conf.py \
+		|| die 'sed patch doc sys.path failed'
+
+	# Bug #836235
+	sed -i '/#include <stdarg/i #include <time.h>' \
+		"${S}"/renderdoc/os/os_specific.h \
+		|| die 'sed include time.h failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Build system does not know that this is a tagged release, as
+		# we just have the tarball and not the git repository.
+		-DBUILD_VERSION_STABLE=ON
+
+		-DENABLE_EGL=ON
+		-DENABLE_GL=ON
+		-DENABLE_GLES=ON
+		-DENABLE_PYRENDERDOC=$(usex qt5)
+		-DENABLE_QRENDERDOC=$(usex qt5)
+		-DENABLE_VULKAN=ON
+
+		# Upstream says that this option is unsupported and should not
+		# be used yet.
+		-DENABLE_WAYLAND=OFF
+
+		-DENABLE_XCB=ON
+		-DENABLE_XLIB=ON
+
+		# Path to glslang*.cmake.
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+
+		# renderdoc_capture.json is installed here
+		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
+	)
+
+	use qt5 && mycmakeargs+=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
+
+		# Needed after qtchooser removal, bug #836474.
+		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
+
+		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
+	)
+
+	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
+
+	# Lots of type mismatch issues.
+	filter-lto
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "android remote contexts" dev-util/android-tools
+	optfeature "vulkan contexts" media-libs/vulkan-loader
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c80ad8af7af6..2ec3967707ab 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 5d3ad812f1af..7f62388494a5 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -5,5 +5,5 @@ DIST Image-ExifTool-12.62.tar.gz 5216215 BLAKE2B 72c30368ad12036af628210f210f06f
 EBUILD exiftool-12.50.ebuild 716 BLAKE2B 7c3f88253c2330a0fd30b7c182fe19bdcb34e84309eecf68d6e425aa85f5e13febbcd4e9f6b01cedf31d6843a966a5d0f7caf79e74881bec18d02138816103d4 SHA512 cf91cc008c15fb296acaa05cffbdb49a6cee6e43619d9fcfe61a1067630d8093756a2768b33128fa42cda0b79468ec9a7385ba6b1a4d28d85c0538c618b4428d
 EBUILD exiftool-12.60.ebuild 721 BLAKE2B e0522fce416d270a07e4a14e6c3565f96461e4d08adeb8dadd75fa3865ed548d6beb7416fef966f7f0739defe9af1458ed73b404dcab4f0cb103b0bf0382c2ea SHA512 f538a282a50640e46b6b4a26b635be565302bb1ed10211f99cc0d3874c9f293f7a6e4734793be79a089aa215b05eafd395c518a9e6315286d4c2d47a8d6b1b26
 EBUILD exiftool-12.61.ebuild 716 BLAKE2B 7c3f88253c2330a0fd30b7c182fe19bdcb34e84309eecf68d6e425aa85f5e13febbcd4e9f6b01cedf31d6843a966a5d0f7caf79e74881bec18d02138816103d4 SHA512 cf91cc008c15fb296acaa05cffbdb49a6cee6e43619d9fcfe61a1067630d8093756a2768b33128fa42cda0b79468ec9a7385ba6b1a4d28d85c0538c618b4428d
-EBUILD exiftool-12.62.ebuild 721 BLAKE2B e0522fce416d270a07e4a14e6c3565f96461e4d08adeb8dadd75fa3865ed548d6beb7416fef966f7f0739defe9af1458ed73b404dcab4f0cb103b0bf0382c2ea SHA512 f538a282a50640e46b6b4a26b635be565302bb1ed10211f99cc0d3874c9f293f7a6e4734793be79a089aa215b05eafd395c518a9e6315286d4c2d47a8d6b1b26
+EBUILD exiftool-12.62.ebuild 718 BLAKE2B 3cc302a932e36b656fb4f1df006f8e4b248c88aa121d2f7be761590e3edaff12b3335e0c2022b417d8edcca843f7f3305a6fd10a71abc1acfae96774b94dc5e0 SHA512 96a76539bd233d6a95c6ba858a1a7b9640793e30ea9e04c793ab4f24ba2aa04e462b611f1c52bf3ef60991dd4983cf82da48b0b908e741d73b8a12d131443dc3
 MISC metadata.xml 10040 BLAKE2B 8bcecde1df2dd3e79c3bcfbd38dcd9d3db9564a7abd5a684e0204779bcb685946f2eeb83a62efaa03efc841f0414b82f1087a3da3c6bd5f43e85561e43d7fb3e SHA512 af79302b57833d1368eff738b2326dd9cd47de47baf42426bfb00f61c1c6f52fcdc41d74bf95d8f65b2b0b00578ce07c3471b8cf4923e2f47c2c0b9d58dea35f
diff --git a/media-libs/exiftool/exiftool-12.62.ebuild b/media-libs/exiftool/exiftool-12.62.ebuild
index 4602af41803e..c7b09e578a63 100644
--- a/media-libs/exiftool/exiftool-12.62.ebuild
+++ b/media-libs/exiftool/exiftool-12.62.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://exiftool.org/ http://exiftool.sourceforge.net"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ~ppc ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 src_install() {
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 11d514a3e5c6..b9e70dbbc5a4 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -8,6 +8,6 @@ DIST libaom-3.6.1.tar.gz 5260460 BLAKE2B c47b748e3dc43e39ecb55c4d61ea3d2d4a889bb
 EBUILD libaom-3.4.0.ebuild 3246 BLAKE2B d42b5eb01f7383b4f4abc0000614251af08d02e1560babcc41f74d13711d6f3d17205b4fbe82011e1be39ce89a7a5694ea000f26df94676a7d7179bb0737034c SHA512 a965cec35285846c6df630d59ce520f37f423946e6a9130d8af72aaa48e9f80bc8df80e020b73bf4e5be8584e23f44fd054bbb6a0d7fb9c1002de4442b4301c4
 EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51edf1cd6f34bea2aa42cd42941c7d259a2a947ca063e3add31c532c0ea4a894de212de625241cd1c3d5e928a87 SHA512 d88224575368b6aa4dbc83edf5970e7a1c5bfef9c1500a9b28e3bb91e2d1586c8b86c03a3756743d8e7c5ec63028b269a276572f9a1c9dc9fff5e02fd6b3f5ed
 EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
-EBUILD libaom-3.6.1.ebuild 4022 BLAKE2B 561965ed3108194943718a84f7533c632e85c2c37602adf3e4c128aea8a519b74304044dd5039b4c98fe6a9ee575d03dd06dd2c28cc197030a322dc9bc2dd9d0 SHA512 14d58d29086f11e4c580f939c9b0a70e03c089ef2d31c5ed3a393cb0ec80a33c02f112a350b00af450b07630858c53b5f75eff2c3223b0b7b4323ee5b6a0192b
+EBUILD libaom-3.6.1.ebuild 4021 BLAKE2B c88291c7c628e21c09ff5b8612b328e886a1ff1a00ed5937669fff1c382256e018358a824555c5df36c1950bad9463ed65bc46677ee0f0d94c29610c1b9e55ee SHA512 5b95f658ff1452162735b477a9efdb809ad1e2d06cccd18b1192b59ce3caaa42446038c38552e7cdd8f86fb96f27bccd763275b0972c243f42546bed54c3af4c
 EBUILD libaom-9999.ebuild 4022 BLAKE2B 561965ed3108194943718a84f7533c632e85c2c37602adf3e4c128aea8a519b74304044dd5039b4c98fe6a9ee575d03dd06dd2c28cc197030a322dc9bc2dd9d0 SHA512 14d58d29086f11e4c580f939c9b0a70e03c089ef2d31c5ed3a393cb0ec80a33c02f112a350b00af450b07630858c53b5f75eff2c3223b0b7b4323ee5b6a0192b
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.6.1.ebuild b/media-libs/libaom/libaom-3.6.1.ebuild
index 47299c68b404..d90b3620ec12 100644
--- a/media-libs/libaom/libaom-3.6.1.ebuild
+++ b/media-libs/libaom/libaom-3.6.1.ebuild
@@ -25,7 +25,7 @@ else
 		https://storage.googleapis.com/aom-releases/${P}.tar.gz
 		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 01e13a5819bd..50f1ba41c981 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
 DIST libheif-1.13.0.tar.gz 1703950 BLAKE2B e79af787c514c02f49eb9deb42c9727a4719584d16ebb73b8ab276d9e5452c5463f359a1ace30819466f4dab30db69fec5afa2eefeaadc828e2272e91c7d4cf7 SHA512 44cb12ec7191bdf8ef2193c075d5d7a064a7a90c00625e5346624de1ebbedd064601998d042c8336d6c5b2aaef4cd3b439b850d0ab5882daa2e22dcc8722c779
 DIST libheif-1.15.2.tar.gz 1749773 BLAKE2B 788ecf59c936bfae9544bedd5fa50fd74f04adf29f804994bc208d2a5339b13984baf78a508babd80fa0d48381b2cc0bfb1e1140de97437b8c0336378a64fcb6 SHA512 79f22dad084bbe965dae7b8f92fc119dbdde7a04577ca9c7bc28b1a022a06f0ae64d3fbd11e82d6907f0fd678a31d98275e508a51a6bd0a9e8675c93790f1996
 EBUILD libheif-1.13.0.ebuild 2057 BLAKE2B fe52e45b8ad8663f468cc9d71015e655022da9dd77ac66bbfff09d144e6785cd30feeb4d7e247d37a0cc87fc835764f9829c6cd2a03b7a4fcba88dadd6266e4e SHA512 5f0ecb6ad7159f6d86021a5c7db5578dcc20d989b765ad91e20b502cbd9da6aa25febfb0445084d6a2388cf020bf49eb8e14aed727cd599788d324313da54260
-EBUILD libheif-1.15.2.ebuild 2062 BLAKE2B 50be0a1be8c15333638fe50270e88c55afc0309230c7637a835ec7d8ef0d32592c6fe1e97036abf058789aba454578e02be3677b19f078b2ab92e0b402a07bd1 SHA512 5bdcc50fde2012282f363cdbfe3d1b1ea75d1149fa89bc7ae231417c51db2595e5b0bb255eeca38ad80d66d6a4483564fed518a29b3673f99cedf99eaf1fdf97
+EBUILD libheif-1.15.2.ebuild 2061 BLAKE2B 7dab10c372403a918f5346b2dabf05d0c5fc377f31074dcba54842b055744fd05ff17e399d4bebf8532dda787aca2ab7efe5c383ae3e6c62f0ec2d48f96e8fe8 SHA512 746150c0f4a7c18d61f1b194917b874488f9894a0c7148f74b8adeb73ebe5432fa9a9284d1895db0209b811a357b439e2cd97015e3a1c07e6a6d4d31a725eba3
 EBUILD libheif-9999.ebuild 2001 BLAKE2B 02130e50e78e847a881aeab0b1f4f86e1aab701500d42b430d3ba073715369bd444eff39150e8d948e1482341cd4e1c685a7eda59dfa697a4517de11c34799c7 SHA512 ad3efd5f606d0c5e5f747353f22d5953d4e1f68e964e945b9bc8c652753dd36ed85ea681ae41b7c270f34c9a131f84e229b49eb41eb4787d80ee909eb1ed9a62
 MISC metadata.xml 805 BLAKE2B 99457c3561cc5ad915c5503f96e52b6261981157de467073ac7a8ece68af3798b9db516b40b7db9e0bd92388b083898926d877fb3bbc8fd1701b280bfd4baa09 SHA512 e5461f86bd18b9878a0e4857fc25ad7554e4095b8b71b2a8de2334b49b7d6c62ccbc2d6bc31e016e65ba3c8bd3a872b5f00b2c2bf39e1d04306124bfedb8486f
diff --git a/media-libs/libheif/libheif-1.15.2.ebuild b/media-libs/libheif/libheif-1.15.2.ebuild
index dc77e7276079..b6354951a1d6 100644
--- a/media-libs/libheif/libheif-1.15.2.ebuild
+++ b/media-libs/libheif/libheif-1.15.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 12e9c2d34702..e3522509c2bc 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -2,6 +2,6 @@ DIST libmediainfo_22.09.tar.xz 1886180 BLAKE2B 3b9fa03ae1fafd06e494ad462ab30a191
 DIST libmediainfo_23.03.tar.xz 1925904 BLAKE2B bd8d716e9e85bdf2c91ddb6b5492e87e75e497469107aa3ca8a045f25bca1202432a2c8e9a01d179afc1d705ad4c35fcc41cda44cf2b9e57bffd0e8db4f2b7c0 SHA512 a13c4042851248ee4c76f2f52bbafe6e2152e99d60d8cccbff3c5aa01c63e27f97c3335cf88bdaa4869a1f1550ed9ce428af127569ee09c2fee344ed06e44942
 DIST libmediainfo_23.04.tar.xz 1932860 BLAKE2B b5de44301693b65537b27bd097b3efa5d8a89e05c9f9d1755b9c0c70589bd8549dcb9079da0c9adc5d465170306f4612e2027127c74d4ed162448230c5632814 SHA512 5c673e78564132c8c5e64a7d2901914968c1c9a9bc362a95b74330e26447378eac3197f106f2abeeeea635bd68bbe57f596827ef6ee7dd139646ee0e05a124cc
 EBUILD libmediainfo-22.09.ebuild 1916 BLAKE2B 5bfa083325243c4c118ce41c4ddc4f09b60129d5ae1f9098cb0a5950cbfc63a8d26b99ecc2b73c9978cb23d1baa6a0dfeafeaaeea0a1f1ead53e599828a77b96 SHA512 604a5a7003c1f0d471c6bd6d7dd695275dcfb98a2d1551485d42c08ad0d39a3b25e0d0462e9f0333bcc6023455a907313aab4465b0a1a606a840d0c6da9e4199
-EBUILD libmediainfo-23.03.ebuild 1987 BLAKE2B 8ff0dab08bc50c702ef9172bfd5b027c68321f30d3ce81fcb690bc861e6381b0850a6f27fe511020b550fc0e53351431b8da0904bc429ffc37cd37bbab02bdd7 SHA512 028e541510a1b3a73155b4203fa1df089f841755f049d13d6b1f142a25d4f9b333c0f86bc5af8f755e0f4e5c645a41b68242676d8835421c40840b23773e4cf7
+EBUILD libmediainfo-23.03.ebuild 1985 BLAKE2B 56573debace8a86c4c9d713cf1affa4409a782e27905d434d1d681d7f88fa3f0acf96c56256ce1c5303bff8c2a2145ad6f4c68cdf357e340333fe303c7885720 SHA512 4e94e9ea55ee38e589a4b5dced9b4f8c3a89fc6f7a527a0764081d57e0b197625d6785a4a8bb8409e54481ec1e3b5cda18f0c65d87490f6778a436f4c256b0ab
 EBUILD libmediainfo-23.04.ebuild 1987 BLAKE2B 8ff0dab08bc50c702ef9172bfd5b027c68321f30d3ce81fcb690bc861e6381b0850a6f27fe511020b550fc0e53351431b8da0904bc429ffc37cd37bbab02bdd7 SHA512 028e541510a1b3a73155b4203fa1df089f841755f049d13d6b1f142a25d4f9b333c0f86bc5af8f755e0f4e5c645a41b68242676d8835421c40840b23773e4cf7
 MISC metadata.xml 347 BLAKE2B 66f84361f792efe1817c3427292038fd8dc244aea4263c2e2b571b7c5adfc9bd3fd4801cfc3154512a1892590f91c8248f603273d3e1c8d241285a7d863871fb SHA512 b33309009eb8ce3104f5995a4baf050ffe93d53e5a9e422e58abdfbc5c3c4c32406b126b9e1d0421656a73ed42ee662a1b5cec052f73e85ce16d4d278669b607
diff --git a/media-libs/libmediainfo/libmediainfo-23.03.ebuild b/media-libs/libmediainfo/libmediainfo-23.03.ebuild
index 1118b3bbb2c3..0f0d1faf1538 100644
--- a/media-libs/libmediainfo/libmediainfo-23.03.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-23.03.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_PN}Lib/Project/GNU/Library
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="curl doc mms"
 
 # Tests try to fetch data from online sources
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index cdc7dae4ad9a..39332f25dc0d 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,5 +1,5 @@
 DIST libzen_0.4.39.tar.bz2 129816 BLAKE2B ff3ffe1b53234e567be12e86deb5dddd54584c112d297bd50764a980f4a3bcd51a08af630d482cca3157fcc9b8452f644807d6055d88420dcc6c311725ed402d SHA512 f261a676cbde9a877b85df536306a035ede1acdc5d827049698d19b3ecd8a65e5f6cfe66851fda034e1b31c95f6d6e82b78b0bc35989ec1568a010fb88a5a2d8
 DIST libzen_0.4.41.tar.bz2 129664 BLAKE2B 9e8f7fd77dfa0224c330a1c6c5e77e96e235b1119efc060ed9077d4dc00a6040c1ee8d8fba09f2bdb6bc9c964e3a4e703bd073d58d6a6366f84ff49f82102211 SHA512 a65bd9753a4d5676eaaf1c6d3e8d6fbd460b0dfee8a5a80708b3924ad1aa2ecfe0059b6d2c6f6e490a6367727f049cafd5d86fca584e11063cb1ca376e07e529
 EBUILD libzen-0.4.39.ebuild 1462 BLAKE2B dfe357023f8271e6bb256c3cf250546fb606f356d1fa337e7776533fcc149e51ff5293d4435394a29e3d37ddf57821cc893c05002faf8460e5f208f9aa4cfba0 SHA512 473ecd955afb67586ee15560197fcb2a8c5dc1eb7e9c837c0f919f46e796aa242d6d79818d3e766c795e50330a4c9544a95a58be94622d9be28c85b1d3645a4f
-EBUILD libzen-0.4.41.ebuild 1472 BLAKE2B ab37fae6bafef787adc19481e35f659f7c266e6f908225604b9d5f86209dd95d76c43d887db1a3696a0a0d416f96279855531cfdc214bbc0e3bb2d1e428fc1f6 SHA512 186f9f04af248010ae339305423c300d9a5fe862c1b613bb3649d245b2e59a25d90d5b4cfaad670348cbcc57fdd3d523d0bda0406e09c7810d4577e11229c44a
+EBUILD libzen-0.4.41.ebuild 1470 BLAKE2B 97e5c4a11f92871662e8ac9315cdcdec5c95d3b013af5dbbe5ec4370796a700554275728e428d16d46e8dfff5d3651ffe8020560825a2cd7becc42a0f6476f29 SHA512 0aad0242170cba3b1282bfaca39e877f7c742c6dbfe1a4ca5f6d48e1070e9b8c3ea905c4eb349b18a266f76e1981848fd6b1a336ea363a4b2f8a0ab367d8ee7c
 MISC metadata.xml 392 BLAKE2B a57d4f857e1716b904183c862184654212a31e3d3ce089891f85c88b627b9a4b956d542c434e9565843b582e9f35c9e5fc8d4c14b647131c9bf239c383df9bba SHA512 77eff51f73560975ee03ea94a3d0880ad8adb4c6a2ae4930d986436562fcafa09677d18843c2dac366b74e8233f7a900f8ae74b7b82335c8b4067a703f6b3d6b
diff --git a/media-libs/libzen/libzen-0.4.41.ebuild b/media-libs/libzen/libzen-0.4.41.ebuild
index 955da1cd6014..a2d648b93250 100644
--- a/media-libs/libzen/libzen-0.4.41.ebuild
+++ b/media-libs/libzen/libzen-0.4.41.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_PN}/Project/GNU/Library
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index b7d18863cefd..bba5d28ecb9d 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,5 +4,5 @@ AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec81
 DIST mlt-7.12.0.tar.gz 1481720 BLAKE2B c0df14cfdbba1eec412e71a1184dfd0e595c89a24b956bc90390679307fec1c8a5f2264e9769123fa2f7d95a67ba35cf9316b32173f7248239431ae47743f6cc SHA512 7111ca31f5ed8479dc899596bec4b9dd9440ab8563844abd9d789f7ce342b61c54d1a5058d6f5288fdd510db7e05db12f7e807bf0cd33dbee11a72185fb0b746
 DIST mlt-7.14.0.tar.gz 1509786 BLAKE2B 6a590bb85f9c1f35cffce393db0ae016351ed9713d37bb22232474df27fc8f647847e9aed6ba6a8a00787a69136533fbb9f2adfb7b4743e2bdee9b146ebbe02a SHA512 9f30b06fd4a38fe41547f3b3919a6cb809f2493ef71af2c7a16029ba7b4a7b633db56c0fabafb1745b6072cd9de4db4131fe55afc66c06fd3dd016c33eb828cc
 EBUILD mlt-7.12.0.ebuild 3618 BLAKE2B 7c10a4d1c2d58aaeb0870962cf034b3a60007535e83fb41737e46b9e2c5999f2e0b1979682b7950012db8113680f7b30feb75a780c1006705b020031984aa219 SHA512 21d50627c26028cd2501d6b62b2a226de9cf01bfa0ee217d994fc83e36f102524b5f88edc7a753533628912b11c2f405a406e3a898c1402ef659998bfcba36ec
-EBUILD mlt-7.14.0.ebuild 3621 BLAKE2B 9ff8e61fbccce6c3e3cd60bda93b1dcdb2b3d19c033bcd77ffb92078e2a3ea6ad685734bf8843ab169c1cc873eabdafff5d8d4de03d98ad1e213158ca09896ab SHA512 b90abdf6fc6fe2d2d6e12d1cb2bfa15729d1411be83037e744c2b07838c53cc1b6347e26e40e0bd1c0387cdf28280113c147b0fbec1cf4bd4a28e3c055ddb48e
+EBUILD mlt-7.14.0.ebuild 3619 BLAKE2B 721cad865878fdf72bc01a7f0636685ee0d0055237a9195f5e2f491a3068c8f1df7c773493009829149bea926fae6afad9c4e2a96f70f72a4cfac11459b45fc5 SHA512 a480731b4fdbea7c1b0e0d503e261e6f57953ecee47d92685e59e6f1b149ccaf70843946527485fa1831081a7ccf8d1dd5b5ed1c1f7a3c266d6069da31a1ab45
 MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd
diff --git a/media-libs/mlt/mlt-7.14.0.ebuild b/media-libs/mlt/mlt-7.14.0.ebuild
index 3e882d7b38e5..8db92c8afad6 100644
--- a/media-libs/mlt/mlt-7.14.0.ebuild
+++ b/media-libs/mlt/mlt-7.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 03a659437e6e..b5ba74638f98 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index fadc59122cf1..1182a513e2be 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -2,6 +2,6 @@ AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866f
 AUX xastir-2.1.8-configure.diff 532 BLAKE2B 527bbff01a05725344f41d28591c600d3661801c19202a33d3d02c9e34547425e25e84a6ab0b09810d3b201ad9c0df9aac3824c826a9effef2e8f830bce9db5e SHA512 4c9ca28fd3a04a497ceb8c41bde5d581f6ad08faab84440b11670322f0862c176cdd3914f6672d738d9b0cce7328dead3cfd7816c74d838b08ecd753a99612cb
 AUX xastir-2.1.8-scripts.diff 3112 BLAKE2B 2e2d96ab6788c700f0f660ce1698dbf59ccf697896404cbd11777cefa077660a1ee2abc7efb208683eb3b131a93c9ffc048c077054b9cf3d77c2458f1c522b39 SHA512 fcf5dc5ead6a0871d219323e78b9c33747e9ba1289a2c75e211af752f8a8d53d919b51dc5ef4c0618780c3d8869b19c10cbe785be8e70f5b75cbe71c97b70a4c
 DIST xastir-2.1.8.tar.gz 2222586 BLAKE2B 4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6 SHA512 361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d
-EBUILD xastir-2.1.8-r3.ebuild 1782 BLAKE2B e7c9cc4c6f6f2070a254ae50f793d8cdeeb575b6034ee7b5b003929dd1bb831808d880dc040a6fba284551370c785916caa2a13fa187dba8b05a7c1c8b0baca7 SHA512 d141eb3703c4deffc76bd62c0e5886d38c70a8f04d2a30871ac37922aa5d08a79b19109f4fac037f85379b11f2c9bc6b8abe19cc0e9d46be82a3b8b6848c6588
+EBUILD xastir-2.1.8-r3.ebuild 1783 BLAKE2B 27c7a6bb0cb18c1497cdc4034fa445be91cecbda8734736ce2c32f0593fe7ddbf9c52491400034aef1f8e17eafd7623357c835bcb38958ec2f27edf01dde6b11 SHA512 bd805ae481e081497bfdacfa9ab45afc28aef0e5e772866f2eaa032e7e7a1e70114c48cc61e559d87e06650e2aab8848fbbc74505bdf251217d1ff90109ff903
 EBUILD xastir-2.1.8-r4.ebuild 1857 BLAKE2B b954ddcf8481e7d4ecc6b63e25523874b96e6a675817b4ac11311f9b5cc7da10fff91d78e8934c36d454dc0f524ccb7023d8a9bf802790f81dc4a87c47068419 SHA512 8931c75946586a13e27dd9f3ce803ce231fe1515222dcdd5b44b9aa2ec1099698ae329f9f83080727c62dd1859a744c0cd9179b6aec5c54f597f4c52eb9e65d3
 MISC metadata.xml 472 BLAKE2B ce31d7060b0e735a8ecda8ad847e3cd45c4f4a2749470d79cd6542be0ae164a5e06e476c536c67c34e23d6a19c6f4a6b94fcfdfdc77827784b4459737c99ccfa SHA512 40d9aa951fe33a6dae574a9cafe564d3241e2121fc7ff0852b4f0f2044661b1b4f49abe1b2819d4291f6bb8f53bceef29b880ab05584d416c0dc08595b92eab8
diff --git a/media-radio/xastir/xastir-2.1.8-r3.ebuild b/media-radio/xastir/xastir-2.1.8-r3.ebuild
index d37d400967ec..01d7d4d56c52 100644
--- a/media-radio/xastir/xastir-2.1.8-r3.ebuild
+++ b/media-radio/xastir/xastir-2.1.8-r3.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="geotiff"
 
 DEPEND=">=x11-libs/motif-2.3:0
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 34816621d06e..4dd0d24fbfd0 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index 1186c86ea8c1..e1c236da5849 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -4,5 +4,5 @@ DIST deadbeef-1.9.4.tar.bz2 5150264 BLAKE2B 993d7a89f1d95d7b03938d05b7f4d5a3634b
 DIST deadbeef-1.9.5.tar.bz2 5204015 BLAKE2B 45b9023807a5652c38f6cafd5ea0fca87e2872db264538f5c9d9ee4815281fe3f4e08eee5d43a083a67b3a9f646de24a90147d76f15622710d8f4adbdabe0c8d SHA512 c7a15f47fd8081a363e5cba732aa4ff4b1c311408728fbc5f7f47cf349bc112274a1d9fe0df8a58f09abf8f7656d914fb1baafa38fdf4dcb38fae7e1f70f682c
 EBUILD deadbeef-1.9.3.ebuild 4008 BLAKE2B 20955715a8328cb668a33c36d2e9572a2dfd8366bf497addff80632fb7cf1566d67bcb7c2563ede3502c51cbec0be23ff51d1f6ff02f89aa09ee0ebff850eb3d SHA512 7b2499bbec78d414533c4a21b1f8a0e8f883ed8f29614a8f6147d383e01e6e7f1528424723091f1bc3c41975bdbbad8db2b39ed18a5a50df7bd39289484131e9
 EBUILD deadbeef-1.9.4.ebuild 4060 BLAKE2B 80daa42d32c974d7236534f18cfb43d1276727f6462ace432d07e103dc733981a3e56003aa44d8c8fd93e8a9b474ec39743b696da8ab72bd3a488245af27131c SHA512 14e35fdafb1a7e6f93f170a22812e0b505128ec4d89144d0e7906772b4251cdd9695eabc54f9c595a2f24d9efcc995d1f4565a64aa480d75c1d93362bf8579f5
-EBUILD deadbeef-1.9.5-r1.ebuild 4177 BLAKE2B ac9638f34c2682b60d2edf81212a2f4c48ac425299343304b3c1a93ab0935bbf6e9fe67063fa401357c77d935ce018a423ff9c72cd7753d27c515176e86f8c04 SHA512 29d1df0c78340a06d462e9a63a932ac4a88ba582f565e856ff4010847b737f9a26ba057b45c206900bd38edfcba378089d8e9d4fb3c842eb77979b69985affb6
+EBUILD deadbeef-1.9.5-r1.ebuild 4176 BLAKE2B ef116e1c043a990e7ac4a46379d8f7af8f2d0610eba5481601d8fcd87e6b12290597820fefdd6cf125d252823c8f285ff1bac4801560d92e1593f8c637229d5a SHA512 720a3fa06dd12c1b7204e59a80f40460a9ad8271ebc4e108e5deed047103d694f103289459160c48d4398759903d9e4d648b12ada061dbb0e2201e5b07b28834
 MISC metadata.xml 1081 BLAKE2B 7c008d6901514e9e05beef2888b7aad4101598f27a80ceeff57623637b672ac6d48bbdfb00239f0e39cec09e5bdc0ed1145575d0497c0dc95271a34a1a3aefce SHA512 d40cf17bb95a7946a985b07607f139a912290a5419f4b38166cdfd554e38b27360390f3abac038882e1cf9042ff9189ff33cc10732d65d99f77fc947a9b74a7d
diff --git a/media-sound/deadbeef/deadbeef-1.9.5-r1.ebuild b/media-sound/deadbeef/deadbeef-1.9.5-r1.ebuild
index 8ec7586401ce..212406872949 100644
--- a/media-sound/deadbeef/deadbeef-1.9.5-r1.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.5-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="
 	wavpack? ( BSD )
 "
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libretro libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio pipewire sc68 shellexec +supereq threads vorbis wavpack"
 
 REQUIRED_USE="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 156e76fa9db3..1b29b3f0bc13 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 77889a1ffdf7..2cfd6183afa8 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,7 +1,7 @@
 AUX qmplay2-23.02.05-fix-libva-glx.patch 619 BLAKE2B c3aeeb812c6012bd4627b984f2fb769e88897030f9f73920102d0e95c179773854ab58002cc97b2df4ba1cea317d725a1a8e0e180143677f16067d6f96a32c73 SHA512 1ae7ab4b443e3ab439fe33748c33484f1d83a20a39d5c9c14a292c9327a4bcd2b1e0c3c456bb82aff6fca84a3e9039174e6f4d2e0beeba3b2427acbd3c389c80
 DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
 DIST QMPlay2-src-23.06.04.tar.xz 1431232 BLAKE2B 7b50e7d28ab9025d7745114c7ee6036df1e1b23b34422ed4097f1ba4e68874efc58a0de68a5635e30cbdb2205777fbdc4f67f759f54cda7e2f926560e4bbc7af SHA512 7e6afb5830b5febd79aa2232d38ccb3483104dd89d20e7476027a7febfd770ccd1df7e6915543df379985d89d307bd1c3bbc8ebc8cc00f440b51e347ddbec0d5
-EBUILD qmplay2-23.02.05-r1.ebuild 3389 BLAKE2B 12be8718cbd3d0c66d96f5ef50cceac405e4950adaec21cc4a046079e0060313a15941cabce43608b4b749832ccdf6f3f45b250caa9f2b0ec77e0a5bc83028c0 SHA512 6b7e3da84decd8c34d8e0a3c74016a276df649aec12749bf5920ee7a754228b8586beeca92125cb86ac4532762430a2add693624909557f5b61021ed22fff1d9
-EBUILD qmplay2-23.06.04.ebuild 3349 BLAKE2B f82145977ed720050e393f0ce96fa47d1d7a7d565af1c3b02ecd85a432c31c903f2c85f85d32f58224898c60a19892f502f4b1952737ed29320a96dec2d0d6b5 SHA512 1846697e864bea8fdecf60f05a5f709fa4f792069ee5307d85c7f16ce1103a03b3dbddfe256ccae52c0c73a49ae8f71949db0ee72fa9ac21c9d3af90e4e954af
-EBUILD qmplay2-9999.ebuild 3323 BLAKE2B 68fb9bd6ac5f06f31813df124a23b6078ae42034d9bad0d90bd1ba7af300984349d19a45a9b01fc103c2d89eff1493b2dce163096690388ac5b81196722ac1a4 SHA512 d3aad38f77c863e8f45e341934715695cbbd800d533801eccdfe9769868e948e8a0119a1af0d1de67f2c4d27463b5eba52fdbdef6d5d497b54af63ebb3ef7818
+EBUILD qmplay2-23.02.05-r1.ebuild 3384 BLAKE2B b1aafd1b3346798f1f1b676627902ca24ccd38eee721b16fea9055698d8c5806f9e64a5e79a2a956fd32e779f904a79eb0c79c9471b146ffc33aedb7bce2e84b SHA512 efd26725ef9b00c214c506c106026e2eb99026aef1386178f24ccf073288df4c2ade3d98e9495b74835c388cab0c63807734edb4154d199f5ff7646c22d3c6ae
+EBUILD qmplay2-23.06.04.ebuild 3344 BLAKE2B ae7d7de6551f46490b7ce7e5e8a9d163c62b3b64f9d327a70c3d139f51556c2b142050fa10534f8c218f5750628f885ac3a1022291a167b806ad446d5e17c518 SHA512 c23e0a10093113e7bb4eae95be33fde3f7f4110a8aa2894c6a302163ab34213cacf40a783a4bf21573d769d2b166e078d35682d2e7bd36706fbd21ff0c5db714
+EBUILD qmplay2-9999.ebuild 3318 BLAKE2B bef41fcb3655faf0fb9d0d02014066cded54f3215db6a64944f152ef24a266cd7974894c7ba0573e6f427df1d9c715aaae369afa4a27ba49d034e97671af5ac2 SHA512 22b73ab2f2effee3cb6e494da91a421d12d30572b2343b667002419e57920af8ce93e39be5dc7d926f6222dc728db45c7e38c8cba6fcf9b9c40daaa42054e34c
 MISC metadata.xml 1287 BLAKE2B f04c4032dd3f32f10e33c551d364a9914d7663448b293ab9161da4741f53e65438749c1cd14b2ab0f5dd6a231109763642e53932d2705170a7e063e594acae36 SHA512 3f480f4d3cff62300e8eed043f16fe2a0f5cb8572be5fa00710b86036b93650b852168b7e01c2611c95755205d1a33883d67dfb8fd187d87c459d923e77c9fbd
diff --git a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
index e5d94c7d4ad9..162a1b938f4a 100644
--- a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
+++ b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
 	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-video/qmplay2/qmplay2-23.06.04.ebuild b/media-video/qmplay2/qmplay2-23.06.04.ebuild
index 099410ccbd31..1e5663f67ccb 100644
--- a/media-video/qmplay2/qmplay2-23.06.04.ebuild
+++ b/media-video/qmplay2/qmplay2-23.06.04.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
 	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="LGPL-3"
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 5844dfa91690..131c3cf98f39 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
 	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="LGPL-3"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 7e890dab1f43..2b2d777140e9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ee8639ca30dc..e23dc73ed24f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2023 14:10:04 +0000
+Fri, 09 Jun 2023 20:10:07 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fe1089c244c1..8523d396c343 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-06-09T14:10:06Z
+TIMESTAMP 2023-06-09T20:10:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSDMr5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSDhyJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA27g//evqclLCAaXOs2juPX9ebOj6azy1GqF7EjMjdZvk75nJxO/eBT3VOAAWX
-EFEwuAHOUtrM6UQeMNuQgmMsw2W+lrw4RkqX0LKNSKuEvTsgPGO1VnEBeKREERu7
-Ye0w2y7jV4V80SQrF+CUK5IzpREe3haXllt1SFCcSMZhNzZ8NLR8KBG9hTI0dQ3L
-0fxDeGIbw6DfmHc3YRc3LCeBreUTE6/oRVX6l9S0jUwHaUq2nXU9Ms0R5aFV5IZm
-LT7/wndlfkvaP7PKXWgVwJqEU2/VYd0QhHrIzDXSG/ZEAkio5AlqoTv90pLTPUYa
-kcTHsx8P0e8qUuB6y6K51VbX1eCTyVylzqRTeSY5vffXEcCDXM3TKM2wXPpXSu/d
-F9mrqFPs8zsTKMtN36nudppM9oLaQRr3Yt3AD8V6RsD47reOVBMdpM3XX/Tpq6zw
-j3G+lot1yYmV6EsuvKrk4/itPY2mtOURevH+bLrkACxlhRB2sNit/60vGzfiT5iJ
-UAOmg3wG+xPrItZbV9ovsCpQVibDVjopKrLtz7Ud/wSKQjhQIct1+DNsdYj4HcwK
-o/DqcYlNPT/fTxSEDAl1YQ1QEcYeiDm7QZXqmtVaPjDlmDdL21BlOhiTSE4dACdK
-A9H39FJHbFsdh4iF3E1wS96tl3u9fChLwsbDzu7j4B5CSqmiYMA=
-=SiZK
+klBqCQ//UvnfuZvTYyNnM5+8KRcgMD7N7F7bNJIbeSn7iNkEdOLxt6uKwNp5LV00
+grSZQ/nsRebGkaOhpd/DBoVUfAEFVdvEH8nCszk3fE6ZvJn47sjgvGbKpL/DlFqf
+TIC0boIMbYM6zQDNHb2OEOmdAYmqUqkRbmVuutruadkw4FJprANX7RLT9/THybSI
+4ZKAmpUmW6cjH0rD5RUTD8agfaf1GfgZ4Fgtjekyx3gIgdIbkzPY05cTrUPa1hxs
+hN8gS7Y5A2MB3juxWy88XOPOgaz+FVjlyjIIvBiS8HdjgKjTzxaaSP7y0eCTKXld
+RrboXJVJNSrUvlnYw2ojCex9fzAILDqFEd01JcQ0W5dMbN3FibNJyVCj2sKy4foN
+xHkXCx6FI7FYgL99tgM3nhe/d13LrRyPKZNqRccsiF7mjbYj8g6HIciWdf3NPy6D
+AdZxaNibzZlP52i1K8U36UM0TJw5w4fRPMoUHUVY6ZM9xUbZHNEw4x8MBXoA1piM
+tRa+Ay2EqZcdFp8H/fE/pmVbUNZipzluQpMPZTztvV7e1Sr3QYIcIGxypNCQm/sS
+37PAdr0z2uN5Ye1DmKfLpKa7l/cIKaIXfAc6wVP1TQxvwpYa/bO+1WX4keeBlOEE
+Dfew6nMrlEwZMOYXWeL5MksayUV09t0Fp01XsYTIKmeo/OkCuCw=
+=G7Xs
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ee8639ca30dc..9a743057bb0f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2023 14:10:04 +0000
+Fri, 09 Jun 2023 20:10:08 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 33129415d1c7..4b76cadc2293 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 2e8d332bc372..9f1eddfca7f4 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/conmon-2.1.7 b/metadata/md5-cache/app-containers/conmon-2.1.7
index 9ef4becb09b6..6647deff81a2 100644
--- a/metadata/md5-cache/app-containers/conmon-2.1.7
+++ b/metadata/md5-cache/app-containers/conmon-2.1.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/containers/conmon
 INHERIT=toolchain-funcs
 IUSE=systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=~amd64 arm64 ~ppc64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/glib:= sys-libs/libseccomp systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/conmon/archive/v2.1.7.tar.gz -> conmon-2.1.7.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a6dc3d2dc291e28503ee57b3cca76faf
+_md5_=8592fc61b4c0519a5e54b330b490e381
diff --git a/metadata/md5-cache/app-containers/podman-4.5.0 b/metadata/md5-cache/app-containers/podman-4.5.0
index ac58fd879f9c..f28e86fdceac 100644
--- a/metadata/md5-cache/app-containers/podman-4.5.0
+++ b/metadata/md5-cache/app-containers/podman-4.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/containers/podman/
 INHERIT=bash-completion-r1 flag-o-matic go-module tmpfiles
 IUSE=apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=~amd64 arm64 ~ppc64 ~riscv
 LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
 RDEPEND=app-crypt/gpgme:= >=app-containers/conmon-2.0.0 cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 ) !cgroup-hybrid? ( app-containers/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= || ( >=app-containers/cni-plugins-0.8.6 ( app-containers/netavark app-containers/aardvark-dns ) ) sys-apps/shadow:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) init? ( app-containers/catatonit ) rootless? ( app-containers/slirp4netns ) selinux? ( sys-libs/libselinux:= ) fuse? ( sys-fs/fuse-overlayfs ) selinux? ( sec-policy/selinux-podman ) virtual/tmpfiles
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/containers/podman/archive/v4.5.0.tar.gz -> podman-4.5.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	go-module	9c75e51a48520b2f01471c1f91762882	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d3aa7158ba802fdb49f16ce5bdf79cdf
+_md5_=67848c7ae538833dace7ec6731b25b72
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0f13d328e460..ca4ea87bfbdf 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/acme-sh-3.0.5 b/metadata/md5-cache/app-crypt/acme-sh-3.0.6
index 87e62aea7777..74e293e8b512 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-3.0.5
+++ b/metadata/md5-cache/app-crypt/acme-sh-3.0.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:0 net-misc/curl net-misc/socat selinux? ( sec-policy/selinux-certbot )
 SLOT=0
-SRC_URI=https://github.com/acmesh-official/acme.sh/archive/refs/tags/v3.0.5.tar.gz -> acme.sh-3.0.5.tar.gz
+SRC_URI=https://github.com/acmesh-official/acme.sh/archive/refs/tags/3.0.6.tar.gz -> acme.sh-3.0.6.tar.gz
 _eclasses_=optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54
-_md5_=6318edbfe5ba406086ccb66b13705d7d
+_md5_=034061dc2d089357780160afa3ef8f76
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index c82710632429..37be991058b0 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20230501 b/metadata/md5-cache/app-dicts/myspell-en-20230501
index 6bdacac19573..039c9fa1cfb1 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20230501
+++ b/metadata/md5-cache/app-dicts/myspell-en-20230501
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries https://proofingtoolgui.org https://github.com/marcoagpinto/aoo-mozilla-en-dict
 INHERIT=myspell-r2
 IUSE=+l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD MIT LGPL-3+
 REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA )
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/1682907652/dict-en-20230501_lo.oxt
 _eclasses_=myspell-r2	d70debd5f4806077ff74738d349a5927
-_md5_=0b3f82e58ee53dcdb7e309c9975e4867
+_md5_=c71b432196bf43fc0932dbe5ba3f2265
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 8d04624cd3cb..d8bd0018961c 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/vscode-1.79.0 b/metadata/md5-cache/app-editors/vscode-1.79.0
new file mode 100644
index 000000000000..38dc7d26d39f
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscode-1.79.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
+EAPI=8
+HOMEPAGE=https://code.visualstudio.com
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop pax-utils xdg optfeature
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://update.code.visualstudio.com/1.79.0/linux-x64/stable -> vscode-1.79.0-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.79.0/linux-armhf/stable -> vscode-1.79.0-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.79.0/linux-arm64/stable -> vscode-1.79.0-arm64.tar.gz )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d5fc16d5d863419740ba8c941099f3a1
diff --git a/metadata/md5-cache/app-editors/vscodium-1.79.0.23159 b/metadata/md5-cache/app-editors/vscodium-1.79.0.23159
new file mode 100644
index 000000000000..7ea74fa69066
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscodium-1.79.0.23159
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=A community-driven, freely-licensed binary distribution of Microsoft's VSCode
+EAPI=8
+HOMEPAGE=https://vscodium.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop pax-utils xdg optfeature
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.79.0.23159/VSCodium-linux-x64-1.79.0.23159.tar.gz -> vscodium-1.79.0.23159-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.79.0.23159/VSCodium-linux-armhf-1.79.0.23159.tar.gz -> vscodium-1.79.0.23159-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.79.0.23159/VSCodium-linux-arm64-1.79.0.23159.tar.gz -> vscodium-1.79.0.23159-arm64.tar.gz )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c9d06fb3a14d62b6c4fe1024c32b58dd
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 60d739e592e5..446f56bb0f41 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-blas-0.3 b/metadata/md5-cache/app-eselect/eselect-blas-0.3
index 0f9583d31314..27092adf98f6 100644
--- a/metadata/md5-cache/app-eselect/eselect-blas-0.3
+++ b/metadata/md5-cache/app-eselect/eselect-blas-0.3
@@ -3,8 +3,8 @@ DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=BLAS/CBLAS module for eselect
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=ff1b5d5d7dc62eee5514773a8da515fd
+_md5_=e972e06789e2dd93b32a63ad04e150b8
diff --git a/metadata/md5-cache/app-eselect/eselect-lapack-0.3 b/metadata/md5-cache/app-eselect/eselect-lapack-0.3
index 047b5b49b788..9883fd8ba3eb 100644
--- a/metadata/md5-cache/app-eselect/eselect-lapack-0.3
+++ b/metadata/md5-cache/app-eselect/eselect-lapack-0.3
@@ -3,8 +3,8 @@ DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=LAPACK module for eselect
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=e6752e9ab476e4f7b5679f140ca73e8f
+_md5_=7f7d57dde0b4879fd188e55eb2be4680
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 70e6abe22343..ed4b9330f007 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203-r2 b/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
deleted file mode 100644
index 93a304c04e1a..000000000000
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=libconfig? ( dev-libs/libconfig:= )
-DESCRIPTION=IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon
-EAPI=7
-HOMEPAGE=https://github.com/evgeni/hdapsd/
-INHERIT=linux-info readme.gentoo-r1 systemd
-IUSE=libconfig
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=libconfig? ( dev-libs/libconfig:= )
-SLOT=0
-SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
-_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d12b50f9b7e16f1552bf8260328b8365
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203-r3 b/metadata/md5-cache/app-laptop/hdapsd-20141203-r3
index 396c41f0649d..85bce12d916e 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203-r3
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/evgeni/hdapsd/
 INHERIT=linux-info readme.gentoo-r1 systemd udev
 IUSE=libconfig
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libconfig? ( dev-libs/libconfig:= )
 SLOT=0
 SRC_URI=https://github.com/evgeni/hdapsd/releases/download/20141203/hdapsd-20141203.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=668d732cce9845883e8521da4ce594a9
+_md5_=0bfeb3fbc9953574c8013235f5b0799c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 11df520910bd..5131fc84d8ea 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.5 b/metadata/md5-cache/app-misc/gramps-5.1.5
index 9152d87ab41a..7aed5c6c0bcc 100644
--- a/metadata/md5-cache/app-misc/gramps-5.1.5
+++ b/metadata/md5-cache/app-misc/gramps-5.1.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://gramps-project.org/
 INHERIT=distutils-r1 xdg-utils
 IUSE=berkdb exif geo postscript +rcs +reports spell test python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_10(-)] dev-python/pyicu[python_targets_python3_10(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_10(-),introspection] ) ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_11(-)] dev-python/pyicu[python_targets_python3_11(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_11(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) reports? ( media-gfx/graphviz[postscript?] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11[sqlite] )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.5.tar.gz -> gramps-5.1.5.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e8099c6510a9597f9a84657f2b9656d8
+_md5_=c5d81211e012c0caa7e70da3ab929c64
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index e78428a19613..5942bd871c8e 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.4.6.2 b/metadata/md5-cache/app-office/libreoffice-bin-7.4.6.2
deleted file mode 100644
index 8d9b196b025d..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.4.6.2
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-IUSE=gnome java kde java +python_single_target_python3_10
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-7.4.6.2*
-RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-cpp/abseil-cpp:0/20220623 dev-libs/boost:0/1.81.0 dev-libs/icu:0/72.1 dev-libs/liborcus:0/0.17 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/6.0.0[icu] media-libs/libjpeg-turbo:0/0.2 media-libs/libpng:0/16 media-libs/openjpeg:2/7 media-libs/zxing-cpp:0/3 sci-mathematics/lpsolve:0/55 >=sys-devel/gcc-12.2.1 >=sys-libs/glibc-2.36 python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10[xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.21 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2-r2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-2.6.0:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libwebp:= media-libs/libzmf media-libs/openjpeg:= media-libs/tiff:= media-libs/zxing-cpp:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( app-accessibility/at-spi2-core:2 dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_10 )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.4.6.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.4.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.4.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.4.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.4.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.4.6.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.4.6.2.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.4.6.2.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.4.6.2.xd3 ) )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d09928e81745a75129a83947d632bf4e
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-7.4.6.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-7.4.6.2-r1
deleted file mode 100644
index 3d2c1f035bd3..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-7.4.6.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
-IUSE=gnome java kde java +python_single_target_python3_11
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-7.4.6.2*
-RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-cpp/abseil-cpp:0/20220623 dev-libs/boost:0/1.81.0 dev-libs/icu:0/72.1 dev-libs/liborcus:0/0.17 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/6.0.0[icu] media-libs/libjpeg-turbo:0/0.2 media-libs/libpng:0/16 media-libs/openjpeg:2/7 media-libs/zxing-cpp:0/3 sci-mathematics/lpsolve:0/55 >=sys-devel/gcc-12.2.1 >=sys-libs/glibc-2.36 python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11[xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.21 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2-r2 dev-db/unixODBC >=games-engines/box2d-2.4.1:0 dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-2.6.0:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libwebp:= media-libs/libzmf media-libs/openjpeg:= media-libs/tiff:= media-libs/zxing-cpp:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( app-accessibility/at-spi2-core:2 dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_11 )
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-7.4.6.2-r1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-7.4.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-7.4.6.2-r1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-7.4.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-7.4.6.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-7.4.6.2-r1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-7.4.6.2-r1.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-7.4.6.2-r1.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-7.4.6.2-r1.xd3 ) )
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5cff7d79e71541d357ca745027e3cd2d
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.4.6.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.4.6.2
deleted file mode 100644
index 497fb49ff671..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.4.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-7.4.6.2[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-7.4.6.2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-7.4.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-7.4.6.2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-7.4.6.2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-7.4.6.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-7.4.6.2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-7.4.6.2.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-7.4.6.2.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-7.4.6.2.xd3 ) )
-_md5_=307c72088b68b5b295cefdcb3213cde8
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.4.6.2-r1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-7.4.6.2-r1
deleted file mode 100644
index baf36d9cfc24..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-7.4.6.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-7.4.6.2-r1[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-7.4.6.2-r1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-7.4.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-7.4.6.2-r1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-7.4.6.2-r1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-7.4.6.2-r1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-7.4.6.2-r1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-7.4.6.2-r1.tar.xz kde? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-7.4.6.2-r1.xd3 ) gnome? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-7.4.6.2-r1.xd3 ) )
-_md5_=307c72088b68b5b295cefdcb3213cde8
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 9622a54ec4ce..d2afe2beda71 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/dvisvgm-3.0.4 b/metadata/md5-cache/app-text/dvisvgm-3.0.4
index 84a486445817..3bb9e6eca06e 100644
--- a/metadata/md5-cache/app-text/dvisvgm-3.0.4
+++ b/metadata/md5-cache/app-text/dvisvgm-3.0.4
@@ -5,10 +5,10 @@ DESCRIPTION=Converts DVI files to SVG
 EAPI=8
 HOMEPAGE=https://dvisvgm.de/
 IUSE=test
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3 Boost-1.0 || ( public-domain BSD-1 )
 RDEPEND=>=app-arch/brotli-1.0.5:= app-text/ghostscript-gpl:= dev-libs/kpathsea:= >=dev-libs/xxhash-0.8.1 >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 >=media-libs/woff2-1.0.2 sys-libs/zlib virtual/tex-base
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/3.0.4/dvisvgm-3.0.4.tar.gz
-_md5_=e8e23ece2e16832e7ee2c5630adf7458
+_md5_=1d531dea76796da368a9a32939349b15
diff --git a/metadata/md5-cache/app-text/krop-0.6.0-r1 b/metadata/md5-cache/app-text/krop-0.6.0-r1
deleted file mode 100644
index 26a97f70f0c8..000000000000
--- a/metadata/md5-cache/app-text/krop-0.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=A tool to crop PDF files
-EAPI=7
-HOMEPAGE=http://arminstraub.com/software/krop
-INHERIT=desktop distutils-r1 xdg-utils
-IUSE=python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_10(-)?] dev-python/PyPDF2[python_targets_python3_10(-)?] dev-python/PyQt5[python_targets_python3_10(-)?,gui,widgets] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/arminstraub/krop/archive/v0.6.0.tar.gz -> krop-0.6.0.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f19959545e54de88f2552dd056a9a5a9
diff --git a/metadata/md5-cache/app-text/krop-0.6.0-r2 b/metadata/md5-cache/app-text/krop-0.6.0-r2
index 8b38dd20b3e4..ab46231363a7 100644
--- a/metadata/md5-cache/app-text/krop-0.6.0-r2
+++ b/metadata/md5-cache/app-text/krop-0.6.0-r2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://arminstraub.com/software/krop
 INHERIT=desktop distutils-r1 xdg-utils
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pikepdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/arminstraub/krop/archive/v0.6.0.tar.gz -> krop-0.6.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=582d4edfbe3e9c4783e650db2b79240e
+_md5_=4166da10899060eee4173986e702ec24
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
deleted file mode 100644
index a429a058a8a3..000000000000
--- a/metadata/md5-cache/app-text/krop-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DESCRIPTION=A tool to crop PDF files
-EAPI=7
-HOMEPAGE=http://arminstraub.com/software/krop
-INHERIT=desktop distutils-r1 xdg-utils git-r3
-IUSE=python_targets_python3_10
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_10(-)?] dev-python/PyPDF2[python_targets_python3_10(-)?] dev-python/PyQt5[python_targets_python3_10(-)?,gui,widgets] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 )
-SLOT=0
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=917e6c865a8e19761798eb5c7d28e4a3
diff --git a/metadata/md5-cache/app-text/sigil-1.9.30 b/metadata/md5-cache/app-text/sigil-1.9.30
index 25b081bd84d8..384717983ea7 100644
--- a/metadata/md5-cache/app-text/sigil-1.9.30
+++ b/metadata/md5-cache/app-text/sigil-1.9.30
@@ -7,11 +7,11 @@ HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake python-single-r1
 IUSE=+plugins system-mathjax python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64
 LICENSE=GPL-3+ Apache-2.0
 RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) system-mathjax? ( dev-libs/mathjax )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.9.30.tar.gz -> sigil-1.9.30.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f43cd05ee369a54672075bd7f3e66b0e
+_md5_=b5923df1d08d2e04e07c1ca381cfc0f5
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 1ce2e472f39f..abdacf3769bc 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.9.0 b/metadata/md5-cache/dev-cpp/tbb-2021.9.0
index 0d9276479697..93792a057c45 100644
--- a/metadata/md5-cache/dev-cpp/tbb-2021.9.0
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.9.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/oneapi-src/oneTBB
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
 RESTRICT=!test? ( test )
 SLOT=0/12.5-2.5-3.5
 SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.9.0.tar.gz -> tbb-2021.9.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=22ebc76fdba0a1d36a5bc58064f60a19
+_md5_=85d8be03f1093afecd7e27fe5bf21f66
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index ecfdbe08e1f5..8c69119b98df 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.1.1 b/metadata/md5-cache/dev-db/pgrouting-3.1.1
index a66a599a6dc7..832c4b4625b4 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.1.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.1.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pgrouting.org/
 INHERIT=cmake postgres-multi
 IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 MIT Boost-1.0
 RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.1.1.tar.gz -> pgrouting-3.1.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	postgres	43fa70d2d8740e8e0149e6da1995ea28	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3f79ef7b92c88d80d6845913ac0d77b7
+_md5_=3dca391f35b8dc94c8c86c4382868464
diff --git a/metadata/md5-cache/dev-db/pgrouting-3.2.1 b/metadata/md5-cache/dev-db/pgrouting-3.2.1
index 17242daebd55..6c1b3867ae63 100644
--- a/metadata/md5-cache/dev-db/pgrouting-3.2.1
+++ b/metadata/md5-cache/dev-db/pgrouting-3.2.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://pgrouting.org/
 INHERIT=cmake postgres-multi
 IUSE=postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 MIT Boost-1.0
 RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14=[server] ) postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) >=dev-db/postgis-2.0 dev-libs/boost sci-mathematics/cgal
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v3.2.1.tar.gz -> pgrouting-3.2.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	postgres	43fa70d2d8740e8e0149e6da1995ea28	postgres-multi	eb5db133692fe18bccaa7c2c5f45306d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0c9bda0283b5f236bf3c36cc7ba44dc0
+_md5_=bbe9dc9585688405b61c0cd87a52230a
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.11 b/metadata/md5-cache/dev-db/unixODBC-2.3.11
index 7e9c46cafe8e..57dcf5ce29eb 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.11
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.unixodbc.org/
 INHERIT=autotools multilib-minimal
 IUSE=+minimal odbcmanual static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl: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/readline-6.2_p5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ncurses-5.9-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.unixodbc.org/unixODBC-2.3.11.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fdf6f261a59c8ed3067614884e9ae283
+_md5_=7ae02beb1d74f6ab423f8950b3bbd91d
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index ef8c0b44de74..88d8ce87b31f 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/R-4.2.3 b/metadata/md5-cache/dev-lang/R-4.2.3
index b286167fe233..328cd3245e84 100644
--- a/metadata/md5-cache/dev-lang/R-4.2.3
+++ b/metadata/md5-cache/dev-lang/R-4.2.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.r-project.org/
 INHERIT=bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs
 IUSE=cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X
-KEYWORDS=amd64 arm64 ~hppa ~ia64 ~loong sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~hppa ~ia64 ~loong sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
 RDEPEND=app-arch/bzip2 app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= >=dev-libs/tre-0.8.0_p20210321[approx] net-misc/curl virtual/blas sys-libs/zlib[minizip] || ( sys-apps/coreutils app-misc/realpath ) cairo? ( x11-libs/cairo:=[X=] x11-libs/pango:= ) icu? ( dev-libs/icu:= ) jpeg? ( media-libs/libjpeg-turbo:= ) kernel_linux? ( net-libs/libtirpc ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:= ) readline? ( sys-libs/readline:= ) tiff? ( media-libs/tiff:= ) tk? ( dev-lang/tk:= ) X? ( x11-libs/libXmu x11-libs/libXt ) java? ( >=virtual/jre-1.8:* ) virtual/fortran
 REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -14,4 +14,4 @@ RESTRICT=minimal? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-4/R-4.2.3.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0c06f91d57094267507d7b4723405f92
+_md5_=5f3a7a9010daaa56d41c85c795296b57
diff --git a/metadata/md5-cache/dev-lang/yap-7.0.1 b/metadata/md5-cache/dev-lang/yap-7.0.1
index 39dbf3e5c82c..411f07c01e33 100644
--- a/metadata/md5-cache/dev-lang/yap-7.0.1
+++ b/metadata/md5-cache/dev-lang/yap-7.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.dcc.fc.up.pt/~vsc/Yap/
 INHERIT=cmake flag-o-matic python-single-r1
 IUSE=R debug doc examples java mpi mysql odbc postgres python raptor readline sqlite static threads xml python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=Artistic LGPL-2
 RDEPEND=dev-libs/libutf8proc sys-libs/zlib dev-libs/gmp:0 java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) R? ( dev-lang/R ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) dev-python/wheel dev-python/numpy ) raptor? ( media-libs/raptor ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite ) xml? ( dev-libs/libxml2 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/vscosta/yap/archive/5bebd8e3aae655690ddf33dfb32289766910fa25.tar.gz -> yap-5bebd8e3aae655690ddf33dfb32289766910fa25.tar.gz https://dev.gentoo.org/~keri/distfiles/yap/yap-7.0.1-gentoo-patchset-0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fc0d013cddf9eb0e748b157122c5ab87
+_md5_=b45da3ec60e569f2e435f454d44063ec
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 79e1738d24f4..e6a42070b218 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/argtable-2.13-r4 b/metadata/md5-cache/dev-libs/argtable-2.13-r4
index f89bd00063ae..15a4cd0b1760 100644
--- a/metadata/md5-cache/dev-libs/argtable-2.13-r4
+++ b/metadata/md5-cache/dev-libs/argtable-2.13-r4
@@ -3,8 +3,8 @@ DESCRIPTION=An ANSI C library for parsing GNU-style command-line options with mi
 EAPI=8
 HOMEPAGE=https://argtable.sourceforge.net
 IUSE=doc debug examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/argtable/argtable2-13.tar.gz
-_md5_=09d26ec7625ca3326d5ad5ea0f0d868a
+_md5_=93cec8acc9f22ac3539e9e8d620c70b0
diff --git a/metadata/md5-cache/dev-libs/libbpf-1.2.0 b/metadata/md5-cache/dev-libs/libbpf-1.2.0
index c9f2bed39462..45066962307e 100644
--- a/metadata/md5-cache/dev-libs/libbpf-1.2.0
+++ b/metadata/md5-cache/dev-libs/libbpf-1.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libbpf/libbpf
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=sys-kernel/linux-headers virtual/libelf
 SLOT=0/1.2
 SRC_URI=https://github.com/libbpf/libbpf/archive/v1.2.0.tar.gz -> libbpf-1.2.0.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=071bcc289c0b977d2f84b619b66f3b56
+_md5_=4aba338ff66a40ed5341e1cad27431c2
diff --git a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1 b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
index 73185f61c1dc..51f71c591970 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
+++ b/metadata/md5-cache/dev-libs/starpu-1.2.6-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://starpu.gforge.inria.fr/
 INHERIT=autotools cuda fortran-2 toolchain-funcs
 IUSE=blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl spinlock-check static-libs test valgrind
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-mathematics/glpk:0= sys-apps/hwloc:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/37744/starpu-1.2.6.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cuda	13d76baf0dc95e560610c6b7dfa79db4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4cbcd7c23e18ca335443e9bd080d62ad
+_md5_=2921ddcefc2a71ea63bb42fe0ef3ff5e
diff --git a/metadata/md5-cache/dev-libs/starpu-1.3.9 b/metadata/md5-cache/dev-libs/starpu-1.3.9
index d816de033f34..5c4fe0c7caac 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.3.9
+++ b/metadata/md5-cache/dev-libs/starpu-1.3.9
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://starpu.gitlabpages.inria.fr/
 INHERIT=autotools cuda fortran-2 toolchain-funcs
 IUSE=blas cuda doc examples fftw fortran hdf5 mpi opencl opengl openmp spinlock-check static-libs test valgrind
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://files.inria.fr/starpu/starpu-1.3.9/starpu-1.3.9.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cuda	13d76baf0dc95e560610c6b7dfa79db4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a5983e340ee1db2724d6935ba7936d2d
+_md5_=e99ca6dbb290b3345e9216b9eb89d918
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 467426639952..49e59a6866f2 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/alcotest-1.7.0 b/metadata/md5-cache/dev-ml/alcotest-1.7.0
index e2c7971c8428..bdd7df9f269a 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.7.0
+++ b/metadata/md5-cache/dev-ml/alcotest-1.7.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mirage/alcotest/
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=ISC
 RDEPEND=>=dev-ml/dune-3.0:= dev-ml/astring:= dev-ml/async_kernel:= dev-ml/async:= >=dev-ml/async_unix-0.15.0:= dev-ml/base:= dev-ml/cmdliner:= >=dev-ml/core-0.15.0:= >=dev-ml/core_unix-0.15.0:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/lwt:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.7.0
 SRC_URI=https://github.com/mirage/alcotest/archive/1.7.0.tar.gz -> alcotest-1.7.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=93524e410c72595a4b41774461a2884e
+_md5_=acaa1198455ba5e87fd7b8ce21f85b7a
diff --git a/metadata/md5-cache/dev-ml/async-0.15.0 b/metadata/md5-cache/dev-ml/async-0.15.0
index 9dd53a032993..072dd725f282 100644
--- a/metadata/md5-cache/dev-ml/async-0.15.0
+++ b/metadata/md5-cache/dev-ml/async-0.15.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
 RDEPEND=dev-ml/async_rpc_kernel:0/0.15 dev-ml/async_unix:0/0.15 dev-ml/textutils:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/async/archive/v0.15.0.tar.gz -> async-0.15.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b3376eb9480d037cccd6952273c40f02
+_md5_=3f1b21c8b5753a850e10e504b6929097
diff --git a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.15.0 b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.15.0
index 52824575270c..e63804efd2bc 100644
--- a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_rpc_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:0/0.15 dev-ml/protocol_version_header:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/async_rpc_kernel/archive/v0.15.0.tar.gz -> async_rpc_kernel-0.15.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=9789bd54fd768d773aecc71ea2a6466f
+_md5_=1e593e2588dfefe941fa3d3378ea262e
diff --git a/metadata/md5-cache/dev-ml/protocol_version_header-0.15.0 b/metadata/md5-cache/dev-ml/protocol_version_header-0.15.0
index 0839469a6ee5..9d6ec5f1009f 100644
--- a/metadata/md5-cache/dev-ml/protocol_version_header-0.15.0
+++ b/metadata/md5-cache/dev-ml/protocol_version_header-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/protocol_version_header
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-ml/core:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/protocol_version_header/archive/v0.15.0.tar.gz -> protocol_version_header-0.15.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a6cfa38db1c2eba7243420c839ee8fc8
+_md5_=3fe047b364d9cc38c5b91ac78975c589
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index b0ec0d09fe78..7feaa63458a9 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r3 b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r3
index 251d6bc24649..8bbb8d9b968b 100644
--- a/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r3
+++ b/metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SSH-AuthorizedKeysFile
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 virtual/perl-File-Spec >=dev-perl/Log-Log4perl-1.0.0 virtual/perl-Text-ParseWords dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHILLI/Net-SSH-AuthorizedKeysFile-0.18.tar.gz https://github.com/mschilli/net-ssh-authorizedkeysfile-perl/pull/4.patch -> Net-SSH-AuthorizedKeysFile-0.180.0-r3-extra-keys-v2.patch
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1e5e38e3dfdbb5ce4ffd52e285fe799f
+_md5_=8ac026dbc6c754be16c16440986c7b8f
diff --git a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0-r3 b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0-r3
index ba5aed3cf356..b675bfd03eb5 100644
--- a/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0-r3
+++ b/metadata/md5-cache/dev-perl/WWW-Curl-4.170.0-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/WWW-Curl
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( MPL-1.0 MPL-1.1 MIT )
 RDEPEND=net-misc/curl dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz https://rt.cpan.org/Public/Ticket/Attachment/2423633/1093328/WWW-Curl-4.17-Work-around-a-macro-bug-in-curl-7.87.0.patch
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=31fc061c764345674efff28815bae072
+_md5_=2b62cd7fe626963463094ded0c0d8704
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index a6f66370da6f..343ea3aebb7c 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.11 b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.11
index 011c9e488188..3bd86db4dbd9 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.11
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.11
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://pear.php.net/package/Mail_Mime
 INHERIT=php-pear-r2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail_Mime-1.10.11.tgz
 _eclasses_=php-pear-r2	920a4ee643aaaeef0f8b358fbf2255ab
-_md5_=b67291d6416e8f99f651f092392e3f8f
+_md5_=53332bc96cb47caf312e022d7bf2205b
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.10.0 b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.10.0
index d11bb410fb19..fb0ea47271c1 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.10.0
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.10.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://pear.php.net/package/Net_SMTP
 INHERIT=php-pear-r2
 IUSE=examples sasl test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL ) >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_SMTP-1.10.0.tgz
 _eclasses_=php-pear-r2	920a4ee643aaaeef0f8b358fbf2255ab
-_md5_=7cabd87ba23d860aca401f8559a44c5f
+_md5_=e827f1155a38372b742c916af6802fce
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4 b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4
index ba3de2ee58c7..bf5e2837de0f 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4
@@ -3,9 +3,9 @@ DESCRIPTION=An API for talking to sieve (RFC 3028) servers
 EAPI=6
 HOMEPAGE=https://github.com/roundcube/Net_Sieve
 IUSE=sasl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-Net_Socket sasl? ( dev-php/PEAR-Auth_SASL )
 SLOT=0
 SRC_URI=https://github.com/roundcube/Net_Sieve/archive/1.5.4.tar.gz -> PEAR-Net_Sieve-1.5.4.tar.gz
-_md5_=76e452ae64119e3303859c0623e193c8
+_md5_=ac0c1f6cb91279a9c148a5fd48d7baf4
diff --git a/metadata/md5-cache/dev-php/adodb-5.22.2 b/metadata/md5-cache/dev-php/adodb-5.22.2
index 2e5a51f97a8f..309790143386 100644
--- a/metadata/md5-cache/dev-php/adodb-5.22.2
+++ b/metadata/md5-cache/dev-php/adodb-5.22.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Database abstraction layer for PHP
 EAPI=8
 HOMEPAGE=https://adodb.org/ https://github.com/ADOdb/ADOdb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD LGPL-2.1+
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.22.2.tar.gz -> adodb-5.22.2.tar.gz
-_md5_=e9ea0d4fad90766028f6e57336b32030
+_md5_=d011e410f14042f2df7ab90fd0cbdbf2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5a2a3b980937..dcf6dad95c92 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-8.6.2 b/metadata/md5-cache/dev-python/elasticsearch-py-8.6.2
index fdc74b8bac29..49831a3bf0b7 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-8.6.2
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-8.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ela.st/es-python https://github.com/elastic/elasticsearch-py https://pypi.org/project/elasticsearch/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/aiohttp-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/elastic-transport-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/elastic-transport-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/requests-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!amd64? ( test ) !test? ( test ) !test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/elastic/elasticsearch-py/archive/refs/tags/v8.6.2.tar.gz -> elasticsearch-py-8.6.2.gh.tar.gz test? ( amd64? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.6.2-linux-x86_64.tar.gz ) )
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=57508cc07bb0164013dece6a81308569
+_md5_=ffd92be19fb91108a59ff1479a08c180
diff --git a/metadata/md5-cache/dev-python/feedparser-6.0.10 b/metadata/md5-cache/dev-python/feedparser-6.0.10
index c938ba988a29..929e4007adfc 100644
--- a/metadata/md5-cache/dev-python/feedparser-6.0.10
+++ b/metadata/md5-cache/dev-python/feedparser-6.0.10
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Parse RSS and Atom feeds in Python
 EAPI=8
 HOMEPAGE=https://github.com/kurtmckee/feedparser/ https://pypi.org/project/feedparser/
 INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/sgmllib3k[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/sgmllib3k[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 SLOT=0
 SRC_URI=https://github.com/kurtmckee/feedparser/archive/6.0.10.tar.gz -> feedparser-6.0.10.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=770fe05ccf2eedb2c59725fbe361da33
+_md5_=6e6b120c86ddac72c9da546a72250c2f
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.22.0 b/metadata/md5-cache/dev-python/ipykernel-6.22.0
deleted file mode 100644
index 4e9371d54db3..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.22.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/comm-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1 pypi virtualx
-IUSE=test python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-6.22.0.tar.gz
-_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=debe4dbe3554d24a479cd0cec5775a20
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.23.0 b/metadata/md5-cache/dev-python/ipykernel-6.23.0
index 179fe2b3d2ad..0f3cabe099e7 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.23.0
+++ b/metadata/md5-cache/dev-python/ipykernel-6.23.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
 INHERIT=distutils-r1 pypi virtualx
 IUSE=test python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-client-8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-20[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-6.23.0.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=dba6e521d0053703590723ae49ecbe94
+_md5_=747d6407e187b0ed843149fab57754e7
diff --git a/metadata/md5-cache/dev-python/mapbox-vector-tile-2.0.1 b/metadata/md5-cache/dev-python/mapbox-vector-tile-2.0.1
index f1508e948009..ecb7ed3f3d67 100644
--- a/metadata/md5-cache/dev-python/mapbox-vector-tile-2.0.1
+++ b/metadata/md5-cache/dev-python/mapbox-vector-tile-2.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tilezen/mapbox-vector-tile/ https://pypi.org/project/mapbox-vector-tile/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/protobuf-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyclipper[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyproj[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/shapely[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tilezen/mapbox-vector-tile/archive/refs/tags/v2.0.1.tar.gz -> mapbox-vector-tile-2.0.1.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5dcf61df0f0c7ce86b1a3d0e80b25f81
+_md5_=70ea3a8f58a81b2a7894ca367966b901
diff --git a/metadata/md5-cache/dev-python/myst-parser-1.0.0 b/metadata/md5-cache/dev-python/myst-parser-1.0.0
index fe03459a86c0..e02c13c94bbf 100644
--- a/metadata/md5-cache/dev-python/myst-parser-1.0.0
+++ b/metadata/md5-cache/dev-python/myst-parser-1.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-param-files[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mdit-py-plugins-0.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit-core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-regressions[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-param-files[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sphinx-pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mdit-py-plugins-0.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extended commonmark compliant parser, with bridges to Sphinx
 EAPI=8
 HOMEPAGE=https://github.com/executablebooks/MyST-Parser/ https://pypi.org/project/myst-parser/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=<dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mdit-py-plugins-0.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=<dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markdown-it-py[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/mdit-py-plugins-0.3.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/sphinx-7[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sphinx-5[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/executablebooks/MyST-Parser/archive/v1.0.0.tar.gz -> MyST-Parser-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e8033cf97238650eb6b89548c4e3664a
+_md5_=0efeede0f8f92322354dbcd9b23c2f78
diff --git a/metadata/md5-cache/dev-python/nagiosplugin-1.3.3 b/metadata/md5-cache/dev-python/nagiosplugin-1.3.3
index 90f932440d63..e9cab693efec 100644
--- a/metadata/md5-cache/dev-python/nagiosplugin-1.3.3
+++ b/metadata/md5-cache/dev-python/nagiosplugin-1.3.3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) doc? ( || ( ( >=dev-lang/python-3.12.0_beta1:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] dev-python/sphinx-rtd-theme[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-python/pypy3-7.3.11_p1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A class library for writing nagios-compatible plugins
 EAPI=8
 HOMEPAGE=https://github.com/mpounsett/nagiosplugin/ https://nagiosplugin.readthedocs.io/ https://pypi.org/project/nagiosplugin/
 INHERIT=distutils-r1 pypi
-IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test doc python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=ZPL
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nagiosplugin/nagiosplugin-1.3.3.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0bdd8393a2b414e335256fec514de6fd
+_md5_=043d6007b2df521f2ecde73f3b7bb05d
diff --git a/metadata/md5-cache/dev-python/pyproj-3.5.0 b/metadata/md5-cache/dev-python/pyproj-3.5.0
index ea451011891c..f111aa4e4fa9 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.5.0
+++ b/metadata/md5-cache/dev-python/pyproj-3.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyproj4/pyproj/ https://pypi.org/project/pyproj/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=>=sci-libs/proj-9.0.0:= dev-python/certifi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyproj4/pyproj/archive/3.5.0.tar.gz -> pyproj-3.5.0.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=029f9d2a4c48db6044ab6d7ccdf3c47b
+_md5_=6d7494b5ac256ee117b04bf552d0c173
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.13.2 b/metadata/md5-cache/dev-python/pyqtgraph-0.13.2
index a9787fcebfac..7cbd2dbd6062 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.13.2
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.13.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.pyqtgraph.org/ https://github.com/pyqtgraph/pyqtgraph/ https://pypi.org/project/pyqtgraph/
 INHERIT=distutils-r1 multiprocessing
 IUSE=opengl svg test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~riscv x86
+KEYWORDS=amd64 ~arm ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/numpy-1.17[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[gui,widgets,opengl=,svg=,python_targets_python3_10(-)?,python_targets_python3_11(-)?] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=test? ( opengl svg ) || ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyqtgraph/pyqtgraph/archive/pyqtgraph-0.13.2.tar.gz -> pyqtgraph-0.13.2.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7abf03483878cb8761d4e12d28a6ab5e
+_md5_=7b13714ccfaea131b26c2cc46a6c3729
diff --git a/metadata/md5-cache/dev-python/redis-4.5.5 b/metadata/md5-cache/dev-python/redis-4.5.5
index d0a7570ad1e2..44970eac81cc 100644
--- a/metadata/md5-cache/dev-python/redis-4.5.5
+++ b/metadata/md5-cache/dev-python/redis-4.5.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/redis/redis-py/ https://pypi.org/project/redis/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-py/archive/v4.5.5.tar.gz -> redis-py-4.5.5.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=67b0060bf33c907ac667a2f3dafe8cda
+_md5_=4ae5834d56bfd37a0d196852cb8b9685
diff --git a/metadata/md5-cache/dev-python/reportlab-4.0.4 b/metadata/md5-cache/dev-python/reportlab-4.0.4
new file mode 100644
index 000000000000..0c1b69beb3c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-4.0.4
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip doc? ( || ( ( >=dev-lang/python-3.12.0_beta1:3.12 >=dev-python/sphinx-5.3.0[python_targets_python3_12(-)] ) ( >=dev-lang/python-3.11.3:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.11:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=8
+HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
+INHERIT=distutils-r1 pypi
+IUSE=doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/reportlab/reportlab-4.0.4.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=cec077574d3e0e2282aa0ed7b04dd4dc
diff --git a/metadata/md5-cache/dev-python/rpy-3.5.8 b/metadata/md5-cache/dev-python/rpy-3.5.8
index 101f859d1b01..9fa27945c892 100644
--- a/metadata/md5-cache/dev-python/rpy-3.5.8
+++ b/metadata/md5-cache/dev-python/rpy-3.5.8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://rpy.sourceforge.io/ https://pypi.org/project/rpy2/
 INHERIT=distutils-r1 pypi virtualx
 IUSE=python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
 PDEPEND=dev-python/ipython[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-lang/R-3.2 dev-python/cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-0.13.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tzlocal[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[sqlite] )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/r/rpy2/rpy2-3.5.8.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=021074021ede9b90f4f4a5bdba1b96e0
+_md5_=e85c806106010f36bbe9bf2c2c633126
diff --git a/metadata/md5-cache/dev-python/shapely-2.0.1 b/metadata/md5-cache/dev-python/shapely-2.0.1
index ce2fd70f5008..6011f71d2fc8 100644
--- a/metadata/md5-cache/dev-python/shapely-2.0.1
+++ b/metadata/md5-cache/dev-python/shapely-2.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/shapely/ https://github.com/shapely/shapely/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=sci-libs/geos-3.9 dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/shapely/shapely/archive/2.0.1.tar.gz -> shapely-2.0.1.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e13457c87f0282868f89123d21122bf1
+_md5_=b6f13ca2251104d24b630f8c59a1d290
diff --git a/metadata/md5-cache/dev-python/sphinx-basic-ng-1.0.0_beta1 b/metadata/md5-cache/dev-python/sphinx-basic-ng-1.0.0_beta1
index 6b1bcd579c42..e74a0e18f236 100644
--- a/metadata/md5-cache/dev-python/sphinx-basic-ng-1.0.0_beta1
+++ b/metadata/md5-cache/dev-python/sphinx-basic-ng-1.0.0_beta1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/myst-parser[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/myst-parser[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A modern skeleton for Sphinx themes
 EAPI=8
 HOMEPAGE=https://github.com/pradyunsg/sphinx-basic-ng/ https://pypi.org/project/sphinx-basic-ng/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=>=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=dev-python/sphinx-4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pradyunsg/sphinx-basic-ng/archive/1.0.0.beta1.tar.gz -> sphinx-basic-ng-1.0.0.beta1.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2b6cafbcb4106de112452152895dd938
+_md5_=cf61b5947371b2b1db428be7cfc4ab0f
diff --git a/metadata/md5-cache/dev-python/svglib-1.5.1 b/metadata/md5-cache/dev-python/svglib-1.5.1
index d39863df03c8..672162fec747 100644
--- a/metadata/md5-cache/dev-python/svglib-1.5.1
+++ b/metadata/md5-cache/dev-python/svglib-1.5.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/cssselect2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/reportlab[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/cssselect2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/reportlab[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tinycss2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure-Python library for reading and converting SVG
 EAPI=8
 HOMEPAGE=https://github.com/deeplook/svglib/ https://pypi.org/project/svglib/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-python/cssselect2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/reportlab[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=dev-python/cssselect2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/reportlab[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tinycss2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/deeplook/svglib/archive/v1.5.1.tar.gz -> svglib-1.5.1.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a89c07239abf539f55b7b1d182bc5068
+_md5_=e4fa04867f22873c2d200b8849113765
diff --git a/metadata/md5-cache/dev-python/symengine-0.9.2-r3 b/metadata/md5-cache/dev-python/symengine-0.9.2-r3
index 2b06fe881fed..dc3243fad095 100644
--- a/metadata/md5-cache/dev-python/symengine-0.9.2-r3
+++ b/metadata/md5-cache/dev-python/symengine-0.9.2-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/symengine/symengine.py/ https://pypi.org/project/symengine/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] =sci-libs/symengine-0.9* python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.9.2.tar.gz -> symengine.py-0.9.2.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=36d6ec72cbff0e0e085d02b599693d06
+_md5_=c767f64248e4d5bf684e6af3ac73c04a
diff --git a/metadata/md5-cache/dev-python/websockets-11.0.3-r1 b/metadata/md5-cache/dev-python/websockets-11.0.3-r1
index e425b972ef30..1de8214663a0 100644
--- a/metadata/md5-cache/dev-python/websockets-11.0.3-r1
+++ b/metadata/md5-cache/dev-python/websockets-11.0.3-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://websockets.readthedocs.io/ https://github.com/python-websockets/websockets/ https://pypi.org/project/websockets/
 INHERIT=distutils-r1
 IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0= ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta1:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-websockets/websockets/archive/11.0.3.tar.gz -> websockets-11.0.3.gh.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/websockets/websockets-11.0.3-python3.12.patch.xz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=448a45625c6d70aadf8690d9ba1f649b
+_md5_=4adbbd1c89b0f500ed8a9308700f3abd
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 34b669624a6d..c985e5a7023a 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/asciimath-2.0.5 b/metadata/md5-cache/dev-ruby/asciimath-2.0.5
index d753e5a018f8..71b3ad86b4e7 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-2.0.5
+++ b/metadata/md5-cache/dev-ruby/asciimath-2.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/asciidoctor/asciimath
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-2.0.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	a84353aa00af1967bcbf6b3486217f18	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=35924410a1140b4518780f32bae6faf2
+_md5_=df6a68a16bb6b9abd486bd5f4462803c
diff --git a/metadata/md5-cache/dev-ruby/backports-3.24.1 b/metadata/md5-cache/dev-ruby/backports-3.24.1
index 748add1ce873..0705bf820a1d 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.24.1
+++ b/metadata/md5-cache/dev-ruby/backports-3.24.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/marcandre/backports
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcandre/backports/archive/v3.24.1.tar.gz -> backports-3.24.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	a84353aa00af1967bcbf6b3486217f18	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7bf0df33b37b9a202242e54734010d32
+_md5_=a63b35cb65c090aeb9c72f425446db2b
diff --git a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0-r1 b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0-r1
index 4d8489b33dbe..b1299f17d2e3 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/kramdown/parser-gfm
 INHERIT=edo ruby-fakegem
 IUSE=doc test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby30? ( dev-ruby/kramdown:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/kramdown:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/kramdown:2[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/kramdown-parser-gfm-1.1.0.gem
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	a84353aa00af1967bcbf6b3486217f18	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fb4b7ad9e592a4440ae2fdabba92c063
+_md5_=601bd8df4f71a22e61fa40ca130efa38
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 33a10619fa38..d849f1f5770c 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/bpftool-6.3 b/metadata/md5-cache/dev-util/bpftool-6.3
index cb9019498f11..301f1af90744 100644
--- a/metadata/md5-cache/dev-util/bpftool-6.3
+++ b/metadata/md5-cache/dev-util/bpftool-6.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kernel.org/
 INHERIT=estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
 IUSE=caps
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.3.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7266ce2d500cdbbebe43b36717fe9932
+_md5_=544257e665e31505e2ddbcb8bda95944
diff --git a/metadata/md5-cache/dev-util/diffoscope-238-r1 b/metadata/md5-cache/dev-util/diffoscope-238-r1
index fdec700c80cd..095304b38449 100644
--- a/metadata/md5-cache/dev-util/diffoscope-238-r1
+++ b/metadata/md5-cache/dev-util/diffoscope-238-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
 INHERIT=distutils-r1 pypi
 IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11[ncurses] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/d/diffoscope/diffoscope-238.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a49d7ef553c4d8f15f2b7bd869c44b7e
+_md5_=27d299b80144faba17fbd5cd05af7a02
diff --git a/metadata/md5-cache/dev-util/valgrind-3.21.0-r1 b/metadata/md5-cache/dev-util/valgrind-3.21.0-r1
index d5fdc453f593..b62769d65f5b 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.21.0-r1
+++ b/metadata/md5-cache/dev-util/valgrind-3.21.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://valgrind.org
 INHERIT=autotools flag-o-matic toolchain-funcs multilib pax-utils verify-sig
 IUSE=mpi verify-sig
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* ~amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.21.0.tar.bz2 verify-sig? ( https://sourceware.org/pub/valgrind/valgrind-3.21.0.tar.bz2.asc )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=2fc98a81d1a65a0a52a8fb5259a8f51b
+_md5_=e948dbb820f286aca4a8eb1be35abbfd
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index fc8c0bb7d9c0..b980d895838b 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/hugin-2022.0.0 b/metadata/md5-cache/media-gfx/hugin-2022.0.0
index d93b7df3c403..d59ffd95ffa0 100644
--- a/metadata/md5-cache/media-gfx/hugin-2022.0.0
+++ b/metadata/md5-cache/media-gfx/hugin-2022.0.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://hugin.sf.net
 INHERIT=python-single-r1 wxwidgets cmake xdg
 IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm64 x86
+KEYWORDS=amd64 arm64 ~x86
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= media-libs/libjpeg-turbo:= >=media-libs/libpano13-2.9.19_beta1:= media-libs/libpng:= media-libs/openexr:= media-libs/tiff:= >=media-libs/vigra-1.11.1-r5[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/opengl x11-libs/wxGTK:3.0-gtk3=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2022.0.0.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f80172b3e4421a706b51e1755b911621
+_md5_=8ad5df4e14af3abe6d7a6dab1eb3b1d2
diff --git a/metadata/md5-cache/media-gfx/icon-slicer-0.3-r1 b/metadata/md5-cache/media-gfx/icon-slicer-0.3-r1
index 362ebfbf03c1..1ed734cdda38 100644
--- a/metadata/md5-cache/media-gfx/icon-slicer-0.3-r1
+++ b/metadata/md5-cache/media-gfx/icon-slicer-0.3-r1
@@ -4,9 +4,9 @@ DEPEND=x11-apps/xcursorgen x11-libs/gtk+:2 dev-libs/popt
 DESCRIPTION=Utility for generating icon themes and libXcursor cursor themes
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/software/icon-slicer/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc sparc ~x86
 LICENSE=MIT
 RDEPEND=x11-apps/xcursorgen x11-libs/gtk+:2 dev-libs/popt
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/icon-slicer/releases/icon-slicer-0.3.tar.gz
-_md5_=33160083a1d5cf7a25ad560fe6270b28
+_md5_=ced3f6a44007a347377b26307276c019
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.12.89-r1 b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.89-r1
new file mode 100644
index 000000000000..36bececaf9c0
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.12.89-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare pretend setup test
+DEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=8
+HOMEPAGE=https://www.imagemagick.org/
+INHERIT=flag-o-matic libtool perl-functions toolchain-funcs
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=imagemagick
+RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/6.9.12-58
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.12-89.tar.xz
+_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=92a33358d41f7a0d0e50f7b28ea3196c
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.1.1.11-r1 b/metadata/md5-cache/media-gfx/imagemagick-7.1.1.11-r1
new file mode 100644
index 000000000000..1ef7dad8b14e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.1.1.11-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare pretend setup test
+DEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=8
+HOMEPAGE=https://www.imagemagick.org/
+INHERIT=autotools flag-o-matic perl-functions toolchain-funcs
+IUSE=bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=imagemagick
+RDEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
+RESTRICT=!test? ( test )
+SLOT=0/7.1.1-43
+SRC_URI=mirror://imagemagick/ImageMagick-7.1.1-11.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5be7ccdafceb0ba50d91f06db9a514d8
diff --git a/metadata/md5-cache/media-gfx/imagemagick-9999 b/metadata/md5-cache/media-gfx/imagemagick-9999
index b973ce1fdba8..5512ca72dcd5 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-9999
+++ b/metadata/md5-cache/media-gfx/imagemagick-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install postinst prepare pretend setup test unpack
+DEFINED_PHASES=configure install prepare pretend setup test unpack
 DEPEND=!media-gfx/graphicsmagick[imagemagick] dev-libs/libltdl bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:=[x265] ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl:= ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg media-gfx/potrace ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:= ) X? ( x11-base/xorg-proto )
 DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=8
@@ -13,4 +13,4 @@ REQUIRED_USE=corefonts? ( truetype ) svg? ( xml ) test? ( corefonts )
 RESTRICT=!test? ( test )
 SLOT=0/9999-43
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	perl-functions	c3fca037246e877693badea0df3b0ef8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=258fe94c4a3a074ab0dd5edaa8caa84f
+_md5_=9d59c022fed47c095356431a7d7ac42e
diff --git a/metadata/md5-cache/media-gfx/openscad-2021.01-r4 b/metadata/md5-cache/media-gfx/openscad-2021.01-r4
index 4cab197a14c6..db957ebd4f80 100644
--- a/metadata/md5-cache/media-gfx/openscad-2021.01-r4
+++ b/metadata/md5-cache/media-gfx/openscad-2021.01-r4
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.openscad.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=elisp-common qmake-utils xdg
 IUSE=emacs
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/hidapi dev-libs/libspnav dev-libs/libxml2 dev-libs/libzip:= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-gfx/opencsg:= media-libs/fontconfig media-libs/freetype >=media-libs/glew-2.0.0:0= media-libs/harfbuzz:= media-libs/lib3mf sci-mathematics/cgal:= x11-libs/cairo >=x11-libs/qscintilla-2.10.3:= emacs? ( >=app-editors/emacs-23.1:* )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openscad/openscad/releases/download/openscad-2021.01/openscad-2021.01.src.tar.gz -> openscad-2021.01.tar.gz
 _eclasses_=elisp-common	01bc6dc778b74a9deebe4e419a3b790e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d39b4ea3ca0bc1e7ce853ff97d95b33d
+_md5_=bc198626b77210c0fe09b31e610cb695
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.27 b/metadata/md5-cache/media-gfx/renderdoc-1.27
new file mode 100644
index 000000000000..00b24a76c2ae
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/renderdoc-1.27
@@ -0,0 +1,17 @@
+BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyside2[python_targets_python3_11(-)] ) ) qt5? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+DESCRIPTION=A stand-alone graphics debugging tool
+EAPI=8
+HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
+IUSE=pyside2 qt5 python_single_target_python3_10 python_single_target_python3_11 doc verify-sig
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
+RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= >=dev-util/glslang-1.3.231:= x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyside2[python_targets_python3_11(-)] ) ) qt5? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
+SLOT=0
+SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.27.tar.gz -> renderdoc-1.27.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.27/v1.27.tar.gz.asc -> renderdoc-1.27.tar.gz.asc )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	cmake	7fb5980de96325cbab639f5b2187357c	docs	7b9e167549c44efa7994614f33ba6d7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ae621e21e07219de76f113758cbe7aeb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 0981f3043a5d..e6d51b796e9d 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/exiftool-12.62 b/metadata/md5-cache/media-libs/exiftool-12.62
index 9e9d38e8d957..cae8d1b17187 100644
--- a/metadata/md5-cache/media-libs/exiftool-12.62
+++ b/metadata/md5-cache/media-libs/exiftool-12.62
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://exiftool.org/ http://exiftool.sourceforge.net
 INHERIT=perl-module
 IUSE=doc test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 arm64 ~ppc ppc64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://exiftool.org/Image-ExifTool-12.62.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a21dcb2f8e88ef37e5f6e38b57d70bd3
+_md5_=33f7365b70c94d075fc9b71e355db96c
diff --git a/metadata/md5-cache/media-libs/libaom-3.6.1 b/metadata/md5-cache/media-libs/libaom-3.6.1
index 9cb6575ed9cd..e634a12c6b6f 100644
--- a/metadata/md5-cache/media-libs/libaom-3.6.1
+++ b/metadata/md5-cache/media-libs/libaom-3.6.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://aomedia.org https://aomedia.googlesource.com/aom/
 INHERIT=cmake-multilib python-any-r1
 IUSE=doc +examples test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://storage.googleapis.com/aom-releases/libaom-3.6.1.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/media-libs/libaom/libaom-3.6.1-testdata.tar.xz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6a53f84e3c6d577cd30cf1dde18b6dc5
+_md5_=a5d1c80e9cc267914bedb45e43cd8bb9
diff --git a/metadata/md5-cache/media-libs/libheif-1.15.2 b/metadata/md5-cache/media-libs/libheif-1.15.2
index e9402ddd56eb..659b00bbad3b 100644
--- a/metadata/md5-cache/media-libs/libheif-1.15.2
+++ b/metadata/md5-cache/media-libs/libheif-1.15.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://github.com/strukturag/libheif
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools xdg multilib-minimal
 IUSE=+aom gdk-pixbuf go rav1e test +threads x265 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/dav1d:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libde265:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo: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(-)?] aom? ( >=media-libs/libaom-2.0.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(-)?] ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) go? ( dev-lang/go ) rav1e? ( media-video/rav1e:= ) x265? ( media-libs/x265:=[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? ( go )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/strukturag/libheif/releases/download/v1.15.2/libheif-1.15.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=20b2fd3376575371b454ba336a235f39
+_md5_=671f60d40ba5c8e27b805dcc8cd89100
diff --git a/metadata/md5-cache/media-libs/libmediainfo-23.03 b/metadata/md5-cache/media-libs/libmediainfo-23.03
index ce4a727f88a8..2b58068b3178 100644
--- a/metadata/md5-cache/media-libs/libmediainfo-23.03
+++ b/metadata/md5-cache/media-libs/libmediainfo-23.03
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
 INHERIT=autotools edos2unix flag-o-matic
 IUSE=curl doc mms
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/tinyxml2:= >=media-libs/libzen-0.4.41 sys-libs/zlib curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/libmediainfo/23.03/libmediainfo_23.03.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edos2unix	33e347e171066657f91f8b0c72ec8773	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=544d354b50f059fe2bda47b6a44ad403
+_md5_=3d26e0ce2b8fb9551d3bd80671be8c25
diff --git a/metadata/md5-cache/media-libs/libzen-0.4.41 b/metadata/md5-cache/media-libs/libzen-0.4.41
index 943b02257eed..bbfcd79b000a 100644
--- a/metadata/md5-cache/media-libs/libzen-0.4.41
+++ b/metadata/md5-cache/media-libs/libzen-0.4.41
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/MediaArea/ZenLib
 INHERIT=autotools
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://mediaarea.net/download/source/libzen/0.4.41/libzen_0.4.41.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4b9697fac739dd523bfc9382ff078667
+_md5_=57ec6f208ce200922ab815ba30d11dd7
diff --git a/metadata/md5-cache/media-libs/mlt-7.14.0 b/metadata/md5-cache/media-libs/mlt-7.14.0
index 85fca0331f54..ddb7499e7d13 100644
--- a/metadata/md5-cache/media-libs/mlt-7.14.0
+++ b/metadata/md5-cache/media-libs/mlt-7.14.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mltframework.org/
 INHERIT=python-single-r1 cmake
 IUSE=debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=media-libs/libebur128-1.2.2:= sci-libs/fftw:3.0= ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) opencv? ( >=media-libs/opencv-4.5.1:=[contrib] ) opengl? ( media-libs/libglvnd media-video/movit ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/7
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v7.14.0/mlt-7.14.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a36841ad8d5efebde1ee78dee293479b
+_md5_=dea46ed5034a880400567a8628d97819
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index f2b399c35bbc..692f186cfbd8 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/xastir-2.1.8-r3 b/metadata/md5-cache/media-radio/xastir-2.1.8-r3
index cc76d388fbac..32700a687943 100644
--- a/metadata/md5-cache/media-radio/xastir-2.1.8-r3
+++ b/metadata/md5-cache/media-radio/xastir-2.1.8-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xastir.org/
 INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=geotiff
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:= sci-libs/shapelib media-gfx/graphicsmagick:=[-q32] geotiff? ( sci-libs/proj sci-libs/libgeotiff:= media-libs/tiff:= )
 SLOT=0
 SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.8.tar.gz -> xastir-2.1.8.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9aca7df58aaf50863f51b8ae5d38ef22
+_md5_=613d7d7bde10df34504f3d0549030682
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 842a421a0246..e32e9e30d961 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.9.5-r1 b/metadata/md5-cache/media-sound/deadbeef-1.9.5-r1
index e58ec76c5283..3667c59eb4d9 100644
--- a/metadata/md5-cache/media-sound/deadbeef-1.9.5-r1
+++ b/metadata/md5-cache/media-sound/deadbeef-1.9.5-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://deadbeef.sourceforge.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools xdg flag-o-matic toolchain-funcs plocale
 IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libretro libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio pipewire sc68 shellexec +supereq threads vorbis wavpack
-KEYWORDS=amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
 RDEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch:=
 REQUIRED_USE=|| ( alsa oss pulseaudio pipewire nullout )
 SLOT=0
 SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.9.5.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fea7f1204e6e7f28cb9b662754b827eb
+_md5_=adde19f9c84dea39ea23be1634a495a1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index ef212d70a029..af6598ee7331 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/qmplay2-23.02.05-r1 b/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
index 4d6e7f4891be..287b1ea68e5e 100644
--- a/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
+++ b/metadata/md5-cache/media-video/qmplay2-23.02.05-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/zaps166/QMPlay2
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
 IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=LGPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
 SLOT=0
 SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.02.05/QMPlay2-src-23.02.05.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=12d9b07fb6e621cf46b24ef77c8070cc
+_md5_=99cad3493bc28735e6c370f65326ee5b
diff --git a/metadata/md5-cache/media-video/qmplay2-23.06.04 b/metadata/md5-cache/media-video/qmplay2-23.06.04
index 32f2cb3f7b1b..7953ff70bebb 100644
--- a/metadata/md5-cache/media-video/qmplay2-23.06.04
+++ b/metadata/md5-cache/media-video/qmplay2-23.06.04
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/zaps166/QMPlay2
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake xdg
 IUSE=avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass modplug notifications opengl pipewire portaudio pulseaudio sid shaders +taglib vaapi vdpau videofilters visualizations vulkan xv
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64
 LICENSE=LGPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) pipewire? ( media-video/pipewire ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) taglib? ( media-libs/taglib ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] media-libs/libva[X] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
 SLOT=0
 SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/23.06.04/QMPlay2-src-23.06.04.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cdef03b8957daac459371aad8887f44e
+_md5_=f8f8dd76267565a7976dc8ad4a733842
diff --git a/metadata/md5-cache/media-video/qmplay2-9999 b/metadata/md5-cache/media-video/qmplay2-9999
index a4daae1c1d25..479677f919e7 100644
--- a/metadata/md5-cache/media-video/qmplay2-9999
+++ b/metadata/md5-cache/media-video/qmplay2-9999
@@ -13,4 +13,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt
 REQUIRED_USE=audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) shaders? ( vulkan )
 SLOT=0
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a44d7f98df9c9fbdc74b700f70d45915
+_md5_=1b763854cf1c70b3f74e664547b279e0
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index de1480bdd5d8..2f8e5a347394 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.7.0 b/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.7.0
index 6551563ccad4..938037f84a0f 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.7.0
+++ b/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.7.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl dev-perl/Capture-Tiny dev-perl/Data-Validate-Domain dev-per
 DESCRIPTION=Monitor whether or not a host is blacklisted
 EAPI=8
 HOMEPAGE=https://github.com/matteocorti/check_rbl
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
+KEYWORDS=~amd64 ~hppa sparc ~x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Capture-Tiny dev-perl/Data-Validate-Domain dev-perl/Data-Validate-IP dev-perl/Monitoring-Plugin dev-perl/Net-DNS dev-perl/Net-IP dev-perl/Readonly virtual/perl-Socket
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/matteocorti/check_rbl/releases/download/v1.7.0/check_rbl-1.7.0.tar.gz
-_md5_=fea23e4d5d7f6236e08fe213577af6d7
+_md5_=7d88cf3e33729a79cda13e0d3e6fcb3b
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.10 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.10
index 0cd7e3e331df..41cca9f1691a 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.10
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.10
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nagios.org/
 INHERIT=systemd toolchain-funcs
 IUSE=apache2 classicui lighttpd +web vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/nagios acct-user/nagios virtual/mailx dev-lang/perl:= dev-libs/libltdl:0 web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( www-servers/apache[apache2_modules_alias,apache2_modules_cgi] www-servers/apache[apache2_modules_alias,apache2_modules_cgid] ( www-servers/apache[apache2_modules_alias] www-apache/mod_fcgid ) ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.4.10.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=020c1aca27181e9d0d9c1b1625a00558
+_md5_=63831a5ba7b586ff4582a9b2baace2d1
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.4 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.4
index 7e693d9b7872..1e0c3ab6dcfc 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.4
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
 INHERIT=autotools verify-sig
 IUSE=+drop-root +smi +ssl +samba suid test verify-sig
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m:= ) suid? ( acct-group/pcap acct-user/pcap )
 REQUIRED_USE=test? ( samba )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz.sig )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=51be6fa90143769a952c310b672b3aec
+_md5_=f840c049dee0c80459ac4c3a3224b745
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index fc9049f6f9ca..98e8c703362c 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r38 b/metadata/md5-cache/net-dns/djbdns-1.05-r38
index d532ad5c3499..3cfdb1a7bb05 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r38
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r38
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://cr.yp.to/djbdns.html
 INHERIT=readme.gentoo-r1 toolchain-funcs
 IUSE=ipv6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ppc64 sparc ~x86
 LICENSE=public-domain
 RDEPEND=acct-user/dnscache acct-user/dnslog acct-user/tinydns sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test32.diff.xz )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c0c972574bd759a7e916feffadfbe682
+_md5_=f5a3ce09ce75f4ffc1bc0e521cedba2e
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index cf0640fce233..5b38a660538f 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r2 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r2
index 79b7f7580d1f..deb8c47b0d16 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r2
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=rpcsvc protocol definitions from glibc
 EAPI=8
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
 INHERIT=autotools
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=!<sys-libs/glibc-2.26 virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4.3/rpcsvc-proto-1.4.3.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d46a201837bb5ff462d4028d2e347720
+_md5_=4dd264a7589d1620c66a3f8792e7d20d
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.40.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.40.2
index 61ebce8b1dba..9fac1bf4f32e 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.40.2
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.40.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.40.2.tar.xz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf24c2a72c46da7352d6e800ae43bd83
+_md5_=fdeafda52e11f205e2940f5a1e1b067e
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r410
index afbff20bb2a6..d62e035f4832 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r410
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.40.2.tar.xz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=04a3ffe6319e5ea99ce0b2ac72fa6291
+_md5_=65c0a6c699019fa46b690943fc6b0530
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r600 b/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r600
index f3bd10b75ef3..1f590e85744a 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r600
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.40.2-r600
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.40.2.tar.xz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	ruby-single	291cec9036393ebb5b11a4199edce193	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4fde36b26f4909a327271263d8bd798c
+_md5_=7e443624bde999d77d56a3aa7556ac90
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 6e475fc7f175..3573245090ea 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612 b/metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612
index 4f60e98d1b75..381d28e8c6a1 100644
--- a/metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612
+++ b/metadata/md5-cache/net-misc/olsrd-0.9.8_p20210612
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.olsr.org/
 INHERIT=toolchain-funcs
 IUSE=gtk pud
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD LGPL-2.1
 RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) pud? ( sci-geosciences/gpsd )
 SLOT=0
 SRC_URI=https://github.com/OLSR/olsrd/archive/4973feb538b5b98b9d8ac2f8f474202f6d73de78.tar.gz -> olsrd-0.9.8_p20210612.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8f93b235e9a9b90962b6cc9e05263855
+_md5_=6350f8ec4980b09dc8bc5bb4c7f5dbe8
diff --git a/metadata/md5-cache/net-misc/suite3270-4.2_p5-r1 b/metadata/md5-cache/net-misc/suite3270-4.2_p5-r1
index 370ca90e9306..0f7f0ff28eae 100644
--- a/metadata/md5-cache/net-misc/suite3270-4.2_p5-r1
+++ b/metadata/md5-cache/net-misc/suite3270-4.2_p5-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://x3270.bgp.nu/
 INHERIT=autotools font
 IUSE=X cjk doc ncurses ssl tcl X
-KEYWORDS=~amd64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ssl? ( dev-libs/openssl:= ) ncurses? ( sys-libs/ncurses:= sys-libs/readline:= ) tcl? ( dev-lang/tcl:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/x3270/suite3270-4.2ga5-src.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=de80c3049c224153421bd4c38ceff5f5
+_md5_=891729b33f312d2840c7f135c738ec98
diff --git a/metadata/md5-cache/net-misc/whois-5.5.17 b/metadata/md5-cache/net-misc/whois-5.5.17
index 26b7a85dfb6e..bd960156f605 100644
--- a/metadata/md5-cache/net-misc/whois-5.5.17
+++ b/metadata/md5-cache/net-misc/whois-5.5.17
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/rfc1036/whois
 INHERIT=toolchain-funcs
 IUSE=iconv idn nls xcrypt
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) !xcrypt? ( virtual/libcrypt:= )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/w/whois/whois_5.5.17.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4ef17dcf27017e4b054a02651fb7d029
+_md5_=d5077d990c9f2cfbbcc5152f3393fb1a
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 91dc84a374ee..871ec12b8529 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-2.4.4 b/metadata/md5-cache/net-print/cups-2.4.4
index d2a98e235a6b..8dfd6716acdc 100644
--- a/metadata/md5-cache/net-print/cups-2.4.4
+++ b/metadata/md5-cache/net-print/cups-2.4.4
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
 IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.4/cups-2.4.4-source.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e02047db081ff05139280127b9e5a75e
+_md5_=0c0cd83ade2945fe0cb4f6c81accb4b0
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index c58559ccd6ab..d9db650ee3c5 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1 b/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
index 9d2e37e83d13..9c40b4c373cc 100644
--- a/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
+++ b/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/10110111/CalcMySky
 INHERIT=multibuild cmake
 IUSE=qt5 qt6
-KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/eigen:3 media-libs/glm qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) qt6? ( dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/14
 SRC_URI=https://github.com/10110111/CalcMySky/archive/refs/tags/v0.2.1.tar.gz -> calcmysky-0.2.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=22d487398e7e54a116ba31e0647fc700
+_md5_=8c56a35c5994ab6c7d409132e66b8ee6
diff --git a/metadata/md5-cache/sci-astronomy/calcmysky-0.3.0 b/metadata/md5-cache/sci-astronomy/calcmysky-0.3.0
index 22511aea1b1f..870106f45a6e 100644
--- a/metadata/md5-cache/sci-astronomy/calcmysky-0.3.0
+++ b/metadata/md5-cache/sci-astronomy/calcmysky-0.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/10110111/CalcMySky
 INHERIT=multibuild cmake
 IUSE=qt5 qt6
-KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/eigen:3 media-libs/glm qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) qt6? ( dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only] )
 REQUIRED_USE=|| ( qt5 qt6 )
 SLOT=0/15
 SRC_URI=https://github.com/10110111/CalcMySky/archive/refs/tags/v0.3.0.tar.gz -> calcmysky-0.3.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d7d7d9b44ed751b1d00d8399c01b38db
+_md5_=6185cc8729c1997f6d12d33fd38f7b0a
diff --git a/metadata/md5-cache/sci-astronomy/erfa-1.4.0 b/metadata/md5-cache/sci-astronomy/erfa-1.4.0
index 7ff66d847e13..2fd9e3c40473 100644
--- a/metadata/md5-cache/sci-astronomy/erfa-1.4.0
+++ b/metadata/md5-cache/sci-astronomy/erfa-1.4.0
@@ -4,9 +4,9 @@ DESCRIPTION=Essential Routines for Fundamental Astronomy
 EAPI=7
 HOMEPAGE=https://github.com/liberfa/erfa
 INHERIT=autotools
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0/1
 SRC_URI=https://github.com/liberfa/erfa/releases/download/v1.4.0/erfa-1.4.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7c7967796e4de2bd1e53b6537bf0877e
+_md5_=2b9ce2f82443336bc2cfad3a7d32a15f
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.6.2 b/metadata/md5-cache/sci-astronomy/kstars-3.6.2
index 2bc83a4ab44d..23a122acef2e 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.6.2
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.6.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://apps.kde.org/kstars/ https://edu.kde.org/kstars/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm kde.org optfeature
 IUSE=fits indi +password raw wcs debug +handbook test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=>=dev-qt/qtdatavis3d-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwebsockets-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kconfigwidgets-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/kcrash-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/knewstuff-5.82.0:5 >=kde-frameworks/knotifications-5.82.0:5 >=kde-frameworks/knotifyconfig-5.82.0:5 >=kde-frameworks/kplotting-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 sys-libs/zlib fits? ( sci-libs/cfitsio:= ) indi? ( sci-libs/gsl:= >=sci-libs/indilib-1.9.1 sci-libs/libnova:= >=sci-libs/stellarsolver-2.2 ) password? ( dev-libs/qtkeychain:=[qt5(+)] ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib:= ) >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtpositioning-5.15.5:5 >=dev-qt/qtquickcontrols-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=indi? ( fits )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.6.2.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	fcc66b44770369fbd8fcdde8430fb0eb	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kde.org	dc60243572471279b11120514b85b558	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2b92a4599370b2a81d8d37549a1ab4ad
+_md5_=632b343c70abe1837293bfa94a4b415c
diff --git a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2 b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
index 27352d20fa85..ba824612d96c 100644
--- a/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
+++ b/metadata/md5-cache/sci-astronomy/predict-2.2.3-r2
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.qsl.net/kd2bd/predict.html
 INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=doc gtk nls xforms xplanet
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= gtk? ( x11-libs/gtk+:2 ) xforms? ( x11-libs/xforms ) xplanet? ( x11-misc/xplanet[truetype] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/predict/predict_2.2.3.orig.tar.gz mirror://debian/pool/main/p/predict/predict_2.2.3-3.1.diff.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d83fe25071b79248ca594086e893585a
+_md5_=4ee42ca4d411ed2fb0fe61d298ff5c5f
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-4.1.1 b/metadata/md5-cache/sci-astronomy/pyephem-4.1.1
index de50c4be2021..ce2e4dfed394 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-4.1.1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-4.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://rhodesmill.org/pyephem/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandon-rhodes/pyephem/archive/refs/tags/4.1.1.tar.gz -> pyephem-4.1.1.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=fd30988220dfd55ae2414a72b305c356
+_md5_=91c8d1838bf4583ad949398489512e5f
diff --git a/metadata/md5-cache/sci-astronomy/pysiril-0.0.12 b/metadata/md5-cache/sci-astronomy/pysiril-0.0.12
index dbcb36fa7dcb..e84c8fc344ac 100644
--- a/metadata/md5-cache/sci-astronomy/pysiril-0.0.12
+++ b/metadata/md5-cache/sci-astronomy/pysiril-0.0.12
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/pysiril
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=sci-astronomy/siril python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/pysiril/-/archive/V0_0_12/pysiril-V0_0_12.tar.bz2
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f1064dc49c51bee5ac40822c0ef7d4e7
+_md5_=764ea4290c360022e14a3d12373c3b59
diff --git a/metadata/md5-cache/sci-astronomy/pysiril-0.0.15 b/metadata/md5-cache/sci-astronomy/pysiril-0.0.15
index fe0ee6f7fe60..9572bd265052 100644
--- a/metadata/md5-cache/sci-astronomy/pysiril-0.0.15
+++ b/metadata/md5-cache/sci-astronomy/pysiril-0.0.15
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/pysiril
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=sci-astronomy/siril python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/pysiril/-/archive/V0_0_15/pysiril-V0_0_15.tar.bz2
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f1064dc49c51bee5ac40822c0ef7d4e7
+_md5_=764ea4290c360022e14a3d12373c3b59
diff --git a/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2 b/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2
index b76bf79fe28d..23aa4d5402cc 100644
--- a/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2
+++ b/metadata/md5-cache/sci-astronomy/siril-1.0.6-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.siril.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson optfeature toolchain-funcs xdg
 IUSE=curl ffmpeg heif jpeg openmp png raw tiff wcs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ Boost-1.0
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 >=dev-libs/libconfig-1.4[cxx] >=media-gfx/exiv2-0.25 media-libs/librtprocess:= >=media-libs/opencv-4.4.0:= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl:= x11-libs/cairo >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) heif? ( media-libs/libheif ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( >=media-libs/libpng-1.6.0 ) raw? ( media-libs/libraw ) tiff? ( media-libs/tiff:= ) wcs? ( >=sci-astronomy/wcslib-7.7 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/siril/-/archive/1.0.6/siril-1.0.6.tar.bz2
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e3c703627365e81d4ff3274cdfd12019
+_md5_=9382361b41d85e756690ad9849d94d1c
diff --git a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3 b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3
index a3afb1a5c907..47e5ee2dd9ce 100644
--- a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3
+++ b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/sirilic
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/wxpython:4.0[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/sirilic/-/archive/V1_14_3/sirilic-V1_14_3.tar.bz2
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=380b0d88e3fd3c47c7d7a4908ee929c5
+_md5_=3248df9047d99587c3e106964b4b602a
diff --git a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1 b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1
index d70a31bd918e..884c63259bda 100644
--- a/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1
+++ b/metadata/md5-cache/sci-astronomy/sirilic-1.14.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/sirilic
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/wxpython-4.2:4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/sirilic/-/archive/V1_14_3/sirilic-V1_14_3.tar.bz2
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0c6d48527a7341be532b8398e3b74619
+_md5_=084c4704c700f3486326b45dd905055f
diff --git a/metadata/md5-cache/sci-astronomy/sirilic-1.15.0 b/metadata/md5-cache/sci-astronomy/sirilic-1.15.0
index 71b123cd847c..7ab58f053527 100644
--- a/metadata/md5-cache/sci-astronomy/sirilic-1.15.0
+++ b/metadata/md5-cache/sci-astronomy/sirilic-1.15.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/sirilic
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/wxpython-4.2:4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/sirilic/-/archive/V1_15_0/sirilic-V1_15_0.tar.bz2
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0c6d48527a7341be532b8398e3b74619
+_md5_=084c4704c700f3486326b45dd905055f
diff --git a/metadata/md5-cache/sci-astronomy/sirilic-1.15.2 b/metadata/md5-cache/sci-astronomy/sirilic-1.15.2
index facaccd4219e..f8ddae60cd86 100644
--- a/metadata/md5-cache/sci-astronomy/sirilic-1.15.2
+++ b/metadata/md5-cache/sci-astronomy/sirilic-1.15.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/free-astro/sirilic
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/wxpython-4.2:4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://gitlab.com/free-astro/sirilic/-/archive/V1.15.2/sirilic-V1.15.2.tar.bz2
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=da2f5d6f60124e074a74b44b412463f8
+_md5_=609c12b9befd9a9d92bd0ef4e7237430
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-23.1 b/metadata/md5-cache/sci-astronomy/stellarium-23.1
index 384b7ed1e5d4..2be8f2376002 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-23.1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-23.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://stellarium.org/ https://github.com/Stellarium/stellarium
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx
 IUSE=debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx verify-sig test
-KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~ppc ppc64 ~riscv ~x86
 LICENSE=GPL-2+ SGI-B-2.0
 RDEPEND=media-fonts/dejavu sys-libs/zlib gps? ( sci-geosciences/gpsd:=[cxx] ) media? ( virtual/opengl ) !qt6? ( dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=sci-astronomy/calcmysky-0.3.0:=[qt5] gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 ) media? ( dev-qt/qtmultimedia:5[widgets] dev-qt/qtopengl:5 ) scripting? ( dev-qt/qtscript:5 ) telescope? ( dev-qt/qtserialport:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt5] ) ) qt6? ( dev-qt/qtbase:6=[gui,network,widgets] dev-qt/qtcharts:6 >=sci-astronomy/calcmysky-0.3.0:=[qt6] gps? ( dev-qt/qtpositioning:6 dev-qt/qtserialport:6 ) media? ( dev-qt/qtmultimedia:6[gstreamer] ) scripting? ( dev-qt/qtdeclarative:6 ) telescope? ( dev-qt/qtserialport:6 ) webengine? ( dev-qt/qtwebengine:6[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt6] ) ) telescope? ( sci-libs/indilib:= )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v23.1/stellarium-23.1.tar.xz verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v23.1/stellarium-23.1.tar.xz.asc ) deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.19/catalog-3.19.dat -> stellarium-dso-catalog-3.19.dat verify-sig? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.19/catalog-3.19.dat.asc -> stellarium-dso-catalog-3.19.dat.asc ) ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v23.1/stellarium_user_guide-23.1-1.pdf verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v23.1/stellarium_user_guide-23.1-1.pdf.asc ) ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf3cde780fc6287f09e05f90ff838eac
+_md5_=a75ee94550c834d818f5fceee0f5c67e
diff --git a/metadata/md5-cache/sci-astronomy/wcslib-7.11 b/metadata/md5-cache/sci-astronomy/wcslib-7.11
index 8a2580cfbb2d..8c3c2d6f542a 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.11
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.atnf.csiro.au/people/mcalabre/WCS/
 INHERIT=flag-o-matic fortran-2
 IUSE=doc fortran fits pgplot static-libs +tools
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) fortran? ( virtual/fortran )
 SLOT=0/7
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.11.tar.bz2
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=978a35a42f6ab7f48d0d6f3acebb8908
+_md5_=ed7454690f3df4c444dd7825de06a28e
diff --git a/metadata/md5-cache/sci-astronomy/wcslib-7.12 b/metadata/md5-cache/sci-astronomy/wcslib-7.12
index 5dac292f8ac5..66874f816bb7 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.12
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.12
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.atnf.csiro.au/people/mcalabre/WCS/
 INHERIT=flag-o-matic fortran-2
 IUSE=doc fortran fits pgplot static-libs +tools
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) fortran? ( virtual/fortran )
 SLOT=0/7
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.12.tar.bz2
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=783dc3480a9710b1e66de71bee0a1362
+_md5_=54c46abe3716d18561e0f554f41aad22
diff --git a/metadata/md5-cache/sci-astronomy/wcslib-7.3 b/metadata/md5-cache/sci-astronomy/wcslib-7.3
index 62cbc78c6af4..d0ee54804ef9 100644
--- a/metadata/md5-cache/sci-astronomy/wcslib-7.3
+++ b/metadata/md5-cache/sci-astronomy/wcslib-7.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.atnf.csiro.au/people/mcalabre/WCS/
 INHERIT=fortran-2 flag-o-matic
 IUSE=doc fortran fits pgplot static-libs +tools
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=fits? ( sci-libs/cfitsio:0= ) pgplot? ( sci-libs/pgplot:0= ) fortran? ( virtual/fortran )
 SLOT=0/7
 SRC_URI=ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-7.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b46ea3a3da3f865355ac4a79a481730b
+_md5_=3a140293680480cc59ef01151efd06bc
diff --git a/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1 b/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1
index bc946e6610c6..d1fd7682fd3a 100644
--- a/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1
+++ b/metadata/md5-cache/sci-astronomy/xephem-3.7.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interactive tool for astronomical ephemeris and sky simulation
 EAPI=7
 HOMEPAGE=https://www.clearskyinstitute.com/xephem
 INHERIT=desktop toolchain-funcs
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=XEphem
 RDEPEND=>=x11-libs/motif-2.3:0 virtual/jpeg:0 media-libs/libpng:0=
 SLOT=0
 SRC_URI=https://www.clearskyinstitute.com/xephem/xephem-3.7.7.tgz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3c78bde10cde786be8e579dd0d59cb3c
+_md5_=5700eac32ced211fd6ce2d5d204a9403
diff --git a/metadata/md5-cache/sci-astronomy/xephem-4.1.0-r1 b/metadata/md5-cache/sci-astronomy/xephem-4.1.0-r1
index e66d61d41093..cf2d6fd7b883 100644
--- a/metadata/md5-cache/sci-astronomy/xephem-4.1.0-r1
+++ b/metadata/md5-cache/sci-astronomy/xephem-4.1.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Interactive tool for astronomical ephemeris and sky simulation
 EAPI=8
 HOMEPAGE=https://xephem.github.io/XEphem/Site/xephem.html
 INHERIT=desktop toolchain-funcs
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/openssl:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=x11-libs/motif-2.3:0 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=https://github.com/XEphem/XEphem/archive/refs/tags/4.1.0.tar.gz -> xephem-4.1.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e7eb75b248f8f54942230a103f39f15d
+_md5_=aaab2f02b6ffcba989b41bb54165a900
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 495ada946e09..75d0675574b9 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/augustus-2.5.5 b/metadata/md5-cache/sci-biology/augustus-2.5.5
index f5bde831abdf..9bf60fcfd547 100644
--- a/metadata/md5-cache/sci-biology/augustus-2.5.5
+++ b/metadata/md5-cache/sci-biology/augustus-2.5.5
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=http://augustus.gobics.de/
 INHERIT=toolchain-funcs
 IUSE=examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://augustus.gobics.de/binaries/augustus.2.5.5.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=80962b244c7531e320f35904727b5bd5
+_md5_=4c500e601e76f119e63d2dc13321648c
diff --git a/metadata/md5-cache/sci-biology/bioperl-1.6.9-r1 b/metadata/md5-cache/sci-biology/bioperl-1.6.9-r1
index fb50cdef3c04..42d74bbb228a 100644
--- a/metadata/md5-cache/sci-biology/bioperl-1.6.9-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-1.6.9-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.bioperl.org/
 INHERIT=perl-module
 IUSE=minimal graphviz sqlite +db +network +run test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=db? ( >=sci-biology/bioperl-db-1.6.9 ) network? ( >=sci-biology/bioperl-network-1.6.9 ) run? ( >=sci-biology/bioperl-run-1.6.9 )
 RDEPEND=dev-perl/libwww-perl !minimal? ( dev-perl/Algorithm-Munkres dev-perl/Array-Compare dev-perl/YAML dev-perl/Bio-ASN1-EntrezGene dev-perl/Clone dev-perl/Convert-Binary-C dev-perl/Data-Stag dev-perl/GD dev-perl/Graph >=dev-perl/HTML-Parser-3.60 dev-perl/List-MoreUtils dev-perl/Math-Random dev-perl/PostScript dev-perl/Set-Scalar dev-perl/SOAP-Lite dev-perl/Sort-Naturally dev-perl/Spreadsheet-ParseExcel >=virtual/perl-Storable-2.05 >=dev-perl/SVG-2.26 >=dev-perl/SVG-Graph-0.01 dev-perl/URI >=dev-perl/XML-DOM-XPath-0.13 dev-perl/XML-Parser >=dev-perl/XML-SAX-0.15 dev-perl/XML-Simple dev-perl/XML-Twig >=dev-perl/XML-Writer-0.4 dev-perl/XML-DOM dev-perl/XML-XPath ) graphviz? ( dev-perl/GraphViz ) sqlite? ( dev-perl/DBD-SQLite ) dev-lang/perl:=
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-1.6.901.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e2bc1ba3ce7d3071e3bfff1ff59b93fa
+_md5_=275c67756e8440c392c02c29c75e1388
diff --git a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r2 b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r2
index 5675378138a7..e0534ee66438 100644
--- a/metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r2
+++ b/metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.bioperl.org/
 INHERIT=perl-module
 IUSE=test test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sci-biology/bioperl-1.6.9 dev-perl/DBD-mysql dev-perl/DBI sci-biology/biosql dev-lang/perl:=
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-DB-1.006900.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ec0bd67d52c316d61cf5adb758afcf04
+_md5_=56259564f94ae015e0cdd27bc2db8b21
diff --git a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9-r1 b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9-r1
index 8d35c5405547..840a3b824f87 100644
--- a/metadata/md5-cache/sci-biology/bioperl-network-1.6.9-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-network-1.6.9-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.bioperl.org/
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sci-biology/bioperl-1.6.9 >=dev-perl/Graph-0.86 dev-lang/perl:=
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Network-1.006900.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=062cfc681671741bdf0ce203cd9f0854
+_md5_=6c074e2b53c3e7242c6ed1e352537670
diff --git a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9-r1 b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9-r1
index d6b625656774..38e93d65b951 100644
--- a/metadata/md5-cache/sci-biology/bioperl-run-1.6.9-r1
+++ b/metadata/md5-cache/sci-biology/bioperl-run-1.6.9-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.bioperl.org/
 INHERIT=perl-module
 IUSE=minimal test test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=sci-biology/bioperl-1.6.9 !minimal? ( dev-perl/Algorithm-Diff dev-perl/XML-Twig dev-perl/IO-String dev-perl/IPC-Run dev-perl/File-Sort ) dev-lang/perl:=
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-Run-1.006900.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89a50a53d48e4dddb7f36a35c0407fdb
+_md5_=517668f69988f82c6a81d26d36633342
diff --git a/metadata/md5-cache/sci-biology/biosql-1.0.1-r2 b/metadata/md5-cache/sci-biology/biosql-1.0.1-r2
index 2db325d864b6..3cb02e1ff37b 100644
--- a/metadata/md5-cache/sci-biology/biosql-1.0.1-r2
+++ b/metadata/md5-cache/sci-biology/biosql-1.0.1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=A generic bioinformatics relational database model
 EAPI=8
 HOMEPAGE=https://biosql.org/
 IUSE=mysql postgres
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) dev-lang/perl
 SLOT=0
 SRC_URI=https://biosql.org/DIST/biosql-1.0.1.tar.bz2
-_md5_=17f139bd8463877fe11118d9b9cc16e2
+_md5_=cc4726c8c2ff5b7c796abd2a154af22a
diff --git a/metadata/md5-cache/sci-biology/clustal-omega-1.2.4-r1 b/metadata/md5-cache/sci-biology/clustal-omega-1.2.4-r1
index e69c94df9fd2..1f9de70fb4e5 100644
--- a/metadata/md5-cache/sci-biology/clustal-omega-1.2.4-r1
+++ b/metadata/md5-cache/sci-biology/clustal-omega-1.2.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Scalable multiple alignment of protein sequences
 EAPI=8
 HOMEPAGE=http://www.clustal.org/omega/
 INHERIT=autotools
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/argtable
 SLOT=0
 SRC_URI=http://www.clustal.org/omega/clustal-omega-1.2.4.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1fe31c7bf68a0e3d5cd862d476a40e5b
+_md5_=e2928c88a8676586ff3c5e4a7f534608
diff --git a/metadata/md5-cache/sci-biology/clustalw-1.83-r4 b/metadata/md5-cache/sci-biology/clustalw-1.83-r4
index 5162a5cfb354..6c70b4b926e8 100644
--- a/metadata/md5-cache/sci-biology/clustalw-1.83-r4
+++ b/metadata/md5-cache/sci-biology/clustalw-1.83-r4
@@ -3,9 +3,9 @@ DESCRIPTION=General purpose multiple alignment program for DNA and proteins
 EAPI=8
 HOMEPAGE=http://www.embl-heidelberg.de/~seqanal/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=clustalw
 SLOT=1
 SRC_URI=ftp://ftp.ebi.ac.uk/pub/software/unix/clustalw/clustalw1.83.UNIX.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=23aaae23f03e4fab6b2db5e41d8328e4
+_md5_=48325a27354b2683cb1b693a641b7ab7
diff --git a/metadata/md5-cache/sci-biology/clustalw-2.1-r2 b/metadata/md5-cache/sci-biology/clustalw-2.1-r2
index 53c95dfd69b1..292b56715d8b 100644
--- a/metadata/md5-cache/sci-biology/clustalw-2.1-r2
+++ b/metadata/md5-cache/sci-biology/clustalw-2.1-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=General purpose multiple alignment program for DNA and proteins
 EAPI=8
 HOMEPAGE=http://www.clustal.org/
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2
 SRC_URI=http://www.clustal.org/download/current/clustalw-2.1.tar.gz
-_md5_=2eca1e9c94ccbb0f35ccc59c88a4ff03
+_md5_=f31e34b6f62eb36c64c11cb4ad763a55
diff --git a/metadata/md5-cache/sci-biology/clustalx-2.1-r3 b/metadata/md5-cache/sci-biology/clustalx-2.1-r3
index 2bf2f4609b14..0ed50c7ddbae 100644
--- a/metadata/md5-cache/sci-biology/clustalx-2.1-r3
+++ b/metadata/md5-cache/sci-biology/clustalx-2.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical interface for the ClustalW multiple alignment program
 EAPI=7
 HOMEPAGE=https://www.ebi.ac.uk/Tools/msa/clustalw2/
 INHERIT=desktop qmake-utils
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sci-biology/clustalw-2.1
 SLOT=0
 SRC_URI=http://www.clustal.org/download/current/clustalx-2.1.tar.gz https://dev.gentoo.org/~jlec/distfiles/clustalx.png.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3f60f1952758458fc3cd4e2789a942f5
+_md5_=26ebb7c606a394252d2be9f3c156984f
diff --git a/metadata/md5-cache/sci-biology/eugene-4.1d-r1 b/metadata/md5-cache/sci-biology/eugene-4.1d-r1
index fffdf9eb43db..04763a13995b 100644
--- a/metadata/md5-cache/sci-biology/eugene-4.1d-r1
+++ b/metadata/md5-cache/sci-biology/eugene-4.1d-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Prokaryotic and Eukaryotic gene predictor
 EAPI=8
 HOMEPAGE=http://eugene.toulouse.inra.fr/
 INHERIT=autotools
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=Artistic
 RDEPEND=media-libs/gd[png] media-libs/libpng:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://mulcyber.toulouse.inra.fr/frs/download.php/1359/eugene-4.1d.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8b37e07736e31e675410189d0ff61791
+_md5_=88a096386941104cea7615974ecef526
diff --git a/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3 b/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3
index df5d67ae2b12..fddda237a67f 100644
--- a/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3
+++ b/metadata/md5-cache/sci-biology/finchtv-1.3.1-r3
@@ -3,9 +3,9 @@ DESCRIPTION=Graphical viewer for chromatogram files
 EAPI=7
 HOMEPAGE=http://www.geospiza.com/finchtv/
 INHERIT=desktop
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=finchtv
 SLOT=0
 SRC_URI=http://www.geospiza.com/finchtv/download/programs/linux/finchtv_1_3_1.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d
-_md5_=26ca9e399e95eecb3e72d2d0092706d3
+_md5_=aa1653d409addfdbdeee78e05f3496f5
diff --git a/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1 b/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1
index c33b45898eff..7fc0b8e6d573 100644
--- a/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1
+++ b/metadata/md5-cache/sci-biology/glimmerhmm-3.0.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A eukaryotic gene finding system from TIGR
 EAPI=7
 HOMEPAGE=http://www.cbcb.umd.edu/software/GlimmerHMM/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=ftp://ftp.cbcb.umd.edu/pub/software/glimmerhmm/GlimmerHMM-3.0.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9fc33629a982f35b93c18da772894fdd
+_md5_=7e23482cbed8382298f1fb42831ae018
diff --git a/metadata/md5-cache/sci-biology/infernal-1.0.2-r1 b/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
index 2fc3fb12ac69..bd51ccd7a7a6 100644
--- a/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
+++ b/metadata/md5-cache/sci-biology/infernal-1.0.2-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://infernal.janelia.org/
 INHERIT=toolchain-funcs
 IUSE=mpi
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=ftp://selab.janelia.org/pub/software/infernal/infernal-1.0.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a3b1f788e8f5b38e41b3a9e38f91fe88
+_md5_=ed6542a9fbe6d76d42075ee482329775
diff --git a/metadata/md5-cache/sci-biology/mothur-1.27.0-r1 b/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
index 0545894407bd..c101821ad3f3 100644
--- a/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
+++ b/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.mothur.org/
 INHERIT=flag-o-matic fortran-2 toolchain-funcs
 IUSE=mpi +readline
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=sci-biology/uchime mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
 SRC_URI=https://www.mothur.org/w/images/c/cb/Mothur.1.27.0.zip -> mothur-1.27.0.zip
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2a931ea6d0536a0cb3441d235f5d2d6b
+_md5_=4d1c6c16f8757994256f73d5be45cb8f
diff --git a/metadata/md5-cache/sci-biology/muscle-3.8.31 b/metadata/md5-cache/sci-biology/muscle-3.8.31
index 43904742ced5..cf3e8608a3fc 100644
--- a/metadata/md5-cache/sci-biology/muscle-3.8.31
+++ b/metadata/md5-cache/sci-biology/muscle-3.8.31
@@ -3,10 +3,10 @@ DESCRIPTION=Multiple sequence comparison by log-expectation
 EAPI=7
 HOMEPAGE=https://www.drive5.com/muscle/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=!sci-libs/libmuscle
 SLOT=0
 SRC_URI=https://www.drive5.com/muscle/downloads3.8.31/muscle3.8.31_src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=373aea64d7c96030dbc1a9c4404f3985
+_md5_=62859cbc1404e079f9f85e83527914cf
diff --git a/metadata/md5-cache/sci-biology/pals-1.0-r2 b/metadata/md5-cache/sci-biology/pals-1.0-r2
index fc03f678d4f1..be05e8cd377a 100644
--- a/metadata/md5-cache/sci-biology/pals-1.0-r2
+++ b/metadata/md5-cache/sci-biology/pals-1.0-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Pairwise Aligner for Long Sequences
 EAPI=8
 HOMEPAGE=https://www.drive5.com/pals/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.drive5.com/pals/pals_source.tar.gz -> pals-1.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=03270366228400ac56642b59fb067532
+_md5_=eacca1433c8023d7321f6b8d4fc4b6d4
diff --git a/metadata/md5-cache/sci-biology/phyml-2.4.5-r4 b/metadata/md5-cache/sci-biology/phyml-2.4.5-r4
index c3f6718e4806..e976ca445806 100644
--- a/metadata/md5-cache/sci-biology/phyml-2.4.5-r4
+++ b/metadata/md5-cache/sci-biology/phyml-2.4.5-r4
@@ -3,9 +3,9 @@ DESCRIPTION=Estimation of large phylogenies by maximum likelihood
 EAPI=8
 HOMEPAGE=http://atgc.lirmm.fr/phyml/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.lirmm.fr/~guindon/phyml_v2.4.5.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d7f38a7c0005dca5f3da1d1fbd9780ae
+_md5_=07b5d0c4fa7ccf9c50fb8bba0dca57c7
diff --git a/metadata/md5-cache/sci-biology/piler-1.0-r2 b/metadata/md5-cache/sci-biology/piler-1.0-r2
index 86197b2927f4..263b42a55fa2 100644
--- a/metadata/md5-cache/sci-biology/piler-1.0-r2
+++ b/metadata/md5-cache/sci-biology/piler-1.0-r2
@@ -3,10 +3,10 @@ DESCRIPTION=Analysis of repetitive DNA found in genome sequences
 EAPI=8
 HOMEPAGE=http://www.drive5.com/piler/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=|| ( sci-biology/muscle sci-libs/libmuscle ) sci-biology/pals
 SLOT=0
 SRC_URI=http://www.drive5.com/piler/piler_source.tar.gz -> piler-1.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5a8dffca1e2b80e93cf1efdff5fd3fd0
+_md5_=5fc094c7ed21adb9be841a3f8cf76801
diff --git a/metadata/md5-cache/sci-biology/pilercr-1.0-r2 b/metadata/md5-cache/sci-biology/pilercr-1.0-r2
index 4fcf9a664a1c..d96473d92e1d 100644
--- a/metadata/md5-cache/sci-biology/pilercr-1.0-r2
+++ b/metadata/md5-cache/sci-biology/pilercr-1.0-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Analysis of Clustered Regularly Interspaced Short Palindromic Repeat
 EAPI=8
 HOMEPAGE=http://www.drive5.com/pilercr/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.drive5.com/pilercr/pilercr1.06.tar.gz -> pilercr-1.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d6fca147863ed9ae98f77d0b6f762060
+_md5_=00fbcbaccb202c9a3276728d356746a2
diff --git a/metadata/md5-cache/sci-biology/probcons-1.12-r1 b/metadata/md5-cache/sci-biology/probcons-1.12-r1
index 183834060c86..25b57d3329f5 100644
--- a/metadata/md5-cache/sci-biology/probcons-1.12-r1
+++ b/metadata/md5-cache/sci-biology/probcons-1.12-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Probabilistic Consistency-based Multiple Alignment of Amino Acid Seq
 EAPI=7
 HOMEPAGE=http://probcons.stanford.edu/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=!sci-geosciences/gmt sci-visualization/gnuplot
 SLOT=0
 SRC_URI=http://probcons.stanford.edu/probcons_v1_12.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0f60285a7f7c2929aed4404425c3fc40
+_md5_=a0d3d7d9a640d31e0ece26e564b37dda
diff --git a/metadata/md5-cache/sci-biology/sibsim4-0.20 b/metadata/md5-cache/sci-biology/sibsim4-0.20
index 860da10909ed..28d4a5edd590 100644
--- a/metadata/md5-cache/sci-biology/sibsim4-0.20
+++ b/metadata/md5-cache/sci-biology/sibsim4-0.20
@@ -3,9 +3,9 @@ DESCRIPTION=A rewrite and improvement upon sim4, a DNA-mRNA aligner
 EAPI=7
 HOMEPAGE=http://sibsim4.sourceforge.net/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/sibsim4/SIBsim4-0.20.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=da65f25e1cebcf8c22efbffb6b2b5c95
+_md5_=c9dc1d70a172b8258f2f0e4f3f7e967c
diff --git a/metadata/md5-cache/sci-biology/stride-20011129-r1 b/metadata/md5-cache/sci-biology/stride-20011129-r1
index 4ef4b0720593..afe8005ace55 100644
--- a/metadata/md5-cache/sci-biology/stride-20011129-r1
+++ b/metadata/md5-cache/sci-biology/stride-20011129-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Protein secondary structure assignment from atomic coordinates
 EAPI=7
 HOMEPAGE=http://webclu.bio.wzw.tum.de/stride/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=STRIDE
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=ftp://ftp.ebi.ac.uk/pub/software/unix/stride/src/stride.tar.gz -> stride-20011129.tar.gz https://dev.gentoo.org/~pacho/stride/stride-20060723-update.patch.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2503d6480cd2b0d2f44e2b3ffe5c4eb1
+_md5_=a98099ba2092ac37edaa2d1816ea88a1
diff --git a/metadata/md5-cache/sci-biology/tree-puzzle-5.2 b/metadata/md5-cache/sci-biology/tree-puzzle-5.2
index 9ab46123d3e2..76d7f6c49f8e 100644
--- a/metadata/md5-cache/sci-biology/tree-puzzle-5.2
+++ b/metadata/md5-cache/sci-biology/tree-puzzle-5.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.tree-puzzle.de
 INHERIT=autotools
 IUSE=mpi
-KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.tree-puzzle.de/tree-puzzle-5.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1ab88737aae8e6c93a46631cd7d1bdd9
+_md5_=5b3f19a3bd68515494075eab507798ef
diff --git a/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3 b/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
index 8c783b8a71d4..5c6539415eee 100644
--- a/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
+++ b/metadata/md5-cache/sci-biology/treeviewx-0.5.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A phylogenetic tree viewer
 EAPI=7
 HOMEPAGE=http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/
 INHERIT=autotools wxwidgets
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/download/0.5/tv-0.5.1.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=c86f5cda4344605df8072acf1799776b
+_md5_=c7a6fb1f3ee6436d674328487c021a24
diff --git a/metadata/md5-cache/sci-biology/trf-4.04-r2 b/metadata/md5-cache/sci-biology/trf-4.04-r2
index 46eab303fe68..61f83fd36499 100644
--- a/metadata/md5-cache/sci-biology/trf-4.04-r2
+++ b/metadata/md5-cache/sci-biology/trf-4.04-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Tandem Repeats Finder
 EAPI=8
 HOMEPAGE=https://tandem.bu.edu/trf/trf.html
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=trf
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://tandem.bu.edu/trf/downloads/trf404.linux
-_md5_=44fad2daec87377702c578544bf008e5
+_md5_=1839ce18db10bbc511a18e93309a3819
diff --git a/metadata/md5-cache/sci-biology/uchime-4.2.40-r1 b/metadata/md5-cache/sci-biology/uchime-4.2.40-r1
index aee56481e6e2..d61afed00a5d 100644
--- a/metadata/md5-cache/sci-biology/uchime-4.2.40-r1
+++ b/metadata/md5-cache/sci-biology/uchime-4.2.40-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Fast, accurate chimera detection
 EAPI=8
 HOMEPAGE=https://www.drive5.com/usearch/manual/uchime_algo.html
 INHERIT=cmake
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.drive5.com/uchime/uchime4.2.40_src.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=75e1e97ed1a0b22c90eebd09f4e46d59
+_md5_=d6d5b7ba215fd8eaf51d3847f4051df6
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 39231cb063a1..bdcb9f4c248b 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/galculator-2.1.4-r2 b/metadata/md5-cache/sci-calculators/galculator-2.1.4-r2
index f7787ff0c7b8..cebb12bb5f1b 100644
--- a/metadata/md5-cache/sci-calculators/galculator-2.1.4-r2
+++ b/metadata/md5-cache/sci-calculators/galculator-2.1.4-r2
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ based algebraic and RPN calculator
 EAPI=7
 HOMEPAGE=http://galculator.mnim.org/
 INHERIT=xdg
-KEYWORDS=~alpha amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2
 _eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f1d291ac463d24c9b48ea440f1d84b05
+_md5_=b6b4969eac040373d5d00c0d037ca9dc
diff --git a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1 b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
index 2a8e5037125e..6543e979b1b2 100644
--- a/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
+++ b/metadata/md5-cache/sci-calculators/hcalc-1.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=DJ's Hex Calculator
 EAPI=7
 HOMEPAGE=http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc
 INHERIT=cmake
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://github.com/jlec/hcalc/archive/refs/tags/1.2.tar.gz -> hcalc-1.2.gh.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=45e7f65309e0cc52695aadb02f7a9943
+_md5_=346b792be33a0aa0fea728bd1d5472c9
diff --git a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r4 b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r4
index e9c7fe55ada1..4c3b063963a7 100644
--- a/metadata/md5-cache/sci-calculators/hexcalc-1.11-r4
+++ b/metadata/md5-cache/sci-calculators/hexcalc-1.11-r4
@@ -5,10 +5,10 @@ DESCRIPTION=Simple hex calculator for X
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=mirror://gentoo/hexcalc-1.11.tar.Z
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2823e228846adae2b07e703326eb26b2
+_md5_=1cb45e7882940377bd5410be796a98e1
diff --git a/metadata/md5-cache/sci-calculators/pcalc-4 b/metadata/md5-cache/sci-calculators/pcalc-4
index 5ecdab6cae19..0979bd809af4 100644
--- a/metadata/md5-cache/sci-calculators/pcalc-4
+++ b/metadata/md5-cache/sci-calculators/pcalc-4
@@ -4,9 +4,9 @@ DESCRIPTION=the programmers calculator
 EAPI=7
 HOMEPAGE=https://github.com/vapier/pcalc
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pcalc/pcalc-4.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=930228e72da7cd2b801f99a25e1a5a98
+_md5_=5339c208d9a512d7815fcdb864944a7d
diff --git a/metadata/md5-cache/sci-calculators/pcalc-5 b/metadata/md5-cache/sci-calculators/pcalc-5
index 6d956e766ef6..596585f86771 100644
--- a/metadata/md5-cache/sci-calculators/pcalc-5
+++ b/metadata/md5-cache/sci-calculators/pcalc-5
@@ -4,9 +4,9 @@ DESCRIPTION=the programmers calculator
 EAPI=7
 HOMEPAGE=https://github.com/vapier/pcalc
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pcalc/pcalc-5.tar.xz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8d76386c914183b858d06dbe72d685c6
+_md5_=3af06578d7c3d2442576fe22bda2067c
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0
index 6608a2d8d41f..82c1eabb85a2 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://qalculate.github.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-4.5.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v4.5.0/qalculate-gtk-4.5.0.tar.gz
 _eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d235760e8bb9e650ac35f42601318b5e
+_md5_=c8e65bb6fff0e2d882a38be0cf784e8c
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1 b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
index ae7b76641202..19122c0c117d 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://speedcrunch.org/
 INHERIT=cmake desktop xdg-utils
 IUSE=doc
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://bitbucket.org/heldercorreia/speedcrunch/get/release-0.12.0.tar.gz -> speedcrunch-0.12.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bb4b9d3558b42063daeb6d1d961f06df
+_md5_=af6f135199e2300b46fd9feae7390920
diff --git a/metadata/md5-cache/sci-calculators/units-2.21-r1 b/metadata/md5-cache/sci-calculators/units-2.21-r1
index de8db3561541..6a550e39b42e 100644
--- a/metadata/md5-cache/sci-calculators/units-2.21-r1
+++ b/metadata/md5-cache/sci-calculators/units-2.21-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/units/units.html
 INHERIT=python-r1
 IUSE=+units-cur python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
 RDEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_targets_python3_10? ( dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) )
 REQUIRED_USE=units-cur? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.21.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9e9ee0a3f52d9a8a4c969ef4b2156686
+_md5_=26a60b1af09512dbf73e4c7c534138b8
diff --git a/metadata/md5-cache/sci-calculators/wcalc-2.5 b/metadata/md5-cache/sci-calculators/wcalc-2.5
index 788ab245bddc..02952e5da09b 100644
--- a/metadata/md5-cache/sci-calculators/wcalc-2.5
+++ b/metadata/md5-cache/sci-calculators/wcalc-2.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://w-calc.sourceforge.net/
 INHERIT=autotools desktop
 IUSE=readline
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/w-calc/wcalc-2.5.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=22122b15062ea46a806d4ad565e51354
+_md5_=29c6822be00a9f6d6a47643ad5dd16f0
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 08fb86471211..eb965fcff169 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2-r1 b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2-r1
index 3c9581419ea5..56b81a4eea4a 100644
--- a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2-r1
+++ b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://vina.scripps.edu/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=debug
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost:=
 SLOT=0
 SRC_URI=http://vina.scripps.edu/download/autodock_vina_1_1_2.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=39ebb5ee53f9b941621ec7081630d6fe
+_md5_=0cfd9bab31da9263a25d0d1c5be068de
diff --git a/metadata/md5-cache/sci-chemistry/clashlist-3.17-r1 b/metadata/md5-cache/sci-chemistry/clashlist-3.17-r1
index 0c27c75e48eb..48ab2a32b274 100644
--- a/metadata/md5-cache/sci-chemistry/clashlist-3.17-r1
+++ b/metadata/md5-cache/sci-chemistry/clashlist-3.17-r1
@@ -3,9 +3,9 @@ DEPEND=>=sci-chemistry/cluster-1.3.081231-r1 sci-chemistry/probe
 DESCRIPTION=Build lists of van der Waals clashes from an input PDB file
 EAPI=7
 HOMEPAGE=http://kinemage.biochem.duke.edu/software/index.php
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=richardson
 RDEPEND=>=sci-chemistry/cluster-1.3.081231-r1 sci-chemistry/probe
 SLOT=0
 SRC_URI=mirror://gentoo/molprobity-3.17.tgz
-_md5_=b076551192b8b94402adb1a885ef8931
+_md5_=12a0a8dc9245bcd63ced6a0abcc2e286
diff --git a/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1 b/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
index 2af6fcf6c347..a7dc2e1b1275 100644
--- a/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
+++ b/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Build lists of collections of interacting items
 EAPI=8
 HOMEPAGE=http://kinemage.biochem.duke.edu/software/index.php
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=richardson
 SLOT=0
 SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/cluster/cluster.1.3.081231.src.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=268abf9ec98b541a31b65182ab2e3413
+_md5_=764c8f8a4af6dd888eea6b7aeb2ebaa0
diff --git a/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r3 b/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r3
index ae4c005b0121..73cbcd0ec3d9 100644
--- a/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r3
+++ b/metadata/md5-cache/sci-chemistry/dssp-2.2.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=The protein secondary structure standard
 EAPI=8
 HOMEPAGE=https://swift.cmbi.umcn.nl/gv/dssp/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost:=[bzip2,zlib]
 SLOT=0
 SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molbio/software/dssp-2/dssp-2.2.1.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cf10b20eff343f4096e58f9c688d5cfe
+_md5_=59e4c5020f62cd80c28ba1ca822f59ec
diff --git a/metadata/md5-cache/sci-chemistry/dssp-3.0.11 b/metadata/md5-cache/sci-chemistry/dssp-3.0.11
index 95492e6d9f87..f546b6bae990 100644
--- a/metadata/md5-cache/sci-chemistry/dssp-3.0.11
+++ b/metadata/md5-cache/sci-chemistry/dssp-3.0.11
@@ -5,11 +5,11 @@ DESCRIPTION=The protein secondary structure standard
 EAPI=8
 HOMEPAGE=https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/cmbi/hssp
 INHERIT=autotools
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Boost-1.0
 RDEPEND=dev-lang/perl:= dev-libs/boost:=[bzip2,zlib]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cmbi/hssp/archive/refs/tags/3.0.11.tar.gz -> dssp-3.0.11.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=36876e07318b8187f02ed066e1e34d1e
+_md5_=b8fa01bcfdc6923a04bf6e867113abfd
diff --git a/metadata/md5-cache/sci-chemistry/easychem-0.6-r1 b/metadata/md5-cache/sci-chemistry/easychem-0.6-r1
index 2c718719f061..0763ce5e0891 100644
--- a/metadata/md5-cache/sci-chemistry/easychem-0.6-r1
+++ b/metadata/md5-cache/sci-chemistry/easychem-0.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Chemical structure drawing program - focused on presentation
 EAPI=8
 HOMEPAGE=http://easychem.sourceforge.net/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl media-gfx/pstoedit x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/easychem/easychem-0.6.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1ea10a60ef6dccb3f0be1851d5a6c92b
+_md5_=f29be9f3b2f9fb3068df6879d2e9a4e5
diff --git a/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2 b/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
index cf1f8c147a74..bd73ac52f6d5 100644
--- a/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
+++ b/metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=periodic table of the elements
 EAPI=6
 HOMEPAGE=http://elem.sourceforge.net/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 sparc x86
+KEYWORDS=amd64 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/xforms
 SLOT=0
 SRC_URI=mirror://sourceforge/elem/elem-src-1.0.3-Linux.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3d04f4bb12447f29a2873239829212ee
+_md5_=315c260d058767143b8487a436857419
diff --git a/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1 b/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1
index 449405d67cfd..18b69093eeb1 100644
--- a/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1
+++ b/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/ginggs/gelemental/
 INHERIT=autotools flag-o-matic xdg
 IUSE=doc
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3 MIT
 RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2
 SLOT=0
 SRC_URI=https://github.com/ginggs/gelemental/archive/v2.0.0.tar.gz -> gelemental-2.0.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=716664ceafa23c14a74889a015499733
+_md5_=48d951b4ec5cacae79105ead9aa3534e
diff --git a/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3 b/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
index f0951f9ba248..1d9615e29924 100644
--- a/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
+++ b/metadata/md5-cache/sci-chemistry/gperiodic-3.0.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/gperiodic/
 INHERIT=toolchain-funcs xdg-utils
 IUSE=nls
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0 x11-libs/gtk+:2 x11-libs/cairo[X]
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/gperiodic/gperiodic-3.0.3.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b6e7f6ff9487568ca79b429e8cd88deb
+_md5_=111cdad824ef96ba0ff830dbcb0f14eb
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
index ca7dfe805289..8f2c8ae16f6f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.gromacs.org/
 INHERIT=bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +doc double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( <sys-apps/hwloc-2:= ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2018.8
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2018.8.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2018.8.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2018.8.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	cuda	13d76baf0dc95e560610c6b7dfa79db4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2e1dcb3cefdfced18f4cc52d5413ed57
+_md5_=d1024169557acd1d466f4203307714a2
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
index f2f060f2a251..a83a0bd4d614 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.gromacs.org/
 INHERIT=bash-completion-r1 cmake cuda readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +doc double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2019.6
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2019.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2019.6.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2019.6.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	cuda	13d76baf0dc95e560610c6b7dfa79db4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5ff7b3dcd17d525ae47c83c42a19380d
+_md5_=989410f43b83d0d3bb6503023ea92da7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.7 b/metadata/md5-cache/sci-chemistry/gromacs-2020.7
index ebc6ecd73e22..96a573d16c00 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.7
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.gromacs.org/
 INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2020.7
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2020.7.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.7.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2020.7.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0296685921498ed1a7c1f4ced5302923
+_md5_=44d0fe02d172240b18842d996f015209
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.6 b/metadata/md5-cache/sci-chemistry/gromacs-2021.6
index 6b407c6b5d56..f884c4278083 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.gromacs.org/
 INHERIT=bash-completion-r1 cmake cuda distutils-r1 flag-o-matic readme.gentoo-r1 toolchain-funcs xdg-utils
 IUSE=X blas cuda +custom-cflags +doc build-manual double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14[profiler] ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0= ) hwloc? ( sys-apps/hwloc:= ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit:= ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cuda? ( single-precision ) opencl? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2021.6
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2021.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.6.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2021.6.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	cuda	13d76baf0dc95e560610c6b7dfa79db4	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ce5183cca4639dae7a256980f02c858c
+_md5_=28689b9a562371302c049ec71a6685e9
diff --git a/metadata/md5-cache/sci-chemistry/molden-5.5 b/metadata/md5-cache/sci-chemistry/molden-5.5
index bf9ce52e5f26..10176430db79 100644
--- a/metadata/md5-cache/sci-chemistry/molden-5.5
+++ b/metadata/md5-cache/sci-chemistry/molden-5.5
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=http://www.cmbi.ru.nl/molden/
 INHERIT=desktop fortran-2 flag-o-matic toolchain-funcs
 IUSE=opengl
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=MOLDEN
 RDEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden5.5.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e001bc09cd538ab64d80eae49115c766
+_md5_=b28035060b3ad883626cda4eb3e3ea70
diff --git a/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2 b/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
index b5fb891ad859..a80462a754c2 100644
--- a/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
+++ b/metadata/md5-cache/sci-chemistry/moldy-2.16e-r2
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=http://www.ccp5.ac.uk/moldy/moldy.html
 INHERIT=toolchain-funcs
 IUSE=doc
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.earth.ox.ac.uk/pub/keith/moldy-2.16e.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=09d7af6f95b5462140a4f8f61ead5fa0
+_md5_=e9e40f56e24c1ccce0db04513b4fee54
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r8 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r8
index 1bce548e4b88..1d4fda06a8c6 100644
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r8
+++ b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r8
@@ -4,10 +4,10 @@ DESCRIPTION=Publication-quality molecular visualization package
 EAPI=8
 HOMEPAGE=http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html http://pjf.net/science/molmol.html
 INHERIT=desktop toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=molmol
 RDEPEND=|| ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/mesa[motif(-),X(+)] ) media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= sys-libs/zlib virtual/glu x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
 SLOT=0
 SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2 https://dev.gentoo.org/~pacho/molmol/molmol_256.png
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc8981084de315bd307a426462ffc43d
+_md5_=fc57f883c4cfaa312919dc79d49c13b5
diff --git a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1 b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
index bbcca71668cb..bb801a24c18a 100644
--- a/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
+++ b/metadata/md5-cache/sci-chemistry/mopac7-1.15-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/mopac7/
 INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs
 IUSE=gmxmopac7
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=dev-libs/libf2c virtual/fortran
 SLOT=0
 SRC_URI=http://www.bioinformatics.org/ghemical/download/current/mopac7-1.15.tar.gz http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b003c0476ccd7ad71ed1861aaad5be2e
+_md5_=9c2c3b3180ffe6cee9380ecbf8b8f29d
diff --git a/metadata/md5-cache/sci-chemistry/mustang-3.2.2 b/metadata/md5-cache/sci-chemistry/mustang-3.2.2
index 028c29091162..192521e53ca7 100644
--- a/metadata/md5-cache/sci-chemistry/mustang-3.2.2
+++ b/metadata/md5-cache/sci-chemistry/mustang-3.2.2
@@ -3,9 +3,9 @@ DESCRIPTION=MUltiple STructural AligNment AlGorithm
 EAPI=8
 HOMEPAGE=http://www.csse.monash.edu.au/~karun/Site/mustang.html
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.csse.monash.edu.au/~karun/mustang/mustang_v3.2.2.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3468cf6dad6f5b3fd8840e0757ac9dcc
+_md5_=72b39ceaad63740f4488fd6f1fd3691e
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225 b/metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225
index 61dac24214cc..4aea52b7dae6 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225
+++ b/metadata/md5-cache/sci-chemistry/openbabel-3.1.1_p20210225
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://openbabel.org/
 INHERIT=cmake desktop flag-o-matic perl-functions python-r1 toolchain-funcs wxwidgets xdg-utils
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 doc examples +inchi json minimal openmp perl png python test wxwidgets python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/libxml2:2 sys-libs/zlib:= inchi? ( sci-libs/inchi ) json? ( >=dev-libs/rapidjson-1.1.0 ) png? ( x11-libs/cairo ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) perl? ( dev-lang/perl:= !sci-chemistry/openbabel-perl )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) test? ( inchi json !minimal wxwidgets )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7.0.0
 SRC_URI=https://github.com/openbabel/openbabel/archive/08e23f39b0cc39b4eebd937a5a2ffc1a7bac3e1b.tar.gz -> openbabel-3.1.1_p20210225.tar.gz https://openbabel.org/docs/dev/_static/babel130.png -> openbabel.png https://openbabel.org/OBTitle.jpg -> openbabel.jpg
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	perl-functions	c3fca037246e877693badea0df3b0ef8	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d569db4cd3e72f18afa12e1236e9fafb
+_md5_=41842cb4d1179218c4eab2269054b02f
diff --git a/metadata/md5-cache/sci-chemistry/probe-2.13.110909 b/metadata/md5-cache/sci-chemistry/probe-2.13.110909
index d3180d7d8c02..27f047bbb0c3 100644
--- a/metadata/md5-cache/sci-chemistry/probe-2.13.110909
+++ b/metadata/md5-cache/sci-chemistry/probe-2.13.110909
@@ -4,9 +4,9 @@ DESCRIPTION=Evaluates atomic packing within or between molecules
 EAPI=7
 HOMEPAGE=http://kinemage.biochem.duke.edu/software/probe.php
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=richardson
 SLOT=0
 SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/probe/probe.2.13.110909.src.zip
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1bd078b7f26db9aec6132b34c1c558ca
+_md5_=20d4004785d7f5c28f6c68221735d7bc
diff --git a/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3 b/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3
index 119f352d4aea..42990d581bdb 100644
--- a/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3
+++ b/metadata/md5-cache/sci-chemistry/procheck-3.5.4-r3
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=https://www.ebi.ac.uk/thornton-srv/software/PROCHECK
 INHERIT=fortran-2 multilib toolchain-funcs versionator
 IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=procheck
 RDEPEND=app-shells/tcsh virtual/fortran
 RESTRICT=fetch
 SLOT=0
 SRC_URI=procheck-3.5.4.tar.gz procheck-3.5.4-README doc? ( procheck-3.5.4-manual.tar.gz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=b86e2c5d873fef674161fd10b7135120
+_md5_=75245a4eea0845ebbcc0a7f906440430
diff --git a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2 b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
index 4d70fbca092f..366719e43e54 100644
--- a/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
+++ b/metadata/md5-cache/sci-chemistry/psi-3.4.0-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://www.psicode.org/
 INHERIT=autotools fortran-2 toolchain-funcs
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sci-visualization/extrema virtual/blas virtual/lapack >=sci-libs/libint-1.1.4:1 virtual/fortran
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/psicode/psi-3.4.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ecd9eddd7cba15554c7599004f94761a
+_md5_=f447f7b9203d28469c00a526a3320c6d
diff --git a/metadata/md5-cache/sci-chemistry/tm-align-20150914-r1 b/metadata/md5-cache/sci-chemistry/tm-align-20150914-r1
index 97ee04b0d64a..da76367e9c9a 100644
--- a/metadata/md5-cache/sci-chemistry/tm-align-20150914-r1
+++ b/metadata/md5-cache/sci-chemistry/tm-align-20150914-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://zhanggroup.org/TM-align/
 INHERIT=cmake flag-o-matic fortran-2
 IUSE=custom-cflags
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=tm-align
 RDEPEND=virtual/fortran
 SLOT=0
 SRC_URI=http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20150914.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c0efb6c6f33b081376d1b36ca966aff2
+_md5_=cfa1e63224fea8203e5337a0c285b503
diff --git a/metadata/md5-cache/sci-chemistry/votca-2022 b/metadata/md5-cache/sci-chemistry/votca-2022
index 680c3be4ecbf..4d28f377772a 100644
--- a/metadata/md5-cache/sci-chemistry/votca-2022
+++ b/metadata/md5-cache/sci-chemistry/votca-2022
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.votca.org/
 INHERIT=bash-completion-r1 cmake python-single-r1
 IUSE=+gromacs test +python_single_target_python3_10
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux
 LICENSE=Apache-2.0
 RDEPEND=!sci-libs/votca-tools !sci-chemistry/votca-csg !sci-chemistry/votca-xtp python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) app-shells/bash:* >=dev-cpp/eigen-3.3 dev-libs/boost:= dev-libs/expat sci-libs/fftw:3.0= dev-lang/perl gromacs? ( sci-chemistry/gromacs:=[gmxapi-legacy(+)] ) sci-libs/hdf5[cxx] sci-libs/libxc sci-libs/libint:2
 REQUIRED_USE=^^ ( python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/votca/votca/archive/v2022.tar.gz -> votca-2022.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c60ca57b3113e53bc498c75613cb485c
+_md5_=90500ca97973846d4fd670f0c29932ac
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index cd7eb1c3f1f5..d5622b56c9e1 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/eagle-7.7.0-r1 b/metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
index e4bbaa4ceb04..ef0c8bd4d8d7 100644
--- a/metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
+++ b/metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
@@ -4,11 +4,11 @@ EAPI=6
 HOMEPAGE=http://www.cadsoft.de
 INHERIT=desktop
 IUSE=doc
-KEYWORDS=-* amd64 x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=cadsoft-2
 RDEPEND=sys-libs/glibc || ( <dev-libs/openssl-1.1 dev-libs/openssl-compat:1.0.0 ) >=sys-libs/zlib-1.2.8-r1 >=media-libs/freetype-2.5.0.1 >=media-libs/fontconfig-2.10.92 x11-libs/libXext x11-libs/libX11 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXrandr-1.4.2 >=x11-libs/libXcursor-1.1.14 >=x11-libs/libXi-1.7.2 net-print/cups x11-libs/libxcb
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=x86? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-7.7.0.run ) amd64? ( ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-7.7.0.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d
-_md5_=e03320fb119f7572fe64ad641ef6b70c
+_md5_=2b46bfb0fc206974931a35043b43d6f7
diff --git a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1 b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
index c1603b79e9b7..32cbd38944f0 100644
--- a/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
+++ b/metadata/md5-cache/sci-electronics/electronics-menu-1.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Creates an "Electronics" desktop menu
 EAPI=7
 HOMEPAGE=http://www.gpleda.org/
 INHERIT=xdg
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 ~arm64 ~ppc ppc64 ~riscv sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://geda.seul.org/dist/electronics-menu-1.0.tar.gz
 _eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=17424fe482ff758d569ee58268182bd0
+_md5_=ac5ee93da373ad97e3dddcc4bb786a44
diff --git a/metadata/md5-cache/sci-electronics/espresso-ab-1.0-r3 b/metadata/md5-cache/sci-electronics/espresso-ab-1.0-r3
index ff23d40293c3..4e13bf831deb 100644
--- a/metadata/md5-cache/sci-electronics/espresso-ab-1.0-r3
+++ b/metadata/md5-cache/sci-electronics/espresso-ab-1.0-r3
@@ -4,9 +4,9 @@ DESCRIPTION=POSIX compliant version of the espresso logic minimization tool
 EAPI=8
 HOMEPAGE=http://www.cs.man.ac.uk/apt/projects/balsa/
 INHERIT=autotools flag-o-matic
-KEYWORDS=amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/other-software/espresso-ab-1.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0ae8622b02ece21abf3e2530004435d0
+_md5_=c92d54dc7fed5c0c1ee85f8c24a18266
diff --git a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1 b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
index 5ca25ecc21cf..9dd3ac6c77ad 100644
--- a/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
+++ b/metadata/md5-cache/sci-electronics/geda-1.9.2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://wiki.geda-project.org/geda:gaf
 INHERIT=autotools xdg
 IUSE=debug doc examples nls stroke threads
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-scheme/guile sci-electronics/electronics-menu x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango nls? ( virtual/libintl ) stroke? ( dev-libs/libstroke )
 SLOT=0
 SRC_URI=http://ftp.geda-project.org/geda-gaf/unstable/v1.9/1.9.2/geda-gaf-1.9.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f7b96b49e76ac329273e23743d941f4e
+_md5_=da2f8ffeae7d062db1f52fd0fda5375b
diff --git a/metadata/md5-cache/sci-electronics/gerbv-2.7.0 b/metadata/md5-cache/sci-electronics/gerbv-2.7.0
index 847d5b440d4f..ee96f5ce45b9 100644
--- a/metadata/md5-cache/sci-electronics/gerbv-2.7.0
+++ b/metadata/md5-cache/sci-electronics/gerbv-2.7.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://gerbv.geda-project.org/
 INHERIT=xdg
 IUSE=doc examples unit-mm
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/cairo
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gerbv/gerbv-2.7.0.tar.gz
 _eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a19b827285cdebf0803480e50c2e3e8d
+_md5_=c53502edd8025dba1de7ad41ef58071e
diff --git a/metadata/md5-cache/sci-electronics/gnucap-20210107 b/metadata/md5-cache/sci-electronics/gnucap-20210107
index 69463bd2ec78..7eed797a4eb5 100644
--- a/metadata/md5-cache/sci-electronics/gnucap-20210107
+++ b/metadata/md5-cache/sci-electronics/gnucap-20210107
@@ -4,9 +4,9 @@ DESCRIPTION=GNUCap is the GNU Circuit Analysis Package
 EAPI=8
 HOMEPAGE=http://www.gnucap.org/
 IUSE=examples
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:=
 SLOT=0
 SRC_URI=https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/gnucap-20210107.tar.gz
-_md5_=b8a046a01f0ae00f2037912ccc6b31ab
+_md5_=6f3e0936bb682d945d3a13e263092e49
diff --git a/metadata/md5-cache/sci-electronics/gspiceui-1.1.0 b/metadata/md5-cache/sci-electronics/gspiceui-1.1.0
index 181d6114cfd6..7c659fb12ca2 100644
--- a/metadata/md5-cache/sci-electronics/gspiceui-1.1.0
+++ b/metadata/md5-cache/sci-electronics/gspiceui-1.1.0
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/gspiceui/
 INHERIT=desktop flag-o-matic toolchain-funcs wxwidgets
 IUSE=examples schematics waveform
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/wxGTK:3.0[X] sci-electronics/electronics-menu || ( sci-electronics/ngspice sci-electronics/gnucap ) waveform? ( sci-electronics/gwave ) schematics? ( sci-electronics/geda )
 SLOT=0
 SRC_URI=mirror://sourceforge/gspiceui/gspiceui-v1.1.00.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=99879ee64094028efe839649e8a1456c
+_md5_=2554d8082c7c402bdb5a41815dccf520
diff --git a/metadata/md5-cache/sci-electronics/gwave-20190116 b/metadata/md5-cache/sci-electronics/gwave-20190116
index bf6265296103..8caaf35df561 100644
--- a/metadata/md5-cache/sci-electronics/gwave-20190116
+++ b/metadata/md5-cache/sci-electronics/gwave-20190116
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://gwave.sourceforge.net
 INHERIT=autotools desktop xdg-utils
 IUSE=gnuplot plotutils
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-2[networking] >=x11-libs/gtk+-2.8.0:2= sys-libs/readline:0= sys-libs/ncurses:0= sci-electronics/electronics-menu gnuplot? ( sci-visualization/gnuplot ) plotutils? ( media-libs/plotutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/gwave/gwave3/gwave-20190116.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=672df3d58e2dca215fdd4b825929860f
+_md5_=ebc98d9ece16384d74f4bba74716838e
diff --git a/metadata/md5-cache/sci-electronics/iverilog-10.3 b/metadata/md5-cache/sci-electronics/iverilog-10.3
index d547c77ae539..3cd7a9624d71 100644
--- a/metadata/md5-cache/sci-electronics/iverilog-10.3
+++ b/metadata/md5-cache/sci-electronics/iverilog-10.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
 INHERIT=autotools
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/steveicarus/iverilog/archive/v10_3.tar.gz -> iverilog-10.3.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=58efbb2a01446befd12dac822b0fcdea
+_md5_=d590349ee76cde4fa0b8d4039b1072eb
diff --git a/metadata/md5-cache/sci-electronics/iverilog-11.0 b/metadata/md5-cache/sci-electronics/iverilog-11.0
index 911514d487a6..500e7040613b 100644
--- a/metadata/md5-cache/sci-electronics/iverilog-11.0
+++ b/metadata/md5-cache/sci-electronics/iverilog-11.0
@@ -5,10 +5,10 @@ DESCRIPTION=A Verilog simulation and synthesis tool
 EAPI=7
 HOMEPAGE=http://iverilog.icarus.com https://github.com/steveicarus/iverilog
 INHERIT=autotools
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/steveicarus/iverilog/archive/v11_0.tar.gz -> iverilog-11.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9a68f1ce9fcd9aa111d49332dc108232
+_md5_=7e298034c2df003477d5239c18c00cdd
diff --git a/metadata/md5-cache/sci-electronics/magic-8.3.232-r1 b/metadata/md5-cache/sci-electronics/magic-8.3.232-r1
index f1815f06e686..7a796184b108 100644
--- a/metadata/md5-cache/sci-electronics/magic-8.3.232-r1
+++ b/metadata/md5-cache/sci-electronics/magic-8.3.232-r1
@@ -5,9 +5,9 @@ DESCRIPTION=The VLSI design CAD tool
 EAPI=8
 HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
 IUSE=cairo debug opengl
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt cairo? ( x11-libs/cairo ) opengl? ( virtual/glu virtual/opengl )
 SLOT=0
 SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.3.232.tgz http://opencircuitdesign.com/~tim/programs/magic/archive/2002a.tar.gz -> magic-tech-mosis-2002a.tar.gz
-_md5_=3d5a7af64fe5c38ed6a93b8aeb91b13e
+_md5_=1d0d8333b9125f82a64460611a04c906
diff --git a/metadata/md5-cache/sci-electronics/ngspice-36 b/metadata/md5-cache/sci-electronics/ngspice-36
index b494544ce3a7..9ec5a2e8b43e 100644
--- a/metadata/md5-cache/sci-electronics/ngspice-36
+++ b/metadata/md5-cache/sci-electronics/ngspice-36
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://ngspice.sourceforge.net
 INHERIT=autotools multibuild toolchain-funcs virtualx
 IUSE=X debug deprecated doc examples fftw openmp +readline +shared tcl test
-KEYWORDS=amd64 ~arm64 ~ppc ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 ) fftw? ( sci-libs/fftw:3.0 ) readline? ( sys-libs/readline:0= ) tcl? ( dev-lang/tcl:0 dev-tcltk/blt )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ngspice/ngspice-36.tar.gz doc? ( mirror://sourceforge/ngspice/ngspice-36-manual.pdf )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=840fa0f2edcba478c0850dbfeb267b09
+_md5_=9e9bad86fcccc7543c53480db98ca5c8
diff --git a/metadata/md5-cache/sci-electronics/pcb-4.2.2 b/metadata/md5-cache/sci-electronics/pcb-4.2.2
index b3e1ac2d63ee..09d8e84c449b 100644
--- a/metadata/md5-cache/sci-electronics/pcb-4.2.2
+++ b/metadata/md5-cache/sci-electronics/pcb-4.2.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://pcb.geda-project.org/
 INHERIT=autotools toolchain-funcs xdg
 IUSE=dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter
-KEYWORDS=amd64 ~ppc x86
+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 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcb/pcb/pcb-4.2.2/pcb-4.2.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d14c809edd5ef52f23e76b5e7bd8de27
+_md5_=acc375d1229357ddfa00b58402b3ab12
diff --git a/metadata/md5-cache/sci-electronics/qelectrotech-0.80 b/metadata/md5-cache/sci-electronics/qelectrotech-0.80
index 9da29ecf94b7..4f49229d4f0e 100644
--- a/metadata/md5-cache/sci-electronics/qelectrotech-0.80
+++ b/metadata/md5-cache/sci-electronics/qelectrotech-0.80
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://qelectrotech.org/
 INHERIT=qmake-utils xdg
 IUSE=doc
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=CC-BY-3.0 GPL-2+
 RDEPEND=dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kwidgetsaddons:5
 SLOT=0
 SRC_URI=https://git.tuxfamily.org/qet/qet.git/snapshot/qet-0.8.0.tar.gz -> qelectrotech-0.80.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=64f8af69cfcbbb3ebca0dea72af804fa
+_md5_=86cef31ffb4a852680fea4f93a7e5718
diff --git a/metadata/md5-cache/sci-electronics/spice-3.5.5-r3 b/metadata/md5-cache/sci-electronics/spice-3.5.5-r3
index e1d4a4cc50c1..6f38de2b9ecb 100644
--- a/metadata/md5-cache/sci-electronics/spice-3.5.5-r3
+++ b/metadata/md5-cache/sci-electronics/spice-3.5.5-r3
@@ -4,10 +4,10 @@ DESCRIPTION=general-purpose circuit simulation program
 EAPI=6
 HOMEPAGE=http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
 INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:0= x11-libs/libXaw >=app-misc/editor-wrapper-3
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/circuits/spice3f5sfix.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4b9f72f476cd97e049adcdbe1e060d13
+_md5_=af51e4fe54e74f718447c52787bce638
diff --git a/metadata/md5-cache/sci-electronics/systemc-2.3.4-r1 b/metadata/md5-cache/sci-electronics/systemc-2.3.4-r1
index 63aa77fd32a7..3e2e87685a6b 100644
--- a/metadata/md5-cache/sci-electronics/systemc-2.3.4-r1
+++ b/metadata/md5-cache/sci-electronics/systemc-2.3.4-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://accellera.org/community/systemc https://github.com/accellera-official/systemc
 INHERIT=autotools
 IUSE=debug doc examples static-libs test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 REQUIRED_USE=examples? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/accellera-official/systemc/archive/2.3.4_pub_rev_20190614.tar.gz -> systemc-2.3.4.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=203c8d67ad10fbcca063f0c277ee641a
+_md5_=37761edd910950b494dd5a5a174f968f
diff --git a/metadata/md5-cache/sci-electronics/voacapl-0.7.6-r1 b/metadata/md5-cache/sci-electronics/voacapl-0.7.6-r1
index 6d8c800cbdc6..8a70a6c68eff 100644
--- a/metadata/md5-cache/sci-electronics/voacapl-0.7.6-r1
+++ b/metadata/md5-cache/sci-electronics/voacapl-0.7.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=HF propagation prediction tool
 EAPI=7
 HOMEPAGE=https://www.qsl.net/hz1jw/voacapl/index.html
 INHERIT=autotools fortran-2
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/jawatson/voacapl/archive/v.0.7.6.tar.gz -> voacapl-0.7.6.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=09fe1db2e99de9d0166f641fb9b79831
+_md5_=aae5d1eae347a29f669b1e9d0ade7baf
diff --git a/metadata/md5-cache/sci-electronics/xcircuit-3.10.30-r1 b/metadata/md5-cache/sci-electronics/xcircuit-3.10.30-r1
index 7f6a42ef7a23..dcead95ce05b 100644
--- a/metadata/md5-cache/sci-electronics/xcircuit-3.10.30-r1
+++ b/metadata/md5-cache/sci-electronics/xcircuit-3.10.30-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://opencircuitdesign.com/xcircuit
 INHERIT=autotools
 IUSE=tcl
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl:= media-libs/fontconfig:1.0= sys-libs/zlib:= x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm x11-libs/libXt tcl? ( dev-lang/tcl:0= dev-lang/tk:0= ) sci-electronics/ngspice
 SLOT=0
 SRC_URI=http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.10.30.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a4792cc281163dc6035859165fb2b2cd
+_md5_=4feda0101bc3fed56ce6ac4e6a0a7f8b
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-4.4.12 b/metadata/md5-cache/sci-electronics/xnec2c-4.4.12
index 010fe375e7ff..fb63793b16c5 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-4.4.12
+++ b/metadata/md5-cache/sci-electronics/xnec2c-4.4.12
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.xnec2c.org
 INHERIT=autotools xdg-utils
 IUSE=doc examples
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://www.xnec2c.org/releases/xnec2c-v4.4.12.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e1ac56c2752b9f5e8c3eff6feaf7cb8e
+_md5_=f605ddff1190f32451dc0d8d706c3641
diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.3 b/metadata/md5-cache/sci-electronics/xoscope-2.3
index 727f9a232bbe..9e1906264538 100644
--- a/metadata/md5-cache/sci-electronics/xoscope-2.3
+++ b/metadata/md5-cache/sci-electronics/xoscope-2.3
@@ -5,10 +5,10 @@ DESCRIPTION=Soundcard Oscilloscope for X
 EAPI=8
 HOMEPAGE=http://xoscope.sourceforge.net
 INHERIT=autotools linux-info
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 media-libs/alsa-lib sci-libs/fftw:3.0= virtual/man x11-libs/gtk+:3 >=x11-libs/gtkdatabox-1
 SLOT=0
 SRC_URI=mirror://sourceforge/project/xoscope/xoscope/2.3/xoscope-2.3.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=475566c97318e47320163e2401185a2e
+_md5_=c2cdcfc16b48908d0b411b6f8c49ef4c
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index c250ddc1c004..0c3f7425c245 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/dcw-gmt-1.1.4 b/metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
index 73153ea36133..992178931735 100644
--- a/metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
+++ b/metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Digital Chart of the World for GMT 5 or later
 EAPI=7
 HOMEPAGE=https://www.soest.hawaii.edu/wessel/dcw/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://www.soest.hawaii.edu/pwessel/dcw/dcw-gmt-1.1.4.tar.gz
-_md5_=7fe643d0eaa4c0cc58b1dda61928b061
+_md5_=6b0d99aeb5fe84a5f58e782df436423a
diff --git a/metadata/md5-cache/sci-geosciences/gmt-5.4.4 b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
index 024281a3a25f..36075efbb77e 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-5.4.4
+++ b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gmt.soest.hawaii.edu/
 INHERIT=bash-completion-r1 cmake flag-o-matic
 IUSE=doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ gmttria? ( Artistic )
 RDEPEND=app-text/ghostscript-gpl net-misc/curl >=sci-libs/netcdf-4.1:=[hdf5] sys-libs/zlib fftw? ( sci-libs/fftw:3.0= ) gdal? ( sci-libs/gdal:= ) lapack? ( virtual/lapack ) pcre? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2 ) !sci-biology/probcons sci-geosciences/dcw-gmt sci-geosciences/gshhg-gmt
 REQUIRED_USE=?? ( pcre pcre2 )
 SLOT=5
 SRC_URI=mirror://gmt/gmt-5.4.4-src.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7c92061049c195dc4232f4216d05b1e3
+_md5_=5fafbf58baaddabd6faf4e06c92dec7d
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-44.1 b/metadata/md5-cache/sci-geosciences/gnome-maps-44.1
index 0a1d05fee324..9b8761453aa9 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-44.1
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-44.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Maps
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.66.0:2 >=dev-libs/gjs-1.69.2 >=dev-libs/gobject-introspection-0.10.1:= gui-libs/gtk:4[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libadwaita-1.0:1[introspection] >=dev-libs/libgweather-4.2.0:4=[introspection] >=sci-geosciences/geocode-glib-3.15.2:2[introspection] >=media-libs/libshumate-1.0:1.0=[introspection] dev-libs/libxml2:2 >=net-libs/rest-0.9.1:1.0[introspection] app-crypt/libsecret[introspection] media-libs/graphene[introspection] net-libs/libsoup:3.0[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/44/gnome-maps-44.1.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e8b671b560d2db03bee979f2b06b4b0c
+_md5_=6433d5ada27875f4161d8abe3f5279c6
diff --git a/metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0-r1 b/metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0-r1
index d6e91bb13706..35ab9228ff02 100644
--- a/metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0-r1
+++ b/metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel
 INHERIT=qmake-utils
 IUSE=doc
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 sci-libs/shapelib:= sys-libs/zlib virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_1_7_0.tar.gz doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=51ff5c7f317100ebfd86b5c73563d8a0
+_md5_=9bf80a9bc865f81d65daeb490a45d446
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
index 95fa6706591c..1206345efe5c 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gpsd.gitlab.io/gpsd/
 INHERIT=udev distutils-r1 scons-utils systemd toolchain-funcs
 IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_mtk3301 +gpsd_protocols_navcom +gpsd_protocols_nmea0183 +gpsd_protocols_nmea2000 +gpsd_protocols_ntrip +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_passthrough +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 ) ) qt5? ( cxx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/29
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.23.1.tar.xz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=3569694efc0ddeb84b19162be1c5afd0
+_md5_=b9ff0081b31c33fadb18e5937c445be9
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.24 b/metadata/md5-cache/sci-geosciences/gpsd-3.24
index 65efd3b57867..10e812242f4f 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.24
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.24
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gpsd.gitlab.io/gpsd/
 INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev
 IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X python_targets_python3_10
-KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 ) ) qt5? ( cxx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/29
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.24.tar.xz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b4f9431240503f5159067922848c4d1d
+_md5_=942adb21130de7fed6b9c32f59c47bca
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.25 b/metadata/md5-cache/sci-geosciences/gpsd-3.25
index bf0be5e00699..6bd1c572d0ef 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.25
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.25
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gpsd.gitlab.io/gpsd/
 INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev
 IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) qt5? ( cxx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.25.tar.xz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=e03d8a4b1ef8df9caca3c6314809b356
+_md5_=1d7f1b51379383f9d717ec7cbfbc0a7d
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-13.0 b/metadata/md5-cache/sci-geosciences/gpxsee-13.0
index 04347100c8c2..e35ea4699067 100644
--- a/metadata/md5-cache/sci-geosciences/gpxsee-13.0
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-13.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gpxsee.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=plocale qmake-utils xdg
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/tumic0/GPXSee/archive/13.0.tar.gz -> gpxsee-13.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=449c57636cd02cb13426579d468d8e83
+_md5_=d99989e31fbbe4d6b617164b63e24a04
diff --git a/metadata/md5-cache/sci-geosciences/grass-8.2.0-r7 b/metadata/md5-cache/sci-geosciences/grass-8.2.0-r7
index 1e05d69cfff3..23438f1df140 100644
--- a/metadata/md5-cache/sci-geosciences/grass-8.2.0-r7
+++ b/metadata/md5-cache/sci-geosciences/grass-8.2.0-r7
@@ -7,11 +7,11 @@ HOMEPAGE=https://grass.osgeo.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools desktop python-single-r1 toolchain-funcs xdg
 IUSE=blas cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X zstd +python_single_target_python3_10
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:4.0 x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 ) opengl? ( X )
 SLOT=0/8.2
 SRC_URI=https://grass.osgeo.org/grass82/source/grass-8.2.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6a4bf4a3de468196303df3ba727bbe23
+_md5_=d1cc8df92085262fb04fd85749bf4686
diff --git a/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2 b/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2
index db89fbc93750..f356dae7c31f 100644
--- a/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2
+++ b/metadata/md5-cache/sci-geosciences/grass-8.2.1-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://grass.osgeo.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop python-single-r1 toolchain-funcs xdg
 IUSE=blas bzip2 cxx fftw geos lapack las mysql netcdf nls odbc opencl opengl openmp pdal png postgres readline sqlite threads tiff truetype X zstd python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11[sqlite] ) >=app-admin/eselect-1.2 python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) sci-libs/gdal:= sys-libs/gdbm:= sys-libs/ncurses:= sci-libs/proj:= sys-libs/zlib media-libs/libglvnd media-libs/glu blas? ( virtual/cblas[eselect-ldso(+)] virtual/blas[eselect-ldso(+)] ) bzip2? ( app-arch/bzip2:= ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos:= ) lapack? ( virtual/lapack[eselect-ldso(+)] ) las? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) pdal? ( >=sci-libs/pdal-2.0.0:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:= ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-python/wxpython-4.1:4.0 x11-libs/cairo[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) opengl? ( X )
 SLOT=0/8.2
 SRC_URI=https://grass.osgeo.org/grass82/source/grass-8.2.1.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=332ef0ba928b8fb9c366257d26f5f341
+_md5_=b4dff4d5f721a93a0f1864ea2fd0b4af
diff --git a/metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7 b/metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
index d4cbf954de27..4451e2c5be36 100644
--- a/metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
+++ b/metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Global Self-consistent, Hierarchical, High-resolution Geography Database
 EAPI=7
 HOMEPAGE=https://www.soest.hawaii.edu/pwessel/gshhg/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://www.soest.hawaii.edu/pwessel/gshhg/gshhg-gmt-2.3.7.tar.gz
-_md5_=febbe8b5e1ff9a3e58d8d9619a81cb93
+_md5_=067dbbeb5afd4b34aa605791857de92b
diff --git a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05 b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
index 236743cae6ae..752ca89788a2 100644
--- a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
+++ b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
@@ -5,10 +5,10 @@ DESCRIPTION=GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device
 EAPI=7
 HOMEPAGE=http://www.daria.co.uk/gps
 INHERIT=autotools gnome2
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev net-wireless/bluez x11-libs/cairo x11-libs/gtk+:3 virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=http://www.zen35309.zen.co.uk/gps/gtk-g-rays2-2.05.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1095f5696ac64bd73db46d2e3ef62aa3
+_md5_=f11027c9efac31fdb692b88d069d479f
diff --git a/metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228 b/metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
index e22d5bd2f754..03f999736538 100644
--- a/metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
+++ b/metadata/md5-cache/sci-geosciences/harmonics-dwf-free-20131228
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Tidal harmonics database for libtcd
 EAPI=8
 HOMEPAGE=https://flaterco.com/xtide/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=ftp://ftp.flaterco.com/xtide/harmonics-dwf-20131228-free.tar.bz2
-_md5_=426e54833911de8eac216aba57d06a3c
+_md5_=9a7c4ab99407710180b91635ab93d4b1
diff --git a/metadata/md5-cache/sci-geosciences/josm-bin-18700 b/metadata/md5-cache/sci-geosciences/josm-bin-18700
index 0e53bd723915..d1ce41fbed74 100644
--- a/metadata/md5-cache/sci-geosciences/josm-bin-18700
+++ b/metadata/md5-cache/sci-geosciences/josm-bin-18700
@@ -5,10 +5,10 @@ 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-18700.jar
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=711bc97740fd0c513d245237af5f660c
+_md5_=94140afbe3f7aae95ca34cbbb03fe76a
diff --git a/metadata/md5-cache/sci-geosciences/laszip-3.4.1 b/metadata/md5-cache/sci-geosciences/laszip-3.4.1
index c53c85c54a3e..3139768f4496 100644
--- a/metadata/md5-cache/sci-geosciences/laszip-3.4.1
+++ b/metadata/md5-cache/sci-geosciences/laszip-3.4.1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for free and lossless compression of the LAS LiDAR format
 EAPI=7
 HOMEPAGE=https://laszip.org/
 INHERIT=cmake
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/LASzip/LASzip/releases/download/3.4.1/laszip-src-3.4.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f4d9270b86e44e66911513466f5781dd
+_md5_=7d825079ed3fb4ef1d0a76afdc492245
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
index 12a8a0d6fb35..5effabb674aa 100644
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/libLAS/libLAS/
 INHERIT=cmake
 IUSE=gdal
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff:= gdal? ( sci-libs/gdal:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz -> liblas-1.8.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b5a7b67cbb3a4b42de70616a8c01ab7e
+_md5_=161981ba5eb9243fd0a5d58e00a7cc7e
diff --git a/metadata/md5-cache/sci-geosciences/libtcd-2.2.7_p3 b/metadata/md5-cache/sci-geosciences/libtcd-2.2.7_p3
index d11d137118d7..cd910018f958 100644
--- a/metadata/md5-cache/sci-geosciences/libtcd-2.2.7_p3
+++ b/metadata/md5-cache/sci-geosciences/libtcd-2.2.7_p3
@@ -4,9 +4,9 @@ DESCRIPTION=Library for reading and writing Tide Constituent Database (TCD) file
 EAPI=8
 HOMEPAGE=https://flaterco.com/xtide/libtcd.html
 IUSE=doc
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=>=sci-geosciences/harmonics-dwf-free-20120302
 SLOT=0/1
 SRC_URI=https://flaterco.com/files/xtide/libtcd-2.2.7-r3.tar.xz
-_md5_=e6f8e1c1ac644ea83ed9fdae56e6c4f7
+_md5_=fd05e63a847db3dfe6e4778be3366fc1
diff --git a/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r2 b/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r2
index 151093582aab..67a18919026f 100644
--- a/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r2
+++ b/metadata/md5-cache/sci-geosciences/mtkbabel-0.8.3.1-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/mtkbabel/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Device-SerialPort dev-perl/TimeDate
 SLOT=0
 SRC_URI=mirror://sourceforge/mtkbabel/mtkbabel-0.8.3.1.tar.gz
-_md5_=8e3b042fc55813e2181fdee7f2478343
+_md5_=8e98ef038dba4cb69c638020cf3286a6
diff --git a/metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0 b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0
index 4a9738020a31..11c2f6b7ad4e 100644
--- a/metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0
+++ b/metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://nzjrs.github.io/osm-gps-map/
 INHERIT=autotools gnome2
 IUSE=static-libs
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.16.0:2 >=net-libs/libsoup-2.4.0:2.4 >=x11-libs/cairo-1.8.0 >=x11-libs/gtk+-3.0:3[introspection] dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/nzjrs/osm-gps-map/releases/download/1.2.0/osm-gps-map-1.2.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9b2a0ee89227be16abb176f3173ef410
+_md5_=07236517f8ddbdc532740e0b17cfbd33
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100 b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
index d56e4f6de156..16500e8ba31f 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-1.4.0-r100
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://osm2pgsql.org/
 INHERIT=cmake lua-single
 IUSE=+lua lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj:= sys-libs/zlib lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) dev-db/postgis
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/1.4.0.tar.gz -> osm2pgsql-1.4.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e200255909eb349855a397f37405e749
+_md5_=4459603d428d6467bbddb3d0820cc4c0
diff --git a/metadata/md5-cache/sci-geosciences/osmctools-0.9-r1 b/metadata/md5-cache/sci-geosciences/osmctools-0.9-r1
index c6a80470d925..0063680985bc 100644
--- a/metadata/md5-cache/sci-geosciences/osmctools-0.9-r1
+++ b/metadata/md5-cache/sci-geosciences/osmctools-0.9-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A few really fast tools to convert, filter and update OSM data files
 EAPI=8
 HOMEPAGE=https://gitlab.com/osm-c-tools
 INHERIT=autotools
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=https://gitlab.com/osm-c-tools/osmctools/-/archive/0.9/osmctools-0.9.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=14a520eb836591e2b868d907ad345801
+_md5_=04f7c6488b3c9ee4821784d27ef89026
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4 b/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
index 9bbcd57af7d5..4ae5916f36b0 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
+++ b/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://routino.org/
 INHERIT=toolchain-funcs distutils-r1
 IUSE=python test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3+
 RDEPEND=python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) || ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://routino.org/download/routino-3.3.3.tgz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f3b890d433e2692341305ad0ae15d83f
+_md5_=9a9f8e28b70154c9fcbeacd42bb0edf4
diff --git a/metadata/md5-cache/sci-geosciences/tcd-utils-20120115-r2 b/metadata/md5-cache/sci-geosciences/tcd-utils-20120115-r2
index bf84af7ed280..99fbfc503a18 100644
--- a/metadata/md5-cache/sci-geosciences/tcd-utils-20120115-r2
+++ b/metadata/md5-cache/sci-geosciences/tcd-utils-20120115-r2
@@ -3,9 +3,9 @@ DEPEND=>=sci-geosciences/libtcd-2.2.4
 DESCRIPTION=Utilities for working with Tidal Constituent Databases
 EAPI=8
 HOMEPAGE=https://flaterco.com/xtide/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=>=sci-geosciences/libtcd-2.2.4
 SLOT=0
 SRC_URI=ftp://ftp.flaterco.com/xtide/tcd-utils-20120115.tar.bz2
-_md5_=23a836394931736dcde51bc4567e9f48
+_md5_=aa69dc8f41253d9c345e7a835e6f119d
diff --git a/metadata/md5-cache/sci-geosciences/xtide-2.15.5 b/metadata/md5-cache/sci-geosciences/xtide-2.15.5
index b5388bd9caf5..b722d4e15bef 100644
--- a/metadata/md5-cache/sci-geosciences/xtide-2.15.5
+++ b/metadata/md5-cache/sci-geosciences/xtide-2.15.5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://flaterco.com/xtide/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop xdg
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libpng:= sci-geosciences/gpsd:= >=sci-geosciences/libtcd-2.2.5_p2:= x11-libs/libX11 x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt sys-libs/zlib media-fonts/font-schumacher-misc
 SLOT=0
 SRC_URI=https://flaterco.com/files/xtide/xtide-2.15.5.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6a7052c402a24319ae79df0d53deebfa
+_md5_=cee03699643ab17da8da1b70d18969da
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 95532b0fd2d0..94d2fdbc1843 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/adolc-2.7.2 b/metadata/md5-cache/sci-libs/adolc-2.7.2
index 7de442c8f907..587c6de95bda 100644
--- a/metadata/md5-cache/sci-libs/adolc-2.7.2
+++ b/metadata/md5-cache/sci-libs/adolc-2.7.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://projects.coin-or.org/ADOL-C/
 INHERIT=autotools toolchain-funcs
 IUSE=+boost mpi sparse
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( EPL-1.0 GPL-2 )
 RDEPEND=boost? ( dev-libs/boost:= ) mpi? ( sys-cluster/ampi:0= ) sparse? ( sci-libs/colpack:0= )
 SLOT=0/2
 SRC_URI=https://github.com/coin-or/ADOL-C/archive/releases/2.7.2.tar.gz -> adolc-2.7.2.tar.gz https://dev.gentoo.org/~sam/distfiles/sci-libs/adolc/adolc-2.7.2-patches.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e75640200f4b1d91158ee22ddbc356ae
+_md5_=66335960d006547bc4e6e667a4eca0c0
diff --git a/metadata/md5-cache/sci-libs/alglib-3.17.0 b/metadata/md5-cache/sci-libs/alglib-3.17.0
index bf39afff92d6..f58e389b0f57 100644
--- a/metadata/md5-cache/sci-libs/alglib-3.17.0
+++ b/metadata/md5-cache/sci-libs/alglib-3.17.0
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.alglib.net/
 INHERIT=cmake flag-o-matic
 IUSE=test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RESTRICT=!test? ( test )
 SLOT=0/3.8
 SRC_URI=https://www.alglib.net/translator/re/alglib-3.17.0.cpp.gpl.tgz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d08aca2fad627b5dd1a9822f4e4af6e9
+_md5_=d70fb1f67831af43db2cd71bc0f5836d
diff --git a/metadata/md5-cache/sci-libs/armadillo-10.2.0-r1 b/metadata/md5-cache/sci-libs/armadillo-10.2.0-r1
index 251bf8585fa5..37a697e12ca3 100644
--- a/metadata/md5-cache/sci-libs/armadillo-10.2.0-r1
+++ b/metadata/md5-cache/sci-libs/armadillo-10.2.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://arma.sourceforge.net
 INHERIT=cmake toolchain-funcs multilib
 IUSE=arpack blas doc examples hdf5 lapack mkl superlu test
-KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5 ) mkl? ( sci-libs/mkl )
 RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://sourceforge/arma/armadillo-10.2.0.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4e9a5edf36143d6ce7546030ae144a71
+_md5_=7d4329667cda6c2b19fba510991fa4a4
diff --git a/metadata/md5-cache/sci-libs/armadillo-10.8.2 b/metadata/md5-cache/sci-libs/armadillo-10.8.2
index edea1e6f15cd..ed3ad176ffc9 100644
--- a/metadata/md5-cache/sci-libs/armadillo-10.8.2
+++ b/metadata/md5-cache/sci-libs/armadillo-10.8.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://arma.sourceforge.net
 INHERIT=cmake toolchain-funcs multilib
 IUSE=arpack blas doc examples hdf5 lapack mkl superlu test
-KEYWORDS=amd64 ~arm ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 PDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 ) hdf5? ( sci-libs/hdf5:= ) mkl? ( sci-libs/mkl )
 RDEPEND=dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( >=sci-libs/superlu-5.2 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://sourceforge/arma/armadillo-10.8.2.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8718dc4236abe095ecebc85a17fb53a7
+_md5_=e6fea3066faecb526238e14ca9095086
diff --git a/metadata/md5-cache/sci-libs/atlas-3.10.2 b/metadata/md5-cache/sci-libs/atlas-3.10.2
index c008aa714e8a..0c4e30a63e15 100644
--- a/metadata/md5-cache/sci-libs/atlas-3.10.2
+++ b/metadata/md5-cache/sci-libs/atlas-3.10.2
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://math-atlas.sourceforge.net
 INHERIT=fortran-2 toolchain-funcs versionator
 IUSE=doc fortran generic lapack static-libs threads
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=mirror://sourceforge/math-atlas/atlas3.10.2.tar.bz2 fortran? ( lapack? ( http://www.netlib.org/lapack/lapack-3.6.0.tgz ) )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d1c7bf680c49c3ab81bd1013d8b179f2
+_md5_=b2c23ba5325eb806d5819c085e312605
diff --git a/metadata/md5-cache/sci-libs/bliss-0.77 b/metadata/md5-cache/sci-libs/bliss-0.77
index 033082c768ae..e9977c7b4fc4 100644
--- a/metadata/md5-cache/sci-libs/bliss-0.77
+++ b/metadata/md5-cache/sci-libs/bliss-0.77
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://users.aalto.fi/~tjunttil/bliss/index.html
 INHERIT=cmake
 IUSE=gmp
-KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=gmp? ( dev-libs/gmp:0= )
 SLOT=0/1
 SRC_URI=https://users.aalto.fi/~tjunttil/bliss/downloads/bliss-0.77.zip
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=30e0634cce1e37652e6587c1e7c45b28
+_md5_=b260444129b6e91358f49563b4e75bd2
diff --git a/metadata/md5-cache/sci-libs/brial-1.2.12 b/metadata/md5-cache/sci-libs/brial-1.2.12
index 587996aeb0f9..6c11281c576f 100644
--- a/metadata/md5-cache/sci-libs/brial-1.2.12
+++ b/metadata/md5-cache/sci-libs/brial-1.2.12
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/BRiAl/BRiAl
 INHERIT=toolchain-funcs
 IUSE=png
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2+
 RDEPEND=dev-libs/boost sci-libs/m4ri[png=]
 SLOT=0
 SRC_URI=https://github.com/BRiAl/BRiAl/releases/download/1.2.12/brial-1.2.12.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=036e247b2fcc4cc7c39cdc77ab01f497
+_md5_=28ddfca6457fe08871206b4b5b3c2da0
diff --git a/metadata/md5-cache/sci-libs/btf-1.2.6 b/metadata/md5-cache/sci-libs/btf-1.2.6
index 5095b7017d99..34ff254be068 100644
--- a/metadata/md5-cache/sci-libs/btf-1.2.6
+++ b/metadata/md5-cache/sci-libs/btf-1.2.6
@@ -4,9 +4,9 @@ DEPEND=sci-libs/suitesparseconfig
 DESCRIPTION=Algorithm for matrix permutation into block triangular form
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/btf-1.2.6.tar.bz2
-_md5_=55c96189afa1e09b14ef81401dfbfc7d
+_md5_=1ead6ff430092a28e39e1446b0d26641
diff --git a/metadata/md5-cache/sci-libs/camd-2.4.6-r1 b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
index 45df6cecb0c5..1a0e4d53695f 100644
--- a/metadata/md5-cache/sci-libs/camd-2.4.6-r1
+++ b/metadata/md5-cache/sci-libs/camd-2.4.6-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 INHERIT=autotools
 IUSE=doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.0
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/camd-2.4.6.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7252e1e57c1e93889abe3b43ffa0585f
+_md5_=12ea0fb95ebc2d5852224be3929c9488
diff --git a/metadata/md5-cache/sci-libs/ccfits-2.5 b/metadata/md5-cache/sci-libs/ccfits-2.5
index b371d23e5b66..72fd4a7b38b5 100644
--- a/metadata/md5-cache/sci-libs/ccfits-2.5
+++ b/metadata/md5-cache/sci-libs/ccfits-2.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://heasarc.gsfc.nasa.gov/fitsio/CCfits/
 INHERIT=autotools
 IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=sci-libs/cfitsio-3.080
 SLOT=0
 SRC_URI=https://heasarc.gsfc.nasa.gov/fitsio/CCfits/CCfits-2.5.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27dd6a986af8ad6686a6067153aa0fbd
+_md5_=c14817face83f97bdc40f8bb197bd5f2
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.9.6 b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
index 35b29373a1c2..9cf69d89ad18 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.9.6
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.9.6
@@ -4,9 +4,9 @@ DEPEND=sci-libs/suitesparseconfig
 DESCRIPTION=Constrained Column approximate minimum degree ordering algorithm
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage//ccolamd-2.9.6.tar.bz2
-_md5_=938132405896e6e71841a9a9a20d75f7
+_md5_=6c3ebe1bf9b6863b9c3a2bc6f714ddd6
diff --git a/metadata/md5-cache/sci-libs/cdd+-077a b/metadata/md5-cache/sci-libs/cdd+-077a
index 8e023b9b838b..2ac64c099cc8 100644
--- a/metadata/md5-cache/sci-libs/cdd+-077a
+++ b/metadata/md5-cache/sci-libs/cdd+-077a
@@ -4,10 +4,10 @@ DESCRIPTION=Another implementation of the double description method
 EAPI=7
 HOMEPAGE=http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=
 SLOT=0
 SRC_URI=ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cdd+-077a.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=00df97f9f2505d6d0e0fd9a75386e31b
+_md5_=29b552b6e17c12a5309216a8a022b859
diff --git a/metadata/md5-cache/sci-libs/cddlib-094m-r1 b/metadata/md5-cache/sci-libs/cddlib-094m-r1
index a12919a7c8c9..d341d71310c1 100644
--- a/metadata/md5-cache/sci-libs/cddlib-094m-r1
+++ b/metadata/md5-cache/sci-libs/cddlib-094m-r1
@@ -4,9 +4,9 @@ DESCRIPTION=C library implementing the Double Description Method
 EAPI=7
 HOMEPAGE=https://www.inf.ethz.ch/personal/fukudak/cdd_home/
 IUSE=doc examples static-libs tools
-KEYWORDS=amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0=
 SLOT=0
 SRC_URI=https://github.com/cddlib/cddlib/releases/download/0.94m/cddlib-0.94m.tar.gz
-_md5_=f4f6774cef1b0087f67a1fa7a344ed22
+_md5_=1da89e4ba7474ab61fe74bfdf07bed9f
diff --git a/metadata/md5-cache/sci-libs/cdf-3.8.0-r1 b/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
index 3c5662f3171c..4eff4563cc50 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
+++ b/metadata/md5-cache/sci-libs/cdf-3.8.0-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://cdf.gsfc.nasa.gov
 INHERIT=java-pkg-opt-2 multilib toolchain-funcs
 IUSE=doc examples java ncurses static-libs java
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CDF
 RDEPEND=java? ( >=virtual/jre-1.8:= ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-cdf.tar.gz java? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_0-dist-java.tar.gz ) doc? ( https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf38ifd.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380crm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380csrm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380frm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380prm.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380ug.pdf https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/unix//cdf38_documentation/cdf380vbrm.pdf )
 _eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e5a4c5b3d920d6d55e00898f31f0f4b8
+_md5_=375d8888131cc79a2b79cb8784b77353
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.490 b/metadata/md5-cache/sci-libs/cfitsio-3.490
index 554c381c75dc..137607b58dfa 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.490
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.490
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 INHERIT=fortran-2 multilib-minimal
 IUSE=bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3 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 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=ISC
 RDEPEND=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(-)?] bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/fortran
 SLOT=0/9
 SRC_URI=https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-3.49.tar.gz
 _eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8ee8f33915748f2770f741b23275675b
+_md5_=3b40059e3df6e3774cd203a5679826aa
diff --git a/metadata/md5-cache/sci-libs/cfitsio-4.0.0 b/metadata/md5-cache/sci-libs/cfitsio-4.0.0
index 0f6f6b22e033..10385c2fba4e 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-4.0.0
+++ b/metadata/md5-cache/sci-libs/cfitsio-4.0.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 INHERIT=fortran-2 multilib-minimal
 IUSE=bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3 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 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=ISC
 RDEPEND=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(-)?] bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/fortran
 SLOT=0/9
 SRC_URI=https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-4.0.0.tar.gz
 _eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3f363c14c89d58f4a429dc225a47a010
+_md5_=096d6f4900f43f17c1c96ad0e2db5346
diff --git a/metadata/md5-cache/sci-libs/cgcode-1.0-r2 b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
index fc8d21d41a3c..372e79e5d961 100644
--- a/metadata/md5-cache/sci-libs/cgcode-1.0-r2
+++ b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Conjugate gradient Codes for large sparse linear systems
 EAPI=8
 HOMEPAGE=http://fetk.org/codes/cgcode/index.html
 INHERIT=fortran-2 flag-o-matic toolchain-funcs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/cgcode-1.0.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2f27d13f006390701c54a0b7e01851d8
+_md5_=553eb6fda910b792b803c00ff110805e
diff --git a/metadata/md5-cache/sci-libs/cifparse-obj-7.105 b/metadata/md5-cache/sci-libs/cifparse-obj-7.105
index 737734f4ad4f..40459618c0c2 100644
--- a/metadata/md5-cache/sci-libs/cifparse-obj-7.105
+++ b/metadata/md5-cache/sci-libs/cifparse-obj-7.105
@@ -4,9 +4,9 @@ DESCRIPTION=Provides an object-oriented application interface to information in
 EAPI=6
 HOMEPAGE=http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/index.html
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=PDB
 SLOT=0
 SRC_URI=http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/cifparse-obj-v7.105-prod-src.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8eb7d69698f494645cda1d1017618eac
+_md5_=753207369a4909dc669e2cb2019643ef
diff --git a/metadata/md5-cache/sci-libs/clapack-3.2.1-r8 b/metadata/md5-cache/sci-libs/clapack-3.2.1-r8
index 9ed103546250..bf275d175a46 100644
--- a/metadata/md5-cache/sci-libs/clapack-3.2.1-r8
+++ b/metadata/md5-cache/sci-libs/clapack-3.2.1-r8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.netlib.org/clapack/
 INHERIT=flag-o-matic cmake
 IUSE=test
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-libs/libf2c-20090407-r1 virtual/blas
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e18661b09af2361783062c2871dc190a
+_md5_=f9b61e61808b8b18396be7b158054c21
diff --git a/metadata/md5-cache/sci-libs/clashscore-db-3.17-r1 b/metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
index 7517e1baec25..679b65a5b797 100644
--- a/metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
+++ b/metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Clashscore-db for clashlist
 EAPI=8
 HOMEPAGE=http://kinemage.biochem.duke.edu/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=richardson
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/molprobity-3.17.tgz
-_md5_=39e50ab41a6b38f2ab4a7dab306abe4b
+_md5_=30d272566415158ecdf95c3c371b319b
diff --git a/metadata/md5-cache/sci-libs/colpack-1.0.10 b/metadata/md5-cache/sci-libs/colpack-1.0.10
index 7548db2f83f8..ab91e8d9b075 100644
--- a/metadata/md5-cache/sci-libs/colpack-1.0.10
+++ b/metadata/md5-cache/sci-libs/colpack-1.0.10
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://cscapes.cs.purdue.edu/coloringpage/
 INHERIT=autotools toolchain-funcs
 IUSE=openmp
-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=GPL-3 LGPL-3
 SLOT=0
 SRC_URI=https://github.com/CSCsw/ColPack/archive/v1.0.10.tar.gz -> colpack-1.0.10.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=90bfcf3ecdc0c1ba9682078d6b01d966
+_md5_=ce2aa9f0cac893cae09adfc30d782cc1
diff --git a/metadata/md5-cache/sci-libs/cqrlib-1.1.4 b/metadata/md5-cache/sci-libs/cqrlib-1.1.4
index f7b3789fb243..97e397e97ef0 100644
--- a/metadata/md5-cache/sci-libs/cqrlib-1.1.4
+++ b/metadata/md5-cache/sci-libs/cqrlib-1.1.4
@@ -5,10 +5,10 @@ DESCRIPTION=Utility library for quaternion arithmetic / rotation math (ANSI C im
 EAPI=8
 HOMEPAGE=http://cqrlib.sourceforge.net/
 INHERIT=autotools
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=https://github.com/yayahjb/cqrlib/archive/CQRlib-1.1.4/cqrlib-1.1.4.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d0ae0d9c4957751c500342594e29dbe8
+_md5_=3ba61ae99cdc383f9f28852572456493
diff --git a/metadata/md5-cache/sci-libs/cxsparse-3.2.0 b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
index 3e117cdd3917..da7261dfdb66 100644
--- a/metadata/md5-cache/sci-libs/cxsparse-3.2.0
+++ b/metadata/md5-cache/sci-libs/cxsparse-3.2.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 INHERIT=multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=sci-libs/suitesparseconfig-5.4.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(-)?]
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/cxsparse-3.2.0.tar.bz2
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89e90b0810e6880d5b3d74495bf9392f
+_md5_=f901643be75eb1f136115cbf7a7228d9
diff --git a/metadata/md5-cache/sci-libs/dcmtk-3.6.7-r1 b/metadata/md5-cache/sci-libs/dcmtk-3.6.7-r1
index c1d7e94ecd4b..40d3d435dc34 100644
--- a/metadata/md5-cache/sci-libs/dcmtk-3.6.7-r1
+++ b/metadata/md5-cache/sci-libs/dcmtk-3.6.7-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://dicom.offis.de/dcmtk.php.en
 INHERIT=cmake
 IUSE=doc png ssl tcpd tiff +threads xml zlib
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=OFFIS
 RDEPEND=dev-libs/icu:= png? ( media-libs/libpng:* ) ssl? ( dev-libs/openssl:= ) tcpd? ( sys-apps/tcp-wrappers ) tiff? ( media-libs/tiff:= ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://dicom.offis.de/download/dcmtk/release/dcmtk-3.6.7.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=41e2c43460f405c0e827e58eadc320c5
+_md5_=9311e57e7be1c94c3a05804f73050ffb
diff --git a/metadata/md5-cache/sci-libs/djbfft-0.76-r3 b/metadata/md5-cache/sci-libs/djbfft-0.76-r3
index 92ee7d77699f..fe60b8c89e9a 100644
--- a/metadata/md5-cache/sci-libs/djbfft-0.76-r3
+++ b/metadata/md5-cache/sci-libs/djbfft-0.76-r3
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://cr.yp.to/djbfft.html
 INHERIT=flag-o-matic toolchain-funcs multilib multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://cr.yp.to/djbfft/djbfft-0.76.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=eb450e335dfdf5191197b2068b31320b
+_md5_=810fc50e206230717db308ab476bf849
diff --git a/metadata/md5-cache/sci-libs/exodusii-6.09-r1 b/metadata/md5-cache/sci-libs/exodusii-6.09-r1
index 1cf2f791a407..5d905a568384 100644
--- a/metadata/md5-cache/sci-libs/exodusii-6.09-r1
+++ b/metadata/md5-cache/sci-libs/exodusii-6.09-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/certik/exodus
 INHERIT=cmake fortran-2
 IUSE=static-libs test
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/netcdf:=[hdf5]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/exodus-6.09.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cad54e5493ef12f61137fb5c9f361204
+_md5_=acfdd3d95df52ae0038621edb12147c7
diff --git a/metadata/md5-cache/sci-libs/fetk-1.5 b/metadata/md5-cache/sci-libs/fetk-1.5
index aee81dee2172..c1a89fe4bf08 100644
--- a/metadata/md5-cache/sci-libs/fetk-1.5
+++ b/metadata/md5-cache/sci-libs/fetk-1.5
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=The Finite Element ToolKit - Meta package
 EAPI=8
 HOMEPAGE=http://fetk.org/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=~dev-libs/maloc-1.5 ~media-libs/sg-1.5 ~sci-libs/gamer-1.5 ~sci-libs/mc-1.5 ~sci-libs/punc-1.5
 SLOT=0
-_md5_=8d4318bc65340cf4fa758eb62f52f845
+_md5_=887e9d914f490a007586e2d6e7eff752
diff --git a/metadata/md5-cache/sci-libs/flann-1.9.1-r5 b/metadata/md5-cache/sci-libs/flann-1.9.1-r5
index 8d6ad149119d..67396b383989 100644
--- a/metadata/md5-cache/sci-libs/flann-1.9.1-r5
+++ b/metadata/md5-cache/sci-libs/flann-1.9.1-r5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mariusmuja/flann
 INHERIT=cmake cuda flag-o-matic toolchain-funcs
 IUSE=cuda doc examples mpi octave openmp
-KEYWORDS=amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( dev-libs/boost:=[mpi] sci-libs/hdf5[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1:= )
 SLOT=0
 SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bf3177931db7806569c35d1115e57680
+_md5_=36f75cd64705e6a250ac966d2a3fb44c
diff --git a/metadata/md5-cache/sci-libs/fplll-5.4.4 b/metadata/md5-cache/sci-libs/fplll-5.4.4
index 6498e629bfc7..c32a2c2bc821 100644
--- a/metadata/md5-cache/sci-libs/fplll-5.4.4
+++ b/metadata/md5-cache/sci-libs/fplll-5.4.4
@@ -5,9 +5,9 @@ DESCRIPTION=Implementations of the floating-point LLL reduction algorithm
 EAPI=8
 HOMEPAGE=https://github.com/fplll/fplll
 IUSE=qd
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/gmp:0 dev-libs/mpfr:0 qd? ( sci-libs/qd )
 SLOT=0/8
 SRC_URI=https://github.com/fplll/fplll/releases/download/5.4.4/fplll-5.4.4.tar.gz
-_md5_=ce9c758e841ef4f547039ba4ac5082e4
+_md5_=ea318c3629c22817b93e4f4b18e8ee49
diff --git a/metadata/md5-cache/sci-libs/galib-2.4.7-r1 b/metadata/md5-cache/sci-libs/galib-2.4.7-r1
index 3ea8d9cef680..e6cf952380f4 100644
--- a/metadata/md5-cache/sci-libs/galib-2.4.7-r1
+++ b/metadata/md5-cache/sci-libs/galib-2.4.7-r1
@@ -4,9 +4,9 @@ EAPI=6
 HOMEPAGE=http://lancet.mit.edu/ga/
 INHERIT=toolchain-funcs
 IUSE=doc examples
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD examples? ( GPL-2 )
 SLOT=0
 SRC_URI=http://lancet.mit.edu/ga/dist/galib247.tgz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=596bd6ec749f0adb4c7725dbb48917a9
+_md5_=84cd6ac93deac06c419fdd2086c71113
diff --git a/metadata/md5-cache/sci-libs/gamer-1.5-r2 b/metadata/md5-cache/sci-libs/gamer-1.5-r2
index c6344e8b1c0d..a33913ce76cc 100644
--- a/metadata/md5-cache/sci-libs/gamer-1.5-r2
+++ b/metadata/md5-cache/sci-libs/gamer-1.5-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://fetk.org/codes/gamer/index.html
 INHERIT=autotools
 IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/maloc-1.4
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/gamer-1.5.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=81cfab1b6f3fd36bf024d202e2e3c243
+_md5_=742f8a2da094ac4a4f192ea9f07b73e7
diff --git a/metadata/md5-cache/sci-libs/givaro-4.1.1-r3 b/metadata/md5-cache/sci-libs/givaro-4.1.1-r3
index 2421c3affb0a..7920d33cb6fc 100644
--- a/metadata/md5-cache/sci-libs/givaro-4.1.1-r3
+++ b/metadata/md5-cache/sci-libs/givaro-4.1.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=C++ library for arithmetic and algebraic computations
 EAPI=8
 HOMEPAGE=https://casys.gricad-pages.univ-grenoble-alpes.fr/givaro/
 IUSE=cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=CeCILL-B
 RDEPEND=dev-libs/gmp:0[cxx(+)]
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/linbox-team/givaro/releases/download/v4.1.1/givaro-4.1.1.tar.gz
-_md5_=47eb4351a938ed49bf2d04428047b4af
+_md5_=146d16daa820c58fca005631edfd28d3
diff --git a/metadata/md5-cache/sci-libs/gts-20121130 b/metadata/md5-cache/sci-libs/gts-20121130
index 016e803fa5d5..fb7283cd3d04 100644
--- a/metadata/md5-cache/sci-libs/gts-20121130
+++ b/metadata/md5-cache/sci-libs/gts-20121130
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://gts.sourceforge.net/
 INHERIT=autotools
 IUSE=doc test
-KEYWORDS=amd64 ~arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gts.sourceforge.net/tarballs/gts-snapshot-121130.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=996682214bbaca8455022de7d422c863
+_md5_=e4b7653eabc5318f5fad407f180d63dc
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.14.1 b/metadata/md5-cache/sci-libs/hdf5-1.14.1
index 488fcfd5d57a..47003357a7e0 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.14.1
+++ b/metadata/md5-cache/sci-libs/hdf5-1.14.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.hdfgroup.org/HDF5/
 INHERIT=autotools fortran-2 flag-o-matic toolchain-funcs prefix
 IUSE=cxx debug examples fortran +hl mpi szip test threads unsupported zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:= ) fortran? ( virtual/fortran )
 REQUIRED_USE=!unsupported? ( cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.14.1
 SRC_URI=https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.1/src/hdf5-1.14.1.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6a944042397df752ab9a0724ba57ff10
+_md5_=5163cbeff17efd170354cefa6e5862d8
diff --git a/metadata/md5-cache/sci-libs/hypre-2.24.0 b/metadata/md5-cache/sci-libs/hypre-2.24.0
index 49fcda936356..10b9522e5120 100644
--- a/metadata/md5-cache/sci-libs/hypre-2.24.0
+++ b/metadata/md5-cache/sci-libs/hypre-2.24.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods
 INHERIT=fortran-2 toolchain-funcs flag-o-matic
 IUSE=debug examples fortran int64 openmp mpi
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/superlu:= virtual/blas virtual/lapack mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=0/2.24.0
 SRC_URI=https://github.com/hypre-space/hypre/archive/v2.24.0.tar.gz -> hypre-2.24.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97f13ba62319e5f95e9f26d85acc9b03
+_md5_=611f6efb744c851930ad3dfc2d9cd1fc
diff --git a/metadata/md5-cache/sci-libs/iml-1.0.5 b/metadata/md5-cache/sci-libs/iml-1.0.5
index bd30eb7ff74e..c6d1723e5431 100644
--- a/metadata/md5-cache/sci-libs/iml-1.0.5
+++ b/metadata/md5-cache/sci-libs/iml-1.0.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.cs.uwaterloo.ca/~astorjoh/iml.html
 INHERIT=autotools
 IUSE=static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/cblas
 SLOT=0
 SRC_URI=https://www.cs.uwaterloo.ca/~astorjoh/iml-1.0.5.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=91305bc01ad46a104e614fcc414e0e24
+_md5_=075c070fcc2b24c175cfefa6a3decb17
diff --git a/metadata/md5-cache/sci-libs/inchi-1.04-r1 b/metadata/md5-cache/sci-libs/inchi-1.04-r1
index 90136442a638..74eab7381411 100644
--- a/metadata/md5-cache/sci-libs/inchi-1.04-r1
+++ b/metadata/md5-cache/sci-libs/inchi-1.04-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=http://www.iupac.org/inchi/
 INHERIT=toolchain-funcs
 IUSE=doc
-KEYWORDS=amd64 arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=IUPAC-InChi
 SLOT=0
 SRC_URI=http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-API.ZIP -> inchi-1.04.zip doc? ( http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-DOC.ZIP -> inchi-1.04-doc.zip )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ffd71d82ab5c2282f28507bd78a6ba2d
+_md5_=9d6024c37e80e3bb33b2622eb01478fc
diff --git a/metadata/md5-cache/sci-libs/inchi-1.06-r1 b/metadata/md5-cache/sci-libs/inchi-1.06-r1
index 34ded8b67acb..5232ae5cd823 100644
--- a/metadata/md5-cache/sci-libs/inchi-1.06-r1
+++ b/metadata/md5-cache/sci-libs/inchi-1.06-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.iupac.org/inchi/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc
-KEYWORDS=amd64 arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=IUPAC-InChi
 SLOT=0
 SRC_URI=https://www.inchi-trust.org/download/106/INCHI-1-SRC.zip -> inchi-1.06.zip doc? ( https://www.inchi-trust.org/download/106/INCHI-1-DOC.zip -> inchi-1.06-doc.zip )
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=84f1e3b69571a2a1659564f31cddfeac
+_md5_=1a891739afd036915531dc255ea18697
diff --git a/metadata/md5-cache/sci-libs/indilib-1.9.8 b/metadata/md5-cache/sci-libs/indilib-1.9.8
index 31e101fe0c16..5fcefa886170 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.9.8
+++ b/metadata/md5-cache/sci-libs/indilib-1.9.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.indilib.org/
 INHERIT=cmake udev
 IUSE=ogg rtlsdr test websocket
-KEYWORDS=amd64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~ppc ppc64 ~riscv ~x86
 LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/libev media-libs/libjpeg-turbo:= net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/libusb:1 ogg? ( media-libs/libogg media-libs/libtheora ) rtlsdr? ( net-wireless/rtl-sdr ) websocket? ( dev-libs/boost:= )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/archive/v1.9.8.tar.gz -> indilib-1.9.8.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bde4822dc122257b2f106a368d8a14fb
+_md5_=ad2fed53fbb0e9c525eae770ffe6e4bb
diff --git a/metadata/md5-cache/sci-libs/itpp-4.3.1-r2 b/metadata/md5-cache/sci-libs/itpp-4.3.1-r2
index 22c2f6165363..b996c17e1736 100644
--- a/metadata/md5-cache/sci-libs/itpp-4.3.1-r2
+++ b/metadata/md5-cache/sci-libs/itpp-4.3.1-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://itpp.sourceforge.net
 INHERIT=cmake
 IUSE=doc
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=sci-libs/fftw:3.0= virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/itpp/itpp-4.3.1.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=291906b9b780c6fb0ed98ef6b7cee188
+_md5_=b091f160a3fc19479f3af6eb1794cff5
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r2 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r2
index c507946a3374..0a2ec2d1c6e7 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r2
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://keras.io/applications/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.8.tar.gz -> keras-applications-1.0.8.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=753d4bbde7ce3ecd2607b87a35fc05ec
+_md5_=5eba62b0e7beca8bd40b6a46e6d56106
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2-r1 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2-r1
index 1381c04f9e6f..478bcb2efabf 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2-r1
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://keras.io/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/K/Keras_Preprocessing/Keras_Preprocessing-1.1.2.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c20d4468c560fd2ded43e9bb75b65c5e
+_md5_=d7fdd9f42c47b899217770b1b5596fc7
diff --git a/metadata/md5-cache/sci-libs/klu-1.3.9-r2 b/metadata/md5-cache/sci-libs/klu-1.3.9-r2
index d135aaea38db..e8de57bfbcbb 100644
--- a/metadata/md5-cache/sci-libs/klu-1.3.9-r2
+++ b/metadata/md5-cache/sci-libs/klu-1.3.9-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 INHERIT=autotools
 IUSE=doc
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=sci-libs/amd-2.4 >=sci-libs/btf-1.2 >=sci-libs/colamd-2.9
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/klu-1.3.9.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cf1995003b2d0fc091162765a8290199
+_md5_=cf3749cda98c21ac74d181757bee4d50
diff --git a/metadata/md5-cache/sci-libs/ldl-2.2.6 b/metadata/md5-cache/sci-libs/ldl-2.2.6
index cff56c600b79..e393b1fadc0f 100644
--- a/metadata/md5-cache/sci-libs/ldl-2.2.6
+++ b/metadata/md5-cache/sci-libs/ldl-2.2.6
@@ -5,9 +5,9 @@ DESCRIPTION=Simple but educational LDL^T matrix factorization algorithm
 EAPI=7
 HOMEPAGE=http://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/ldl-2.2.6.tar.bz2
-_md5_=a8458a62872f8c1e617073257189b9df
+_md5_=2f62b91d4ead084f409abe629d49e90f
diff --git a/metadata/md5-cache/sci-libs/libaec-1.0.6 b/metadata/md5-cache/sci-libs/libaec-1.0.6
index 4d4eddea9c93..b09d5fb0a337 100644
--- a/metadata/md5-cache/sci-libs/libaec-1.0.6
+++ b/metadata/md5-cache/sci-libs/libaec-1.0.6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.dkrz.de/k202009/libaec
 INHERIT=cmake
 IUSE=+szip
-KEYWORDS=amd64 arm arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=szip? ( !sci-libs/szip )
 SLOT=0/2
 SRC_URI=https://gitlab.dkrz.de/k202009/libaec/-/archive/v1.0.6/libaec-v1.0.6.tar.gz -> libaec-1.0.6.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1e1f01d7e7324f0951e3513a79bf2375
+_md5_=3eec47647f3e2348b28bc8f02bb4f164
diff --git a/metadata/md5-cache/sci-libs/libdap-3.20.9 b/metadata/md5-cache/sci-libs/libdap-3.20.9
index 95ba88131975..782c67b69991 100644
--- a/metadata/md5-cache/sci-libs/libdap-3.20.9
+++ b/metadata/md5-cache/sci-libs/libdap-3.20.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.opendap.org
 INHERIT=autotools flag-o-matic
 IUSE=static-libs test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 URI )
 RDEPEND=dev-libs/libxml2:2 net-misc/curl sys-apps/util-linux sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.opendap.org/pub/source/libdap-3.20.9.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=60ebbf2f95aa34fb3913c3240ed20016
+_md5_=c4ef71e3fb821ae9310aae0360e92fb4
diff --git a/metadata/md5-cache/sci-libs/libint-1.1.6 b/metadata/md5-cache/sci-libs/libint-1.1.6
index 9046b40bb72b..566e6dd521a2 100644
--- a/metadata/md5-cache/sci-libs/libint-1.1.6
+++ b/metadata/md5-cache/sci-libs/libint-1.1.6
@@ -5,10 +5,10 @@ DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian funct
 EAPI=7
 HOMEPAGE=https://github.com/evaleev/libint
 INHERIT=autotools fortran-2 toolchain-funcs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=1
 SRC_URI=https://github.com/evaleev/libint/archive/release-1-1-6.tar.gz -> libint-1.1.6.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=78f1a203d78a841581d6621b21440820
+_md5_=82ff2f93907938b25bd9c5f68c863602
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r5 b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
index 0d92b9baa697..4eaad40051d3 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0-r5
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/evaleev/libint
 INHERIT=autotools fortran-2 toolchain-funcs
 IUSE=static-libs doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=2
 SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c1d8e8344115c30e4ea8d1af2acc6189
+_md5_=c60ed181d0259232ea9d9229b221a09e
diff --git a/metadata/md5-cache/sci-libs/libnova-0.16.0 b/metadata/md5-cache/sci-libs/libnova-0.16.0
index 148be3d8ae36..acaeb928aa48 100644
--- a/metadata/md5-cache/sci-libs/libnova-0.16.0
+++ b/metadata/md5-cache/sci-libs/libnova-0.16.0
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=http://libnova.sourceforge.net/
 INHERIT=autotools
 IUSE=doc examples
-KEYWORDS=amd64 ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 SLOT=0/0.16
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/libnova-0.16.0.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89c705ee0ac3bb1a296b65c45072c726
+_md5_=017624ca858f72cfb656f5e7672bba12
diff --git a/metadata/md5-cache/sci-libs/libqalculate-4.6.1 b/metadata/md5-cache/sci-libs/libqalculate-4.6.1
index c22b538985c3..1cb1f013358c 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-4.6.1
+++ b/metadata/md5-cache/sci-libs/libqalculate-4.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://qalculate.github.io/
 INHERIT=toolchain-funcs
 IUSE=curl icu gnuplot +hardened readline test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= dev-libs/libxml2:2 dev-libs/mpfr:= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v4.6.1/libqalculate-4.6.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2e7b55c3cf3bf5694fd8597f67911531
+_md5_=53125c1549e522c9cebeef945a47752f
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3 b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
index 5ad8bdb7dec8..eb0430271178 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sigrok.org/wiki/Libsigrok
 INHERIT=autotools python-r1 java-pkg-opt-2 udev xdg-utils
 IUSE=bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb python_targets_python3_10 python_targets_python3_11 java
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=java? ( >=virtual/jre-1.8:* ) !static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2 ) ftdi? ( dev-embedded/libftdi:1 ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284 ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] bluetooth? ( >=net-wireless/bluez-4.0:= ) cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) >=dev-python/pygobject-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aa0f13373f2fd281789895da6600765e
+_md5_=109a45a638bc573d292a2fe60cbd051a
diff --git a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2 b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2
index b855a28985c7..b419210b7ed4 100644
--- a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2
+++ b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://libspatialindex.org/ https://github.com/libspatialindex/libspatialindex
 INHERIT=cmake
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=197708c6f06c2ac26252719756419469
+_md5_=d785db0f3b8ad3063163b479b375a39d
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.25-r1 b/metadata/md5-cache/sci-libs/libsvm-3.25-r1
index ec3ec9d75395..ee14be16fd3c 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.25-r1
+++ b/metadata/md5-cache/sci-libs/libsvm-3.25-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/libsvm/
 INHERIT=flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
 IUSE=java openmp python tools java python_targets_python3_10
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.8:* ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 ) )
 SLOT=0/2
 SRC_URI=https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.25.tar.gz
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=33f3f5c5f2cfdd06d108bdd00f6ce802
+_md5_=9eb6a7f984460e6f5773d330b3981b81
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.30 b/metadata/md5-cache/sci-libs/libsvm-3.30
index bbf30bf037b3..ee3978db6f6a 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.30
+++ b/metadata/md5-cache/sci-libs/libsvm-3.30
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/libsvm/
 INHERIT=java-pkg-opt-2 python-r1 toolchain-funcs
 IUSE=java openmp python tools java python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.8:* ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0/2
 SRC_URI=https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.3.tar.gz
 _eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=edf68388972a9e86c6108692174c159c
+_md5_=d2692abd5227cb76d6492429532da10d
diff --git a/metadata/md5-cache/sci-libs/libxc-5.1.7 b/metadata/md5-cache/sci-libs/libxc-5.1.7
index c17031d6123f..4965c3ae2e42 100644
--- a/metadata/md5-cache/sci-libs/libxc-5.1.7
+++ b/metadata/md5-cache/sci-libs/libxc-5.1.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://octopus-code.org/wiki/Libxc
 INHERIT=autotools fortran-2
 IUSE=fortran test
-KEYWORDS=amd64 x86 ~amd64-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux
 LICENSE=MPL-2.0
 RDEPEND=virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/libxc/libxc/-/archive/5.1.7/libxc-5.1.7.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=114c5cd980634b6975335caeb5e9aea3
+_md5_=0423c041c10df89ba84f3291e1085caf
diff --git a/metadata/md5-cache/sci-libs/lmfit-9.0-r1 b/metadata/md5-cache/sci-libs/lmfit-9.0-r1
index 20f2c7932f26..43c4ce946848 100644
--- a/metadata/md5-cache/sci-libs/lmfit-9.0-r1
+++ b/metadata/md5-cache/sci-libs/lmfit-9.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=library for Levenberg-Marquardt least-squares minimization and curve
 EAPI=8
 HOMEPAGE=https://jugit.fz-juelich.de/mlz/lmfit
 INHERIT=cmake
-KEYWORDS=amd64 arm ~arm64 x86
+KEYWORDS=amd64 arm ~arm64 ~x86
 LICENSE=BSD-2
 SLOT=0/9
 SRC_URI=https://jugit.fz-juelich.de/mlz/lmfit/-/archive/v9.0/lmfit-v9.0.tar.gz -> lmfit-9.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a810950d62100050f351f84c4bd872eb
+_md5_=d882867926ad19ff10b8999dd49a8447
diff --git a/metadata/md5-cache/sci-libs/m4ri-20200125 b/metadata/md5-cache/sci-libs/m4ri-20200125
index cc33ae965c17..341a6f2a375e 100644
--- a/metadata/md5-cache/sci-libs/m4ri-20200125
+++ b/metadata/md5-cache/sci-libs/m4ri-20200125
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://bitbucket.org/malb/m4ri
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=debug openmp cpu_flags_x86_sse2 png static-libs
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=png? ( media-libs/libpng:= )
 SLOT=0
 SRC_URI=https://bitbucket.org/malb/m4ri/downloads/m4ri-20200125.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a89d6745906da25c8369588136aa0eb7
+_md5_=5ce0eb974b6361a471bd2afc2cc3cb4b
diff --git a/metadata/md5-cache/sci-libs/mc-1.5 b/metadata/md5-cache/sci-libs/mc-1.5
index 8b1540f11773..956d01180576 100644
--- a/metadata/md5-cache/sci-libs/mc-1.5
+++ b/metadata/md5-cache/sci-libs/mc-1.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://fetk.org/codes/mc/index.html
 INHERIT=autotools fortran-2
 IUSE=debug doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc <sci-libs/superlu-5 sci-libs/umfpack virtual/blas virtual/lapack virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/mc-1.5.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=05deb03c9f153ffbacd0611c4c66f6c1
+_md5_=3441a21949cdc49d1f96ea61556bbfec
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r5 b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
index faf3f3269e3c..be4d515170ef 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r5
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r5
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
 INHERIT=cmake
 IUSE=doc double-precision examples int64 openmp
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=!<sci-libs/parmetis-4.0.3-r2
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8dec238a91f5fcb7855600e10cf59dc2
+_md5_=f3d244376ce9e83e9544dab0cc3c8eeb
diff --git a/metadata/md5-cache/sci-libs/mpfi-1.5.4 b/metadata/md5-cache/sci-libs/mpfi-1.5.4
index 735971050944..e6b9068c98f8 100644
--- a/metadata/md5-cache/sci-libs/mpfi-1.5.4
+++ b/metadata/md5-cache/sci-libs/mpfi-1.5.4
@@ -5,10 +5,10 @@ DESCRIPTION=Multiple precision interval arithmetic library based on MPFR
 EAPI=7
 HOMEPAGE=http://perso.ens-lyon.fr/nathalie.revol/software.html
 INHERIT=autotools
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0=
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/file/38111/mpfi-1.5.4.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f4c7cf8e606778e1275baf8f7a812c0d
+_md5_=8023f671f442e91c02c704f529744dc6
diff --git a/metadata/md5-cache/sci-libs/mpir-3.0.0-r1 b/metadata/md5-cache/sci-libs/mpir-3.0.0-r1
index 51824691bc64..cb0a0f12d438 100644
--- a/metadata/md5-cache/sci-libs/mpir-3.0.0-r1
+++ b/metadata/md5-cache/sci-libs/mpir-3.0.0-r1
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.mpir.org/
 INHERIT=autotools toolchain-funcs
 IUSE=+cxx cpudetection
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 SLOT=0/23
 SRC_URI=https://www.mpir.org/mpir-3.0.0.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=11f0a678ca3217b133118d6efba7a563
+_md5_=126a52835afa1cb2ef54ccd348da83e0
diff --git a/metadata/md5-cache/sci-libs/neartree-5.1.1 b/metadata/md5-cache/sci-libs/neartree-5.1.1
index ea2f3507e3c4..cc97d47f5eed 100644
--- a/metadata/md5-cache/sci-libs/neartree-5.1.1
+++ b/metadata/md5-cache/sci-libs/neartree-5.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=Function library efficiently solving the Nearest Neighbor Problem
 EAPI=7
 HOMEPAGE=http://neartree.sourceforge.net/
 INHERIT=cmake
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/cvector
 SLOT=0
 SRC_URI=mirror://sourceforge/neartree/NearTree-5.1.1.tar.gz -> neartree-5.1.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=260342862d49ec968751881f787f10b2
+_md5_=ef43c1a368e33da05cbc7a44d84a5c4d
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.8.1-r1 b/metadata/md5-cache/sci-libs/netcdf-4.8.1-r1
index c6fb096b9f67..9aec64082005 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.8.1-r1
+++ b/metadata/md5-cache/sci-libs/netcdf-4.8.1-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
 INHERIT=cmake flag-o-matic
 IUSE=+dap doc examples hdf +hdf5 mpi szip test tools
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=dev-libs/libxml2 dap? ( net-misc/curl:0= ) hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= virtual/jpeg ) hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )
 REQUIRED_USE=test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/Unidata/netcdf-c/archive/v4.8.1.tar.gz -> netcdf-4.8.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b3ba22f22bf46e7945ed38bf9994f833
+_md5_=e050c7f0b49b70e43723b66e224d4ac1
diff --git a/metadata/md5-cache/sci-libs/netcdf-4.9.2 b/metadata/md5-cache/sci-libs/netcdf-4.9.2
index 7a89c6d9efd2..0a5a503892c5 100644
--- a/metadata/md5-cache/sci-libs/netcdf-4.9.2
+++ b/metadata/md5-cache/sci-libs/netcdf-4.9.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
 INHERIT=cmake
 IUSE=+dap doc examples hdf +hdf5 mpi szip test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=dev-libs/libxml2 dap? ( net-misc/curl:= ) hdf? ( media-libs/libjpeg-turbo:= sci-libs/hdf:= sci-libs/hdf5:= ) hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )
 REQUIRED_USE=szip? ( hdf5 ) mpi? ( hdf5 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://downloads.unidata.ucar.edu/netcdf-c/4.9.2/netcdf-c-4.9.2.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5812ea0f3d3c449bcf0e55136a5a49bd
+_md5_=cc471dae39de9909e6e0e9f9bee7236c
diff --git a/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r301 b/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r301
index cd3abb36d33c..e873acb45c3d 100644
--- a/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r301
+++ b/metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r301
@@ -4,9 +4,9 @@ DESCRIPTION=C++ library for netCDF
 EAPI=7
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
 IUSE=examples
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=>=sci-libs/netcdf-4.2:0=
 SLOT=3
 SRC_URI=https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx-4.2.tar.gz
-_md5_=2b2e09b4707ae957cb6786de4d9478ee
+_md5_=037741a63eca0a616262150be82a365c
diff --git a/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1 b/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1
index e198fdeeb0a7..0ef8ecb3c7bd 100644
--- a/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1
+++ b/metadata/md5-cache/sci-libs/netcdf-cxx-4.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ library for netCDF
 EAPI=7
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
 IUSE=examples
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=>=sci-libs/netcdf-4.2:=[hdf5]
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/Unidata/netcdf-cxx4/archive/v4.3.1.tar.gz -> netcdf-cxx-4.3.1.tar.gz
-_md5_=4efbe251a45129eeff60bb47e0851f9e
+_md5_=0e01320083dad8c1f88f5039a4ae3d21
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.7.1-r1 b/metadata/md5-cache/sci-libs/nlopt-2.7.1-r1
index 4d8e2295f555..be3b429e9acd 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.7.1-r1
+++ b/metadata/md5-cache/sci-libs/nlopt-2.7.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/stevengj/nlopt
 INHERIT=python-r1 cmake fortran-2
 IUSE=cxx guile octave python test python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 MIT
 RDEPEND=guile? ( dev-scheme/guile:* ) octave? ( >=sci-mathematics/octave-6 ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) dev-python/numpy[python_targets_python3_10(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stevengj/nlopt/archive/v2.7.1.tar.gz -> nlopt-2.7.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3e805f3446e4a36efdd53b83ffde0f05
+_md5_=c94642750ba28587f1f7088b6fafb135
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.7.1-r2 b/metadata/md5-cache/sci-libs/nlopt-2.7.1-r2
index cb1b5f469e8a..f5eb97460865 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.7.1-r2
+++ b/metadata/md5-cache/sci-libs/nlopt-2.7.1-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/stevengj/nlopt
 INHERIT=python-r1 cmake fortran-2
 IUSE=cxx guile octave python test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 MIT
 RDEPEND=guile? ( dev-scheme/guile:* ) octave? ( >=sci-mathematics/octave-6:= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stevengj/nlopt/archive/v2.7.1.tar.gz -> nlopt-2.7.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0491a5c6cc40399b7449e836eb3d0cd8
+_md5_=88b185bf9dee64519b8673c89627f9a4
diff --git a/metadata/md5-cache/sci-libs/ogdi-4.1.0-r1 b/metadata/md5-cache/sci-libs/ogdi-4.1.0-r1
index f07846ea3e70..44511488841a 100644
--- a/metadata/md5-cache/sci-libs/ogdi-4.1.0-r1
+++ b/metadata/md5-cache/sci-libs/ogdi-4.1.0-r1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/expat net-libs/libtirpc:= sys-libs/zlib
 DESCRIPTION=Open Geographical Datastore Interface, a GIS support library
 EAPI=7
 HOMEPAGE=http://ogdi.sourceforge.net/ https://github.com/libogdi/ogdi
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat net-libs/libtirpc:= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/libogdi/ogdi/releases/download/ogdi_4_1_0/ogdi-4.1.0.tar.gz
-_md5_=49b55bc8dce59a8df41849161e7c3311
+_md5_=70b523849265bf9c987a42c67b004671
diff --git a/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2 b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
index 2d4e78149ea5..683b1365e847 100644
--- a/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
+++ b/metadata/md5-cache/sci-libs/parmetis-4.0.3-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
 INHERIT=cmake toolchain-funcs
 IUSE=doc examples openmp pcre
-KEYWORDS=amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
 RDEPEND=>=sci-libs/metis-5.1.0-r5 virtual/mpi[fortran] pcre? ( dev-libs/libpcre:= ) !<sci-libs/metis-5.1.0-r5
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=320abb1918ffaa948b905c8e011f6229
+_md5_=0ccbe7b24bcb5aad46488817adcfc5cb
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.3 b/metadata/md5-cache/sci-libs/pastix-5.2.3
index 16685aec6b8c..b0025da81626 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.3
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix
 INHERIT=fortran-2 toolchain-funcs
 IUSE=doc int64 mpi +smp starpu static-libs
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-C
 RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/fortran
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/latestfile/218/pastix_5.2.3.tar.bz2
 _eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5094ae0129802c0ed1119b62c9ef9b43
+_md5_=b37b4fdf47d0dd5e77bd97aef1716109
diff --git a/metadata/md5-cache/sci-libs/pdal-2.4.3 b/metadata/md5-cache/sci-libs/pdal-2.4.3
index 44f18118afb0..7c4c8a224206 100644
--- a/metadata/md5-cache/sci-libs/pdal-2.4.3
+++ b/metadata/md5-cache/sci-libs/pdal-2.4.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pdal.io/
 INHERIT=cmake
 IUSE=postgres test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=net-misc/curl app-arch/zstd:= dev-libs/libxml2 dev-libs/openssl:= sci-libs/gdal:= sci-libs/libgeotiff:= sys-libs/libunwind:= sys-libs/zlib postgres? ( dev-db/postgresql:*[xml] )
 RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://github.com/PDAL/PDAL/releases/download/2.4.3/PDAL-2.4.3-src.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d49a1ed42450c191f6684625aa8936c3
+_md5_=9ef3eebae943288250a3c145243a7d9d
diff --git a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7 b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
index 7de68760599b..56e2a1f72513 100644
--- a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
+++ b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://www.astro.caltech.edu/~tjp/pgplot/
 INHERIT=fortran-2 flag-o-matic toolchain-funcs
 IUSE=doc motif static-libs tk
-KEYWORDS=amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 RDEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs/motif:= ) tk? ( dev-lang/tk:= ) virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.astro.caltech.edu/pub/pgplot/pgplot522.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2650c3422f7621e44e7b9ecf35b45f86
+_md5_=7a913e9e842bb15c00d22b48d7e32b00
diff --git a/metadata/md5-cache/sci-libs/primegen-0.97-r2 b/metadata/md5-cache/sci-libs/primegen-0.97-r2
index ea005d1497bc..6c936838d609 100644
--- a/metadata/md5-cache/sci-libs/primegen-0.97-r2
+++ b/metadata/md5-cache/sci-libs/primegen-0.97-r2
@@ -3,9 +3,9 @@ DESCRIPTION=Small, fast library to generate primes in order
 EAPI=7
 HOMEPAGE=http://cr.yp.to/primegen.html
 INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://cr.yp.to/primegen/primegen-0.97.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=408472566c4daedfcef29a5927cb4684
+_md5_=c56ccddedce19b9ce23d89b94cd83bbe
diff --git a/metadata/md5-cache/sci-libs/punc-1.5 b/metadata/md5-cache/sci-libs/punc-1.5
index 43e008912c66..1b8e5d08bcdc 100644
--- a/metadata/md5-cache/sci-libs/punc-1.5
+++ b/metadata/md5-cache/sci-libs/punc-1.5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://fetk.org/codes/punc/index.html
 INHERIT=autotools fortran-2 toolchain-funcs
 IUSE=debug doc mpi
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/punc-1.5.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3d47ec3cf38024643b37e1b336c4cdd5
+_md5_=b8c5233a30f2532a4aab4d911c8395b5
diff --git a/metadata/md5-cache/sci-libs/qd-2.3.23 b/metadata/md5-cache/sci-libs/qd-2.3.23
index b2a0467d5c14..bf3356d37ace 100644
--- a/metadata/md5-cache/sci-libs/qd-2.3.23
+++ b/metadata/md5-cache/sci-libs/qd-2.3.23
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.davidhbailey.com/dhbsoftware/
 INHERIT=fortran-2
 IUSE=cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=https://www.davidhbailey.com/dhbsoftware/qd-2.3.23.tar.gz
 _eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=17d5e1eb5f352c4db5a11e817165664f
+_md5_=83e0cd9008ecc38a6ae0c0644c8d98d6
diff --git a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2 b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2
index b0d96b65daf4..8240beacdc7a 100644
--- a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2
+++ b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Library for updating of QR and Cholesky decompositions
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/qrupdate
 INHERIT=fortran-2 flag-o-matic multilib toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=virtual/lapack virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=613cbb424f29c4e7da03514bb5f2f95c
+_md5_=4ee7a57b5ea81bd4e5b30d8270d92dc6
diff --git a/metadata/md5-cache/sci-libs/scikit-learn-1.1.2 b/metadata/md5-cache/sci-libs/scikit-learn-1.1.2
index bd589cce9287..6d8f1fdc56bc 100644
--- a/metadata/md5-cache/sci-libs/scikit-learn-1.1.2
+++ b/metadata/md5-cache/sci-libs/scikit-learn-1.1.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://scikit-learn.org/stable/
 INHERIT=distutils-r1
 IUSE=examples test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=virtual/blas:= virtual/cblas:= dev-python/wheel[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/joblib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/threadpoolctl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scikit-learn/scikit-learn/archive/1.1.2.tar.gz -> scikit-learn-1.1.2.gh.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=10fdf560870c126be139d652bb229db8
+_md5_=c1434ba49939dde8201a16381ff1bc0f
diff --git a/metadata/md5-cache/sci-libs/scotch-6.1.2 b/metadata/md5-cache/sci-libs/scotch-6.1.2
index f9cff6ba01c9..b7023984c927 100644
--- a/metadata/md5-cache/sci-libs/scotch-6.1.2
+++ b/metadata/md5-cache/sci-libs/scotch-6.1.2
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch
 INHERIT=toolchain-funcs flag-o-matic multilib
 IUSE=doc int64 mpi static-libs test tools +threads
-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=CeCILL-2
 RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
 REQUIRED_USE=test? ( threads )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.2/scotch-v6.1.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1ff0591f21acca64733c78d97e42c51c
+_md5_=34fcbd207a111b683454f4293939d993
diff --git a/metadata/md5-cache/sci-libs/scotch-7.0.1-r1 b/metadata/md5-cache/sci-libs/scotch-7.0.1-r1
index 71d3170eb1f9..f4f6877eddcf 100644
--- a/metadata/md5-cache/sci-libs/scotch-7.0.1-r1
+++ b/metadata/md5-cache/sci-libs/scotch-7.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch
 INHERIT=toolchain-funcs flag-o-matic multilib
 IUSE=doc int64 mpi static-libs test tools +threads
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=CeCILL-2
 RDEPEND=sys-libs/zlib mpi? ( virtual/mpi )
 REQUIRED_USE=test? ( threads )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://gitlab.inria.fr/scotch/scotch/-/archive/v7.0.1/scotch-v7.0.1.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a2770b5e278d3353895ec5adc00f2b1b
+_md5_=7118b47e700d973a8d5f76513496f935
diff --git a/metadata/md5-cache/sci-libs/spqr-2.0.9-r2 b/metadata/md5-cache/sci-libs/spqr-2.0.9-r2
index 99a383eb9868..3c488601754e 100644
--- a/metadata/md5-cache/sci-libs/spqr-2.0.9-r2
+++ b/metadata/md5-cache/sci-libs/spqr-2.0.9-r2
@@ -5,9 +5,9 @@ DESCRIPTION=Multithreaded multifrontal sparse QR factorization library
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=doc partition tbb
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=virtual/lapack >=sci-libs/cholmod-2[lapack,partition?] partition? ( >=sci-libs/metis-5.1.0 ) tbb? ( <dev-cpp/tbb-2021:= )
 SLOT=0
 SRC_URI=http://202.36.178.9/sage/spqr-2.0.9.tar.bz2
-_md5_=b0cffddb04afc2c38a74e6ab18ebe817
+_md5_=4a300acc87b1ba37c814153eb7882d4a
diff --git a/metadata/md5-cache/sci-libs/stellarsolver-2.4 b/metadata/md5-cache/sci-libs/stellarsolver-2.4
index 1fd2f6755186..a99ace16ebe0 100644
--- a/metadata/md5-cache/sci-libs/stellarsolver-2.4
+++ b/metadata/md5-cache/sci-libs/stellarsolver-2.4
@@ -5,10 +5,10 @@ DESCRIPTION=Cross-platform Sextractor and Astrometry.net-Based internal astromet
 EAPI=8
 HOMEPAGE=https://github.com/rlancaste/stellarsolver
 INHERIT=cmake
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sci-libs/cfitsio:= sci-libs/gsl:= sci-astronomy/wcslib:=
 SLOT=0
 SRC_URI=https://github.com/rlancaste/stellarsolver/archive/2.4.tar.gz -> stellarsolver-2.4.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4eb2d907d8b7de9b87c64895f7e7156a
+_md5_=c9e3fa4c768972eb8e3a078403b38d16
diff --git a/metadata/md5-cache/sci-libs/suitesparse-5.4.0 b/metadata/md5-cache/sci-libs/suitesparse-5.4.0
index 8096ada893e4..56a8be162903 100644
--- a/metadata/md5-cache/sci-libs/suitesparse-5.4.0
+++ b/metadata/md5-cache/sci-libs/suitesparse-5.4.0
@@ -3,8 +3,8 @@ DESCRIPTION=Metapackage for a suite of sparse matrix tools
 EAPI=7
 HOMEPAGE=https://people.engr.tamu.edu/davis/suitesparse.html
 IUSE=cuda doc lapack partition tbb
-KEYWORDS=amd64 arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=~sci-libs/suitesparseconfig-5.4.0 ~sci-libs/amd-2.4.6[doc?] ~sci-libs/btf-1.2.6 ~sci-libs/camd-2.4.6[doc?] ~sci-libs/ccolamd-2.9.6 ~sci-libs/cholmod-3.0.13[cuda?,doc?,partition?,lapack?] ~sci-libs/colamd-2.9.6 ~sci-libs/cxsparse-3.2.0 ~sci-libs/klu-1.3.9[doc?] ~sci-libs/ldl-2.2.6[doc?] ~sci-libs/spqr-2.0.9[doc?,partition?,tbb?] ~sci-libs/umfpack-5.7.9[doc?,cholmod]
 SLOT=0
-_md5_=56fb2534c507ad6a7ed530fa4ef62758
+_md5_=37038e7d60ec1be81c3c1c84fe37a406
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3-r2 b/metadata/md5-cache/sci-libs/superlu-4.3-r2
index 876112e4283e..45a9142847ea 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3-r2
+++ b/metadata/md5-cache/sci-libs/superlu-4.3-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://crd-legacy.lbl.gov/~xiaoye/SuperLU/
 INHERIT=autotools fortran-2 multilib toolchain-funcs
 IUSE=doc examples test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sci-libs/superlu/superlu_4.3.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4d4b51daa941dc7e3e65141d32234098
+_md5_=b478373982499dadefd463f8f3862056
diff --git a/metadata/md5-cache/sci-libs/superlu-5.3.0 b/metadata/md5-cache/sci-libs/superlu-5.3.0
index 75b1277fb817..c73f1b7fec10 100644
--- a/metadata/md5-cache/sci-libs/superlu-5.3.0
+++ b/metadata/md5-cache/sci-libs/superlu-5.3.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://portal.nersc.gov/project/sparse/superlu/
 INHERIT=cmake fortran-2
 IUSE=doc examples test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=virtual/blas virtual/fortran
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/xiaoyeli/superlu/archive/refs/tags/v5.3.0.tar.gz -> superlu-5.3.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0be715ab9815e751c02bcabe55189c21
+_md5_=e6a6a3fdad82919e09366ee0ab5256ef
diff --git a/metadata/md5-cache/sci-libs/symengine-0.9.0-r3 b/metadata/md5-cache/sci-libs/symengine-0.9.0-r3
index 1fd02bcfe42d..11f6f09e4426 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.9.0-r3
+++ b/metadata/md5-cache/sci-libs/symengine-0.9.0-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/symengine/symengine
 INHERIT=cmake llvm toolchain-funcs
 IUSE=arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) boost? ( dev-libs/boost:= ) ecm? ( sci-mathematics/gmp-ecm ) flint? ( sci-mathematics/flint:= ) mpc? ( dev-libs/mpc:= ) llvm? ( <sys-devel/llvm-16:= ) tcmalloc? ( dev-util/google-perftools )
 RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://github.com/symengine/symengine/archive/v0.9.0.tar.gz -> symengine-0.9.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d6c887c0cb613be581fa73d130b177ec
+_md5_=029e77f6ea1cbaf2b1f9f1d38c4d883c
diff --git a/metadata/md5-cache/sci-libs/szip-2.1.1 b/metadata/md5-cache/sci-libs/szip-2.1.1
index f6c774df0b60..5b2c873a3d61 100644
--- a/metadata/md5-cache/sci-libs/szip-2.1.1
+++ b/metadata/md5-cache/sci-libs/szip-2.1.1
@@ -3,9 +3,9 @@ DESCRIPTION=Extended-Rice lossless compression algorithm implementation
 EAPI=8
 HOMEPAGE=https://www.hdfgroup.org/doc_resource/SZIP/
 IUSE=static-libs
-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=szip
 RDEPEND=!sci-libs/libaec[szip]
 SLOT=0/2
 SRC_URI=https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz
-_md5_=0dfcd69b49857169d486b56160cf5bfa
+_md5_=a0c6c5ee9ce788e940acb8c1a3611263
diff --git a/metadata/md5-cache/sci-libs/udunits-2.2.28 b/metadata/md5-cache/sci-libs/udunits-2.2.28
index 3dedbbcae12e..1df41fb4667f 100644
--- a/metadata/md5-cache/sci-libs/udunits-2.2.28
+++ b/metadata/md5-cache/sci-libs/udunits-2.2.28
@@ -5,10 +5,10 @@ DESCRIPTION=Library for manipulating units of physical quantities
 EAPI=7
 HOMEPAGE=https://www.unidata.ucar.edu/software/udunits/
 INHERIT=fortran-2
-KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-BSD
 RDEPEND=dev-libs/expat virtual/fortran
 SLOT=0
 SRC_URI=ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.2.28.tar.gz
 _eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=830944a5c163474e7dc28499c0a9f608
+_md5_=88f18eaf95ee969301d98d3b2716f6cd
diff --git a/metadata/md5-cache/sci-libs/ufconfig-3.7.1 b/metadata/md5-cache/sci-libs/ufconfig-3.7.1
index 2fefb8cce772..d1259867dc43 100644
--- a/metadata/md5-cache/sci-libs/ufconfig-3.7.1
+++ b/metadata/md5-cache/sci-libs/ufconfig-3.7.1
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/UFconfig
 INHERIT=multilib toolchain-funcs
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-3.7.1.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=89e13daeccfa0c4a4510de3b571746cc
+_md5_=5222d07db6472ac67d4a91e86ec8d7d4
diff --git a/metadata/md5-cache/sci-libs/voro++-0.4.6-r1 b/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
index 72ad79ce5a29..ce9d9bb47ae8 100644
--- a/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
+++ b/metadata/md5-cache/sci-libs/voro++-0.4.6-r1
@@ -4,9 +4,9 @@ DESCRIPTION=3D Voronoi cell software library
 EAPI=7
 HOMEPAGE=http://math.lbl.gov/voro++/
 INHERIT=cmake
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://math.lbl.gov/voro++/download/dir/voro++-0.4.6.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bca78e3ba5e551ae3cfc0fd78460d9a1
+_md5_=513a41e6296d63a1ed2c5e60a0c761e0
diff --git a/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1 b/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
index 6cbe7f629129..336c51b7d7c6 100644
--- a/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
+++ b/metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Software package for algebraic, geometric and combinatorial problems
 EAPI=7
 HOMEPAGE=https://4ti2.github.io
 INHERIT=autotools
-KEYWORDS=amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-mathematics/glpk:=[gmp] dev-libs/gmp:0=[cxx(+)]
 SLOT=0
 SRC_URI=http://4ti2.de/version_1.6.7/4ti2-1.6.7.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=df00a64ac5488c2ed292d62e020df1e0
+_md5_=9f0403fc055e4a955cad1799082587b7
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 485dac4b7c30..203bc124a7e0 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/arb-2.23.0 b/metadata/md5-cache/sci-mathematics/arb-2.23.0
index b4697427903e..742df5015583 100644
--- a/metadata/md5-cache/sci-mathematics/arb-2.23.0
+++ b/metadata/md5-cache/sci-mathematics/arb-2.23.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://fredrikj.net/arb/
 INHERIT=cmake
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=sci-mathematics/flint-2.9.0:=
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/fredrik-johansson/arb/archive/2.23.0.tar.gz -> arb-2.23.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4d5bae91775ad68b06e553d4592cb9a8
+_md5_=48ec127172350aacb1f6fdf9405c5a04
diff --git a/metadata/md5-cache/sci-mathematics/cgal-5.5 b/metadata/md5-cache/sci-mathematics/cgal-5.5
index 8c6a0236d515..35d749399238 100644
--- a/metadata/md5-cache/sci-mathematics/cgal-5.5
+++ b/metadata/md5-cache/sci-mathematics/cgal-5.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.cgal.org/
 INHERIT=cmake
 IUSE=doc examples
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3 GPL-3 Boost-1.0
 RDEPEND=dev-cpp/eigen dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/mpfr:= sys-libs/zlib x11-libs/libX11:= virtual/glu:= virtual/opengl:=
 SLOT=0/14
 SRC_URI=https://github.com/CGAL/cgal/releases/download/v5.5/CGAL-5.5.tar.xz doc? ( https://github.com/CGAL/cgal/releases/download/v5.5/CGAL-5.5-doc_html.tar.xz )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=639d7ef18dc6914932d301de9401d787
+_md5_=e75c4827a04386b28673857c67568a99
diff --git a/metadata/md5-cache/sci-mathematics/cliquer-1.22 b/metadata/md5-cache/sci-mathematics/cliquer-1.22
index 10c9be75e148..d517b82ad2f4 100644
--- a/metadata/md5-cache/sci-mathematics/cliquer-1.22
+++ b/metadata/md5-cache/sci-mathematics/cliquer-1.22
@@ -3,8 +3,8 @@ DESCRIPTION=C routines for finding cliques in an arbitrary weighted graph
 EAPI=7
 HOMEPAGE=https://users.aalto.fi/~pat/cliquer.html https://github.com/dimpase/autocliquer
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~riscv x86
+KEYWORDS=amd64 ~arm ~riscv ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://files.sagemath.org/spkg/upstream/cliquer/cliquer-1.22.tar.gz
-_md5_=36310453c52b1d142a23daa261bd3048
+_md5_=f74051c2f8f47f1bb42454938e7f82f8
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2 b/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
index 0600c8b38ec4..fc7ade978f4a 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
+++ b/metadata/md5-cache/sci-mathematics/coq-8.12.0-r2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://coq.inria.fr/
 INHERIT=desktop multilib
 IUSE=gtk debug +ocamlopt doc
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/camlp5:=[ocamlopt?] || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] )
 RESTRICT=test
 SLOT=0/8.12.0
 SRC_URI=https://github.com/coq/coq/archive/V8.12.0.tar.gz -> coq-8.12.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b220e42b3572e8c91fb697a3b16e97b8
+_md5_=e06770f956eeaac8c783e903b9941939
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.17.0 b/metadata/md5-cache/sci-mathematics/coq-8.17.0
index 3d2805125d87..6dde1d1166ba 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.17.0
+++ b/metadata/md5-cache/sci-mathematics/coq-8.17.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://coq.inria.fr/ https://github.com/coq/coq/
 INHERIT=desktop dune edo
 IUSE=debug doc gui +ocamlopt test
-KEYWORDS=~amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/zarith:= || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gui? ( >=dev-ml/lablgtk-3.1.2:3=[sourceview,ocamlopt?] >=dev-ml/lablgtk-sourceview-3.1.2:3=[ocamlopt?] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/8.17.0
 SRC_URI=https://github.com/coq/coq/archive/V8.17.0.tar.gz -> coq-8.17.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f4fa857d2bf2553473cf3af6dfba4d28
+_md5_=6a7ff97e8e02494b1b14d1b93b161bc4
diff --git a/metadata/md5-cache/sci-mathematics/eclib-20221012 b/metadata/md5-cache/sci-mathematics/eclib-20221012
index 50617cca132e..ace832cf9e84 100644
--- a/metadata/md5-cache/sci-mathematics/eclib-20221012
+++ b/metadata/md5-cache/sci-mathematics/eclib-20221012
@@ -4,10 +4,10 @@ DESCRIPTION=Programs for elliptic curves defined over the rational numbers
 EAPI=8
 HOMEPAGE=https://github.com/JohnCremona/eclib
 IUSE=boost flint minimal test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari:= dev-libs/ntl:= boost? ( dev-libs/boost:= ) flint? ( sci-mathematics/flint:= )
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/JohnCremona/eclib/releases/download/20221012/eclib-20221012.tar.bz2
-_md5_=caa877f4a878ee13f6566b32067b95a7
+_md5_=b87a16431f30316d7ec0d23148eae635
diff --git a/metadata/md5-cache/sci-mathematics/ent-101202 b/metadata/md5-cache/sci-mathematics/ent-101202
index bc06a4149d1e..26cf5aac7705 100644
--- a/metadata/md5-cache/sci-mathematics/ent-101202
+++ b/metadata/md5-cache/sci-mathematics/ent-101202
@@ -4,9 +4,9 @@ DESCRIPTION=Random number sequence test and entropy calculation
 EAPI=8
 HOMEPAGE=https://www.fourmilab.ch/random/ https://github.com/Fourmilab/ent_random_sequence_tester
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/ent-101202.zip
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=06aefc8a0b063fc7e36d1c25f3518760
+_md5_=97c6c18d960ed23bafc8136d709d2dfc
diff --git a/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1 b/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
index 9dd839cf2ecd..ef57a3a84961 100644
--- a/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
+++ b/metadata/md5-cache/sci-mathematics/euler-1.61.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Mathematical programming environment
 EAPI=7
 HOMEPAGE=http://euler.sourceforge.net/
 INHERIT=autotools
-KEYWORDS=amd64 ~ppc -sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/euler/euler-1.61.0.tgz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a4cc367c3587f9a1cab8e6a45fcb9cbd
+_md5_=011bbb00629583abf4988c1846c36408
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.8.4 b/metadata/md5-cache/sci-mathematics/flint-2.8.4
index f7b87ca259f6..63f787e574de 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.8.4
+++ b/metadata/md5-cache/sci-mathematics/flint-2.8.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.flintlib.org/
 INHERIT=cmake python-any-r1
 IUSE=doc ntl test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/wbhart/flint2/archive/refs/tags/v2.8.4.tar.gz -> flint-2.8.4.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=43c8248fc35f3edadc18495c4f92ea06
+_md5_=b49f299777fabd61c68214ff8cfaa45b
diff --git a/metadata/md5-cache/sci-mathematics/flint-2.9.0 b/metadata/md5-cache/sci-mathematics/flint-2.9.0
index e4be2356b460..68204067ef13 100644
--- a/metadata/md5-cache/sci-mathematics/flint-2.9.0
+++ b/metadata/md5-cache/sci-mathematics/flint-2.9.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.flintlib.org/
 INHERIT=cmake python-any-r1
 IUSE=doc ntl test
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/gmp:= dev-libs/mpfr:= ntl? ( dev-libs/ntl:= ) virtual/cblas
 RESTRICT=!test? ( test )
 SLOT=0/17
 SRC_URI=https://github.com/wbhart/flint2/archive/refs/tags/v2.9.0.tar.gz -> flint-2.9.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7234e77d0b2d2bf6368475ab7d00de4f
+_md5_=34ac9a507d957c8d23d98c8ed1fad5f8
diff --git a/metadata/md5-cache/sci-mathematics/flintqs-1.0 b/metadata/md5-cache/sci-mathematics/flintqs-1.0
index da5f181339ee..b0fad510bbd8 100644
--- a/metadata/md5-cache/sci-mathematics/flintqs-1.0
+++ b/metadata/md5-cache/sci-mathematics/flintqs-1.0
@@ -3,9 +3,9 @@ DEPEND=dev-libs/gmp:=
 DESCRIPTION=Multi-polynomial quadratic sieve for integer factorization
 EAPI=7
 HOMEPAGE=https://github.com/sagemath/FlintQS
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:=
 SLOT=0
 SRC_URI=http://files.sagemath.org/spkg/upstream/flintqs/flintqs-1.0.tar.gz
-_md5_=103d099ae675f5d92cf3e59e60cec740
+_md5_=7b6b2d6bbc3bdbd6752559bddff2165e
diff --git a/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r4 b/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r4
index 527c9ce2a3e7..e9c5d9b66638 100644
--- a/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r4
+++ b/metadata/md5-cache/sci-mathematics/frobby-0.9.0-r4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.broune.com/frobby/
 INHERIT=toolchain-funcs
 IUSE=doc
-KEYWORDS=amd64 ~arm x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0=[cxx(+)]
 SLOT=0
 SRC_URI=http://www.broune.com/frobby/frobby_v0.9.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8b8b4533066264f57682e0afa2577b85
+_md5_=f85b28853034bd6205cfb0e9569a410f
diff --git a/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4 b/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4
index a17b92f25878..7ee31b0bd773 100644
--- a/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4
+++ b/metadata/md5-cache/sci-mathematics/gfan-0.6.2-r4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://users-math.au.dk/~jensen/software/gfan/gfan.html
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=doc
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0=[cxx(+)] sci-libs/cddlib:0=
 SLOT=0
 SRC_URI=https://users-math.au.dk/~jensen/software/gfan/gfan0.6.2.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=db825066acdb10bf8620332c5f4222d0
+_md5_=18bdd8e568de7d44cc7cbb04e1269cd6
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.7.9 b/metadata/md5-cache/sci-mathematics/gimps-30.7.9
index 6b7a5b6a5c9d..7937f23aed8f 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-30.7.9
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.7.9
@@ -4,11 +4,11 @@ DESCRIPTION=The Great Internet Mersenne Prime Search
 EAPI=7
 HOMEPAGE=https://www.mersenne.org/
 INHERIT=pax-utils readme.gentoo-r1 systemd tmpfiles
-KEYWORDS=-* amd64 x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v307b9.linux64.tar.gz -> gimps-30.7.9.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v307b9.linux32.tar.gz -> gimps-30.7.9.linux32.tar.gz )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=30a77ea017c5d06429d79aa9b5cb22df
+_md5_=9cf2f464f4990422d7505a0f467f0237
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.8.15 b/metadata/md5-cache/sci-mathematics/gimps-30.8.15
index 70e096d11308..52e0180e09d6 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-30.8.15
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.8.15
@@ -4,11 +4,11 @@ DESCRIPTION=The Great Internet Mersenne Prime Search
 EAPI=8
 HOMEPAGE=https://www.mersenne.org/
 INHERIT=pax-utils readme.gentoo-r1 systemd tmpfiles
-KEYWORDS=-* amd64 x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v308b15.linux64.tar.gz -> gimps-30.8.15.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v308b15.linux32.tar.gz -> gimps-30.8.15.linux32.tar.gz )
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a50f98c05b035137eae53eda71dffde0
+_md5_=9d27720f1779224a0c86a3c024f1ec12
diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.8.6 b/metadata/md5-cache/sci-mathematics/ginac-1.8.6
index 83b2801aeb19..101ba5de0882 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.8.6
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.8.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.ginac.de/
 INHERIT=python-any-r1
 IUSE=doc examples
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=sci-libs/cln-1.2.2
 SLOT=0
 SRC_URI=http://www.ginac.de/ginac-1.8.6.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ef05e7a5bacdc7c3765cf0667d8c9566
+_md5_=cbc507379f874c30c478dc6ecc26a26f
diff --git a/metadata/md5-cache/sci-mathematics/gmm-5.4 b/metadata/md5-cache/sci-mathematics/gmm-5.4
index b3e264164b32..2ba486e72560 100644
--- a/metadata/md5-cache/sci-mathematics/gmm-5.4
+++ b/metadata/md5-cache/sci-mathematics/gmm-5.4
@@ -3,9 +3,9 @@ DESCRIPTION=Generic C++ template library for sparse, dense and skyline matrices
 EAPI=8
 HOMEPAGE=http://getfem.org/gmm.html
 INHERIT=flag-o-matic
-KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 LGPL-3-with-linking-exception )
 SLOT=0
 SRC_URI=mirror://nongnu/getfem/stable/gmm-5.4.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=31b9e2c85af455b6adb15c9f1b6a0920
+_md5_=689e06d37c7a9ea07ba8c9ed04877f77
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5-r1 b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5-r1
index 3e4f338694fa..fd6afc3dfef2 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5-r1
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.inria.fr/zimmerma/ecm
 INHERIT=toolchain-funcs
 IUSE=+custom-tune openmp cpu_flags_x86_sse2
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-libs/gmp:=
 SLOT=0
 SRC_URI=https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-7.0.5.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=521c52394f1836e175dc0915dc41a277
+_md5_=2b6360efd19c27ebcb22b5aed39fab86
diff --git a/metadata/md5-cache/sci-mathematics/jags-4.3.0 b/metadata/md5-cache/sci-mathematics/jags-4.3.0
index bd587b9d9408..40f6ea1dc0ab 100644
--- a/metadata/md5-cache/sci-mathematics/jags-4.3.0
+++ b/metadata/md5-cache/sci-mathematics/jags-4.3.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://mcmc-jags.sourceforge.io/
 INHERIT=toolchain-funcs
 IUSE=doc
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack
 SLOT=0
 SRC_URI=mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/JAGS-4.3.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f9073dde14dcb45194210918b76fedac
+_md5_=f8eba4ea459958d8da46ad6731d168ab
diff --git a/metadata/md5-cache/sci-mathematics/lrcalc-1.2 b/metadata/md5-cache/sci-mathematics/lrcalc-1.2
index ea2bdb12a807..c34205d262e2 100644
--- a/metadata/md5-cache/sci-mathematics/lrcalc-1.2
+++ b/metadata/md5-cache/sci-mathematics/lrcalc-1.2
@@ -3,9 +3,9 @@ DESCRIPTION=Littlewood-Richardson Calculator
 EAPI=7
 HOMEPAGE=https://sites.math.rutgers.edu/~asbuch/lrcalc/
 IUSE=static-libs test
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-1.2.tar.gz
-_md5_=da38d68dfd8ecc0a9098db41a4b4a5ae
+_md5_=18be0c2add48d349fa143b2881398446
diff --git a/metadata/md5-cache/sci-mathematics/lrcalc-2.1 b/metadata/md5-cache/sci-mathematics/lrcalc-2.1
index c804df66bf78..a71300114884 100644
--- a/metadata/md5-cache/sci-mathematics/lrcalc-2.1
+++ b/metadata/md5-cache/sci-mathematics/lrcalc-2.1
@@ -3,9 +3,9 @@ DESCRIPTION=Littlewood-Richardson Calculator
 EAPI=7
 HOMEPAGE=https://sites.math.rutgers.edu/~asbuch/lrcalc/
 IUSE=static-libs test
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=GPL-3+
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-2.1.tar.gz
-_md5_=8b699ee0a5f8b3f0fa2f9d6ca6397d07
+_md5_=7b4108c26280d3c792bf6472d6224371
diff --git a/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5-r1 b/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5-r1
index a68f33f2f7cb..775e121314c0 100644
--- a/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5-r1
+++ b/metadata/md5-cache/sci-mathematics/mathomatic-16.0.5-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mfillpot/mathomatic
 INHERIT=toolchain-funcs flag-o-matic
 IUSE=doc gnuplot
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline:= sys-libs/ncurses:= gnuplot? ( sci-visualization/gnuplot )
 SLOT=0
 SRC_URI=https://github.com/mfillpot/mathomatic/archive/mathomatic-16.0.5.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5eef09e91e738e5d1ba4e86df2e18947
+_md5_=be4e4f93a1655301294798ddea4a677a
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1 b/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
index 735778a377a2..91a120269ea1 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://maxima.sourceforge.net/
 INHERIT=autotools elisp-common flag-o-matic python-single-r1 xdg-utils
 IUSE=clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test l10n_de l10n_es l10n_pt l10n_pt-BR python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+
 RDEPEND=clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( <dev-lisp/gcl-2.6.14[ansi,readline] ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) virtual/libcrypt:= emacs? ( >=app-editors/emacs-26:* ) gui? ( dev-lang/tk:0 ) X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] vtk? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) sci-libs/vtk[python,rendering,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) ) emacs? ( virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended )
 REQUIRED_USE=vtk? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl ) gui? ( X )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.46.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0fa109a876541ad7486b89bd1e4b9c08
+_md5_=6c8e458eaab9b79adac7dcee2a863f19
diff --git a/metadata/md5-cache/sci-mathematics/nauty-2.8.6-r1 b/metadata/md5-cache/sci-mathematics/nauty-2.8.6-r1
index c319d67cf3a0..623b8beebcc2 100644
--- a/metadata/md5-cache/sci-mathematics/nauty-2.8.6-r1
+++ b/metadata/md5-cache/sci-mathematics/nauty-2.8.6-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://pallini.di.uniroma1.it/
 INHERIT=autotools
 IUSE=cpu_flags_x86_popcnt examples
-KEYWORDS=amd64 ~arm ~riscv x86
+KEYWORDS=amd64 ~arm ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 sys-libs/zlib sci-mathematics/cliquer
 SLOT=0
 SRC_URI=https://pallini.di.uniroma1.it/nauty2_8_6.tar.gz mirror://debian/pool/main/n/nauty/nauty_2.8.6+ds-1.debian.tar.xz https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=657ad1e54b341cc26afda4a279c18454
+_md5_=83d00e9d663c84cefe3b09c0cad4a306
diff --git a/metadata/md5-cache/sci-mathematics/normaliz-3.9.3 b/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
index e52952d80dba..37f1e1878b88 100644
--- a/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
+++ b/metadata/md5-cache/sci-mathematics/normaliz-3.9.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.normaliz.uni-osnabrueck.de/
 INHERIT=toolchain-funcs
 IUSE=doc extras nauty openmp
-KEYWORDS=amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/gmp:=[cxx(+)] nauty? ( sci-mathematics/nauty )
 SLOT=0/3
 SRC_URI=https://github.com/Normaliz/Normaliz/releases/download/v3.9.3/normaliz-3.9.3.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=90039e3d8c3089719d3ca30776f3ea22
+_md5_=f425a6422ef739684cd03003bb7da233
diff --git a/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2 b/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
index 8aff2b096a68..8673ceca4886 100644
--- a/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
+++ b/metadata/md5-cache/sci-mathematics/num-utils-0.5-r2
@@ -3,8 +3,8 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=A set of programs for dealing with numbers from the command line
 EAPI=7
 HOMEPAGE=https://suso.suso.org/programs/num-utils/index.phtml
-KEYWORDS=amd64 arm ~ppc x86
+KEYWORDS=amd64 arm ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://suso.suso.org/programs/num-utils/downloads/num-utils-0.5.tar.gz mirror://debian/pool/main/n/num-utils/num-utils_0.5-15.debian.tar.xz
-_md5_=50e4d4f479dedfab37b90981224d8d79
+_md5_=38855914137f113288ab8bce21f3ffa2
diff --git a/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2 b/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
index 6781f23fbde2..29750b346a62 100644
--- a/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
+++ b/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.gnu.org/software/octave/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
 IUSE=curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib java
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:= sys-libs/ncurses:= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] ) glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:= ) imagemagick? ( media-gfx/graphicsmagick:=[cxx] ) java? ( >=virtual/jre-1.8:* ) json? ( dev-libs/rapidjson ) opengl? ( media-libs/freetype:= media-libs/fontconfig:= virtual/glu x11-libs/gl2ps:= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:= ) qrupdate? ( sci-libs/qrupdate:= ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:= sci-libs/camd:= sci-libs/ccolamd:= sci-libs/cholmod:= sci-libs/colamd:= sci-libs/cxsparse:= sci-libs/umfpack:= ) ssl? ( dev-libs/openssl:= ) sundials? ( >=sci-libs/sundials-4:= ) X? ( x11-libs/libX11:= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=fltk? ( opengl X ) gui? ( X ) opengl? ( || ( fltk gui ) )
 SLOT=0/7.3.0
 SRC_URI=mirror://gnu/octave/octave-7.3.0.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=75c34497a9ffc6367a13e620fbfea6a2
+_md5_=b8120f83285fc745d8397342c2e07ad1
diff --git a/metadata/md5-cache/sci-mathematics/octave-8.1.0 b/metadata/md5-cache/sci-mathematics/octave-8.1.0
index 59d1a0a2e31d..b01b18054dcc 100644
--- a/metadata/md5-cache/sci-mathematics/octave-8.1.0
+++ b/metadata/md5-cache/sci-mathematics/octave-8.1.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.gnu.org/software/octave/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
 IUSE=curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib java
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre2 sys-libs/ncurses:= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] ) glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:= ) imagemagick? ( media-gfx/graphicsmagick:=[cxx] ) java? ( >=virtual/jre-1.8:* ) json? ( dev-libs/rapidjson ) opengl? ( media-libs/freetype:= media-libs/fontconfig:= virtual/glu x11-libs/gl2ps:= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:= ) qrupdate? ( sci-libs/qrupdate:= ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:= sci-libs/camd:= sci-libs/ccolamd:= sci-libs/cholmod:= sci-libs/colamd:= sci-libs/cxsparse:= sci-libs/umfpack:= ) ssl? ( dev-libs/openssl:= ) sundials? ( >=sci-libs/sundials-4:= ) X? ( x11-libs/libX11:= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=fltk? ( opengl X ) gui? ( X ) opengl? ( || ( fltk gui ) )
 SLOT=0/8.1.0
 SRC_URI=mirror://gnu/octave/octave-8.1.0.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6c88288d43b8d75abf114d8480860f64
+_md5_=bcc408a2219d2bc49a875918fdd87c43
diff --git a/metadata/md5-cache/sci-mathematics/otter-3.3-r4 b/metadata/md5-cache/sci-mathematics/otter-3.3-r4
index 4f1726a07b1f..7c774db0a526 100644
--- a/metadata/md5-cache/sci-mathematics/otter-3.3-r4
+++ b/metadata/md5-cache/sci-mathematics/otter-3.3-r4
@@ -4,10 +4,10 @@ DESCRIPTION=An Automated Deduction System
 EAPI=7
 HOMEPAGE=http://www.cs.unm.edu/~mccune/otter/
 INHERIT=flag-o-matic toolchain-funcs
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=otter
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
 SLOT=0
 SRC_URI=http://www.cs.unm.edu/~mccune/otter/otter-3.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d3ef682044610ac7b46501653400c723
+_md5_=2cc5cdb825f1d9c11850f5af7764ba60
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.15.3 b/metadata/md5-cache/sci-mathematics/pari-2.15.3
index 73ba45b0d55c..08a7348ee241 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.15.3
+++ b/metadata/md5-cache/sci-mathematics/pari-2.15.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=data doc examples fltk gmp test threads X
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.15.3.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0a8638484decdae01e63915f73383191
+_md5_=3b56c2153f9c394d7e50e9fd31fcb63e
diff --git a/metadata/md5-cache/sci-mathematics/pari-data-20191216 b/metadata/md5-cache/sci-mathematics/pari-data-20191216
index e5bcb2e1a2c3..2a72026c93ef 100644
--- a/metadata/md5-cache/sci-mathematics/pari-data-20191216
+++ b/metadata/md5-cache/sci-mathematics/pari-data-20191216
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Additional dataset packages for PARI
 EAPI=7
 HOMEPAGE=https://pari.math.u-bordeaux.fr/packages.html
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/packages/elldata.tgz -> elldata-20191216.tgz https://pari.math.u-bordeaux.fr/pub/pari/packages/galpol.tgz -> galpol-20191216.tgz https://pari.math.u-bordeaux.fr/pub/pari/packages/seadata.tgz -> seadata-20191216.tgz https://pari.math.u-bordeaux.fr/pub/pari/packages/nftables.tgz -> nftables-20191216.tgz https://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz -> galdata-20191216.tgz
-_md5_=22963a079068dfa1a4c3f2b8f1dda798
+_md5_=f7e20206a170fbc91494afdadf9be268
diff --git a/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0 b/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
index ae3601094686..bae92fae6759 100644
--- a/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
+++ b/metadata/md5-cache/sci-mathematics/planarity-3.0.2.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=The edge addition planarity suite of graph algorithms
 EAPI=8
 HOMEPAGE=https://github.com/graph-algorithms/edge-addition-planarity-suite/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_3.0.2.0/planarity-3.0.2.0.tar.gz
-_md5_=5dda67a31b3dab9566359c5699901bfa
+_md5_=8fc209e2cfb88fbada88192253079101
diff --git a/metadata/md5-cache/sci-mathematics/polymake-4.6-r1 b/metadata/md5-cache/sci-mathematics/polymake-4.6-r1
index c8130a5a0329..729da99fcc66 100644
--- a/metadata/md5-cache/sci-mathematics/polymake-4.6-r1
+++ b/metadata/md5-cache/sci-mathematics/polymake-4.6-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://polymake.org/
 INHERIT=flag-o-matic ninja-utils toolchain-funcs
 IUSE=bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular
-KEYWORDS=amd64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2 GPL-2+ MIT WTFPL-2
 RDEPEND=libpolymake? ( dev-lang/perl ) dev-libs/boost:= dev-libs/gmp:= dev-libs/libxml2:2= dev-libs/libxslt:= dev-libs/mpfr:= sys-libs/readline:= bliss? ( sci-libs/bliss:=[gmp] ) cdd? ( sci-libs/cddlib:= ) flint? ( sci-mathematics/flint:= ) lrs? ( >=sci-libs/lrslib-051:=[gmp] ) nauty? ( sci-mathematics/nauty:= ) normaliz? ( >=sci-mathematics/normaliz-3.8:= ) ppl? ( dev-libs/ppl:= ) singular? ( sci-mathematics/singular:= ) dev-lang/perl dev-perl/JSON dev-perl/Term-ReadLine-Gnu dev-perl/TermReadKey dev-perl/XML-SAX dev-perl/XML-Writer
 REQUIRED_USE=^^ ( bliss nauty )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://polymake.org/lib/exe/fetch.php/download/polymake-4.6-minimal.tar.bz2
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=123aaed05bb75bcb8cd135becda1652a
+_md5_=8365f24676a18636c5f25a45e8f80281
diff --git a/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3 b/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
index 0f5c4c3009b1..3481e0780dea 100644
--- a/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
+++ b/metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=http://statmath.wu.ac.at/prng/
 INHERIT=autotools
 IUSE=doc examples static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://statmath.wu.ac.at/prng/prng-3.0.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=abdb4a739341b059327ebcf4bb594429
+_md5_=6286dfe3bc3411d12923f612674d37d1
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.6.2-r2 b/metadata/md5-cache/sci-mathematics/pspp-1.6.2-r2
index e580eb2b0028..d73f7dd9a4f7 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-1.6.2-r2
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.6.2-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=python-any-r1 xdg
 IUSE=doc examples gtk ncurses nls perl postgres
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=dev-libs/libxml2:2 sci-libs/gsl:0= sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/libiconv x11-libs/cairo[svg(+)] x11-libs/pango gtk? ( dev-util/glib-utils x11-libs/gtk+:3 x11-libs/gtksourceview:4= >=x11-libs/spread-sheet-widget-0.7 ) postgres? ( dev-db/postgresql:=[server] )
 SLOT=0/1.6.2
 SRC_URI=mirror://gnu/pspp/pspp-1.6.2.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3ec1221efb8442d93fd3005185afef8f
+_md5_=fdc1486c83fb70f434c5a12ebc015c43
diff --git a/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1 b/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
index 5a5baab8d631..0e739dd46b9b 100644
--- a/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
+++ b/metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=https://statmath.wu.ac.at/software/RngStreams/
 INHERIT=out-of-source
 IUSE=doc examples
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://statmath.wu.ac.at/software/RngStreams/rngstreams-1.0.1.tar.gz
 _eclasses_=out-of-source	15ce2b6ae214f3abe70892ce1e517abd
-_md5_=7c0921fa396315d9764b37d776f4fa96
+_md5_=d52542bb9c3bace272fd7d5975e0edd6
diff --git a/metadata/md5-cache/sci-mathematics/rw-0.9 b/metadata/md5-cache/sci-mathematics/rw-0.9
index 8e41a1c3300d..34b040ac30ca 100644
--- a/metadata/md5-cache/sci-mathematics/rw-0.9
+++ b/metadata/md5-cache/sci-mathematics/rw-0.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Compute rank-width decompositions of graphs
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/rankwidth/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=!media-gfx/xpaint
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/rankwidth/rw-0.9.tar.gz
-_md5_=b21975c1ef11d4b874b7ded1a99018c5
+_md5_=f1860076f24670111e82b31d2c636670
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.3.1_p3 b/metadata/md5-cache/sci-mathematics/singular-4.3.1_p3
index 8986e1219114..9379362148d2 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.3.1_p3
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.1_p3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
 INHERIT=elisp-common
 IUSE=emacs examples polymake +readline static-libs
-KEYWORDS=amd64 ~ppc ~riscv x86 ~x86-linux
+KEYWORDS=amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-3-1/singular-4.3.1p3.tar.gz
 _eclasses_=elisp-common	01bc6dc778b74a9deebe4e419a3b790e
-_md5_=24e6d895d8189a98b31ae17e3c288eec
+_md5_=3c391f0d988bb3a0172440b1562944e9
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.3.2_p1 b/metadata/md5-cache/sci-mathematics/singular-4.3.2_p1
index 2f4afdb78f6c..a2312c34be2a 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.3.2_p1
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.2_p1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
 INHERIT=elisp-common
 IUSE=emacs examples polymake +readline static-libs
-KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~x86-linux
+KEYWORDS=amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint sys-apps/texinfo emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=https://www.singular.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-3-2/singular-4.3.2p1.tar.gz
 _eclasses_=elisp-common	01bc6dc778b74a9deebe4e419a3b790e
-_md5_=2bc5426066e86cb085c523d7a3efa2fc
+_md5_=e9dce492aca8c206741120b11ad15e4a
diff --git a/metadata/md5-cache/sci-mathematics/unuran-1.8.1 b/metadata/md5-cache/sci-mathematics/unuran-1.8.1
index b013f25b8e99..789c6079c171 100644
--- a/metadata/md5-cache/sci-mathematics/unuran-1.8.1
+++ b/metadata/md5-cache/sci-mathematics/unuran-1.8.1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://statmath.wu.ac.at/unuran/
 INHERIT=out-of-source
 IUSE=doc examples gsl prng +rngstreams
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gsl? ( sci-libs/gsl:= ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams:= )
 SLOT=0
 SRC_URI=https://statmath.wu.ac.at/unuran/unuran-1.8.1.tar.gz
 _eclasses_=out-of-source	15ce2b6ae214f3abe70892ce1e517abd
-_md5_=29c7eca2d5a3bb281abc39ac90cfa4aa
+_md5_=e1b7bfbf6b5e8ca746361b097df538da
diff --git a/metadata/md5-cache/sci-mathematics/unuran-1.9.0 b/metadata/md5-cache/sci-mathematics/unuran-1.9.0
index 184270af288e..5a8fa898b207 100644
--- a/metadata/md5-cache/sci-mathematics/unuran-1.9.0
+++ b/metadata/md5-cache/sci-mathematics/unuran-1.9.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://statmath.wu.ac.at/unuran/
 INHERIT=autotools out-of-source
 IUSE=doc examples gsl prng +rngstreams
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=gsl? ( sci-libs/gsl:= ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams:= )
 SLOT=0
 SRC_URI=https://statmath.wu.ac.at/unuran/unuran-1.9.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	out-of-source	15ce2b6ae214f3abe70892ce1e517abd	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bfa78d81dec479185423011d94fc9ab5
+_md5_=33bfdd2d4a2a30e97b882a60a5413a9f
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1 b/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1
index d536f330c674..a0dbcf809ff2 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake plocale wxwidgets xdg
 IUSE=test
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3[webkit] media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-23.04.1.tar.gz -> wxmaxima-23.04.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6f0917dbaa85ebf68db601cdccad3fa5
+_md5_=ac100a8ab8b088980969d30b69560aa1
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 006951cd100c..ff8eab3ee2c2 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/boinc-7.20.2-r3 b/metadata/md5-cache/sci-misc/boinc-7.20.2-r3
index 71c64bf95310..c7727a239291 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.20.2-r3
+++ b/metadata/md5-cache/sci-misc/boinc-7.20.2-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://boinc.berkeley.edu/
 INHERIT=autotools desktop flag-o-matic linux-info optfeature wxwidgets xdg-utils
 IUSE=X cuda curl_ssl_gnutls +curl_ssl_openssl opencl
-KEYWORDS=amd64 arm64 ~ia64 ~ppc ppc64 sparc x86
+KEYWORDS=amd64 arm64 ~ia64 ~ppc ppc64 sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=acct-user/boinc app-misc/ca-certificates cuda? ( x11-drivers/nvidia-drivers ) opencl? ( virtual/opencl ) dev-libs/openssl:= net-misc/curl[curl_ssl_gnutls(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] sys-libs/zlib X? ( dev-libs/glib:2 media-libs/freeglut media-libs/libjpeg-turbo:= x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libxcb:= x11-libs/wxGTK:3.0-gtk3[X,opengl,webkit] x11-libs/xcb-util ) sys-apps/util-linux !app-admin/quickswitch
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif ) https://github.com/BOINC/boinc/archive/client_release/7.20/7.20.2.tar.gz -> boinc-7.20.2.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6d01714e853369ec9bb5cc05958a4fcf
+_md5_=ea5c4b51c28193e94c05a8dad5d5c720
diff --git a/metadata/md5-cache/sci-misc/boinc-7.22.0 b/metadata/md5-cache/sci-misc/boinc-7.22.0
index 155261c7ac83..c62757f145cf 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.22.0
+++ b/metadata/md5-cache/sci-misc/boinc-7.22.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://boinc.berkeley.edu/
 INHERIT=autotools desktop flag-o-matic linux-info optfeature wxwidgets xdg-utils
 IUSE=X cuda curl_ssl_gnutls +curl_ssl_openssl opencl
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm64 ~ia64 ~ppc ppc64 sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=acct-user/boinc app-misc/ca-certificates cuda? ( x11-drivers/nvidia-drivers ) opencl? ( virtual/opencl ) dev-libs/openssl:= net-misc/curl[curl_ssl_gnutls(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)] sys-libs/zlib X? ( dev-libs/glib:2 media-libs/freeglut media-libs/libjpeg-turbo:= x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libxcb:= x11-libs/wxGTK:3.0-gtk3[X,opengl,webkit] x11-libs/xcb-util ) sys-apps/util-linux !app-admin/quickswitch
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif ) https://github.com/BOINC/boinc/archive/client_release/7.22/7.22.0.tar.gz -> boinc-7.22.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a635f4701c662cc7d25ad135a8c4a7b4
+_md5_=ac5b355fa2f6bd538415f080b76f7e1b
diff --git a/metadata/md5-cache/sci-misc/h5utils-1.13.1 b/metadata/md5-cache/sci-misc/h5utils-1.13.1
index db06c3aabb67..d801756295a2 100644
--- a/metadata/md5-cache/sci-misc/h5utils-1.13.1
+++ b/metadata/md5-cache/sci-misc/h5utils-1.13.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/NanoComp/h5utils
 INHERIT=autotools
 IUSE=hdf octave
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= sci-libs/hdf5:0= sys-libs/zlib hdf? ( sci-libs/hdf:0= virtual/jpeg:0 )
 SLOT=0
 SRC_URI=https://github.com/NanoComp/h5utils/archive/1.13.1.tar.gz -> h5utils-1.13.1.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=13cc73260d57d648f247e9788a0833c1
+_md5_=f1991edb1d84fe10ba46819daaa2b825
diff --git a/metadata/md5-cache/sci-misc/nco-4.5.1-r3 b/metadata/md5-cache/sci-misc/nco-4.5.1-r3
index b0a4fb134b96..efbad9008cf9 100644
--- a/metadata/md5-cache/sci-misc/nco-4.5.1-r3
+++ b/metadata/md5-cache/sci-misc/nco-4.5.1-r3
@@ -5,11 +5,11 @@ EAPI=6
 HOMEPAGE=http://nco.sourceforge.net/
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=dap gsl hdf5 ncap2 openmp static-libs test udunits
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sci-libs/netcdf-4:=[dap=,hdf5?,tools(+)] gsl? ( sci-libs/gsl:= ) ncap2? ( dev-cpp/antlr-cpp:2= ) udunits? ( >=sci-libs/udunits-2 )
 RESTRICT=!test? ( test )
 SLOT=0/4.5.1
 SRC_URI=http://nco.sf.net/src/nco-4.5.1.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a4b74a2b21e1a818bfb13be45c5a2214
+_md5_=13c616961e4d0b329fb50a56596c3050
diff --git a/metadata/md5-cache/sci-misc/nco-5.1.3-r1 b/metadata/md5-cache/sci-misc/nco-5.1.3-r1
index 5a1e03eae34c..5164d8f3cb60 100644
--- a/metadata/md5-cache/sci-misc/nco-5.1.3-r1
+++ b/metadata/md5-cache/sci-misc/nco-5.1.3-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://nco.sourceforge.net/
 INHERIT=toolchain-funcs
 IUSE=dap gsl hdf5 ncap2 openmp test udunits
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=sci-libs/netcdf-4:=[dap=,hdf5?,tools(+)] gsl? ( sci-libs/gsl:= ) ncap2? ( dev-cpp/antlr-cpp:2= ) udunits? ( >=sci-libs/udunits-2 )
 RESTRICT=!test? ( test )
 SLOT=0/5.1.3
 SRC_URI=http://nco.sf.net/src/nco-5.1.3.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b639bf7a2a55d9aebf2782e1cf8ddff6
+_md5_=593a2f058656a2634e4ee2549ed2d73b
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-6.2.0 b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
index 512dd3177685..eeef8e4da63b 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Programming language and IDE for agent-based modelling
 EAPI=7
 HOMEPAGE=https://ccl.northwestern.edu/netlogo/
 INHERIT=desktop java-pkg-2 xdg
-KEYWORDS=-* amd64 x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* media-libs/mesa sys-libs/glibc x11-libs/libdrm x11-libs/libX11 x11-libs/libXrender x11-libs/libXxf86vm >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://netlogoweb.org/assets/images/desktopicon.png -> netlogo.png amd64? ( https://ccl.northwestern.edu/netlogo/6.2.0/NetLogo-6.2.0-64.tgz ) x86? ( https://ccl.northwestern.edu/netlogo/6.2.0/NetLogo-6.2.0-32.tgz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=48ca6b5c64b9576aed2f036ea30ac39b
+_md5_=c7a95f8a6bbaf88e4354dab7ace9a496
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2 b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2
index de57d083d66f..49e467f26403 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-6.2.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://ccl.northwestern.edu/netlogo/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop java-pkg-2 xdg
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* media-libs/mesa sys-libs/glibc x11-libs/libdrm x11-libs/libX11 x11-libs/libXrender x11-libs/libXxf86vm >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://netlogoweb.org/assets/images/desktopicon.png -> netlogo.png amd64? ( https://ccl.northwestern.edu/netlogo/6.2.2/NetLogo-6.2.2-64.tgz ) x86? ( https://ccl.northwestern.edu/netlogo/6.2.2/NetLogo-6.2.2-32.tgz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8ebbcc291928817655e2aaf331b2645c
+_md5_=d6cc0fa290f62fee322f0fad43a81175
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 617e751fdfe0..6e419e674558 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/bullet-3.21 b/metadata/md5-cache/sci-physics/bullet-3.21
index 931dbb658fdc..37bc0b524685 100644
--- a/metadata/md5-cache/sci-physics/bullet-3.21
+++ b/metadata/md5-cache/sci-physics/bullet-3.21
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.bulletphysics.com/
 INHERIT=cmake toolchain-funcs
 IUSE=doc double-precision examples extras openmp tbb test +threads
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/freeglut tbb? ( <dev-cpp/tbb-2021.4.0:= )
 REQUIRED_USE=openmp? ( threads ) tbb? ( threads )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/3.21
 SRC_URI=https://github.com/bulletphysics/bullet3/archive/3.21.tar.gz -> bullet-3.21.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c607a9dfc2a4e5207cb5b0edeae798dc
+_md5_=9a175aca2e005840ffb84c45239094e0
diff --git a/metadata/md5-cache/sci-physics/clhep-2.4.5.3 b/metadata/md5-cache/sci-physics/clhep-2.4.5.3
index a62c643ea0c4..9811a0693e88 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.4.5.3
+++ b/metadata/md5-cache/sci-physics/clhep-2.4.5.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://proj-clhep.web.cern.ch/proj-clhep/
 INHERIT=cmake
 IUSE=doc test threads
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 RESTRICT=!test? ( test )
 SLOT=2/2.4.5.3
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.5.3.tgz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=019a1d1d1c388a115b59afb0f865ede7
+_md5_=4800474dfb898644be84ad8f93203e55
diff --git a/metadata/md5-cache/sci-physics/clhep-2.4.6.2 b/metadata/md5-cache/sci-physics/clhep-2.4.6.2
index 486f7d6a2535..032d63af7cae 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.4.6.2
+++ b/metadata/md5-cache/sci-physics/clhep-2.4.6.2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://proj-clhep.web.cern.ch/proj-clhep/
 INHERIT=cmake
 IUSE=doc test threads
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 RESTRICT=!test? ( test )
 SLOT=2/2.4.6.2
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.6.2.tgz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=66431cc479a855c480a0b3dc3f6573ee
+_md5_=4800474dfb898644be84ad8f93203e55
diff --git a/metadata/md5-cache/sci-physics/geant-4.11.0.3 b/metadata/md5-cache/sci-physics/geant-4.11.0.3
index 466f3253e7b3..175ec992491f 100644
--- a/metadata/md5-cache/sci-physics/geant-4.11.0.3
+++ b/metadata/md5-cache/sci-physics/geant-4.11.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://geant4.web.cern.ch/
 INHERIT=cmake python-single-r1
 IUSE=+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl python qt5 raytracerx static-libs tbb threads vtk +python_single_target_python3_10
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.5.1:2=[threads?] data? ( ~sci-physics/geant-data-4.11.0.0 ) doc? ( app-doc/geant-docs ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) vtk? ( sci-libs/vtk:=[qt5] )
 REQUIRED_USE=^^ ( c++17 c++20 ) inventor? ( opengl ) motif? ( opengl ) python? ( ^^ ( python_single_target_python3_10 ) ) qt5? ( opengl ) tbb? ( threads ) vtk? ( qt5 )
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4-v11.0.3.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=16ceeeea64c609ad627f054aec0d5dfc
+_md5_=f11360d786b8ccafc8b535f1718143b5
diff --git a/metadata/md5-cache/sci-physics/geant-4.11.1.0 b/metadata/md5-cache/sci-physics/geant-4.11.1.0
index cdb9233301a2..0666310e9605 100644
--- a/metadata/md5-cache/sci-physics/geant-4.11.1.0
+++ b/metadata/md5-cache/sci-physics/geant-4.11.1.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://geant4.web.cern.ch/
 INHERIT=cmake
 IUSE=+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl qt5 raytracerx static-libs tbb threads vtk
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 RDEPEND=dev-libs/expat >=sci-physics/clhep-2.4.6.2:2=[threads?] data? ( ~sci-physics/geant-data-4.11.1.0 ) doc? ( app-doc/geant-docs ) gdml? ( dev-libs/xerces-c ) hdf5? ( sci-libs/hdf5[threads?] ) inventor? ( media-libs/SoXt ) motif? ( x11-libs/motif:0 ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qt3d:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) vtk? ( sci-libs/vtk:=[qt5] )
 REQUIRED_USE=^^ ( c++17 c++20 ) inventor? ( opengl ) motif? ( opengl ) qt5? ( opengl ) tbb? ( threads ) vtk? ( qt5 )
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/releases/geant4-v11.1.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=850e3eacccffdaeb0d61def1e651a64b
+_md5_=18b2ae55383c6d7a52667d67da06cc84
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.11.0.0 b/metadata/md5-cache/sci-physics/geant-data-4.11.0.0
index a98aadc1ff9f..e5598c4ffff1 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.11.0.0
+++ b/metadata/md5-cache/sci-physics/geant-data-4.11.0.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Data files for Geant4 physical processes
 EAPI=7
 HOMEPAGE=https://geant4.web.cern.ch
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.4.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.8.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.4.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.7.tar.gz
-_md5_=9df0357e9f20d043c014bcf1cbc2f059
+_md5_=24d83112b57e2bb61e71347c5a441d82
diff --git a/metadata/md5-cache/sci-physics/geant-data-4.11.1.0 b/metadata/md5-cache/sci-physics/geant-data-4.11.1.0
index bf835027a2a5..505944e0efd2 100644
--- a/metadata/md5-cache/sci-physics/geant-data-4.11.1.0
+++ b/metadata/md5-cache/sci-physics/geant-data-4.11.1.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Data files for Geant4 physical processes
 EAPI=7
 HOMEPAGE=https://geant4.web.cern.ch
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=geant4
 SLOT=4
 SRC_URI=https://geant4-data.web.cern.ch/geant4-data/datasets/G4RealSurface.2.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4TENDL.1.4.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4SAIDDATA.2.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ABLA.3.1.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4INCL.1.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4EMLOW.8.2.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PII.1.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4ENSDFSTATE.2.3.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4RadioactiveDecay.5.6.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4NDL.4.7.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PARTICLEXS.4.0.tar.gz https://geant4-data.web.cern.ch/geant4-data/datasets/G4PhotonEvaporation.5.7.tar.gz
-_md5_=97092a1c2cb480da75d3f45198878fa8
+_md5_=c6650a0bc8fe4ac1917e604d66e279f6
diff --git a/metadata/md5-cache/sci-physics/hepmc-2.06.09-r2 b/metadata/md5-cache/sci-physics/hepmc-2.06.09-r2
index ded3d7ac3ae8..424734b2a346 100644
--- a/metadata/md5-cache/sci-physics/hepmc-2.06.09-r2
+++ b/metadata/md5-cache/sci-physics/hepmc-2.06.09-r2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://hepmc.web.cern.ch/hepmc/
 INHERIT=cmake
 IUSE=cm doc examples gev test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://hepmc.web.cern.ch/hepmc/releases/hepmc2.06.09.tgz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4301fbd2c29ec15d65346f6457b8b8f5
+_md5_=04167002d992b0486784c9c53bb16ebc
diff --git a/metadata/md5-cache/sci-physics/hepmc-2.06.11 b/metadata/md5-cache/sci-physics/hepmc-2.06.11
index ffb6484a7bf4..f0bd4fc8221f 100644
--- a/metadata/md5-cache/sci-physics/hepmc-2.06.11
+++ b/metadata/md5-cache/sci-physics/hepmc-2.06.11
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://hepmc.web.cern.ch/hepmc/
 INHERIT=cmake
 IUSE=cm doc examples gev test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!sci-physics/hepmc:0
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://hepmc.web.cern.ch/hepmc/releases/hepmc2.06.11.tgz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9b7eff88d62954746f66c54ffa6da716
+_md5_=8b988d97c1a2babfbe474af3de66d5d7
diff --git a/metadata/md5-cache/sci-physics/herwig-6.5.21-r2 b/metadata/md5-cache/sci-physics/herwig-6.5.21-r2
index d24a0f350bc4..85badbc072f1 100644
--- a/metadata/md5-cache/sci-physics/herwig-6.5.21-r2
+++ b/metadata/md5-cache/sci-physics/herwig-6.5.21-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/
 INHERIT=autotools fortran-2
 IUSE=doc static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=all-rights-reserved
 RDEPEND=virtual/fortran
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6521.f https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6521.INC https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/HERWIG65.INC doc? ( https://www.hep.phy.cam.ac.uk/theory/webber/Herwig/hw65_manual.pdf )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4b9c9e471181eab22b6ab437549a49ad
+_md5_=6ae4b68fc7c1c8bffe2792cc7f541bc6
diff --git a/metadata/md5-cache/sci-physics/lammps-20220217 b/metadata/md5-cache/sci-physics/lammps-20220217
index 72c7fdb35b6b..d2ce2a0d29b4 100644
--- a/metadata/md5-cache/sci-physics/lammps-20220217
+++ b/metadata/md5-cache/sci-physics/lammps-20220217
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://lammps.sandia.gov/
 INHERIT=cmake fortran-2 distutils-r1
 IUSE=cuda examples gzip hip lammps-memalign mpi opencl python test python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5:=[mpi] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0= sci-libs/netcdf:= cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) opencl? ( virtual/opencl ) hip? ( dev-util/hip:= ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python3_10 ) ) ?? ( cuda opencl hip )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.lammps.org/tars/lammps-17Feb2022.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b9043e745c815a7bc77c1c1e9fd3439d
+_md5_=0456a7c70eb90381a66fe80618cbd175
diff --git a/metadata/md5-cache/sci-physics/lammps-20220217-r1 b/metadata/md5-cache/sci-physics/lammps-20220217-r1
index f4b9095ba755..0d3d3768ed7f 100644
--- a/metadata/md5-cache/sci-physics/lammps-20220217-r1
+++ b/metadata/md5-cache/sci-physics/lammps-20220217-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://lammps.sandia.gov/
 INHERIT=cmake fortran-2 distutils-r1
 IUSE=cuda examples gzip hip lammps-memalign mpi opencl python test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5:=[mpi] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0= sci-libs/netcdf:= cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) opencl? ( virtual/opencl ) hip? ( dev-util/hip:= ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) ?? ( cuda opencl hip )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.lammps.org/tars/lammps-17Feb2022.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cd6afa9e2df65d25fdfbfbf9f2c016a0
+_md5_=3578572cd19378e0a2fc2eb9da6d5ab0
diff --git a/metadata/md5-cache/sci-physics/lammps-20220623 b/metadata/md5-cache/sci-physics/lammps-20220623
index e1c95ec13c07..1d8b2ac297b8 100644
--- a/metadata/md5-cache/sci-physics/lammps-20220623
+++ b/metadata/md5-cache/sci-physics/lammps-20220623
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://lammps.sandia.gov/
 INHERIT=cmake fortran-2 distutils-r1
 IUSE=cuda examples gzip hip lammps-memalign mpi opencl python test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5:=[mpi] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0= sci-libs/netcdf:= cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) opencl? ( virtual/opencl ) hip? ( dev-util/hip:= ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) ?? ( cuda opencl hip )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.lammps.org/tars/lammps-23Jun2022.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cd6afa9e2df65d25fdfbfbf9f2c016a0
+_md5_=3578572cd19378e0a2fc2eb9da6d5ab0
diff --git a/metadata/md5-cache/sci-physics/lammps-20230328 b/metadata/md5-cache/sci-physics/lammps-20230328
index 44c5561a1a70..935dbebff751 100644
--- a/metadata/md5-cache/sci-physics/lammps-20230328
+++ b/metadata/md5-cache/sci-physics/lammps-20230328
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://lammps.sandia.gov/
 INHERIT=cmake fortran-2 distutils-r1
 IUSE=cuda examples gzip hip lammps-memalign mpi opencl python test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/gzip media-libs/libpng:0 sys-libs/zlib mpi? ( virtual/mpi sci-libs/hdf5:=[mpi] ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) ) sci-libs/voro++ virtual/blas virtual/lapack sci-libs/fftw:3.0= sci-libs/netcdf:= cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) opencl? ( virtual/opencl ) hip? ( dev-util/hip:= ) dev-cpp/eigen:3 virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python3_10 python_targets_python3_11 ) ) ?? ( cuda opencl hip )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.lammps.org/tars/lammps-28Mar2023.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	2d32e797ee29a8ffdd452f4a85860666	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cd6afa9e2df65d25fdfbfbf9f2c016a0
+_md5_=3578572cd19378e0a2fc2eb9da6d5ab0
diff --git a/metadata/md5-cache/sci-physics/lhapdf-6.3.0-r1 b/metadata/md5-cache/sci-physics/lhapdf-6.3.0-r1
index 438665576033..3713d24822fa 100644
--- a/metadata/md5-cache/sci-physics/lhapdf-6.3.0-r1
+++ b/metadata/md5-cache/sci-physics/lhapdf-6.3.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://lhapdf.hepforge.org/
 INHERIT=distutils-r1 docs
 IUSE=examples python_single_target_python3_10 python_single_target_python3_11 doc
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.11:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.3:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://www.hepforge.org/downloads/lhapdf/LHAPDF-6.3.0.tar.gz
 _eclasses_=distutils-r1	2d32e797ee29a8ffdd452f4a85860666	docs	7b9e167549c44efa7994614f33ba6d7a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c7bc239f15de0a96e05fc71f765eb4a9
+_md5_=3be430a4a1aaed7a682c90cce8f05d8b
diff --git a/metadata/md5-cache/sci-physics/pythia-6.4.28-r2 b/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
index 719da2651449..6863f284ebc9 100644
--- a/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
+++ b/metadata/md5-cache/sci-physics/pythia-6.4.28-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://pythia6.hepforge.org/
 INHERIT=autotools fortran-2
 IUSE=doc examples
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
 RDEPEND=virtual/fortran
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/pythia-6.4.28.tar.xz https://root.cern.ch/download/pythia6.tar.gz -> pythia6-20160413.tar.gz doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp0613man2.pdf ) examples? ( mirror://gentoo/pythia-6.4.18-examples.tar.bz2 )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=569005808d84cd5466aaa18abed1c332
+_md5_=ccb132e3bbb4daba51249b1d944945e9
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 9cb038093023..9334212f485b 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.19 b/metadata/md5-cache/sci-visualization/epix-1.2.19
index 913ec89691ac..f0d60ed56c82 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.19
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.19
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://mathcs.holycross.edu/~ahwang/current/ePiX.html
 INHERIT=autotools bash-completion-r1 elisp-common
 IUSE=doc emacs examples
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.19_withpdf.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=66a96026bf62e2287f3897d7c04532d6
+_md5_=3de1dd2f4a658ca3c4ee780d034f5c59
diff --git a/metadata/md5-cache/sci-visualization/g3data-1.5.4 b/metadata/md5-cache/sci-visualization/g3data-1.5.4
index e90dc820b2d2..9c5cace7207d 100644
--- a/metadata/md5-cache/sci-visualization/g3data-1.5.4
+++ b/metadata/md5-cache/sci-visualization/g3data-1.5.4
@@ -5,10 +5,10 @@ DESCRIPTION=Tool for extracting data from graphs
 EAPI=7
 HOMEPAGE=https://github.com/pn2200/g3data
 INHERIT=autotools
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://github.com/pn2200/g3data/archive/refs/tags/v1.5.4.tar.gz -> g3data-1.5.4.gh.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6c682a0523feed405b55bac1ae05f1c6
+_md5_=180240b9e5278c79555956bd6eb8047d
diff --git a/metadata/md5-cache/sci-visualization/ggobi-2.1.11 b/metadata/md5-cache/sci-visualization/ggobi-2.1.11
index 4900f0641a29..f88aef4830eb 100644
--- a/metadata/md5-cache/sci-visualization/ggobi-2.1.11
+++ b/metadata/md5-cache/sci-visualization/ggobi-2.1.11
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.ggobi.org/
 INHERIT=autotools xdg
 IUSE=doc minimal nls
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=CPL-1.0
 RDEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/ggobi/ggobi_2.1.11.orig.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=17f050846f4960370e2e6b110b12e884
+_md5_=00ce0fa95d060282a0280274a83dd692
diff --git a/metadata/md5-cache/sci-visualization/gwyddion-2.61 b/metadata/md5-cache/sci-visualization/gwyddion-2.61
index 8a8d568b1534..5658874b4aa8 100644
--- a/metadata/md5-cache/sci-visualization/gwyddion-2.61
+++ b/metadata/md5-cache/sci-visualization/gwyddion-2.61
@@ -7,10 +7,10 @@ HOMEPAGE=http://gwyddion.net/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools xdg
 IUSE=bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32 dev-libs/libzip media-libs/libpng:0= >=sci-libs/fftw-3.1:3.0=[openmp?] virtual/libiconv virtual/libintl x11-libs/cairo >=x11-libs/gtk+-2.18:2 x11-libs/libXmu x11-libs/pango bzip2? ( app-arch/bzip2 ) fits? ( sci-libs/cfitsio[bzip2?] ) jansson? ( dev-libs/jansson ) hdf5? ( sci-libs/hdf5[hl,zlib?] ) openexr? ( media-libs/openexr:= ) perl? ( dev-lang/perl:= ) ruby? ( dev-ruby/narray ) unique? ( dev-libs/libunique:3 ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://gwyddion.net/download/2.61/gwyddion-2.61.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b6763ee9677250e66d67319c7058f54d
+_md5_=1c62770ed1296ae78f100be41b03b071
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3ff7e191b150..ae49e177f4e2 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.10.0 b/metadata/md5-cache/sys-apps/pciutils-3.10.0
index 26bbb7fa7e85..abb675214095 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.10.0
+++ b/metadata/md5-cache/sys-apps/pciutils-3.10.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
 INHERIT=toolchain-funcs multilib-minimal flag-o-matic
 IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwdata
 REQUIRED_USE=static-libs? ( !udev )
 SLOT=0
 SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.10.0.tar.gz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=689e2d5db6569db41182a036309e39d6
+_md5_=4b9ff6a6c63ba66c28cc3ffc23e7d501
diff --git a/metadata/md5-cache/sys-apps/sysvinit-3.07 b/metadata/md5-cache/sys-apps/sysvinit-3.07
index 65b674ec36bb..30a098843c53 100644
--- a/metadata/md5-cache/sys-apps/sysvinit-3.07
+++ b/metadata/md5-cache/sys-apps/sysvinit-3.07
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
 INHERIT=toolchain-funcs flag-o-matic plocale verify-sig
 IUSE=selinux ibm nls static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/root selinux? ( >=sys-libs/libselinux-1.28 ) !<app-i18n/man-pages-l10n-4.18.1-r1 !<sys-apps/openrc-0.13 selinux? ( sec-policy/selinux-shutdown )
 SLOT=0
 SRC_URI=https://github.com/slicer69/sysvinit/releases/download/3.07/sysvinit-3.07.tar.xz verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/3.07/sysvinit-3.07.tar.xz.sig )
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=dd240160002a809aa61cd7052731be09
+_md5_=e3d35b18b2979bdd24c224d0752103d4
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index fdf85a8dd186..fcf50a46b85b 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/parted-3.6 b/metadata/md5-cache/sys-block/parted-3.6
index 11c0b3dca816..f008e3bf29d6 100644
--- a/metadata/md5-cache/sys-block/parted-3.6
+++ b/metadata/md5-cache/sys-block/parted-3.6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parted/
 INHERIT=autotools verify-sig
 IUSE=+debug device-mapper nls readline verify-sig
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=sys-fs/e2fsprogs-1.27 sys-apps/util-linux device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-5.2:0= )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.6.tar.xz verify-sig? ( mirror://gnu/parted/parted-3.6.tar.xz.sig )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=81def30881f4bacfc4b3ef9c2e421987
+_md5_=d35b67e0f3e756d7f87c5a873e480cc3
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 074ddf68444d..dc660702cd11 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/bmake-20230414 b/metadata/md5-cache/sys-devel/bmake-20230414
index 7db4b41f1083..192081c536f6 100644
--- a/metadata/md5-cache/sys-devel/bmake-20230414
+++ b/metadata/md5-cache/sys-devel/bmake-20230414
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=NetBSD's portable make
 EAPI=8
 HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20230414.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=d0ace234150879b6959bb7c8f5d80c1b
+_md5_=aaf8592347a1062992202e7e3de7fbe3
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index fd7331ab2641..244e15cb6788 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/xfsprogs-6.2.0 b/metadata/md5-cache/sys-fs/xfsprogs-6.2.0
index 57d707d10896..530d192ed736 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-6.2.0
+++ b/metadata/md5-cache/sys-fs/xfsprogs-6.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/
 INHERIT=flag-o-matic systemd usr-ldscript
 IUSE=icu libedit nls selinux split-usr
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/inih dev-libs/userspace-rcu:= >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) selinux? ( sec-policy/selinux-xfs )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-6.2.0.tar.xz
 _eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=c7aad0b5628b8eb90b85ae5efb948656
+_md5_=59178676bb358b7ef37ea3648265dd8b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 57eb57f511ec..26be49d2b2d3 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.183 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.183
new file mode 100644
index 000000000000..fdbab0893ff7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.183
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.183
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.183 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.183
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-193.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-193.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3677311e1815525f59538d1bf4e806b0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.116 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.116
new file mode 100644
index 000000000000..272be0c7d04d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.116
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.116
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.116 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.116
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-122.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-122.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9de7b29d1e4407b307182ed95a3d9bf0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.246 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.246
new file mode 100644
index 000000000000..51aab293a4ae
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.246
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.246
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.246 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.246
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-253.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-253.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=22d8f8f752ea86f596191f3d49d288aa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.33 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.33
new file mode 100644
index 000000000000..d4022d217146
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.33
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.33
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.33 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.33
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-38.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-38.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=fd499f3354bc25c94813a3872010ca13
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.7
new file mode 100644
index 000000000000..4fb3653b54b9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.3.7
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.3.7
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.3.7 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-10.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.3.1-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.3.1-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.3.1-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.3.1-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=52d80b933d0abd24a9d5d1f888aada90
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.183 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.183
new file mode 100644
index 000000000000..ef888336fdbf
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.183
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.183
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.183 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.183
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-193.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-193.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.183-1.gpkg.tar -> gentoo-kernel-5.10.183-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.183-1.gpkg.tar -> gentoo-kernel-5.10.183-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.183-1.gpkg.tar -> gentoo-kernel-5.10.183-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.183-1.gpkg.tar -> gentoo-kernel-5.10.183-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=2422c72e784d853dab46884d24a219c8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.116 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.116
new file mode 100644
index 000000000000..b8f5ce4cf9ff
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.116
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.116
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.116 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.116
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-122.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-122.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116-1.gpkg.tar -> gentoo-kernel-5.15.116-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116-1.gpkg.tar -> gentoo-kernel-5.15.116-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116-1.gpkg.tar -> gentoo-kernel-5.15.116-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116-1.gpkg.tar -> gentoo-kernel-5.15.116-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=3a8ae6be2f70d60acd9626d82f8147e7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.246 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.246
new file mode 100644
index 000000000000..c21690dd9000
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.246
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.246
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.246 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.246
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-253.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-253.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246-1.gpkg.tar -> gentoo-kernel-5.4.246-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246-1.gpkg.tar -> gentoo-kernel-5.4.246-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246-1.gpkg.tar -> gentoo-kernel-5.4.246-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246-1.gpkg.tar -> gentoo-kernel-5.4.246-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=e827ff5379e16533be8dd3e7897a71e0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.33 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.33
new file mode 100644
index 000000000000..e698b36f0405
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.33
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.33
+RDEPEND=!sys-kernel/gentoo-kernel:6.1.33 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.33
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-38.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-38.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33-1.gpkg.tar -> gentoo-kernel-6.1.33-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33-1.gpkg.tar -> gentoo-kernel-6.1.33-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33-1.gpkg.tar -> gentoo-kernel-6.1.33-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33-1.gpkg.tar -> gentoo-kernel-6.1.33-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=cad2b30138d88863a6bbc530b2441b9f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.7
new file mode 100644
index 000000000000..68f99477229c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.3.7
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.3.7
+RDEPEND=!sys-kernel/gentoo-kernel:6.3.7 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.3-10.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.7-1.gpkg.tar -> gentoo-kernel-6.3.7-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.7-1.gpkg.tar -> gentoo-kernel-6.3.7-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.7-1.gpkg.tar -> gentoo-kernel-6.3.7-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.7-1.gpkg.tar -> gentoo-kernel-6.3.7-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=68f99116fb8734b0fcefafa3774e7199
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.183 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.183
new file mode 100644
index 000000000000..001ee2458f38
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.183
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.183
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.183
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.183.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.183.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=6d46e875226d6340b91d52c28b2e9147
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.116 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.116
new file mode 100644
index 000000000000..0a237c4ecec0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.116
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.116
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.116
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.116.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.116.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=2eac001ceafd53f76d270f933dce1217
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.246 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.246
new file mode 100644
index 000000000000..c4f5d3ef2e37
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.246
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build verify-sig
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.246
+RDEPEND=virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.246
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.246.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.246.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=a8d9882e72b6a1a3ab6202bed1ccc813
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.33 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.33
new file mode 100644
index 000000000000..9285e5ab1124
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.33
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.33
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.33
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.33.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.33.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=6af3201a419530fc1a9351b0f433c39c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.7
new file mode 100644
index 000000000000..43c6bfef2b44
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.3.7
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.3:3.11 >=dev-lang/python-3.10.11:3.10 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.3.7
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.3.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.7.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.7.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.3.1-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.3.1-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.3.1-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.3.1-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.3.1-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	ba15b8b81f30ca448294d759a9f7902c	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=aa8a6e1653e357261e5beaf4601b97a1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index fb9cdfd0b9f3..5b336a8fd486 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1 b/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1
index b988020398db..f46cb1e08719 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1
+++ b/metadata/md5-cache/sys-libs/libunwind-1.6.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://savannah.nongnu.org/projects/libunwind
 INHERIT=multilib-minimal
 IUSE=debug debug-frame doc libatomic lzma static-libs test 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=~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=lzma? ( app-arch/xz-utils[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test !test? ( test )
 SLOT=0/8
 SRC_URI=mirror://nongnu/libunwind/libunwind-1.6.2.tar.gz loong? ( https://dev.gentoo.org/~xen0n/distfiles/sys-libs/libunwind/libunwind-1.6.2-loong.patch.xz ) !doc? ( https://dev.gentoo.org/~sam/distfiles/sys-libs/libunwind/libunwind-1.6.2-docs.tar.xz )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=03f00289461ee327b94c00439255c19b
+_md5_=36be7e0087a14f90c4ed68f4cd0639a3
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index e2a0f241e6ce..c3d4a9f055a3 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/parallel-20230422 b/metadata/md5-cache/sys-process/parallel-20230422
index c80badb1fb41..a91fdf543d57 100644
--- a/metadata/md5-cache/sys-process/parallel-20230422
+++ b/metadata/md5-cache/sys-process/parallel-20230422
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
 INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20230422.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20230422.tar.bz2.sig )
 _eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=6052dda29944c00b09e005ca429a0f1e
+_md5_=7ca0798cb408c481b7018a3141d0adc0
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index ccd63a802f6e..f8577d5062cd 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.183 b/metadata/md5-cache/virtual/dist-kernel-5.10.183
new file mode 100644
index 000000000000..54311d08d057
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.183
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.183 ~sys-kernel/gentoo-kernel-bin-5.10.183 ~sys-kernel/vanilla-kernel-5.10.183 )
+SLOT=0/5.10.183
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.116 b/metadata/md5-cache/virtual/dist-kernel-5.15.116
new file mode 100644
index 000000000000..b2883daf8ce0
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.116
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.116 ~sys-kernel/gentoo-kernel-bin-5.15.116 ~sys-kernel/vanilla-kernel-5.15.116 )
+SLOT=0/5.15.116
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.246 b/metadata/md5-cache/virtual/dist-kernel-5.4.246
new file mode 100644
index 000000000000..6475b96519f3
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.246
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.246 ~sys-kernel/gentoo-kernel-bin-5.4.246 ~sys-kernel/vanilla-kernel-5.4.246 )
+SLOT=0/5.4.246
+_md5_=844ac6f7a5f9492ed01a8c238a631cd8
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.33 b/metadata/md5-cache/virtual/dist-kernel-6.1.33
new file mode 100644
index 000000000000..37de730b3378
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.33
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.33 ~sys-kernel/gentoo-kernel-bin-6.1.33 ~sys-kernel/vanilla-kernel-6.1.33 )
+SLOT=0/6.1.33
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.3.7 b/metadata/md5-cache/virtual/dist-kernel-6.3.7
new file mode 100644
index 000000000000..ac30e7732352
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.3.7
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.3.7 ~sys-kernel/gentoo-kernel-bin-6.3.7 ~sys-kernel/vanilla-kernel-6.3.7 )
+SLOT=0/6.3.7
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/lapacke-3.8-r1 b/metadata/md5-cache/virtual/lapacke-3.8-r1
index cecf8103e686..67980f413dfa 100644
--- a/metadata/md5-cache/virtual/lapacke-3.8-r1
+++ b/metadata/md5-cache/virtual/lapacke-3.8-r1
@@ -3,7 +3,7 @@ DEPEND=>=sci-libs/lapack-3.8.0[lapacke,eselect-ldso?] eselect-ldso? ( || ( >=sci
 DESCRIPTION=Virtual for LAPACK C implementation
 EAPI=7
 IUSE=eselect-ldso
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=>=sci-libs/lapack-3.8.0[lapacke,eselect-ldso?] eselect-ldso? ( || ( >=sci-libs/lapack-3.8.0[lapacke,eselect-ldso] >=sci-libs/openblas-0.3.10[eselect-ldso] ) )
 SLOT=0
-_md5_=f0e7d55a3f7efed3abd4af2bfd715ce3
+_md5_=f8917d2f283e5bf6bca5db4b86b37269
diff --git a/metadata/md5-cache/virtual/szip-2.1 b/metadata/md5-cache/virtual/szip-2.1
index 301aa7e4eed6..7e69145fa7ea 100644
--- a/metadata/md5-cache/virtual/szip-2.1
+++ b/metadata/md5-cache/virtual/szip-2.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for szip compression drop-in replacements
 EAPI=8
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 RDEPEND=|| ( sci-libs/libaec[szip] sci-libs/szip )
 SLOT=0/2
-_md5_=2915a4835f2cd090c126b63087809fb3
+_md5_=ad1b066983e79c17ac517acdf220bdb6
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 4e197a6937cc..b5a1b1c3b945 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.17 b/metadata/md5-cache/www-apache/passenger-6.0.17
index 829a49d84167..f361d77a2027 100644
--- a/metadata/md5-cache/www-apache/passenger-6.0.17
+++ b/metadata/md5-cache/www-apache/passenger-6.0.17
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.phusionpassenger.com/
 INHERIT=apache-module flag-o-matic ruby-ng toolchain-funcs
 IUSE=apache2 debug test apache2 ruby_targets_ruby30 ruby_targets_ruby31
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=Boost-1.0 MIT BSD
 RDEPEND=ruby_targets_ruby30? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby31(-)] >=dev-ruby/rake-0.8.1[ruby_targets_ruby31(-)] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.17.tar.gz
 _eclasses_=apache-module	c39c4721f3b26f641833bddb8ee0718e	depend.apache	416d1c5005c5f4594e79812fb7323f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-ng	af08d2b1445bef89013607f69330a791	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=587394d3528e1817b3a13270e7ee1df1
+_md5_=7a3b2d3fdceddcb265ab6fda3c18bfa5
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 0caf8499e4fb..b1fd380be226 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-115.0.5790.13 b/metadata/md5-cache/www-client/google-chrome-beta-115.0.5790.24
index 5190aee5263a..5fd8097c9a75 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-115.0.5790.13
+++ b/metadata/md5-cache/www-client/google-chrome-beta-115.0.5790.24
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_115.0.5790.13-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_115.0.5790.24-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-116.0.5803.2 b/metadata/md5-cache/www-client/google-chrome-unstable-116.0.5817.0
index 1e7ea3b15564..c75a2fe455c7 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-116.0.5803.2
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-116.0.5817.0
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_116.0.5803.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_116.0.5817.0-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=af0793b63d0070684d513c0045380acb
diff --git a/metadata/md5-cache/www-client/microsoft-edge-114.0.1823.37 b/metadata/md5-cache/www-client/microsoft-edge-114.0.1823.43
index 145934792148..4908d23c111f 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-114.0.1823.37
+++ b/metadata/md5-cache/www-client/microsoft-edge-114.0.1823.43
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_114.0.1823.37-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_114.0.1823.43-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e3faf660236342ed84650dbc4c099195
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.35 b/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.41
index cede72ea5ebd..6e98cce6b2e1 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.35
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.41
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_114.0.1823.35-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_114.0.1823.41-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.30 b/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.43
index b766773d7c96..ccdbe8ae79ad 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.30
+++ b/metadata/md5-cache/www-client/microsoft-edge-beta-114.0.1823.43
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_114.0.1823.30-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-beta/microsoft-edge-beta_114.0.1823.43-1_amd64.deb
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c35de9f6a641eab8e5a8a8dc008143f6
diff --git a/metadata/md5-cache/www-client/opera-99.0.4788.47 b/metadata/md5-cache/www-client/opera-99.0.4788.65
index d096da69c0cb..8c085490b740 100644
--- a/metadata/md5-cache/www-client/opera-99.0.4788.47
+++ b/metadata/md5-cache/www-client/opera-99.0.4788.65
@@ -10,6 +10,6 @@ LICENSE=OPERA-2018
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/99.0.4788.47/linux/opera-stable_99.0.4788.47_amd64.deb https://download2.operacdn.com/pub/opera/desktop/99.0.4788.47/linux/opera-stable_99.0.4788.47_amd64.deb https://download3.operacdn.com/pub/opera/desktop/99.0.4788.47/linux/opera-stable_99.0.4788.47_amd64.deb https://download4.operacdn.com/pub/opera/desktop/99.0.4788.47/linux/opera-stable_99.0.4788.47_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-110.0.5464.2.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/99.0.4788.65/linux/opera-stable_99.0.4788.65_amd64.deb https://download2.operacdn.com/pub/opera/desktop/99.0.4788.65/linux/opera-stable_99.0.4788.65_amd64.deb https://download3.operacdn.com/pub/opera/desktop/99.0.4788.65/linux/opera-stable_99.0.4788.65_amd64.deb https://download4.operacdn.com/pub/opera/desktop/99.0.4788.65/linux/opera-stable_99.0.4788.65_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-110.0.5464.2.tar.xz )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4e80f148f4994f89a4462f1796b062b1
diff --git a/metadata/md5-cache/www-client/vivaldi-6.0.2979.22 b/metadata/md5-cache/www-client/vivaldi-6.0.2979.22
index b596a1e31e66..ac854bbdd361 100644
--- a/metadata/md5-cache/www-client/vivaldi-6.0.2979.22
+++ b/metadata/md5-cache/www-client/vivaldi-6.0.2979.22
@@ -5,11 +5,11 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info unpacker xdg
 IUSE=gtk proprietary-codecs qt5 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
+KEYWORDS=-* amd64 ~arm ~arm64
 LICENSE=Vivaldi
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:112 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.22-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.22-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.22-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dc2e8b9576175068ad742cab9b13d217
+_md5_=56d83cc20d2cdb59a5dd607dd61037e8
diff --git a/metadata/md5-cache/www-client/vivaldi-6.0.2979.18 b/metadata/md5-cache/www-client/vivaldi-6.1.3035.51
index e93b408d5cf1..d77191893e86 100644
--- a/metadata/md5-cache/www-client/vivaldi-6.0.2979.18
+++ b/metadata/md5-cache/www-client/vivaldi-6.1.3035.51
@@ -5,11 +5,11 @@ HOMEPAGE=https://vivaldi.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=chromium-2 desktop linux-info unpacker xdg
 IUSE=gtk proprietary-codecs qt5 widevine +l10n_af +l10n_am +l10n_ar +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_ca-valencia +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sr-Latn +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm ~arm64
+KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:112 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:114 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.18-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.18-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.0.2979.18-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.1.3035.51-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.1.3035.51-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_6.1.3035.51-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=56d83cc20d2cdb59a5dd607dd61037e8
+_md5_=a1dc14c19861e998c5ee6b9209925075
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-6.1.3023.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-6.1.3035.50
index 550398e00c91..aef48246e923 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-6.1.3023.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-6.1.3035.50
@@ -10,6 +10,6 @@ LICENSE=Vivaldi
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] gtk? ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:114 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.1.3023.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.1.3023.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.1.3023.3-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.1.3035.50-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.1.3035.50-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_6.1.3035.50-1_arm64.deb )
 _eclasses_=chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a1dc14c19861e998c5ee6b9209925075
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 07492aee9b67..077b7c26aa7c 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-115.0.5790.13_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-115.0.5790.24_beta
index 7fbacecb05c7..2b9b88e96c26 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-115.0.5790.13_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-115.0.5790.24_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_115.0.5790.13-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_115.0.5790.24-1_amd64.deb
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-116.0.5803.2_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-116.0.5817.0_alpha
index 12efe4695f30..8e684ec2ef47 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-116.0.5803.2_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-116.0.5817.0_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_116.0.5803.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_116.0.5817.0-1_amd64.deb
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
 _md5_=eaa785838d85936e9a01ebeaaf056ec1
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 796604b67b83..505e165e74ea 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/xaos-3.6 b/metadata/md5-cache/x11-misc/xaos-3.6
index 7ee6a5d65409..09877b2907ba 100644
--- a/metadata/md5-cache/x11-misc/xaos-3.6
+++ b/metadata/md5-cache/x11-misc/xaos-3.6
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://matek.hu/xaos/doku.php
 INHERIT=autotools desktop strip-linguas
 IUSE=aalib doc gtk nls png svga threads X
-KEYWORDS=amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:= sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm )
 SLOT=0
 SRC_URI=mirror://sourceforge/xaos/xaos-3.6.tar.gz https://dev.gentoo.org/~jlec/distfiles/xaos.png.tar
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7476a294fa9d65cc8c7efb568954dbc0
+_md5_=45ffa079d8bd7ad47479800ef58a6084
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.3.0 b/metadata/md5-cache/x11-misc/xsnow-3.3.0
index 7fcad3c7c414..8abd1835b322 100644
--- a/metadata/md5-cache/x11-misc/xsnow-3.3.0
+++ b/metadata/md5-cache/x11-misc/xsnow-3.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=let it snow on your desktop and windows
 EAPI=7
 HOMEPAGE=https://janswaal.home.xs4all.nl/Xsnow/ https://sourceforge.net/projects/xsnow/
 INHERIT=autotools xdg
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm64 ~ppc ppc64 sparc ~x86
 LICENSE=freedist
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/xsnow/3.3.0/xsnow-3.3.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3066d1715fa23fa0e200ca4c04a22bc5
+_md5_=7379c86f932317aa2101d4604a6ed705
diff --git a/metadata/md5-cache/x11-misc/xsnow-3.6.0-r1 b/metadata/md5-cache/x11-misc/xsnow-3.6.0-r1
index 78214b23b732..488e933a9975 100644
--- a/metadata/md5-cache/x11-misc/xsnow-3.6.0-r1
+++ b/metadata/md5-cache/x11-misc/xsnow-3.6.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.ratrabbit.nl/ratrabbit/xsnow/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools xdg
-KEYWORDS=amd64 ~arm64 ~ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm64 ~ppc ppc64 sparc ~x86
 LICENSE=freedist
 RDEPEND=dev-libs/glib:2 sci-libs/gsl:= sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm x11-libs/libXtst x11-libs/libxkbcommon
 SLOT=0
 SRC_URI=https://www.ratrabbit.nl/downloads/xsnow/xsnow-3.6.0.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d5c8de8c9d7aad290753e65cb38fd104
+_md5_=99a4ce71b6b167b4f617002193ba1911
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 935590009e97..b896fef99fc8 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-06-09T14:10:06Z
+TIMESTAMP 2023-06-09T20:10:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSDMr5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSDhyJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klADtBAAgjF3NqXjKTwDBE62ra2jy6egj++0cXTX2D1EbFcWWkyQ2IrmZiaztg7j
-QW8H2r0Cjmqnlz5ga54nBrxfIlPPIU3D84gVK06Jg2Sp0ogN4pFyt4Kc0qFZqb8n
-0y0gY/2EPVs1NmmpuSzteSpNaDD+D24htX/9cHggP0Sei1P0swJJtPTOEp9YXwJF
-HFzcfYE60VFIAEfSSA887WFPHQS/Z5aaHrQpJe3vyC1QX0jRbsElGQlZ4YHs/6zw
-2lWT4RrschGazQJhxTPQkB9OdO0NlEAdUYmHS/B0e5j+tI11Gl0KwxMz26JbD02R
-F4Z72LEnj1zxwBpn0zr2dwph3KnRuOY7vRaAsVRJvBwF7E5UORMMQgeodK2/9ZIc
-CS+tg/9+9QVza4KMImIP+PB3gN35IimBPXhV93Tzfn2J/GQE+vkm9P6lgTScaNm7
-+xN+DnQkQ0LZG4VjYJqjBo8IzKhs0N8CXe9dJzxmNZwOxNPpQ8I8DwVcymHoJ8BJ
-BvIOR2NmDuXhPAl+zGbzg9ucCRd1Sig6eTUMVWrPJpjfDvvhWMatj2q8JV9gTxXk
-DCCcMtC7ej6Aivp8QrINtE7BNlSEXV51qlkJSRfH0bCSTnCdsgGSOlLQ8PYX/f99
-Y/JM1Mk6axfsRUE7IH1/fUYpgMmBR3OySioBWKGc4ODLPgklJ+I=
-=WNp/
+klABbg//Wmov33LHrvua6CpoD6ecvmWdjCcCUfwby59Gq/XNl878A7zjNcrT3DbE
+Y49KCebB8xMqsCOYXaDqtIz16m1AJ25clm7WCRMU5GMR1wWjnnwuQbRQmxz1tYSs
+N0aZ9zgSHr6YjeimnS3/EfK4gOTvG5jA2sK7LokvyGYb4W7z9w9140h/Q/LWWvI2
+nfnqvzLb5rwKcjZXuWMIl9LmMpYm7tWKqihOYjVEH/K5EK/n2G3A5PwiPao95KGx
+1r6MWyVW/37dHMGfLRKWBpraviMX86tw+wNrFioT901tkildVjp5d4zSXSIBwFh2
+Z/GX2BiMi7zWyxnmqTYrS/qvlZxDYhpPhxdihut04XrL0Oco9GpRUwXFQOA3brsM
+puZ4S3c8Fqjv63VZzdbYzt5EoVUgoPq71O4f82Uz5v0i00QG/Rb3wBirGMkTibKe
+NQyGS4TAxzQJP05q7petQo0WpeD4XJ9IjWNUEfXZzO9QasC9p9mVPSlMG0H/RkTm
+R5cWgzVM3dJfDcjbqbv0DdSVNM4qAndlER5AkNc60Sgfz3RrxM0oKJA8s4muXVZc
+OPlJ688wRhWCL8bq6G21J5CmQNibXRB3qCGoBppm1Uf3PkKKkGA67r2XZhK+dNLJ
+63GU0TXTZTd/OOYqB426DpSpoev1w33PAy3MtGOnrG2fjbOfOqI=
+=S1ax
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ee8639ca30dc..9a743057bb0f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2023 14:10:04 +0000
+Fri, 09 Jun 2023 20:10:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e8a441bddc8a..3c7eeb4a1972 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun  9 02:10:03 PM UTC 2023
+Fri Jun  9 08:10:07 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1ed3832ba563..8cec2ce188fd 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2023 14:15:01 +0000
+Fri, 09 Jun 2023 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 67dc2626b1c6..48276c6771fa 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ef42095e67ab3ef131d1cea93dc53cf9fcf994d0 1686319518 2023-06-09T14:05:18+00:00
+e80f04f14fc2e54d6cbe829df4ac90b6ec780961 1686339503 2023-06-09T19:38:23+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 52b2a855ba4f..56fc2ca69c47 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1686319801 Fri 09 Jun 2023 02:10:01 PM UTC
+1686341401 Fri 09 Jun 2023 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ee8639ca30dc..e23dc73ed24f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Jun 2023 14:10:04 +0000
+Fri, 09 Jun 2023 20:10:07 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 13b325bf22b1..eaab6e2927a2 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 6cfa4eae4ad2..04ec481ac624 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,5 +1,5 @@
 DIST check_rbl-1.6.3.tar.gz 50250 BLAKE2B cdaaf7252871c6a2cf34a1cacef36251b8526b73f4edb73fc1611a3426f350523928532bc78068438b8e71ec0e023da46749673aa5e9e1d5c6cd8b889f330305 SHA512 2fc84089eb9e41657f522aa7813776b3d46811759e177d031ff5d2f737d63c00897d50d5d878c1e5d5368ca1dde0b173e81b8a6f16fbb970270ef63d988add9b
 DIST check_rbl-1.7.0.tar.gz 51673 BLAKE2B 7e2d23ea5cd44082ebe9963326bc2a8517c737640fada229d0b65d64ac92ce50e80b675834f4bd7dbc56d653e0243558fe6f1c402b11498d48bc948d3facda57 SHA512 5b219362bfa736832e935c64019ee50b87d4f9cc2bce0ab4795eb4c59e03712adc9461cdd6624cbaf1d98a5afdd9f611dbdc58fd913a4478b0fef0664cddcf80
 EBUILD nagios-check_rbl-1.6.3.ebuild 1539 BLAKE2B 3421f10685efde047e70d9c99fa8949a4574979cc1e3602a9306709d77bd4b840a53010b899d461ca69ba5184552a59837d77779d58b5692d1fede17b87f0040 SHA512 7411be35a29ea4236f7fef35b6dcb2bb093b00ae76925bee218237ac01164361f49ea70a09e43dadc6e103e5f1bdae74fe1e8cd47752f9096448e336745db702
-EBUILD nagios-check_rbl-1.7.0.ebuild 1609 BLAKE2B c6346ede8bdfe21a7642ea57b8f69af0251a748707680afe95903b976cc7e3d2061bb16f754f0d1f9206da9a0bea65f32ea7edfe30cea6cd8d6149e2a24d8a2c SHA512 c848d8bc8eb30ee5c23b1ac18160009e05ea14c63fd303195621df0aa4a763e87a57d87ca703b7318e05ae3fbca60b8be948e6e309b7544b42b8d32b9f0cb9ea
+EBUILD nagios-check_rbl-1.7.0.ebuild 1608 BLAKE2B 31870c27730560bcda1f3db4ea3309c6cc5f83e21c67ed220073a95cd6c9753b48e467165ff921e304d39afbb866cb9e56ce19c7bf7c2528728cf4d875a656c3 SHA512 cce07442e9ed8f479f8d8c6267205c4e2187036be33e9a3390666174f212a8650d11876f2d70c6ec122364607f83a2e4916519a1833a4862d9f2ddef7fe03fa7
 MISC metadata.xml 469 BLAKE2B fbdd218961dcf07ca906741000ed4268491946520ed7ff6920b50a2ed70676e0fd68b63d39426c7cfdfd177c8ad70c2228736e2b2ccdecb4db1c72f686f9417f SHA512 e72d2be36e83f2691bd5d6f491a79616bed686d03ef02f33aa8d80db55f08f876a31cc3822615a5eeb5df03f7ed2e93146de20d185acf795955cc2cd6e38adf5
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild
index fe1663694bb6..67e83f2d8f0d 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa sparc ~x86"
 IUSE=""
 
 # No, this is not redundant -- see bug 627082.
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index d552a7ba1b63..50a25b095e93 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -3,6 +3,6 @@ AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae
 DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4 SHA512 fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86 SHA512 92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
-EBUILD nagios-core-4.4.10.ebuild 9247 BLAKE2B 0b7f8376c20f46868ad77cc7530c0056f3352416433b21ef4c5d3a661121eb31e96adefd28a978644157e7e428f7acafcef70415e00d2e4d85a26159dc081645 SHA512 96e94b04a772de2220213f058e64ddf799f0bdfa197e33c50ab40e6dd3f75a5031bf180ea2911f19fcc3f717eae0146e190bd6683f17426854227d8f84a47c97
+EBUILD nagios-core-4.4.10.ebuild 9245 BLAKE2B 5056a9193c1af83fa96cea7e45875a1215c985d21080d7f8d125eddc3da7a9bf23c6e809fac07c3717da7e1630aa9b6e56138594b42caf4ba43e1e2026a66eb3 SHA512 4e9568dcdd22558c43fd4dba6d6c70d8623d85a407744bf1bc8348ef7c11c25d5492b7b944bd8e003a8e9fc74b793ce7b49cf93f854e5203fab681c04300c362
 EBUILD nagios-core-4.4.7.ebuild 9243 BLAKE2B cdbc7b6b1f4ee156db7000d4413f33722d888c7cdb2bca0f072d189219cc677d9da6a255590b126505f9ac27329ff2361d55e5eebc47c2e553bf2200a370e36c SHA512 81b8c9af2f2b0dd9dcb362163c2bc224de97fe0327ee97b4376ddab373a1c657fe3be88bb948e0d9f6398aab6a9f79bca40e757adbc0130d473530c0f5570bed
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
index 1f5a40a99885..712bba954d18 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index b2c48b78e070..8c8fd0174030 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -4,6 +4,6 @@ DIST tcpdump-4.99.3.tar.gz.sig 442 BLAKE2B 97dbac4534f9b9daf0ab89d6a230835690737
 DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df
 DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8
 EBUILD tcpdump-4.99.3.ebuild 2115 BLAKE2B 37bda3fe4cd04cb8fd791544687481366b4d0f4b1fb191ba5db84ef18e245a5bcc5dc08dd4c64762181414f9496defa0dc1c12205bccbf5dc0b1daa68ab83ff6 SHA512 3948eee9b67e478a3f79c6239e5bc38dd62b421880f61dbe063d8ef7ec92d1a1dbfec0679634bab4153e2f34fbf91856620eef283334cfc645956c4107e105b8
-EBUILD tcpdump-4.99.4.ebuild 2117 BLAKE2B ba8f583d50db98bbbd3644b6c379c4f20373e341c338ada4413331d1cdda06d1ca8690fad7644231a2e66fe6e4d615529d325e618ae81630ce42e6115ce7652b SHA512 bf58ae5c3957e765de9d373ab06fdeda7b3acc4276a9f23bed3b7619cf3f38247f4cbf28f663dece1e8023656c781bc53d0c0741c505115dd4e8a6d77a0a7622
+EBUILD tcpdump-4.99.4.ebuild 2116 BLAKE2B 968b901338d0a8ec0b79a6d469fc3dab5f02fd3e76df961730c1c2f85f283f15cce075d01c1cd31e681adda469a395140d9d05bdb29c999a1c0156d6d0474509 SHA512 d29e8d508bcda8b1ae8aead08b66985ad97cab8acda5a086bf71bc9360aa4c42e888772c67049d55c13af95e206d38d9f2d8ae9bfbcce338a925c2bdab5d1864
 EBUILD tcpdump-9999.ebuild 2122 BLAKE2B faf5926fb5ce40c6e7357664dd142c8ae74c892a9c059500e85a81e7db977d8ba3638d3d4fa4837da758f9bd1dc6a04b200fcee9c9a4c037593a0f72e0c6541c SHA512 9a15c2c766c1fb8471545b6aa5988596e166b4f0a7d0b12dcafdf2cc2cf99037f54ef9ce2e9bd11235840451598a3a2f81557e3fdc057b13147ec8412e03cdfb
 MISC metadata.xml 593 BLAKE2B 7b4608973227459d0700d2f402e583a8cad512ca898287c2b32c71f42f6674a2c27cdc94d60e4af6fbe0df1478b8c2a2e0832d249adefbb7768ca1db0f3650b4 SHA512 45196d5f82e8bd5b26e2327a9a85ff7e49daabc5f396d7183a8cd6f3fbabef0d84014e355aa257c861487570f695ec07698e783624447d8d5120a03bbcf0fcd3
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild
index cb2c61c3d610..4bcb2d2a5c40 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.4.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="BSD"
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index aab8342fd0fe..d77be4099a67 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index e055ce773f79..dc672133ed71 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -21,5 +21,5 @@ DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83
 DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 0bd6948ba3930f7d6e657f91ff76b1101fa7bb8f3da6849344c2230622fce6c15354e632a9140fefafee5986b522fb85c77c70ac64821d280043d1cd3564be2a SHA512 ed5ea46e3346841a8e8b6a77756c1dba53dab5636f73cf495bf1a182c393bef83d6035f6af26fb903baa75ee689db4abae222b6f85a7e245eb59f9c805163774
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 EBUILD djbdns-1.05-r35.ebuild 3564 BLAKE2B d4cd41577de6d5639b8ac7cdc58850677ecef30e9d4147d0972d28a2624b2aabf2ab2249dfb3a8ff7b7795895f00dc38adce23a4cb260a65fce587e1986f853b SHA512 fc9235c3a2aca2b304888e107ef922a5b9abbc2d78087bc5082d021f6bbce3011446d0dd472e97574f9cd50b6e0c7e914042a10950a1dc2bd859664638db686a
-EBUILD djbdns-1.05-r38.ebuild 3870 BLAKE2B 45f9560f98bf524778be0953d38a21b9e1bd46c2cae1a5fe28c723ce08f37a4f8e05bcfce6ec3b003650990425c6c9aa0828668507c1e95bd7e5ac589c36c541 SHA512 eb714701b3cbcc60c052fe30046c4559559ca935d16cfe55e20a56d6e7580618f7d5418201d5263b7d0011e870d3589c1221938a4a7878d68f2c5b6fd31be272
+EBUILD djbdns-1.05-r38.ebuild 3868 BLAKE2B fc067873fa652b675fc1e5bae68669f1b58d433f9bf72cc471df02d3d238c630d1c4d7b30be5c21fe96e8e38c8b316df5da82c201c86ecc398eac741d2adcf6f SHA512 203f6af93d0e1bdf0740b42b2d526e566ad1f95785fc7b5587688df11a9526a1d2883f35b666bc449d8bdfd0133e51d3c9ef5770a1d6d5f8d3d3b518fae01390
 MISC metadata.xml 245 BLAKE2B 73b051fe35e6e3a8252464f473cfb6b2b87cb42e37e0c9b829a9a97417445f5d9f82bdb3c963daf9a0d914dfe7fffb231c32cd0f43e3ab0286fb9ffcc17051d3 SHA512 b66dbf131c8939413984b638aac6c40c06273035c0d9c0f58189fef258a5ae3589ccd3c4d6f9ca81a5ed363d313e95c657f2bdb0ae58f524399c4a82e2fc9893
diff --git a/net-dns/djbdns/djbdns-1.05-r38.ebuild b/net-dns/djbdns/djbdns-1.05-r38.ebuild
index b9e8644c4128..d5e32320b88d 100644
--- a/net-dns/djbdns/djbdns-1.05-r38.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r38.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
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index b262444eb31c..a1a414821ba7 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index e04fc87a0b20..cf4817e8e821 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -3,6 +3,6 @@ DIST rpcsvc-proto-1.4.3.tar.xz 167964 BLAKE2B dc15392fd68b76ffa92c08039076aed293
 DIST rpcsvc-proto-1.4.4.tar.xz 168648 BLAKE2B 2cba39b0307d773133306c4222e43cc44d4189bb125f993634b2a5e7679e5f5b4d28b05b95db6e694d316b4fdd182cf91c2a01ed1c519a3ca7ced5ebf5da3d10 SHA512 0138ac8fb2d8de3cb56f661bd1b6435fa0a35d3bd12c5cb7081c9ae1701e3620f47fe3dd002263db456655b61316749768e9a1a44325a1a6a542beae364a0393
 EBUILD rpcsvc-proto-0-r1.ebuild 471 BLAKE2B b0b4ceaa115b11ede6f31697b22ef19201a61918b8b64efa5e46e859f9e566459e3d9e3e12199eb93075d7d01b3fa21b0b81155f1ebbd3ecf85ac2ba212b2f1e SHA512 2259a0d8b0a1357c882de4d3d1db7cb95cc2756e8d83a2677e42418a5c6549a90e6da0a870cc04935951623cb713c9eb15077f5680e011087e78ef0d14ca80f0
 EBUILD rpcsvc-proto-1.4.3-r1.ebuild 1098 BLAKE2B 174b875d821f49c18f8f952bfb6c644a950d77b7f83b7a8b78f6cd562f057bcda7645ba179fc33cce4ab9ea9d57d9e644a25aa56b8dd292f15385d3b40b37197 SHA512 28a94298d2bacd886a64cfc2f3362e73db3f6f09d2b6cdf86e829563480215af1504781df137dbdf8d9cd8aa6d26cc28eba2ebcf9f778b6b2a486c0831ad0e27
-EBUILD rpcsvc-proto-1.4.3-r2.ebuild 1215 BLAKE2B 9705bb7cfb21ef1b9ed42cff9c6c501e4a7e930a9b71bb9d7ca76932c8dacffae004572a43e3b607457afb4a50e8432ec5411c5b91fb2a1a50237327b9550f0e SHA512 a77611b0fa0dde95af874952af9e77cac26edfb77d9bb4b3b8435df622ff09583d4699e1cafe9d102c80b5a15acbe719d009e45024e20b23d6d736c6f0ca40dc
+EBUILD rpcsvc-proto-1.4.3-r2.ebuild 1211 BLAKE2B 0ebbc2e149e98aa72441cb6fd821d3ffcb9202364343419682ea6c4f2cb1ae389d51ef0f0dda8ca0e3dff1391ce44269b76e6b48252e2efbfc4af070d65de34e SHA512 017f5430f49e55748e8cb2acb4a4a7db5cbca52e8ab2a97103069cb4afae6242c25c62d4bf52bea650ed5029dc7ebc387eacf69b178e6a019d00f62fb296e518
 EBUILD rpcsvc-proto-1.4.4.ebuild 1129 BLAKE2B cc838388a23fe4eb32e3a7810712b4387fb34a64e8811992230a1ed204c81f40f3d7590a76954e66407aab7d1326e2509f23032679d089d5415ad6a7a25f7d8b SHA512 e8ece4c6cf093045750708e643dd487d11ca7690b5643abeb8e8676a5212804bf0ce56b94b44a34ab67b5b2befff9c46f662cd6a8063ba8e8044c93c22c43c86
 MISC metadata.xml 473 BLAKE2B 698516ac72d10ef9da180c90077a04520ba92e66ff8750a8666e799171414cd8ab1a8c0211cac51fbae458e92b55b1627a1d018d3aae71c3ec9f33dd673af775 SHA512 aca1897bf12f0f821170c9b5734f1d990e8efa645481049e989aabad3eea722f9bce410f769f953121b8a2be942fdbca1100514e253fba0c9e356d703c234004
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r2.ebuild
index 4af94447f1c1..3325c015d3b1 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r2.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/rpcsvc-proto/releases/download/v${PV}/${P}.t
 
 LICENSE="LGPL-2.1+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="!<sys-libs/glibc-2.26
 	virtual/libintl"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 281e5b0b1b7e..01090e598351 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -7,7 +7,7 @@ DIST webkitgtk-2.40.2.tar.xz 40065104 BLAKE2B 177ac87de1c17768c50761f4146f3c8dc2
 EBUILD webkit-gtk-2.40.1-r410.ebuild 8030 BLAKE2B ee467dfd5ce6f705486b06b16083dcd7653db507965b7234bc9f2a9149972089e8d66802ada90c625256af53acadfbd7a1c648586005e7821a2e6c5c1dde5bf3 SHA512 e39a94c5e6afd41f77ac5fda8bef1564c482439045889830dfeda29a3aa066c2e02396ee6f6057c634c3c445de3a20f37dd0222609b779786aaed904ba21d5ee
 EBUILD webkit-gtk-2.40.1-r600.ebuild 7909 BLAKE2B 2e8c22850cf8cd1c9e8c8c040b161d290394ace2790cb24d106ad23a0ff85e2c0d36089f7a18ec22a9388e820ea46bb9f74223cc57364cebfb6739d1514a6a6a SHA512 b450774370f501b8790a4f58b07bbf24dd28650257cf55aa8e8ee0f24768f9051bd81726d90594f051c5bf67e9d858c6aaffb1bce9ec8c23dc4c459d9756fb13
 EBUILD webkit-gtk-2.40.1.ebuild 7756 BLAKE2B a4ca1a9aed73893ac75c78b4a21fc1e23802fe04e38d8f7fce2af747aa8586485f54397f99d785b4498f176641c4640a9066c37ea2321a82c9313497edaf646c SHA512 33d75aa7a06079fa45e64115cda7ac3610b36f522af7301859fae491bd994f3078786a18fcdb93ef1a5451c061fe0ce53fc0f0cbdab0a4f46895c5dc85e00966
-EBUILD webkit-gtk-2.40.2-r410.ebuild 7958 BLAKE2B d785c918733de6ae43707ad0279b4bef60585b2f00b37e265956484acbf0e534809d4dabfb9ef155301f576c3e5a54c4ab9fca73021609f448d66fe9167ede4f SHA512 e4efbd57b56594e03288cdea7c600c8e45d4c6389d63d98283f7dc5a38d851246f941732b49bacca05aafe5efb55eea211a0967e63ea9fcd97d620aa3ec6ec3f
-EBUILD webkit-gtk-2.40.2-r600.ebuild 7831 BLAKE2B 14c7fe3388005d0c259320b25d0d86ae5dcb10ecef044c25b09941e2785b324671e53875d0481a4317b9c51ead711ec383fdda011768d36ffce9db3076182fc6 SHA512 54bbedaf9750b7e3d59ebe93d46a1967d4d8d3b42edcc83bb47cf4b5d6f703fcfb8c037118ddd56a29a26ea85d622e6e69fb613c527ed78a376fe74228516500
-EBUILD webkit-gtk-2.40.2.ebuild 7684 BLAKE2B 79d1ee9d6c3b9518aa8173971ca768f7c16c49ae664583317e19c962c1f1482f95c8ecafbb2ea20082c5e89998901512928b9c4275d5a19fff02cac4990d02fb SHA512 23680753b6f8da4c6452236d6005bc9f0d50f06039085c82493b847ba4d0fd37b0ce97e9d0d5a29e210f612147a077c6cc410b3dd305957687bc9bbb663f0afc
+EBUILD webkit-gtk-2.40.2-r410.ebuild 7955 BLAKE2B aca26f18a95f98424a4273f01d718e75240b1ea774d3d8e86744313c0e0fa2d7774e49243fa915a0d99ff233afed1ed7c76d33d5e893b1dfc696af563ea77e22 SHA512 af727c20cd686687269a18b22e91beec5a3070c9ad7b131923d4888924d55ae1fc1e5c6b711133cfa66347ca6fb5c549b96c4fa28a4e7c6f7c7e66605700ef28
+EBUILD webkit-gtk-2.40.2-r600.ebuild 7828 BLAKE2B 800e8c6fcb8ee420b4d02222a7e169c660a1883063868003d30843bbd9006e8a267bc10c7becd34a4c4853b26319ea14f3b90248b58c05f410e15af01d4f3902 SHA512 45a6a2cf794dd175f1a32bd9fdda9da22c2ad8e5ca106759659fc79a3736bd85de0910ecd2e216492bccf5335a32a05f9f4975c7aaedf8b24b2067f307f4db5b
+EBUILD webkit-gtk-2.40.2.ebuild 7681 BLAKE2B ca629cce538eeaa1c31ced8fa924aef93746c884e44c04bcf6be006ab84f296336162e09b7b023157037a4b05f94e71cf88a8ed642e1217d31c1659e963b04ea SHA512 3d5944d1c17e23b7156d36c633f222cc0183de8eb52004c168d0667a1e7035e091b025be8a61feb0456dd30820e5348b6b1071d87ec5f797bc6f415e190fef7a
 MISC metadata.xml 709 BLAKE2B 270bd59a793199307b37c8899bdec1438c4576a6221926af6a81ae612e31269ba128b571e184ccf245cb6e82d73b2365adfa33a31cb79857dc2d0502b8fd1614 SHA512 37fa190e40b0b3fc2838ac39f7ee5915547b412692894ffdb72cc91e69236accdb3570f8d20b057fbd4db9d0b4e8d1cee638bce0720ceadd95cfec1ef8b53581
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
index 0a0206f43621..7eed67454925 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
index da7c60d6349a..c3d6fc150158 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
index ecf36ebc1763..8d407c2de659 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.40.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad gles2-only keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 40aa74719131..2b0e14188a77 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index d40670d9b07b..3ddc5e5573d8 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,5 +1,5 @@
 AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473d786c1e9acccf3512ba437d203798114ea1e9eb1fa79f4e5c6eca977b7b1357c2e668e SHA512 26329da5360bd25dacea3fde8c025f0bc34203970d2e75b47157fc0c4a3873cf6e7faa93c0a5a51bf20618846135ab18a09b6157521c3199c0667f969d491c4d
 AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791
 DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e
-EBUILD olsrd-0.9.8_p20210612.ebuild 2655 BLAKE2B 46420f18ff26eb00d8b29f18a71a8d21e12ff6d5bf6b50da4a1e17c4b2a91d74dff7ad9400f77d4367c855395163d65a0dfcdd01048eea737ba99ec33e06bb08 SHA512 086b206676f785066746108cdc713f72e2eb9e7c783f1abb38433589b7c34a82baa9d5d911f2c158b9d24d5ea1b230292ec5551ed684244c0605c7db61da6e31
+EBUILD olsrd-0.9.8_p20210612.ebuild 2656 BLAKE2B 1e0b9635035033f4acb095b44c9b9ce7dbb31d3f350ef257212655913318f0e376746b9c041518297264f9b3388e02cf5aaa5e5fcf6b00b416984dd0a3f5daaa SHA512 a59c6488fc51b15243789cc28ae4ae073793ef7d480534da0945293460ce6367686bfc4c380ed9e15b6020d82eac9dec5fae9c879bd610d1fb9a2a046b631250
 MISC metadata.xml 324 BLAKE2B 0e3d7a0154ecc4a0ae6c8f48bc9b28aad1289e1635783f3a74cf753f6392d530823cb1c1e0034f04c50fae65a2ec67892702737d9052a889353f1c0e63fd2f1f SHA512 d43e748039672d6b51690be28db0f6a19e8e41a7a930721cb3c51e0620f19a3ae603a9a35eb9994118a662a312678f38d5a80c6cf7ecd2d676148366ddcae41b
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
index ebcdd8a89db8..f24860958dc8 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gtk pud"
 
 DEPEND="
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index f306e42215ae..6d995abbff58 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -8,5 +8,5 @@ DIST suite3270-4.2ga5-src.tgz 4192998 BLAKE2B 2e29a9e9f25688bd5fc84101cab684c0fc
 EBUILD suite3270-4.0_p13.ebuild 2048 BLAKE2B d80986faad81ef67e87e2b04c08501597b52038a3b2c9d1acc036e7b60771dae0b7fbf87778362c243c461b17122f43d493e45b90a0306b3b350048613ecc9be SHA512 7f3b6c7fe32ff609f6ac04bc07ed1f2db932ab3dbc8cf8f5a33a296e1dc45fddc122900be2cea3b5ce307106b564a64cc07b78dc1a51f613c47f471af9221292
 EBUILD suite3270-4.0_p14.ebuild 2052 BLAKE2B 9dc44ca0a90febe1ce62cd0a97ad7eb77ba1f61dabe77d22b2285fc9549779d554a389e3b6563e4cff6cd1d98d074c27e67d70d3c769efd2596f5c1eaaa044fe SHA512 c4ac7388701fa6756d9b4e982e234813ab9edcd488d1afea90875ea8fd2e286ff670c8467915bf1a2dd6f12361f19112035cad2ff4c80790b3f25e4f33e45b26
 EBUILD suite3270-4.1_p11.ebuild 1859 BLAKE2B bef4edc8308450eb4a0492944de6cdc90e32e23b496666452d63d47c7bedef04e7060962764bc636c5f60bb725a4bca33e9e6948fd18b24a4ffe60fc03e7f229 SHA512 e16cc0876b34ec9dc7b608e57ec8d8f26762f3b9b589404fc959da9a7f329da20a8baa4550c6ff93ff2a53d8dff0801ebed13b0634af9bf383a8bef7a70a124c
-EBUILD suite3270-4.2_p5-r1.ebuild 2035 BLAKE2B 850c915e744e242f668fed07764babcbc6e2ee197cc12c6cfd325233ed0b12d06638adba1910909052dff6811ff2adfe14e422ff8eac99c594a48c5b1fecc5db SHA512 3a7dbe9bcc842d382aa800b83fb5393bdfe7655712acc2f1f896501d08d98cdd0f8c645dce8d6e34b059ec19803f3f0648f600b570e25fcc9ef2b29db14bdce8
+EBUILD suite3270-4.2_p5-r1.ebuild 2034 BLAKE2B 1f0fefc132bdc4faa620b5e5bd9f38ae2bc113dc7760458507aba1f61f4a64b9e46f2bf13b5b705b618d90c6202ba6b770a0513f6652dd1212b3125dbd1e168c SHA512 0e6d29a3d2c12f0a327032591e500833355c0e368386e648a97520ae6c873299216190a660c6f40f75386a8be021256292b6f9ec624009364640ce98e13ef203
 MISC metadata.xml 457 BLAKE2B cb4578a310eb76545a496f18038819ff2743decd2fca974700cb361883644a442ea7eb0a2c0e4e189012c74b3738cc7baade6c8e791149a98ec8fdb664f0b868 SHA512 9e24148183d02f4e8ed481720da479757690a29163e7d0c22d3a66f88b1c84d3d0d1ac9ed0c22d973a88fb59341228f1ffbda6dece48f14d0efce8d3e15a6a96
diff --git a/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
index 89288f125a7c..9efea00ad56e 100644
--- a/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
+++ b/net-misc/suite3270/suite3270-4.2_p5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~s390 sparc ~x86"
 IUSE="X cjk doc ncurses ssl tcl"
 
 RDEPEND="
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index d3617d49b9fc..ec33ea8c2579 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -6,6 +6,6 @@ DIST whois_5.5.16.tar.xz 90516 BLAKE2B c3d34dd392c2d7968c5c9b7bcce07d144dc3d7dce
 DIST whois_5.5.17.tar.xz 90608 BLAKE2B 82793097e421d88130d089fc64bb0bceac0c9170b39388262b45d2bf62fc2f8b7c4e393fc5351bba6be303ced00a00af1972bf73c1c8c7c86c812b19a0a6fb5a SHA512 0ed33edc2005eb51a88bda505cc3f6ebe3966095d6f12c03cfe62c12e7e575e1d008632d12de6f27b4c09b91ce5a45705d57acce88409e573bbd7b5132df7fc6
 EBUILD whois-5.5.14.ebuild 1808 BLAKE2B 515bdfc63e20ec89b88a133e14ca14d41a523738999c376db7f4f23ef65b0620e5ab57ee029afc3945c63cdd26757a574fd686cf3bf2d0a3d9917cf13fb089e0 SHA512 505ea2158d675fdaba18bffebb1e4011a21ac6b8286ab29325085a615be9143277d18ce022c27c9ede8b45d092976a7b008e5767f36a3d04ce86e7fc45515abc
 EBUILD whois-5.5.16.ebuild 1816 BLAKE2B efd577b1381c19776018f0602f6344c938ade6f8de4382f19bd02e26eb3ae680256fcfd2cbe60e59346415884af99969224ec9ba017e7bccfbccb466822c388b SHA512 a24cef284e30e8f5306a23d18f45155ec03055b1c84cf86d7a641b741bdcd021a76ddc50a0de540fb391e65f84f390dc7f31d8a57dc7f0407269d2d3cca6ebd5
-EBUILD whois-5.5.17.ebuild 1811 BLAKE2B d10fbd208513db92efc473405b9e8ebb63e12bad843be5788ef4dc7446a0de0fe497d383669d081ef75256c0e35698361291509b1b67aafb0fd22824d830f441 SHA512 c8fa2e33108c33a70fa9c8cf4ea80d3e1d05407fc15dc357c8760abb2b286bb244886b4a4b195697a18f160afbabb0d42f5ac96b5e69622c79852631be98afa8
+EBUILD whois-5.5.17.ebuild 1810 BLAKE2B c2f84957f093699545bdbf468e852ed25f717c40ac2f5878b44104373124e2b25da7bf89d31a3eee73ff46b90e444f5e15c768d7b6730f87d7b8719fa396dcdc SHA512 11f8c9f5999b325b414c6f22caa764dbc1f5703e975cb6057d49f3548f4c8592a18ccb9c4bd9e50b899d50405803df6f3a3ad108e3236528bb2806fe804e0cd7
 EBUILD whois-9999.ebuild 1816 BLAKE2B efd577b1381c19776018f0602f6344c938ade6f8de4382f19bd02e26eb3ae680256fcfd2cbe60e59346415884af99969224ec9ba017e7bccfbccb466822c388b SHA512 a24cef284e30e8f5306a23d18f45155ec03055b1c84cf86d7a641b741bdcd021a76ddc50a0de540fb391e65f84f390dc7f31d8a57dc7f0407269d2d3cca6ebd5
 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f
diff --git a/net-misc/whois/whois-5.5.17.ebuild b/net-misc/whois/whois-5.5.17.ebuild
index 4febff007d8c..2d169c52d9e3 100644
--- a/net-misc/whois/whois-5.5.17.ebuild
+++ b/net-misc/whois/whois-5.5.17.ebuild
@@ -17,7 +17,7 @@ else
 	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}"/${PN}
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index f38f59505f44..a5b1039d58b8 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 7a825e44adce..c926569b80b9 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -8,6 +8,6 @@ AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46af
 DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
 DIST cups-2.4.4-source.tar.gz 8135056 BLAKE2B 888ebf4630c08a200248ef1472374a002712b4c817f2e16c04c30b3c2e5842bc38656a976b1dd24eb0eec0630cb84b97d48339dca034f2e19fc2a6fc6ec58c7f SHA512 861b7d8e92b5ff2c2f693464f417ce1c22da74508acbfb2cb6a889154d4673f4b3f4dd87c53f8539a01b603d66546ebc6c121b88d483746e2f180d587ff3c675
 EBUILD cups-2.4.2-r7.ebuild 9765 BLAKE2B bab5aaa86a5ef65a7f15678ff716279ef580a9b79b6c160ec1b60ee913a146d20756699fb0d721f5e118691c0696a234c781b0d7aae0bb0f22c976f5efa556b9 SHA512 e0e4a3426f08858fc3f6006e1db3cff31b347404089d465efe379d1b0ddf313990346c81d915f3e82d4ebdcabd11bd2edd196cca987be7fb475d4e45aac7f8b7
-EBUILD cups-2.4.4.ebuild 9425 BLAKE2B 281532f0d1423c993ef120e479b60e90f468240d8521bcd9bd3f101ac95d5cd8d075f17f83aba556edba070710f3177e08d39116b7e54dc04af81fb92b356e8d SHA512 7e62838a88c63daca7836e49f0fa5287902ab220fd35b338d384d9978ad897f5b4c08450381a4567f70a4b041d048dbd41f9b82b816938cb78c5c19b9474e24a
+EBUILD cups-2.4.4.ebuild 9423 BLAKE2B 16b6408ebc418b89bc4bb2aab4e59799b8793762a986bab9fcf3d4339e1e70d79e5af2bd3bfa66e1599a43541defbd6a4562053639922a11e9b56f302d556d32 SHA512 3bfedf0c5c928acc4fb5c48c5295475aab03c03d430eb3c9c84b7b128f9268f636b7899b9def7ec1c92d65a128a025dbfb854f16cfbb70c48cab403abdd650ed
 EBUILD cups-9999.ebuild 9429 BLAKE2B c25dfe792b5c3a63274823ad9d7f7578bd8bd05cab2f4840cd53e425a830c84465a7bc463e38a7fff1daa801137de19cf95151e2cd474e0edf88b44c4e835f87 SHA512 444117c67782830965c4b64ed366c010f943bd2256cc4a1c56ade6e0adfb4eb8d0af39696296d81dc5829097b1acdb79058f806cbd3af64dbecf5960b57c57bb
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.4.ebuild b/net-print/cups/cups-2.4.4.ebuild
index c90ea6d7520e..ad5cde8b0df7 100644
--- a/net-print/cups/cups-2.4.4.ebuild
+++ b/net-print/cups/cups-2.4.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+		KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 	fi
 fi
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bcee07669db7..73e5333367a9 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/x86/package.use.stable.force b/profiles/arch/x86/package.use.stable.force
new file mode 100644
index 000000000000..a6c0d6da525f
--- /dev/null
+++ b/profiles/arch/x86/package.use.stable.force
@@ -0,0 +1,6 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2023-06-03)
+# Destabilizing x86 keywords on sci-*/* packages
+app-office/libalkimia gmp
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index f7788b6a3a88..a35e1badefbd 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,29 @@
 
 #--- END OF EXAMPLES ---
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2023-06-03)
+# Destabilizing x86 keywords on sci-*/* packages
+app-metrics/collectd collectd_plugins_gps collectd_plugins_sigrok
+dev-games/openscenegraph las
+dev-libs/efl physics
+dev-ml/zarith mpir
+media-libs/a52dec djbfft
+dev-python/graphviz test
+kde-apps/cantor R
+dev-python/sympy symengine
+kde-apps/gwenview fits
+kde-apps/marble gps
+kde-plasma/plasma-workspace gps
+media-gfx/graphviz gts
+media-libs/libpano13 suitesparse
+media-libs/opencv gdal lapack
+media-libs/openimageio dicom
+sci-libs/cholmod partition
+sci-libs/gdal armadillo fits geos hdf5 netcdf ogdi
+sci-libs/gsl cblas-external
+sci-libs/hdf szip test
+sci-libs/hdf5 szip
+
 # Hans de Graaff <graaff@gentoo.org> (2023-03-28)
 # dev-ruby/stringex is not marked stable here yet
 dev-ruby/kramdown unicode
diff --git a/profiles/package.mask b/profiles/package.mask
index c02692d60f3d..71b3a22f07e8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -39,13 +39,6 @@
 # Removal on 2023-07-09.  Bug #888245.
 dev-python/doctest-ignore-unicode
 
-# Sam James <sam@gentoo.org> (2023-06-09)
-# Severe security vulnerability: executes arbitrary code returned in responses
-# from the server. Appears a CA is abusing that acme-sh uses eval.
-# Please see https://github.com/acmesh-official/acme.sh/issues/4659 and
-# https://bugs.gentoo.org/908104.
-app-crypt/acme-sh
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2023-06-08)
 # May be broken on some arches due to weird LLVM interaction.
 # Masked for now.
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 33963c4611b0..72e54ad060cd 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/calcmysky/Manifest b/sci-astronomy/calcmysky/Manifest
index 32b774a6746e..fae2b507c98b 100644
--- a/sci-astronomy/calcmysky/Manifest
+++ b/sci-astronomy/calcmysky/Manifest
@@ -1,5 +1,5 @@
 DIST calcmysky-0.2.1.tar.gz 2161314 BLAKE2B b0aa1abc75f59c9c16429749bb8669e49e17e3dc7716bb78f472a9181c7d77a2c82c2f3800529f620604f233f88855908b0b55d824bf259d0912e157b9537faf SHA512 3915b965ee656b259ce7f158dfdd3c9c11a6c3ff907307899ae55e88ad6c1ccfbec8e0a1f784f5232fb0cb2c8300422fa25b8b1d4d11639d3ebb8c76d67059e5
 DIST calcmysky-0.3.0.tar.gz 2164140 BLAKE2B 18d904ad0ed2ec81d705005fa3fea4e66d7250ff2c46bd563e14c783768760d6cc55ea3376682298d5290516ea3b9bf170da8546da5eafc2d2603e597220d9d4 SHA512 529e9cd3d1e71e5ba3e910e9af44e5ddf1af105b499948325401faa9e0cf7911d8ef003570f5bb5395ff6954c37ae6fd7242eb1300f78636232d745012d495ef
-EBUILD calcmysky-0.2.1.ebuild 1219 BLAKE2B b14475b1a0c672b046ff13176cfd18f03f6a2d3497dd940a7cae27c86e6a738c4e0fba750af34442687623cb5593f8101c8b2b75a393de55bef6222a2951970a SHA512 931e9837b003d6636de3a46c4cbf1e5c3e5fc6839e927e57b5a56cc0885a25cc4218b406e9880cb656aae4108bc8625301db9f578a562f65b9f361b6e4b80469
-EBUILD calcmysky-0.3.0.ebuild 1219 BLAKE2B 1e381be2dee5899d77a0777483081ee352be8074f970a08368916174776dadfd358d7bf8cd6222e8cb8a4669c95c2f0a057b9dff7aa47beb82288a6750950f8d SHA512 d3b3e62e267bd309d2bf08ed78b29e3c9b4c5bef3c3f2ab00393550575f28dfee34b958c474780f665ef4d91e3b11885ee48bcc5e024fe8bf77f4a143638d214
+EBUILD calcmysky-0.2.1.ebuild 1220 BLAKE2B c4fd5ff5b75451a3ab29e0b260f287fae25be873dcc815d6937f59eeead5c6367512b2db8ef5212ac47e1e3936afdd3833119e8c13e4c14d329bc5ede2b507ad SHA512 0bae538f2dbe409c4c0281cf5b4db301bea874dcedda8994a521229dca63b2566a3e71230b5622f82c822a95fa965460627bb536f8ca0944ec76369e04a1a6a5
+EBUILD calcmysky-0.3.0.ebuild 1220 BLAKE2B 96fa75434224737253e61900154f96a9a1577c3a5afdcc927daf1fcc7e30652b9b6c55829efbc68efead24cae846ce0b2fb0cc96d089780dc965da4a3031e17f SHA512 cd3bee65131528c9a98304bce978b2cefd8cdaba347e3ff59d451d849b070e7fccf72b07be02c3c945fcafdf3d3bb85cdbab6aff091235b765cebfab59881c84
 MISC metadata.xml 582 BLAKE2B dbfe97e6d7c27ec436cd080f0d9c7969f4a13a174db9637970dc19d9ca3c6387e3de1f97093fb8699e22f77927daa49e10709bfe14b91ade50e3d8bc449bfcb2 SHA512 ec397bf939ac6935284ae74ceca2cd253b9558d963ab627153cd5360bff6f506a8cfe53cbf49a38a59a71fd3013f25138c44d1034aed134f0d1995d021ad7408
diff --git a/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild b/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
index 079e8175a060..a1d89d8471ce 100644
--- a/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
+++ b/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-3"
 # subslot is soversion
 SLOT="0/14"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/sci-astronomy/calcmysky/calcmysky-0.3.0.ebuild b/sci-astronomy/calcmysky/calcmysky-0.3.0.ebuild
index d84ed59f6414..577176466199 100644
--- a/sci-astronomy/calcmysky/calcmysky-0.3.0.ebuild
+++ b/sci-astronomy/calcmysky/calcmysky-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-3"
 # subslot is soversion
 SLOT="0/15"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/sci-astronomy/erfa/Manifest b/sci-astronomy/erfa/Manifest
index 64cd4c40486d..1a4bbc226540 100644
--- a/sci-astronomy/erfa/Manifest
+++ b/sci-astronomy/erfa/Manifest
@@ -1,5 +1,5 @@
 DIST erfa-1.4.0.tar.gz 641051 BLAKE2B 448f9f883d85a3c39a58497c6211542719c77b05b6bf4087519b710642c144939a9e27ba44b82a42d759dc04e1effe9833ae087487292846f954e6c3f93fb8db SHA512 2befe5a45486dbbd2ee88229cce7a6101462254bd346d3a2859e294f31119eb5cf5e4113e4061fa3e371216ed793a79ea1ba98fc6fd8aa53d2ba4170e1e135e2
 DIST erfa-2.0.0.tar.gz 729292 BLAKE2B af081b44bdcde4457aba661b08b6bc941e8a4e4fad4a61c40a529dd719eb125263662126246cee83dfa73eb81032888331522e04fe824d0e54fd66bd6ce8b222 SHA512 6761a8c1e1fc20f8603b451a47a47c872fe99e39ec805f131f3db24aeb5b6ac3ac480c89630ff9defbedd0e621fb7e2b7922869b8c29ada1fd41cb9793c9ca0a
-EBUILD erfa-1.4.0.ebuild 548 BLAKE2B 6ccecf946e74d7ff15baa05bbd57c8546774b05c573ce5a27d29cccbd7c2ce109a6200cdfec4610fe9f2ee95613955aea167b2b6d2a3b443a6db8c3207be5bb6 SHA512 553a93ef37fc23b2535716ac398d88cc87c8875ee864d0a074327ea2593e561dce0588c8962391e031f5ca85904388c1b202d257a9b19151917b8383f328dc30
+EBUILD erfa-1.4.0.ebuild 549 BLAKE2B bb8c9e3f72b8c30bf4aa003bce69305238f200d0ce547fef3245397d22dcaa88e2611fb99d06e03fa28d8a42b8daf83d30f2879df60ad2c5c205bec874f55a61 SHA512 a357a4d43a3eafbce4407efc996432c6db6c5375936691e0859ec77366e370563bd2184b83ac30c70083266968748f3ff315870e6971b42da5bf86ee2c91d6f2
 EBUILD erfa-2.0.0.ebuild 541 BLAKE2B 7e905008445f2bd5b71b2b07f6173371fab0f1e540ac398ad772844ebb72fe135ec5d4a193dc0a5230b9a0d3484a1eddbde776dd97ed745ac3811ed6761b47fa SHA512 2930292f2b1262bef346e91c568c899870730d2700233bbca0485e2773e155331328c688d72196a58e3e697a42296ccfa75588ce1ee8d0355ed889c725272e8c
 MISC metadata.xml 603 BLAKE2B 38def9126519f315cdef6df3fc6bd26936083228b7a33accb821373f436fd31f14a62e8d5242da86b5bc51a3dd05a7d749faee41d4e816d0413a4404a877902d SHA512 60ccfd3237909339c96ea12ab7e0ad18dc1ea0246aa0d20ab99ed59bf613d8a8c33f6fb2d2dff4948f838f209aea509386d9a9645e24a53b349052290c307540
diff --git a/sci-astronomy/erfa/erfa-1.4.0.ebuild b/sci-astronomy/erfa/erfa-1.4.0.ebuild
index 0d4dc7846097..0f22559424f9 100644
--- a/sci-astronomy/erfa/erfa-1.4.0.ebuild
+++ b/sci-astronomy/erfa/erfa-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/liberfa/erfa/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_prepare() {
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index dd9909b27d10..25656771e21a 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,3 @@
 DIST kstars-3.6.2.tar.xz 111110944 BLAKE2B 8a2c5821b982ee62167e2ba28d70d3931d9643d7c9410097169f87556ec4b2ea137e6595089960c63c6063f69c1415968664b8dd1e05a8f8a619b37d2539c26e SHA512 8519aaab748afe948af332cf3b54a031aa65ac0d36f4dc3b5da7de9bffd9eab402221a11378ebe4d97cf4d4b0754b1a7c644f8222c93e0fca089f26545f10283
-EBUILD kstars-3.6.2.ebuild 2635 BLAKE2B 82865cca64f96065192348818f800bb660caf3007398f667da4cab8361305937b68a169d15b85b375afc7de6121542efe4be998d7fa34d7d016fbc3dfb693723 SHA512 c8fd1aeaa39fdb5107505f4670d01dfccafc0c80fbc5cfb07ffec1e39fa9802ea6b570e310c77f780c6387ff1ef0e8ee52424f5fb94b86e6fd88b9321e969929
+EBUILD kstars-3.6.2.ebuild 2636 BLAKE2B 5522231cc0444c6e8e57909c622851e6a3cdbea8dd519555c0a0232a617d4c0daea5d649eae7d463fac92e9ba748cc1d827081f3679dad282e9e3049d496f272 SHA512 76c91f64024ca6b966e4e59ae415e027e6eaec56c969ac52211c7f24fc52341b25347f44174c08356e9d5b88a9c497700281c9a9f89a4b6f7323cfdf056400f9
 MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8
diff --git a/sci-astronomy/kstars/kstars-3.6.2.ebuild b/sci-astronomy/kstars/kstars-3.6.2.ebuild
index 436307024d9c..6c9297ac84a4 100644
--- a/sci-astronomy/kstars/kstars-3.6.2.ebuild
+++ b/sci-astronomy/kstars/kstars-3.6.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
diff --git a/sci-astronomy/predict/Manifest b/sci-astronomy/predict/Manifest
index acb961dc1ef2..424ec49a0b42 100644
--- a/sci-astronomy/predict/Manifest
+++ b/sci-astronomy/predict/Manifest
@@ -2,5 +2,5 @@ AUX predict-2.2.3-earthtrack.patch 1175 BLAKE2B 17e1327695b12321abce6cb01e821141
 AUX predict-update 4039 BLAKE2B 856aea796dcd612d17cdcc8d9aa7015e59faaa42a66caf42bd01c3e51c4193119208eb2c9015d215a014e2c08511c6ebbd13b78d4a4a0f86b7b133e4363d0ed2 SHA512 8bcc89babe25f44ca985776b994265a12be8e3d6390e4301594f7a8d1402d7d42aa66f6ae1ab6f51c2d8d910d9f012920382928c0238fce4e1707cb8843a739a
 DIST predict_2.2.3-3.1.diff.gz 78624 BLAKE2B c80ffcf2b624a36e919d0f659c4cb46dbb4d00c83dd7c0e900d052a7258be92a4435a8de7ff319d16169373eab1061bed61a2311c5344eb5fc2f43183c0b8b46 SHA512 9fe2e3ffd931be7ab85f10db4cd35a2091a459c3fd0c48e9ecf8a4482c20400c267b38d31f72d28270d50b7305bc49418fefe35ff013ac9be1627d853205bd5f
 DIST predict_2.2.3.orig.tar.gz 1444530 BLAKE2B 0bcca42aa0b7294d5276d5f9db2e321b1d47afdcb5194eeeb90d6912bd6f38c02a21036638febc45a72e304b9ae4737840f6ee3f4550eccf557e830272ef3956 SHA512 260f7f4dbc72cca4b0b5f7bc9dcf612b8a7e3ef12ab6f34afa3c06b1ac24427435af1c4bae9d39e7cbcdff6cccad72e3235dd191605464642f014207651d8c11
-EBUILD predict-2.2.3-r2.ebuild 5744 BLAKE2B 3eb9bde51520bfa0adca1a28a0bbf812d6414fb093a89caef7b6527e691193c65025bfa745479b8aed4cc29be2715402328fc2c34f0ea43d607d45a508c1021d SHA512 a11b9a90a74851cf336eb00fff9f081fcfa4f4fb7e3511b610c7d4726fffbac369db0d809971124de8ba5e6349751b9575c01c74526c77ae478f839bdbacd279
+EBUILD predict-2.2.3-r2.ebuild 5745 BLAKE2B 44f10d329f1e65c463061423e439e3668f62ab8562b540aebead9e6799a15848903e6a3447cdc84e5490c2bfeabd626c549e5626cb7eb0e05454acd9838bb94a SHA512 f1cdbb8661ec591a22ea92366260157b00aa7d9c24df03cffd80724e83e62b7b2ca73795b8ca038f1bb32fa27b9fe3e8795721d77451e4520bfa145eac7078ce
 MISC metadata.xml 837 BLAKE2B f970f2e44a77574ff97ce39603a9ed5748fd4e8db136cabb174a9974060d1be085d5b3dbe58123b1c42ae992e06e34f00e28e5299ef311d42fe0b050b1da655e SHA512 90958bd68ac91ccf04d1b53b3f99123960623f4351af4717df3a92fd8a877b757d75548f5d2b83d9e073953bc108722b7a07af6511bf96c0937c8760248a41eb
diff --git a/sci-astronomy/predict/predict-2.2.3-r2.ebuild b/sci-astronomy/predict/predict-2.2.3-r2.ebuild
index 670d872ba9c0..3b3f89fbfc61 100644
--- a/sci-astronomy/predict/predict-2.2.3-r2.ebuild
+++ b/sci-astronomy/predict/predict-2.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.orig.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc gtk nls xforms xplanet"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-libs/ncurses:0=
diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
index 8d8133d215a7..edef78751a8f 100644
--- a/sci-astronomy/pyephem/Manifest
+++ b/sci-astronomy/pyephem/Manifest
@@ -1,6 +1,6 @@
 AUX pyephem-4.1.3-clang-15.patch 1126 BLAKE2B 2a976402626fa74e1c9304230b996980f6364e0a82e0316f1994317bad9966fb5ca10cc1ddc1480c405a140a0196854ab7baa1a5e06b3287e2921dd650b4b741 SHA512 f5cfade697342512d8b8386eb73a766ad3730007546759dbe1d79b59609ef697baea7b910d8ebfe53949d5406c1135673b8108fb0482ac81d4fcc7048c65d20b
 DIST pyephem-4.1.1.gh.tar.gz 2659977 BLAKE2B e373857d3fb66e742f9db992165dbd1d50afbb6b91588f2cfcd299409d491ef1174c54a182dd59b5a8e298a07312899c8f8b5a8aaa63e6b31deb5f8b1cd3131e SHA512 2539f36b7110cacd6cf95e9ba0be26ca837a66ba81f092d4be01405029adf22478184861f46ecf09d6cd35927140874e0f0d228b06537d05f3e2eddbcb35da85
 DIST pyephem-4.1.3.gh.tar.gz 2660800 BLAKE2B 272a96dfe5debe083274f911737246ea90dc15b12b141e41c018d0b4eff13e548fe1d99cfb75ea7d06d7784cd9cbce7f43149a08de051cd9e12a4b5d6a306607 SHA512 1d113e1adbe5c8175364a29ae405d80005e54a4f60d475534d6721dc51b4f58d314ad161ddaf791614fcd4b0550e4b2142f4e52ec4771ca0d1be6b10f3f8cc4d
-EBUILD pyephem-4.1.1.ebuild 1215 BLAKE2B 981583c9aabbb84fa281e519d95803fb1e8251f05b073a320ca2e4294d12b422d8e3c110cb78365c6f22b1822a428ded329ba3eb88236ca5e045802fa688e159 SHA512 e672579e47899d44bde83c1baba1dd680cc650205871394ec1de4e66a8c4aa12b942fd1b3f37c4ee1d07ab54adc6c52619429e387241bba914dcb8e967b69402
+EBUILD pyephem-4.1.1.ebuild 1216 BLAKE2B 073d45a5b53a3b000bf701e1f6d60a457276403c556d935df253a6cac22e3ab8df37ce5338ce48e19728d8981402f4a59976e0be40a1b147babc5a4b290ebb97 SHA512 7579809a22743679bf299ca0b367494e422f00527e43d5f7e503293cce652c4064b40bfd0c131b7a85a2e346e8ca9289ee8507dcb0fa671e8a428fff09f4e563
 EBUILD pyephem-4.1.3.ebuild 1265 BLAKE2B f9e874b2c9d457b240a2add69c5685290030277e3f35b400436d1ea42a108f61985e697daf7fb465412fece1b6f67af0182ae1b235b0d6283cfeb7b351a8e25b SHA512 558aa7ca7c899f70c4f327577bb71e1b84a090267dfb739dcde9bc8de22f613be5b8dd1026b9ff83c2aae7fda2d3ad92c392c85aa22be1590de1dd09564cc8fa
 MISC metadata.xml 1010 BLAKE2B 3d603ea6d647cc50bcc0a0f31704a6e201e6deff6694f7604b3dd39184eeb6ca7fe72b38772aca9c89f0d7185b5ed14f9ff67ba624aba68baaa358ad893bbc59 SHA512 c09f86ba1462ad279f3336165a7b8be4cae8499de3a16282e658bf76eb60ddbe0cb86b9d8f5a74edec2dd4c148c66d687c6becd5f84df9483b0f9bf1beb9eec5
diff --git a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
index 70f43d4f5342..68e64d9a6b26 100644
--- a/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-4.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brandon-rhodes/pyephem/archive/refs/tags/${PV}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( dev-python/sphinx )"
diff --git a/sci-astronomy/pysiril/Manifest b/sci-astronomy/pysiril/Manifest
index 456874e14cba..51cd6d373e32 100644
--- a/sci-astronomy/pysiril/Manifest
+++ b/sci-astronomy/pysiril/Manifest
@@ -1,5 +1,5 @@
 DIST pysiril-V0_0_12.tar.bz2 114199 BLAKE2B c16209716c64591a2372dc090f419e5411a2607daa4420470cf7f07a729a997316f0d6f862d20722b2d23091ddd919e570289fdef1b0102b1ad2ae13cc3b4e37 SHA512 460355791f9041ace238f4727f8a219871f560fcf631ca798c1edc0ec729acca98c8abd1b14e460f0f127f5baa03603099a6f5c4151e0c1e627d2cff24bb6f18
 DIST pysiril-V0_0_15.tar.bz2 107650 BLAKE2B 94efb349e1e92e75bc7813d08a1fc1cd38b9c6199da8ba71e28f3b5b2420295cd770e4327c073558d600adf80efe39a295663b030f9048e9124a5fb71a7aba30 SHA512 e1820e14b14041eb99d2f5165fa81ba64d8e1459d50af6a0c748ac5cbef90447ce2f92c12bcfd8da784a7ae7f04c270b3bd75fe5369f1671840e3f9105271429
-EBUILD pysiril-0.0.12.ebuild 526 BLAKE2B 0a498c5d2585a91fc2714f1d8904ef59276c4f7c9043192a06c6008fbcf5116eece3cfec41ada8cf8425f26993f12969a233250706eb9bf8a768b2ac3d3c07f7 SHA512 fd7325f03eed6d52192ee5d9b66375a23cf19c90c422e52d6156f2c4d7501c731869603f94b9a62f13fa5e3bc7e4477db95b0ba5bfd09453b9eaa57e8beef923
-EBUILD pysiril-0.0.15.ebuild 526 BLAKE2B 0a498c5d2585a91fc2714f1d8904ef59276c4f7c9043192a06c6008fbcf5116eece3cfec41ada8cf8425f26993f12969a233250706eb9bf8a768b2ac3d3c07f7 SHA512 fd7325f03eed6d52192ee5d9b66375a23cf19c90c422e52d6156f2c4d7501c731869603f94b9a62f13fa5e3bc7e4477db95b0ba5bfd09453b9eaa57e8beef923
+EBUILD pysiril-0.0.12.ebuild 527 BLAKE2B dd47f9570e0d5386e8d086c62494e5408682b5052b31c5b0dbf1c93dfbd128430ae4144038609ec265bbccd4ae37e3407331274e571e9032c4705808b0422b0a SHA512 6fa45c931cec9bd7acb47595a52b5cbd23f84021889adb842549f166635298d8045084d32dcb3d4298113b3cc9d0462ff24f7b991d787b2a558ef345615ef6d9
+EBUILD pysiril-0.0.15.ebuild 527 BLAKE2B dd47f9570e0d5386e8d086c62494e5408682b5052b31c5b0dbf1c93dfbd128430ae4144038609ec265bbccd4ae37e3407331274e571e9032c4705808b0422b0a SHA512 6fa45c931cec9bd7acb47595a52b5cbd23f84021889adb842549f166635298d8045084d32dcb3d4298113b3cc9d0462ff24f7b991d787b2a558ef345615ef6d9
 MISC metadata.xml 494 BLAKE2B e7781f189c50537ef692224940af06eb26c7703e43edd89fa9a5b49d8eaca673afaf6c52254593fedc4e21ac4bff77dcffaae1fb34babdf233d10b986de8782f SHA512 f5387f6360b29b6f7df9f12f72b2760c8702d57d7c672ca0f3b525fb536f1bc3f5cf11860e83774c680a16984e2f732938354c45ed66eb6a8ac3647532e117d2
diff --git a/sci-astronomy/pysiril/pysiril-0.0.12.ebuild b/sci-astronomy/pysiril/pysiril-0.0.12.ebuild
index 353887254d53..1cd3b366df91 100644
--- a/sci-astronomy/pysiril/pysiril-0.0.12.ebuild
+++ b/sci-astronomy/pysiril/pysiril-0.0.12.ebuild
@@ -14,6 +14,6 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="sci-astronomy/siril"
diff --git a/sci-astronomy/pysiril/pysiril-0.0.15.ebuild b/sci-astronomy/pysiril/pysiril-0.0.15.ebuild
index 353887254d53..1cd3b366df91 100644
--- a/sci-astronomy/pysiril/pysiril-0.0.15.ebuild
+++ b/sci-astronomy/pysiril/pysiril-0.0.15.ebuild
@@ -14,6 +14,6 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="sci-astronomy/siril"
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 6db7ceaded51..7f618d3d925e 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -7,7 +7,7 @@ AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719
 AUX siril-prototypes.patch 1436 BLAKE2B cee44f2c66cd00e29b4c1259c4be5fd6de9544fecfd1c41cea8aa735d23c0aad6b30479d4bee35131f7b1a5e0c9878ea67134a4a57658a49ef3d530f7fcbea2d SHA512 8b2f1673fc39153746496a23586ce6f9d76c24dbd648db4d943307ee4d3299cef7de425d709a342d3585783d22fa2fa6268c4f38676e5eb1d31e6ca0b762b422
 DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
 DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d
-EBUILD siril-1.0.6-r2.ebuild 2108 BLAKE2B 4f5ef6255833b4ba1af3f1e3d2c060106f9518e4699358536bdf3d9268779c4699bda678491ef9f0fbbd1a2ffc48c1d6914e7508afa9d2c055921f6855cc99a5 SHA512 19ca8a9ef27de5a886563d9ea23c4f47e58e6b4cff4770c5c9f49524013af15f55f588fd063de7fa8185fcb29957d9eac18b427294535c0fbfeb7835221b6df1
+EBUILD siril-1.0.6-r2.ebuild 2109 BLAKE2B 0573ff346b01b714b82e5af8070ab3349eed1ce3cc2360d64c49794d308b44676346a05ca10fa20e354aa3e705d685f5723af939d7a33c0969306937be13361b SHA512 fd92dbcdb3a454c7f0431e48b87fde98dc64f658a3f418c23bb82ad879255ec0c1be7f9410c6d74bd95b5c1e439bfedb790e0f2a13ea238f66fc1f2bd0eae56c
 EBUILD siril-1.2.0_beta1.ebuild 2234 BLAKE2B 07e826aa1c9916644cdd53e3cfb03b88175f802d18f0105c70b07e70d67444e9d369ab1d337d870afb6c2bb37ee293139769f8c9f3c558654b229cc32ec46ad0 SHA512 3244a88ab9287239e7c253ce1b345ef56c383340d0982a405d40ea4c925563c313a5103af46c6ea65a705d768e583bd735422738985960561a7ea045c1a53cec
 EBUILD siril-9999.ebuild 2026 BLAKE2B b48b513249493b5293063fb86c9f8f526e82d4f7f461b43671b31520a8ee1a31ab21ea2b1859b4b37c666e9ff09bf568db43c93a18c0e9e24bc6cd241e7cd77e SHA512 ed0b053f0f20d061b5562fae58afea32fb11304e8f1079c15595f43d53cce9c0db293a4d212b387f91c5faff3eb2e4ef5d783bbbd572b023abff27f7ff6c9a28
 MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1
diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
index bd365161a77b..293b7cbc6638 100644
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/sci-astronomy/sirilic/Manifest b/sci-astronomy/sirilic/Manifest
index d60d718b310d..0257fb178ec8 100644
--- a/sci-astronomy/sirilic/Manifest
+++ b/sci-astronomy/sirilic/Manifest
@@ -1,8 +1,8 @@
 DIST sirilic-V1.15.2.tar.bz2 120659 BLAKE2B 9b1753b91dad8f504e265967dc126a155f0d503354d65ffe75ccf5f6a782991a471181b81387810636b41f76b061d9ae78e5f6b463eeea38d51b24dd3bf5943c SHA512 1af1de3c160eba5d54f6c6569e93916b6066cff62af86ac49a085792d99dd04c3a086bc2eda1d8cc8b84003d90e0e85cbdc14382c129da5ee2c28166b6cd81d9
 DIST sirilic-V1_14_3.tar.bz2 100939 BLAKE2B 3eabbde3e0884d793c2b2f87464cbf4acac5382d4d088f30f67405a60d934b4de3fee99ebb8e955f9ba1412c4279fe9acdcd4a8cd9b76a666207684561ec6118 SHA512 e311097481ef60ddac568653816a12f11864f8beeceff5ca0dd9c6e4caaf5d69e1373659be19fa99984ef9797caca8a0c9cbb56adc3143e79f59b75010b306b9
 DIST sirilic-V1_15_0.tar.bz2 119272 BLAKE2B 0ded20e019e5f5be73f0b362b5b14712c242a99efab0a77cb60f3ad5835214b82e26a278dc23d185130f0ffbc4c243da792cda3ff10574cf9189d4162099e83f SHA512 2922b4a418310cd1bffd25ef9b61cb8be83834dfc0625b249fec2af9d08bdc73c63c2dcb9c74326ed0641ebcd8deba38e225ba5d455683ce5aa3fcd61dfec1cc
-EBUILD sirilic-1.14.3-r1.ebuild 587 BLAKE2B 428562edbe69e252b8057604ff3e05ed2fd5597ba9f9aa37420371e1860e20cc71be46405721b432ca58b35c6ae9e13efd26d0cef41ce12ac907fb42c7fa81f3 SHA512 7809e0e180ab1d930c1e25608d9988fb2a53a6a125d59f865883c448c24242d25ae70a8e9a6144ef2721cc7f81669da3a4e770e954c9127fa1e71e8f4d4961ca
-EBUILD sirilic-1.14.3.ebuild 581 BLAKE2B 7e26ea42920608d1735de44cd6a7badb8d777e5882e222fd67cfcd4504d3f6a967e864283a2f96ed31a6fc2e77c4b42d2b9fb0ea2569186ddfea0ade56d98907 SHA512 483ce59507db120c7d99de4377c4c5b25f408b352ec179e7c32d492c5da2b521165e8442f485bca42db8565aa6ec71ef312b13b415fdccdfe457232c9de92225
-EBUILD sirilic-1.15.0.ebuild 587 BLAKE2B 428562edbe69e252b8057604ff3e05ed2fd5597ba9f9aa37420371e1860e20cc71be46405721b432ca58b35c6ae9e13efd26d0cef41ce12ac907fb42c7fa81f3 SHA512 7809e0e180ab1d930c1e25608d9988fb2a53a6a125d59f865883c448c24242d25ae70a8e9a6144ef2721cc7f81669da3a4e770e954c9127fa1e71e8f4d4961ca
-EBUILD sirilic-1.15.2.ebuild 572 BLAKE2B 952dcd5ad0613c40f6c45540d38900dd132e18e4339e8e9957dedbd2f999f1127ca9077d1196ca16ec8ab8ce3207e27a127e90c4fc58caa11bc0d6c75d7ed652 SHA512 269b416df5669acb134a1fbb234cb3ec01aa5c979814432c324a13153f828983a190299288888f7ff0f179e52895499d88e8fb00dbcd6056ba08682292217229
+EBUILD sirilic-1.14.3-r1.ebuild 588 BLAKE2B e25fce183367874f7026b0f81bf1b0158cb654ab164bf732f696ab08ee1a263e814bcba8d0cfa977fff78eaa67e68c70429a57865266f4468de57ac23beb36bb SHA512 7d9238a081ec0a32348ca99de0eadeab07065672d6713fa51f9cd2020044cdc6fc85c164198a2d464baae1d5da65b6d7591ea8fa8664c958dc1778bdc3f7ee0a
+EBUILD sirilic-1.14.3.ebuild 582 BLAKE2B 3a721f14372aea656fe5dd0c461a39a38ce866018531ba28ecbc68ec842ef657ec2e6c452fd910c41a2f26e5d63d9f45ec7f480c9f22a425f3e267b32cccc732 SHA512 dd47638b7f2e59b74c5a5add6d4f1f6967ac1e6cb3d8e738903d6e624ed815de2eaa5564ea2d6e24f29b1e024435d01aa5c653786187ffa29d9afbe6eb98507c
+EBUILD sirilic-1.15.0.ebuild 588 BLAKE2B e25fce183367874f7026b0f81bf1b0158cb654ab164bf732f696ab08ee1a263e814bcba8d0cfa977fff78eaa67e68c70429a57865266f4468de57ac23beb36bb SHA512 7d9238a081ec0a32348ca99de0eadeab07065672d6713fa51f9cd2020044cdc6fc85c164198a2d464baae1d5da65b6d7591ea8fa8664c958dc1778bdc3f7ee0a
+EBUILD sirilic-1.15.2.ebuild 573 BLAKE2B cb9bce62f4f6ef60216ee1b70de7a2dc8e286f149cef7111671057f6161003675b0b5f0cc495bc6002c1aff5167fa28c55779a7126b1bcef5934af3e6f5d5e1c SHA512 01eda1cc4eabec44f17bf22f70e05e432655571c384776aa743321e73c1b64e5fe29bbcc79d9e9d29c2247243f2f354c00150b7375a4b9cbb5f1c304b912faa1
 MISC metadata.xml 689 BLAKE2B 95ee65f7f16fca17c7d63dbdfe19161d6b964902502fb088a3c56b529b2f78872feccfaf1a83cf7b53ab12eb63ac257208e0603d6e09c2c6ec520a64ff7eb692 SHA512 fd1c370fb355d80372dc8e6584e9ac17f9d1f971ad7cb884d0bbb0af9dc44ccad985adfbe81b14554e76c1b7444db004563e8366cccb81a9810141467cdf45ed
diff --git a/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild b/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild
index bacf673c6d6a..9f600595d28b 100644
--- a/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.14.3-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=dev-python/wxpython-4.2:4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sci-astronomy/sirilic/sirilic-1.14.3.ebuild b/sci-astronomy/sirilic/sirilic-1.14.3.ebuild
index 95aac7c6c64f..9f9195da2e9e 100644
--- a/sci-astronomy/sirilic/sirilic-1.14.3.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.14.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="dev-python/wxpython:4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sci-astronomy/sirilic/sirilic-1.15.0.ebuild b/sci-astronomy/sirilic/sirilic-1.15.0.ebuild
index bacf673c6d6a..9f600595d28b 100644
--- a/sci-astronomy/sirilic/sirilic-1.15.0.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.15.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV//./_}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=dev-python/wxpython-4.2:4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sci-astronomy/sirilic/sirilic-1.15.2.ebuild b/sci-astronomy/sirilic/sirilic-1.15.2.ebuild
index 77d68d96241b..02d35c556618 100644
--- a/sci-astronomy/sirilic/sirilic-1.15.2.ebuild
+++ b/sci-astronomy/sirilic/sirilic-1.15.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-V${PV}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=dev-python/wxpython-4.2:4.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index ab46d7957bd4..8aaef92536fe 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -11,5 +11,5 @@ DIST stellarium-dso-catalog-3.19.dat 28678714 BLAKE2B 855ec3370efa2ad33d9a99cf47
 DIST stellarium-dso-catalog-3.19.dat.asc 313 BLAKE2B 6ae0acdb9b1012e71c346e5834b88dd1e8146789158a5d81e7e992b1730ab5a74899aac76b84b269fb1ccdc2494ddb258209c580751705bda6023fc59132e7d7 SHA512 95a1cf3911c67e2104d6240b9a5e0ce0d0f2d8ed5edcb40303432d17b3d4ccd8875eb9b9e8b7f94e81d1103dba98d3ac5cb6354933f78ebda83015a45297a159
 DIST stellarium_user_guide-23.1-1.pdf 32513574 BLAKE2B 30e971f186d88bdfe5d8346dd4385444eb75e84ce8f5acc8d9f3a6050ac5a7c734b6f74e681738cdb4d4af91645b50a81bb65798b5caa58a9a23691bb40b5593 SHA512 5e5a69f9377496fb42ce2e2ce72e4caf0d35e475e586ccba2814ca7d2e2a3f60bfc46e496f9153a7b4157977460ac7c574d7f452f4af746799ecc9231e32e49d
 DIST stellarium_user_guide-23.1-1.pdf.asc 313 BLAKE2B b573ea45b236ad35cca1614919bb1e2076d4785f2d5d878a874f9536df9c454c9aa2a90797ea930f669676bc23db545ca051996f2ba2124e3eb3acc0890bc975 SHA512 124f9a4ee2452297d6ffdf696cb32c7087d7b5e31c08c56016842414b407fd8c14ce1dd59d160b7d685a0db88982e0a9b6410fbe69ef476a3a16649e16c591a2
-EBUILD stellarium-23.1.ebuild 5624 BLAKE2B a4af77dfccb049815794f5d652d55a9eca37f039ff493f4caa1f6973b8d5f65dedf138e4d9886625bbf84d0ea5fce20f48bde640655a009950fb5b660e33f4d2 SHA512 7547915a05aa9c0af18787880c7dc285960d3f5ace56440bb5c5d778673a417c081fa427cb80f37ce1cdf87d2f780654b0896f1807b656294c1bc6710ff6536a
+EBUILD stellarium-23.1.ebuild 5625 BLAKE2B f921a0805b88b3b932532aec76f75776308800d1bcf2f77daa6cd82f5b760d7151b562fee1e8e0e8e6e1f4a8bd9ada0b1dc0599a2be0f9defc0660720bbe4e58 SHA512 fe18193f9ca5e8b2f646504e96c66e2a67ddc25219a4d1dd6618d75258cb8574f84f3c4c7f54f6f733b7d2e7a6d643151a7b2aedf2269bc93a5bac0977e1af38
 MISC metadata.xml 1667 BLAKE2B dd7848212ed755809c49cdba0ed63138b5f6f188240f71601e113894fded940ed3ea3850028915700961789f150ea7f5d91a4ff6c4570b753dbe6ff397b81b46 SHA512 bea670b08be632304aab3b9d456bce249f2109195e6e309bd703778e5a93561e552212c900897b72e293a3d81d188afabd5e1d8c213334f6d01b1dc035badca6
diff --git a/sci-astronomy/stellarium/stellarium-23.1.ebuild b/sci-astronomy/stellarium/stellarium-23.1.ebuild
index 1b941b04eabf..3c20b4d3f079 100644
--- a/sci-astronomy/stellarium/stellarium-23.1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-23.1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
 IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
 
 # Python interpreter is used while building RemoteControl plugin
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index 24c9424ad06b..941b8d2a5db2 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -2,8 +2,8 @@ DIST wcslib-7.11.tar.bz2 2946962 BLAKE2B 7c812f50e3c539da3d58a70acd9128bd957fccd
 DIST wcslib-7.12.tar.bz2 2989693 BLAKE2B 8070cdddb9e89478464443411d165706d44593e33290149da11d2c2857bad202f5dd6ad98b5840167f618eceb9ec47e35f3ee332a8c6e1719fc2b20fe2f31ef2 SHA512 7f38f725992d3c4bd3c1b908d494ac361c17f6b60f091d987fda596211423bb7396b3a5e2f1f6dd6215835016d302083472a7ad0822f17cdfe230c8f556b3e23
 DIST wcslib-7.3.1.tar.bz2 2434274 BLAKE2B 9789a8eb34fe37c96b52e20efe3c14368499058e5c46aad4853b2be5f32a31df26525ec2c38d0ce87bcb7891b91a3ec3ac537e3c662c716a7c4381f26cd715e4 SHA512 753e0e202fb4250d321c36a0df9cd45ed88697111a06e108bc3e5397ddecc60d460cda2b4d45b5311dd72b88b66d4c70ff150b03e2da46c834b024f15304779b
 DIST wcslib-7.3.tar.bz2 2435669 BLAKE2B c0f641b4c2fdd9d332816195f399eb2ab3c5aa585f08c4857af77bd5ed4074e653663f7cbddc6d7678cd85bed2c0bd95719cd83a5138d21ad24841396d4c11b9 SHA512 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892
-EBUILD wcslib-7.11.ebuild 1691 BLAKE2B 58ef14aa53eddbf08b6978c71e48fbfb6d828ffddaf384c73314f424c219920a6d22c02f03c91b69e8f315bb137d26f789804d0a25242a72aba2e691ae5169a6 SHA512 f7bb8ddd29ec98ac40c7bc7bd6a010f9ea7941b04ff8fe3ea4778c84667c677f6134461c00b437ca7b30a181d36515102e57940615754b3a5ce6f6aa84817edc
-EBUILD wcslib-7.12.ebuild 1736 BLAKE2B a885ba32c04301191ca2e05329155c9d0db938f535e9655de40e4b7778c36834597875fbd9ba1aa33e0d9b6675f0d8106f778d48e39be26f7c40d8c0f802dc70 SHA512 00ce5ff3d00bfb310f12e5f50afeabf926fd9e7b3f445acce83e7467b87aec2dd36bc8052f4d5018eae16d55842cb84427738db8eb0584dbc9a1f8003629e7a4
+EBUILD wcslib-7.11.ebuild 1692 BLAKE2B 110dd3f1c0c60d0121e9bee0d2e9658dfd54e73edc6cb78cb6cb760a1d4f5a89d3ae5a3101871b31671bcd24a046517675cbae6e223093927311fd7b31b2e0f9 SHA512 5827a2244751c956e3068cfe2a257230201f7955f9725d7dd599d9575e7f838c17a124d354e5d99ffef0f61e700ecfcbf1eda7c4e1a2d9e53250eaaee61b561d
+EBUILD wcslib-7.12.ebuild 1737 BLAKE2B 6550a5c28f503c16c18db130d829572a880b431f9bc563f7623f9febf7e40f933ff90b6b4b15b8a4a8ad0e5775315f0a280526d4d465b7963ef6cbe175daf14e SHA512 dd950485ad24fe4ed867d07dc94b4aa18088c273df77f1bab175f148b74758671d2ffc84cc66b863597b42a003d1e5f80f4475f526ddd2cf24819732573ec7be
 EBUILD wcslib-7.3.1.ebuild 1693 BLAKE2B e00e09b8e5223ef63eb2c65d626bb5f1e60d5cfa1a490ad9ceca268bec913c23f13d916520ef7b1b5c4e032f5fdc59dff3680e3448f48d0f66ccdfa7a53ed15a SHA512 e69ba5bed4b3acd3fdf871453a0a3f22faadbbaf6858f0806e260b7cb0f45fefd1a922a8f710ee1485bd33114801c03aaa1bc7baebceef0d34febb18729f2ca3
-EBUILD wcslib-7.3.ebuild 1691 BLAKE2B 98f7e1ed446fb03c86419ff096131ddc318a9b11d5d97b8fc484dcdb22e277e2908112839080aa6c9633e1101b2d56ab2d97caf2cc950e18a982ec094efa26a0 SHA512 f16ee1129c6a4c54dbdf1da67e14af94d0eeba5945c164adaa5f187f3e287a721ccb6f9a7a9c989b77f7e5d2545e0d5c2ca2cd01c93e6742e6386cf844716bb4
+EBUILD wcslib-7.3.ebuild 1692 BLAKE2B 0f15fd784ed995b96ec752f0d5a346be101eb8931c4ec0f82568ae30669630b0c4a79e9c57901bb1c6b4dd560c1902c6ba3e6c276fbad19fe6c8f41371632b9e SHA512 d55fdde26174e1846245bcf17585030253855f72e8f527677c7b511ab27642d6741b79759b56d1ee024e91e1260492bdbe6c1cca552df7e477c13a9d64ed7ab4
 MISC metadata.xml 1109 BLAKE2B d2076683baab3ea4aeadb1c90ed55f44abc749554d6469eb886606491277ca009b60fae15c4eafb66f8b55ce37706e0618946446aa589bee8544609303e0278e SHA512 98ce562fdee94819b992e5129d48649ab4a1389397b632eda8279c55c4d3c35c1aacd34dd6269ef1c5b8ecb63359f1c7f0f3944c2a3080608d6b8453eb3c4c0d
diff --git a/sci-astronomy/wcslib/wcslib-7.11.ebuild b/sci-astronomy/wcslib/wcslib-7.11.ebuild
index d8ab5e2261ec..0e550f6db2e3 100644
--- a/sci-astronomy/wcslib/wcslib-7.11.ebuild
+++ b/sci-astronomy/wcslib/wcslib-7.11.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
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/7"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="
diff --git a/sci-astronomy/wcslib/wcslib-7.12.ebuild b/sci-astronomy/wcslib/wcslib-7.12.ebuild
index d5e071cb157b..a67288ffaeee 100644
--- a/sci-astronomy/wcslib/wcslib-7.12.ebuild
+++ b/sci-astronomy/wcslib/wcslib-7.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/7"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="
diff --git a/sci-astronomy/wcslib/wcslib-7.3.ebuild b/sci-astronomy/wcslib/wcslib-7.3.ebuild
index a01c6a87494c..9db899f0732f 100644
--- a/sci-astronomy/wcslib/wcslib-7.3.ebuild
+++ b/sci-astronomy/wcslib/wcslib-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 
 SLOT="0/7"
 LICENSE="LGPL-3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran fits pgplot static-libs +tools"
 
 RDEPEND="
diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest
index b54d9c661b8e..b143f7ea8116 100644
--- a/sci-astronomy/xephem/Manifest
+++ b/sci-astronomy/xephem/Manifest
@@ -5,6 +5,6 @@ AUX xephem-4.1.0-allow-parallel-builds.patch 620 BLAKE2B dbcd36eb74e0a92ae36fe02
 AUX xephem-4.1.0-respect_env_vars.patch 3331 BLAKE2B 9e9cd514429485e7934b0d82355ebac66dce6870fd85a490f691fd4943bc23aa66531d7bce4d4e925a6d26bd7bffad0e0eb37506b593b032914a1d8d34edaeab SHA512 c88ce6569cf1e9fd27d3868344e1160d666fc0399a4dd2d4c3c10154fc947f25ebf5904123edd7ae3ca54832eeb89d67c6e2586fd4fa8e3bcb31304d44a1e8a9
 DIST xephem-3.7.7.tgz 18128521 BLAKE2B a7d0ee2cf1be64f79ed0c5cea6d37e48c69875de5b3c9592554ee8be25b369e964c7a6bb05690ef28893b7af8277daf39ba85538f56852f35538180f9ad0c2ba SHA512 0a21f783a0a543f19a527afb87647ff2e988c6a426a37e01b9a3d1d76a9ee74125ce802e2dbc5e13034f11ef897e6188cb5b0bb92bc0d35db0fb8839e0c53157
 DIST xephem-4.1.0.tar.gz 17213750 BLAKE2B 921aa4b305cb80df5746db962739d16ee23f1831b59934389ecd218b874ba1fc51aab07896d1283760db1a50be6279da50ed112320fc481f90b4f2d6e25c96dc SHA512 bcad3a6b375cabf1f44e39bc99386552d97a7e7d2ee4063dae4ccd3d5842604f0efc3407447f18a5c9e7f265bab6eebe98bdb64626dcf2135b56f346818ef1b6
-EBUILD xephem-3.7.7-r1.ebuild 1187 BLAKE2B c147005f67ed8e8a6db14c62bf0ca467e841799af6466d565e1174fe5ef87b9a13e88743f53dfda718a81ccd408dc7271a450e2b625e0a92ec25ff1bf112dd36 SHA512 8a3d81f32410892bc14667c729b88ffffb1b57006fd57904f4ee86e1c554e2d03b1db363187e4c7a9fe76dc5d3baaa4a13f0dfc8d6b166207a3852d3c14efe0d
-EBUILD xephem-4.1.0-r1.ebuild 1443 BLAKE2B a34eb747db8496e2a0690eb3d367ea4ad29331713adfeae21a0bacce5de7446b61631f5601d1e6698068563fe23bb0beeb875eda5d5bc01ab99682477cd5d4fe SHA512 0aa3f9e5c42603b8be13d80ae77539b9faf63734934f90080e2a409f8d30ab99f900a42a3fe6efa8c1d612617b1294cbb440cf8ac01b14901d391820d1226e12
+EBUILD xephem-3.7.7-r1.ebuild 1188 BLAKE2B 76aa9492529af3174a953ce6d6a8a346418f0b0861792b800fb7ca37b88731f2dc6682753b753790ddb3e560daa0840c561a2065dfc75e48a995b9aab84202e9 SHA512 71b3515c86a1aac04e1ef2424b76f9b5aa4c097c5a9923a52649fe935b94c3b2dc4622f48dde980b64045c162b3e70a31c764dd13be60e3785e27072bbd2dae5
+EBUILD xephem-4.1.0-r1.ebuild 1444 BLAKE2B 72f7ea449a40be37de394b3572e9b6c0424fc9188ae2be5aace23ad823b0f205e1ed83c23c80193087b391c57d425ee33b8561931fd40396b89e994c1465e164 SHA512 9b0079f4c033eb0a4e76d595790df2a1f134902a2f68c64f23e14a78f6935d454971901b3a28b84aefb7c632a0d35f0cd9be4653984eb5f409b9bf13432334ed
 MISC metadata.xml 809 BLAKE2B a7bb501c3896ab9cda8bfd76212ca6eba0efa46fb12d3d272b566bdd25402c9aa235feec36d78d49480f8e8ab6ca13ba7c02506aeb4ccf70a9ece678c4e4ead3 SHA512 bd4f46f28856dd588170fb9ee5cfb0c8be96deba1ca86c22bc6ed9b6bbf4667cf172ad8559186edc43a328af6a0c73571dedf051420eb571804e27c59ffbe280
diff --git a/sci-astronomy/xephem/xephem-3.7.7-r1.ebuild b/sci-astronomy/xephem/xephem-3.7.7-r1.ebuild
index bc5fc47e529b..ab4d62d3d83c 100644
--- a/sci-astronomy/xephem/xephem-3.7.7-r1.ebuild
+++ b/sci-astronomy/xephem/xephem-3.7.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clearskyinstitute.com/xephem/${P}.tgz"
 
 LICENSE="XEphem"
 SLOT=0
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=x11-libs/motif-2.3:0
 	virtual/jpeg:0
diff --git a/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
index 9e166cb3a632..5918c6ef4b29 100644
--- a/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
+++ b/sci-astronomy/xephem/xephem-4.1.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/XEphem-${PV}"
 
 LICENSE="MIT"
 SLOT=0
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 8f49144101ac..3af3124bbc9c 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/augustus/Manifest b/sci-biology/augustus/Manifest
index f6d9d647aba0..759691acff14 100644
--- a/sci-biology/augustus/Manifest
+++ b/sci-biology/augustus/Manifest
@@ -1,6 +1,6 @@
 AUX augustus-2.5.5-sane-build.patch 5271 BLAKE2B 1ba799aa4d9611087f1455f334dc35616979267bb546aa2ab16f6c8d3d528af84373da482840b455d4d0f0374af24cc3010f6925d4a93c0eb7abe524544fd408 SHA512 5afe12b51b8ce27ef32e8e66dd72be451022757228b4c86dec938b26870885bee06712438a22801a42944d2def8ae8bf4a2d7fdb82e12455c145abcd6f0c4aa1
 DIST augustus-3.4.0.tar.gz 221652100 BLAKE2B dfc8c98107f5a955f688f3d2976ca936faf2ef7004095f6b9d7c1902a36ca5d3c9aef59cab1b82b56cd5c2abc7b67195c5030111ed68557d53128814b1bf6bab SHA512 ca1df1016589f55527a883429edd5024cbc32c1b32036c81f9df5e0967a7d194f5b7a82109e924f380627427d9731caa478e63cad8cd804c01521aed76d8c4a6
 DIST augustus.2.5.5.tar.gz 70826249 BLAKE2B 3f3f1537c5c614f00298e1835eeb7bbe968987c3e0dee13299e1e26b4abf198d8635a93121b11722d2c90b63ff54cf153c72716d01c3ca033481bb54357b7bcf SHA512 33eb05d5c90200d2fc17026743d3a25e73aa3e217b8546f0bed4c94bcb460597d853377a67896e52e45ead5d736d13ed3b2c91b31fed8216da2920c825e8c20f
-EBUILD augustus-2.5.5.ebuild 910 BLAKE2B 5cde42582b4873dbaabe4457a4b7b4f5305b928cbfd7afc3c067cbeb3ea042e82faa56810b4f72078d57f7b0ecd4c96eaa30cfde5ef73d67c26fd05d0035d84e SHA512 03103b4d5cec5dfd46971f1a089d0c02d3cc5ecf7647ee5589e8e297b3f60689c2c763b8c8f2137becfa0e11c0e3c7977186c466085c3065f88eaf5a469bcb9c
+EBUILD augustus-2.5.5.ebuild 911 BLAKE2B 92c56fcf261b64393440c92e0f01b9dae018e082b4addb5759cbfc807183944059775a8482fafcba5c3dc3fc4ca7568c93bd4be546b65a0bc446028a537c71f6 SHA512 a54cc943fa343179edb7d21c9cd841672d6abc548e5a2c6b56c054b85bd64684dc7bf145110c6eb51788d600a37bfcad60e8f4d8c982aa92213ee75ed95cc963
 EBUILD augustus-3.4.0-r3.ebuild 1033 BLAKE2B 52d45534a5f9cc900d3a048926046fac00016a16f6dd8d65b530c24d99a0873ebdb177eff3d83ed74cb3cd6f1660a17ff0349217d073893d351d31b5ccfbe1d7 SHA512 6a0a337b6c4376412b7184fc6303b4c18da80936d8228ac35c8a106ab2e2070a2c998ee3ce28e2453275eeeecc82c7b4be4bdc0a031b5b47c820e6e76db5a867
 MISC metadata.xml 360 BLAKE2B a2a37a6ac8535c7c1e48711fe6f330bddc6057a445afb33bced10e3137255bbe647d85a1c300af4cc802c2fdaa4a6d4ee169e82778ba4437e60824daf2485633 SHA512 7f3cc43067ed98c6fee8302eff2855b3594c2adc3e81d72c27aa20bd9e4477401607a4424e93368a3e501bcb90a44106bebdffd2ca0069e94b3b5d3e5fc2156e
diff --git a/sci-biology/augustus/augustus-2.5.5.ebuild b/sci-biology/augustus/augustus-2.5.5.ebuild
index 5bf36e85cb9b..ed345330c4a7 100644
--- a/sci-biology/augustus/augustus-2.5.5.ebuild
+++ b/sci-biology/augustus/augustus-2.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://augustus.gobics.de/binaries/${PN}.${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 
 S="${WORKDIR}/${PN}.${PV}"
diff --git a/sci-biology/bioperl-db/Manifest b/sci-biology/bioperl-db/Manifest
index c9a9fdd4e8f8..0c5363d08341 100644
--- a/sci-biology/bioperl-db/Manifest
+++ b/sci-biology/bioperl-db/Manifest
@@ -1,4 +1,4 @@
 AUX bioperl-db-1.6.9-db.patch 1567 BLAKE2B 40a1ba874e745630d886d0531ab90385bb2207073bebc823c52f595fa4752b0b9bf310adf7148ba4c7c5c1ec19ddec226d28a34311c932a0f37da6af1c0dd422 SHA512 a0a2ca951645b70b2e4eb3390598b2a42d6631109500238d6fc482d97a616ec1881738e5dc9af118d37fdf50657916ff275124f409510cf15515dfbc829766c0
 DIST BioPerl-DB-1.006900.tar.gz 492799 BLAKE2B fb923533ecdb74e868a3aef0c0c6ba8da419ae3c0e9d2e8c55297aad15563b135b6b00fd158481b31dcacd1125f7e10a557052bd4b04eed3a400c972653ff757 SHA512 e06b8b9aa4188a83128f910d7b4a031f69d36f75e4f2d7210357366379024ef39b58eca97112b5b419f141c82b7518086273cc97c9637382ee5e0ddb9ce28746
-EBUILD bioperl-db-1.6.9-r2.ebuild 2351 BLAKE2B 338fef5e883902619f1c369fa2ca450711aefe5ac49d16e210242703fe665ee0e7ed9b13e50f02a1d7e866b39bc954f6e163f549f5d4966ee389c320ee550047 SHA512 b481726e1b72f3874449b3a97f9309839658f825ecf39eff4f2f019efa62f696b73e878aceec99fc4e434446f8a92cb4e9267d82f631b301ab4c399fcecf2b08
+EBUILD bioperl-db-1.6.9-r2.ebuild 2352 BLAKE2B 77d3d4f1ce2804f271e7b1192a7f3ac66c373b04e2bc31578f3b18a291f598a00f318d1b9edf465b175c61b3749bb9989d1ec6dfab3e47cf3c16998337f61477 SHA512 36cffa1e0d2266b17a9d0c756923e87df3d4d85eae2b5695f06b1e4d7c9415380d7040b928c5c3e931d073d1d5d335782170bbc063301a47f70b7920fbfa8a00
 MISC metadata.xml 345 BLAKE2B 3bc3614e7030d42358f8c616b364d20788507eb62fdb72b9c581bf6ae7629bd1d258a8ff97de8e09e28e83217d88cecb53744c1d36892da04ec264db93287d12 SHA512 e543c3388ae8594a533eb55919e4cff9fbcefef82b043c151c9c1d0732918803a2811c0c3352684483fa0e5494f6559f864a9d453300c790fb4cafc765a418d5
diff --git a/sci-biology/bioperl-db/bioperl-db-1.6.9-r2.ebuild b/sci-biology/bioperl-db/bioperl-db-1.6.9-r2.ebuild
index 6359865b90e0..435dc4a67173 100644
--- a/sci-biology/bioperl-db/bioperl-db-1.6.9-r2.ebuild
+++ b/sci-biology/bioperl-db/bioperl-db-1.6.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ DESCRIPTION="Perl tools for bioinformatics - Perl API that accesses the BioSQL s
 HOMEPAGE="http://www.bioperl.org/"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/sci-biology/bioperl-network/Manifest b/sci-biology/bioperl-network/Manifest
index 7559088328af..a1e240f63a92 100644
--- a/sci-biology/bioperl-network/Manifest
+++ b/sci-biology/bioperl-network/Manifest
@@ -1,3 +1,3 @@
 DIST BioPerl-Network-1.006900.tar.gz 2198089 BLAKE2B 67197ed356f642d9e85f779019f6854f4baa3963e059895b89c75ae56f8b5a075ca04b04ce5c7622d46a3a2f55e1c7d80af695085c607ed7fda5517c71c579f3 SHA512 d0a95af17cb024cbc615c784f1dbcddd7bfc5b54524163ab127f1077ded18df222fe067c085f3dd17dd416d6417b8f726526be164e1e33144991393f6b6d5842
-EBUILD bioperl-network-1.6.9-r1.ebuild 554 BLAKE2B a569458f835cfe5950784aad33b8b3dc5330ef7e81036215354fec4f57c77142c3879c5d9e706ad8278d7651ff50a15f278bba67a58a846408197fbaf225eae1 SHA512 3e8e84fb53f91ff2c752c07af5e739dfc9f68e9142557d3914c17f553a702540d20b6642fdd8a382694f958fb75ca00628426cbe4c0a017b43203ee11ba63d99
+EBUILD bioperl-network-1.6.9-r1.ebuild 555 BLAKE2B d4f96473c29b041f89109bb12147ecfa35f9ddd7b4201f434ace407cf58ac2ec705c5d66e22e13d70c4070d54a9825978788938de6febde4da0d4f116df21ba7 SHA512 5cbf416ba3d964c1d9508d2818551a14026b4668f6fa5f3cfdd160140dd1aedb89e69df90fa6813fb4a2b527da6a12c7284b414a121f134b36ab011a91ddeb65
 MISC metadata.xml 350 BLAKE2B 3ed0b50a1cba8de14da5b9a7c73e9b4ae75ab71a4065e950115d0fbe29ca948e23597ecd14e921f64a22ccd023a991c1f8eb8e6571c7fa6280116664f9e6f6c1 SHA512 ef397b00868ba21c8718958189efd201deb6316ed7030cc07547cee07c20b98af13c57f778e39835abc9dbbd6898a497e2a371bb3c0803fbf06bfdf44ea2b90f
diff --git a/sci-biology/bioperl-network/bioperl-network-1.6.9-r1.ebuild b/sci-biology/bioperl-network/bioperl-network-1.6.9-r1.ebuild
index 513429a9e292..fc51a12da036 100644
--- a/sci-biology/bioperl-network/bioperl-network-1.6.9-r1.ebuild
+++ b/sci-biology/bioperl-network/bioperl-network-1.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ DESCRIPTION="Perl tools for bioinformatics - Analysis of protein-protein interac
 HOMEPAGE="http://www.bioperl.org/"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test" # bug 298326
 
 RDEPEND="
diff --git a/sci-biology/bioperl-run/Manifest b/sci-biology/bioperl-run/Manifest
index 6ff8fd52a6b7..9ff30c818cc7 100644
--- a/sci-biology/bioperl-run/Manifest
+++ b/sci-biology/bioperl-run/Manifest
@@ -1,3 +1,3 @@
 DIST BioPerl-Run-1.006900.tar.gz 14546677 BLAKE2B 9faf58796b9874b19b66e74abc51ed1d1b6e2928bcf9904506b2af6b2b7c1772a90eab24bf0e7c050fd4a2b120ba506ad5edb8a693496b7468fe7c8d05d11f0a SHA512 47f2b853885c604291ac0aba3269b897de59cf7da6f7d54a50ff950cca836338091309df550f32695159c620be23391306d0421d2bbc22eebbb61a9e280ad83c
-EBUILD bioperl-run-1.6.9-r1.ebuild 650 BLAKE2B a214f71456de9391214b0a7f34dadf26613c9879e395062b5e48af26692a3d252c07527cd05ced889a6b9a03ba06d61b19362d936e9d984753b898bdc6bdbd70 SHA512 be72eba0015551c616680ecc1f623d3818f48a6bef98532c90f2abca325952c16dd9be8ded66bc9e5ff89c70345d343cb9f7e40c7594995ab286ad5e2b3eb64d
+EBUILD bioperl-run-1.6.9-r1.ebuild 651 BLAKE2B 551f61c4be76c6e77b74aa87c0d831ff182f1fd552137540e65daade1ecce7f017d7166727140bc936530aa7b637fc9bb012330fce0141b2b91001bb18da9fd4 SHA512 6ecd3b654f1172890b14024dc07033486866f6b604d59d31053507235f7cd8e7b4758c18c3990fa5c0165993d4546ae0644931a1b44513ae4e3f28687162b51c
 MISC metadata.xml 346 BLAKE2B 95f61e91a850b29694d458a88cca4d4594bc307c3ff2f3987b8da6d0d1344cb00f9c8d0c2657b35adc167887cc75340808a3637f571bdf4de12d52f92b87bae3 SHA512 2ffa2072f142a304c63e4b2403eaf1f65fcf61aee9798c08c896ccab9569fa90926c83652589190a2ba60170fff20ccc106e0b8397fe7e8d3519cce4064ed000
diff --git a/sci-biology/bioperl-run/bioperl-run-1.6.9-r1.ebuild b/sci-biology/bioperl-run/bioperl-run-1.6.9-r1.ebuild
index 2541aab82506..9c32c7eaa5f7 100644
--- a/sci-biology/bioperl-run/bioperl-run-1.6.9-r1.ebuild
+++ b/sci-biology/bioperl-run/bioperl-run-1.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ DESCRIPTION="Perl wrapper modules for key bioinformatics applications"
 HOMEPAGE="http://www.bioperl.org/"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="minimal test"
 RESTRICT="test"
 
diff --git a/sci-biology/bioperl/Manifest b/sci-biology/bioperl/Manifest
index f90a88626a90..0752f1f35d7d 100644
--- a/sci-biology/bioperl/Manifest
+++ b/sci-biology/bioperl/Manifest
@@ -1,3 +1,3 @@
 DIST BioPerl-1.6.901.tar.gz 12284856 BLAKE2B 004947fde9d02355ac96f71b67a33a27d6d0163892c978ac9059e70e089fb83b473e21252c5217dfba8faaa65bc3d2eebb8826d03f29a13409e2b6d337316b42 SHA512 227387437c940da1435ed83fad6ec2168ca12a729c90dc557e84750c6474213874c23a8f23e50db4027909469627baee581faa11be6208c8e0a5453a01c7eca4
-EBUILD bioperl-1.6.9-r1.ebuild 1488 BLAKE2B 7a8ad3ad21b292fed0453d9965694aad7f383539f4ff2a689c26c0ff129e8a3d40a8fced69222423e39344e947fb58489620b34fb6bf904f1d4bc6747aa53d42 SHA512 2c41a0018ec7f11f3f45a9c2b003921a88e7205b22ac82fd4255267e825080e5f0e8bd1adb2b86b3c204eafb8920bad4ac9f34b4a100b71103469fb1dd46a9e3
+EBUILD bioperl-1.6.9-r1.ebuild 1489 BLAKE2B 8f09d16400f32d2dc8714e3b83da65af4e57ca84f444536100d8c2c826d326ba4043e14926fdeab66f2248bb391cef9e149c0f5494d964c15bf33acd9cc68ad9 SHA512 d171097738607995329d8bbdab052d0988d4a56fa028c79f1a395acf64405ad0123423a4cdd91d6e28b7bed4770c23dcb2e7d56e408e5cf1f03a98d4fd6029bd
 MISC metadata.xml 575 BLAKE2B 0aee3e1be6aa5514054d2a81b42cf8f6642defbd103b3f61135da6a7dcf3ca1009047a14624fa0b58bec932eea6a764bd635cd4e1e1435d853d638a6f7176e9c SHA512 82a09cbc517100b42a9239cab0a5e8ae4589256889cbcb15cadc6606f76cf02e3570f6145bc7f1ea6ab73966e810a35ade22df4025929cf14417e452352e1dfe
diff --git a/sci-biology/bioperl/bioperl-1.6.9-r1.ebuild b/sci-biology/bioperl/bioperl-1.6.9-r1.ebuild
index 2896271e137a..a692fe812401 100644
--- a/sci-biology/bioperl/bioperl-1.6.9-r1.ebuild
+++ b/sci-biology/bioperl/bioperl-1.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ DESCRIPTION="Perl tools for bioinformatics - Core modules"
 HOMEPAGE="http://www.bioperl.org/"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="minimal graphviz sqlite ${SUBPROJECTS}"
 REQUIRED_USE="minimal? ( !graphviz )"
 
diff --git a/sci-biology/biosql/Manifest b/sci-biology/biosql/Manifest
index b01dc8d040fd..8861ccd1ca13 100644
--- a/sci-biology/biosql/Manifest
+++ b/sci-biology/biosql/Manifest
@@ -1,3 +1,3 @@
 DIST biosql-1.0.1.tar.bz2 253516 BLAKE2B d2b0d6c3f03389fbcf9dfca823b02c611b63d4c1ee1356150f92bb8c14c534d988644253fd1a6ed6522b8d2d06cacf7b21d7a9e9fe7b9464704497e7f976b283 SHA512 2e1fef6ab9b4386f146910937700f9108f8ef266161b7adfbbc52c0011eebc84716637c897a01a399ff39b066ff0a5905ba3fa27e7b41f53a87baf58d5b32695
-EBUILD biosql-1.0.1-r2.ebuild 983 BLAKE2B 01978ad51480c8fad57d48ce108583832a9d8eb12b5fed010784d6c4760589bc6840fe3d57bf8979ad750be737220ed7b6f21188f6304710f5075dac30740961 SHA512 b241af21b076ee4df162a9ed8927cc6fb16f46e143103dd388426b7adbc4b7f10d04fd54caa93edbce72e4b3a379fd06a0ca7042f6d24b8741204d9d05e56059
+EBUILD biosql-1.0.1-r2.ebuild 984 BLAKE2B c67cedc71b92e782fb8bd7cad79df71ee1c308c9c06b6aa7cfd6e488fb1f9102ccdba88efa08b16bd120809cdf1058a20351e9959d0dd686644fca8a826a3b0d SHA512 9ecf56d4ce875a0b3fffbcb68cb24e75fc91f7a6837071f72a4e4692670487272aafdb98cef97042ff45a0298e16e7534c425134110dbc87321e3ac8e460cba5
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/biosql/biosql-1.0.1-r2.ebuild b/sci-biology/biosql/biosql-1.0.1-r2.ebuild
index fd42d5e58a9a..838f3b443ed8 100644
--- a/sci-biology/biosql/biosql-1.0.1-r2.ebuild
+++ b/sci-biology/biosql/biosql-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://biosql.org/DIST/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="mysql postgres"
 
 # WARNING: bioperl-db is claimed to be incompatible with >=postgresql-8.3 (see INSTALL)
diff --git a/sci-biology/clustal-omega/Manifest b/sci-biology/clustal-omega/Manifest
index 8318d11f103d..d60c5b6fa734 100644
--- a/sci-biology/clustal-omega/Manifest
+++ b/sci-biology/clustal-omega/Manifest
@@ -1,3 +1,3 @@
 DIST clustal-omega-1.2.4.tar.gz 1170516 BLAKE2B 0751a30a8d7bab2bac01980b84a28720e127dfeeec5b72f1826c8d9da4e84d5d9434b0f138b600155cc76f4385320913edb9bbdeb463ed757364feb3538f325b SHA512 b31514c30b412d731ee22c9020156b65a6a6cbc6fd51edc195d17b560935184bc070feeb58964c54df9eecdefb00e5a21ce859cb0ea69d92917f6bd8e93b819e
-EBUILD clustal-omega-1.2.4-r1.ebuild 543 BLAKE2B 23d251225ea265bf6407ca8fb6d87cae12ec3c564961241385b62e503294a6f112e33497a054d3578402395502fa64802d4a9556fa5fd29cc84e240477501bed SHA512 d139dca41c6b25c8e2c91ef29938b4d80e75e486ce967376cc77225424a3006c42c89bccabe6cd71fc57e62d8bc10c258e660cf663d66929229d278680c8d54e
+EBUILD clustal-omega-1.2.4-r1.ebuild 544 BLAKE2B def48d6cb0d9ae39646f25e456271e87b7392ca33eac405701e30e89eb9dd182020ce31eca4a1a3e018a83d8d1de66466065654fb394954807e23d49036ca127 SHA512 d9b559a4cecf0b1a4ee07293ab4afbf973d7d6be5a95316f6116647ec8fd48076a6f671b27a1776b95af76e6d85b0d6fd1e2db7dc94586c5c8d3105a27699fb8
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/clustal-omega/clustal-omega-1.2.4-r1.ebuild b/sci-biology/clustal-omega/clustal-omega-1.2.4-r1.ebuild
index 2a4a2c108fed..4d5b2a779bf9 100644
--- a/sci-biology/clustal-omega/clustal-omega-1.2.4-r1.ebuild
+++ b/sci-biology/clustal-omega/clustal-omega-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://www.clustal.org/omega/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="dev-libs/argtable"
 RDEPEND="${DEPEND}"
diff --git a/sci-biology/clustalw/Manifest b/sci-biology/clustalw/Manifest
index b02851cb1dc1..a8f698fb1939 100644
--- a/sci-biology/clustalw/Manifest
+++ b/sci-biology/clustalw/Manifest
@@ -2,6 +2,6 @@ AUX 1.83-as-needed.patch 800 BLAKE2B 37db9a8c0f7b5db47065f5c6e01cefc095363e30a5f
 AUX 1.83-clang.patch 162 BLAKE2B b4ed2add1aaf33ef3d3138124377ed88bbe030b2e50f24e7dc87717fd06e3f76c6660c518d60083520f13b2349a1051a3981605e6130e0632e112212af345f51 SHA512 0e9aa3e61194f6d35449544c31693ee9f23ced8460b6ef4eca45b7f969867a6de04b898531e2749e65ee353547bd6fd3f19b7ee29d202ca30b5043567bf045bd
 DIST clustalw-2.1.tar.gz 350761 BLAKE2B 479acb42ec0b0adee8e04e99132a782c947a1261f48e674c6a11e4f38e44e5709d03f0c864f0cd3cf7eb4faf76a36b6121c3e3d3573c86ee3895971df07f1a58 SHA512 659cfe0121015dd2b84578b1a0a7f016fc944de155686b9bdef31122200a21e792203f3a6ab93a31676a50ffb70858b506ceb7ac27d921189a8381dbe0887921
 DIST clustalw1.83.UNIX.tar.gz 166863 BLAKE2B a3b1eabad8bc736cde4655f13fa8544759b7b5c50ea97fd45ee0be45ac6c361db5ced8ad21622ac2530b57c37c77dfd67657afd2c411acbfb7ff2a3ba014637e SHA512 c0cc9ebf4c8869be819065546b499b547990342c87425fae8f921a141704343f2a518ecfc2b8bfd527061902825fc5befcb2cd080c83ba887390e48338c9dc1a
-EBUILD clustalw-1.83-r4.ebuild 809 BLAKE2B 8641c9cd2b8e14b99bc6b59a5c90adc58682f209fd6a34b293d53dd167d9dc4152cc61c310fbf5fe7a7d3f17d8eb90aafc8e07f4865c7366805546bd1a31051d SHA512 9d56c56216a3d610f53ceaa64ca199825047337915959ea458ffc1adae11b83ae699bb35d041281accc917d0aa18ced1ffb0d6d765ee1c763115fcc0900361bd
-EBUILD clustalw-2.1-r2.ebuild 464 BLAKE2B 89efbdc8c9d83fc90e5ff611ae3f0f93c236c4d706048517a513bfe8e7d4ee22d7e996683ae4ffa404a91c2c984d1aaf2ca52167076b7155fe37a01c37f940a9 SHA512 e9f1cacef31985fa1b1b48d05d2bdbc21c54fb4d8bbd677bb742d03e811afbf0868d365f72d675e34b1fb798166db3678c437b2dd50a7f4bb68f37d349b48743
+EBUILD clustalw-1.83-r4.ebuild 810 BLAKE2B 720c484ba111b8f198581f7ec232793f40728f604fd773cfbc29dfcd258310ffc8ca97793eeb1d2b08e9c4052b464438b81d0bc390ebe650c73c01a7c01009e5 SHA512 6db7fa9e762e2631bc2fac8ea8028a5424a11050a74a97e4c3c2c6deaa621b76d2c7c50dd76aa8ce1f2c50a6094fb4559d7ca5eb4e00a737c2e24b103a20f0ea
+EBUILD clustalw-2.1-r2.ebuild 465 BLAKE2B 9e9bef107eddcbcd6b29a5a4f59b69132ea88440d8e0bda530a6739264deaf4ed1e336fe055a212e1fde5589eab6bd72a58862483d58c6ac533927956c2dff52 SHA512 a2d0dc84f8b7a5dd7ca093681017fea7611d2b1a0f5dc88c0e4b1949d18cbf7d9ae299e53bdd4980ac04711514f9d5f4a36098dacd5ea8e39ea848ca3c8583c0
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/clustalw/clustalw-1.83-r4.ebuild b/sci-biology/clustalw/clustalw-1.83-r4.ebuild
index fe20213ae7b5..23c4ba9a3229 100644
--- a/sci-biology/clustalw/clustalw-1.83-r4.ebuild
+++ b/sci-biology/clustalw/clustalw-1.83-r4.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}/${PN}${PV}"
 
 LICENSE="clustalw"
 SLOT="1"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-as-needed.patch
diff --git a/sci-biology/clustalw/clustalw-2.1-r2.ebuild b/sci-biology/clustalw/clustalw-2.1-r2.ebuild
index 15c658788b5b..16a957f6c636 100644
--- a/sci-biology/clustalw/clustalw-2.1-r2.ebuild
+++ b/sci-biology/clustalw/clustalw-2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="http://www.clustal.org/download/current/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_install() {
 	default
diff --git a/sci-biology/clustalx/Manifest b/sci-biology/clustalx/Manifest
index b6075e6ac694..8237f313332a 100644
--- a/sci-biology/clustalx/Manifest
+++ b/sci-biology/clustalx/Manifest
@@ -1,5 +1,5 @@
 AUX clustalx-2.1-qt5.patch 8173 BLAKE2B dca2d4f7531ac38510cc9c2aa788244293c436940d38945c906c76b7a29d395179190833517c01cbe48d450111d3f115427fb55536ab55dd01fc0617ff9e7bc2 SHA512 d8c9e9e1aade86f6ba4aa88618ace305152b819cf445119c82b4d4e56c7923e25876c83fd74c8dc91715ce484ff0ea3111b13ed7d8219c1222ad60e09b72d29e
 DIST clustalx-2.1.tar.gz 341649 BLAKE2B 43a740b278127d4745699a75479e422cc95a864bd55a9fe37eb68c0b36ae89e07848e8fdae2207ff9b3850eebc273b803df0261eefd3e7d96d8fa58c75af3adc SHA512 e8cbad783722161de6999ab01a91d555fc10db609197a8d2878f91e9d7dc998784c02d2ccb54c4936ee27b41321db6f4f37021221662f483b8b6d945b6e1c026
 DIST clustalx.png.xz 74808 BLAKE2B 3e0b7ba5d0c4e1013a1ea0146460384279e7116cccde1abdd2e34de16867d83b88c0a04fbc64524e340611fdc5a5df4dbc73f10af610a43fae65c0907b7ac25d SHA512 0907710c944fc1b883c58501cd7bc2abbc5bf171495b58dbe9829d60d7c3530c210f89a5bfafc3cec03808ae50f5c9a78ce37b9175c2e37590494e115e8e343a
-EBUILD clustalx-2.1-r3.ebuild 1335 BLAKE2B 699de7fc342e8446cc26d4df33f4160f12a8db5296a3c7da5dbfd925d574888e9b29d6ebafa2ffe01b3f226d76294dc0757409b342bccfe03d85dbbb3e47409d SHA512 089251d547375351d37d244d52dd98b649f6e19cf985fa4f631c68aa8e59f760537d6209c84eac1a5bb2d6381931c21993dce8fd4a812efcbe80a04b3e8b4163
+EBUILD clustalx-2.1-r3.ebuild 1336 BLAKE2B 06a333b85b40abfedc034d2a9eb4133d2e49fa2e3a7ad18920cae45444d7e2d3f9d2ec364024ff54ce2c82f502c1ac5cff03c6d71eafae28251153820c65a001 SHA512 37f141b7c69300fbd920eecd8c54532c53f059c305f7bb1ad6b051c0e3bf22c25d4a3e87871d5f1e5bb891c512427b645506cecd76a8ae2ce8dbf53daad09882
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/clustalx/clustalx-2.1-r3.ebuild b/sci-biology/clustalx/clustalx-2.1-r3.ebuild
index bd9b57aabe79..fa956bd186e8 100644
--- a/sci-biology/clustalx/clustalx-2.1-r3.ebuild
+++ b/sci-biology/clustalx/clustalx-2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/sci-biology/eugene/Manifest b/sci-biology/eugene/Manifest
index 21120d84e544..6e45624f0ef7 100644
--- a/sci-biology/eugene/Manifest
+++ b/sci-biology/eugene/Manifest
@@ -6,5 +6,5 @@ AUX eugene-4.1d-clang16.patch 638 BLAKE2B 31ba74851ef79712e2583775c1cefc80035d4d
 AUX eugene-4.1d-fix-c++14.patch 635 BLAKE2B d6e72bd7e4b80f21ebbc78cfc5f791fa23b0c22cd3414a5ecaaf50c54e1789625901bd0f9a5357f523de5dbca02d75229557d8a032f2e7cdd345e7dae3dbe19d SHA512 8ff6a8a2ee4b70b14d0fa9984c057307fe5b7d22e8a26969d82fb1ab7ee30a90cb3520ea8d3e16a59f09dfc46a3310cb43c621fabb31a39216209a4c3523e718
 AUX eugene-4.1d-portable-getopt.patch 1433 BLAKE2B 8de256a490936a6c893c055917919a7cfc6a510675b4c12021d7cedb8a6cdf4aa73fb60d6ae4186b1df7abb784da09a9dc440464d8cbd90ac5d9ea758262391e SHA512 6a365eed393a27c080ec6f0eaa288a88e7909daa657637cb819aeb3e908934f8f228bd1026205402bc180e54c4ffe56be5ff5eedc95d3817b65da08774c9496c
 DIST eugene-4.1d.tar.gz 7473965 BLAKE2B 537ba871b701a5c199791809f76ea883ff77fe768e27a69b95186ef82ab32cab9b5761405a9fadfeea9f58fe88cadce83bba4b1fa6cba5f4ede2347a516d1df0 SHA512 dab37930e211b3783954f6e4a762450760201b77e0b4214f16724516d9be583d0a7ec44a2f510e73f4370e9c2dc67a425456a057fdba8f51cb72386e16a26ef5
-EBUILD eugene-4.1d-r1.ebuild 990 BLAKE2B 3c00ecefa82adfd64bc57cc9f8ad89e09cb29a2bec5a4552b64bd7477173f56a4bdca24f2dc2001385bf45800f4c865ea7095f8b7e181c528fa4dbee26e11e40 SHA512 a6ba26dd315a52f65a2e7a501ad515caa6fa499ef560d4c5b2b94586a146c6b84852fdbe8f6fc662088b2a72597a9b45e7a7a20cbeca0ccc742033d25f181e7d
+EBUILD eugene-4.1d-r1.ebuild 991 BLAKE2B fb647b48a66e0db34918db999945b6958058638349c5ea0b574f493b140c58bc6c03531b79ea691e925a53e38a3bb89f339623af40a1c81482eb3d48550f215c SHA512 8fe7eb01bf02d960a62296a5b873c52dce23f24a12a36a951c9c7d6e8dca89e48f3aad845592f23b2cc3b4cbf00fad8c0da9d659ed06febe3d21c5d8d8c8b2f1
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/eugene/eugene-4.1d-r1.ebuild b/sci-biology/eugene/eugene-4.1d-r1.ebuild
index 40fb83ffc058..3800d7a2bdc3 100644
--- a/sci-biology/eugene/eugene-4.1d-r1.ebuild
+++ b/sci-biology/eugene/eugene-4.1d-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://mulcyber.toulouse.inra.fr/frs/download.php/1359/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 DEPEND="
diff --git a/sci-biology/finchtv/Manifest b/sci-biology/finchtv/Manifest
index 9fda9c5c6d0e..b86632eebaf5 100644
--- a/sci-biology/finchtv/Manifest
+++ b/sci-biology/finchtv/Manifest
@@ -1,3 +1,3 @@
 DIST finchtv_1_3_1.tar.gz 6706911 BLAKE2B 5aea60c2a107dc0d1d878b0416011f57bfcdb73b6e7c0da80be5b485ec5824aae7c610235057b74002765f5ab5e7bd250efec2a04a471b55abd046afc560ea38 SHA512 813217a6d44cbd60fff061da94f70adadcc803b77352b278246711bf1b952b592a0fdb6bfc9d74264d896cb816078e809bdc633981d4009c422f59f74aca5bc8
-EBUILD finchtv-1.3.1-r3.ebuild 718 BLAKE2B 565eac2d89a9cf378309957a0a10b3aaf5b61311cec1651dd69307541cfcf067433d686fad48c340b47bc609484c475ffff1c5c5dfd6da1f89b61a7f0f4ac130 SHA512 06dd522e0ea7b6f5501b31162022d7eb9e3b75f3b7c1688a6ce5222d1726212e9f6e484a832686c3dce2676a72d20f2446c6c8c953482b63a071309e3d285dae
+EBUILD finchtv-1.3.1-r3.ebuild 719 BLAKE2B 6a72672e6365d1d26f5839e92c6490ee742708833909b23249ba59bd9d1c9295f40e548e6a87170ebb109f35d3c05a7af913c3eca00adf4b8e30a02dba743169 SHA512 b5b10698f5d428c40ee0d44becea8be01172852aa5af622e3983b43f2e5a7fe827dc9923916e25521db6352c099919281f1faa0030eb6a807a54de4446a90830
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild b/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild
index 60608c9aff2a..d3634ac607b1 100644
--- a/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild
+++ b/sci-biology/finchtv/finchtv-1.3.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://www.geospiza.com/finchtv/download/programs/linux/${MY_P}.tar.gz"
 
 LICENSE="finchtv"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-biology/glimmerhmm/Manifest b/sci-biology/glimmerhmm/Manifest
index ed259a54d26d..f0f760cdd059 100644
--- a/sci-biology/glimmerhmm/Manifest
+++ b/sci-biology/glimmerhmm/Manifest
@@ -1,5 +1,5 @@
 AUX 3.0.1-gentoo.patch 4235 BLAKE2B 8263516018df83c39da08e906bcdbfb8445ef26c064a82d8edf547fba5b569921905dd32476a99726f1864cc24ec5464fbc48db55e08cca0b9555647dddae120 SHA512 e0350a4b604fe76462bbb7139264a9b2916c050c335589031bdca0cf0c6a653bbf84d9827f5c2096ff13f1007d4ef2e93698814758f787a98e4dd818be44bc3d
 AUX glimmerhmm-3.0.1-fix-data-path.patch 512 BLAKE2B fc37954be58eaaec074fbb3ff9a8109907fc71be39365aa07e62c884a78c910d0ffcceaee907736107b56d97f0e7c9baf30f9fd71f239ede6cebe4bc9bcfb59e SHA512 0e1b65887a7a27c8d9adbf88a904ddbb4afc56e5052a6693ca57ae160bc9c6dab8589b633d364aead873fc1aaa671580bfc0deed9bde153f5069a0351244ef51
 DIST GlimmerHMM-3.0.1.tar.gz 45475952 BLAKE2B 355f4e9f26c31167e0935de8012fa99a243838d0dd47e0e46ae4cb1df4eaf188a13fb365025bc4be82805c89f36f534a9907030515f96b9422340e9e966f4ea6 SHA512 15307d1982527bd83433882552cd3e12c76a65a2a119b6911a748dc801f80b1fc5732cb769a52e5c6281bdd48cf619a02edbd1b96ee40319fc620a3a7cdd82b7
-EBUILD glimmerhmm-3.0.1-r1.ebuild 989 BLAKE2B 7b411464fe1fd149ee78db9f067ff9c549854cf0ee8d572df30d0d03c3081bfe66c7ad26ad3051313909a51fc0ef0ac7e6e13f0ec378bf23929d2d4267d3b764 SHA512 1a55d81a6294016b4c90c952f49810ddf0a34f5b6b299f0040775a6a7cebe94aad5730d864143d4f09457b6616032fae2da3c893f47501d7c7effe60616a7196
+EBUILD glimmerhmm-3.0.1-r1.ebuild 990 BLAKE2B af2935449242c6324045c64c9a91a6d6f887891dcfbee89817c067c0c7a65792614f8244af428608f8d2b0fe5e4cc0939f56ef99b567ebfee678a2948f93bc5c SHA512 a17e8d42120751084bb2330ceb57d87b48dcb3e3e2222577f350a69a37777a38a3b9dd323bd055f7e8248b3c286021249577f43f895d0dd49fd4aa77dc624037
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild b/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild
index 5424e942a7f7..b6fc54eb65b1 100644
--- a/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild
+++ b/sci-biology/glimmerhmm/glimmerhmm-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cbcb.umd.edu/pub/software/glimmerhmm/${MY_P}-${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-biology/infernal/Manifest b/sci-biology/infernal/Manifest
index 9bd728080ffa..e6ec5176113b 100644
--- a/sci-biology/infernal/Manifest
+++ b/sci-biology/infernal/Manifest
@@ -2,5 +2,5 @@ AUX infernal-1.0.2-fix-build-system.patch 3142 BLAKE2B e5869c089b158cb8c22bff849
 AUX infernal-1.0.2-overflows.patch 540 BLAKE2B 1336442c3d1ef8a78d5d7a345bbbc3abf918d6edb0cef8fddcac32b9ece9f990464b3815592f564a05494a8b7c5c75e438349c384c29caa73c467e40f737db45 SHA512 c8bafb2c10d09cae24f882d5238b6ae974669d59e0ee583bcedb13e81c88ea9859c1f78343d5be91a5cca05a3dc07ffe6436b33e201a46baf349795da5eec906
 AUX infernal-1.0.2-perl-5.16-2.patch 4206 BLAKE2B eb4309d31e874f395d20bded4c132fb8b811fe17b4af5c95bd56ade05e22e7bf45c08e67884ca339aa7a2e13b2ddc9bb9527cbddef9458ce8fe05b7bd4707e49 SHA512 9784f31c18f6c53b15c0454d3a41db27c3f433ac3d3030bc113e9f9e8194fb51109de5055d038a3c639b1c4142d6fd0010825df484a857c9f072f43d8cadcb44
 DIST infernal-1.0.2.tar.gz 15205421 BLAKE2B 3570ae42feb96ead383c2f1c09d34b4719ae0a5ae8fa973fd02f9ea6e8935c81ab49c7db21dad2e20c1ae6ab6fb9514f12704bbf5917f15f6582effae480312f SHA512 0399be14c17f053574e95d8c5b9eaf990545795a9268e20f0940e11a8e78fc49beb4b23994e9ea427764fbb29e9b39f6da9cb1d85eb4b56d354057b48515c4af
-EBUILD infernal-1.0.2-r1.ebuild 886 BLAKE2B 8f82a57ed31081abb50ee798ad80f3de5b7db8dbc3a3428b150de486834fae52253d9765d27a19276cbd79daf9a522c52733caf7a1ed824064932dbae3ade282 SHA512 af5e2dd5822150faa278e4160e41696a322deec3ac97e3df0cc100a1b8cebc929c747235a051ac86afed0269812f10dfb005160a56b49703aa67376064c49ad1
+EBUILD infernal-1.0.2-r1.ebuild 887 BLAKE2B 361985bc54c2d90ca87885edca9d058969416c20c78a8156696f585ae0e0971f2e41c858d9338660fca17bf5a5fec125c131f46db8484eea95c1551b357c6239 SHA512 42aadf3def8a01d822a138d3baf319ec536dc48565863c0d63bdcda69e50fb3636d1059ca0db262576b05123d3b54c69418c68b203483213521e1ae4fdb44d82
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/infernal/infernal-1.0.2-r1.ebuild b/sci-biology/infernal/infernal-1.0.2-r1.ebuild
index 2e96418b6bb9..9aa5fd13f4db 100644
--- a/sci-biology/infernal/infernal-1.0.2-r1.ebuild
+++ b/sci-biology/infernal/infernal-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://selab.janelia.org/pub/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="mpi"
 
 RDEPEND="mpi? ( virtual/mpi )"
diff --git a/sci-biology/mothur/Manifest b/sci-biology/mothur/Manifest
index 6e085b66342a..28a0c3b5a9b6 100644
--- a/sci-biology/mothur/Manifest
+++ b/sci-biology/mothur/Manifest
@@ -1,5 +1,5 @@
 AUX mothur-1.27.0-makefile.patch 1196 BLAKE2B dbe053a5f5629eadae57bd09545ef46106741204050d0c888532388fe0b7f8f2fe4d5f311163e95812d0d828aae2228a2f72b7f0c861f5a3d42a41e17b6ba4f3 SHA512 8a78ddbc926d4e116deed440fda8431ccbca3299ac182fc84850259187dc130cc43fb6f23845d055d998293fa43f94cbe35930242c5f6aa049f8275ad3e42adf
 AUX mothur-1.27.0-overflows.patch 4894 BLAKE2B a9de0276a9ccbb5e86d6cf208f86414ea8c0befdf80807e05b40bee0c6f685cb40a608005e69eb3f77b85990424a36cde14971044cb6a1136a50d85078eb9f1f SHA512 aa392b2060cecc38006a7ac50aaa8e4249a020029234ac2abdc33441b12a09faabb0335144ff4d888e55a1da1838a45347981f49f6658f3546a54a30b5e2133a
 DIST mothur-1.27.0.zip 7095054 BLAKE2B 96a6410d36f64ff50591955aa22bfddf6217c7568022c8c7f70ab70c65d57af2217477de56b6f9ceaf11237cdc5380bd354cf6564002357546539585d0f58221 SHA512 81821ca95d4ce3f0d1e6aa920c4fe3fddd70f716157312ed0590c1c4ad728e6786bfe79f6badddcfb060ed5d1996cc1b5062c320a59209fef35f68e687ba3dd5
-EBUILD mothur-1.27.0-r1.ebuild 845 BLAKE2B 52cc28dcfd3df857f51b9c430c1ec5f658562e922f1394f0d79cba4fd6cd33161cb5639e0d7ca95c6b5daeffebe376baa5c2df0c5db6e8c6382fda40a215060d SHA512 6fa585f94e0caf8cbe40a2673d4e5eb49c6c8c9e5cbc279deef1b525d1674ce986068a08a994fecc079b5cee2301cd92fb395d884c4e23c98afe7587a49cabeb
+EBUILD mothur-1.27.0-r1.ebuild 846 BLAKE2B 7e8af4ea878dc3ba7a9361780a36cbb5a9fedd2b6c91a0cf1c7bb641a740e744aebfa9e7680d93627fb01ae2c01605c360eed12458bd1582f183d45a8e6fdc1d SHA512 4f7c99493fdecf9e27b5804252377a24ebb8e7d5f23e6a73e41082aad6dfbc5004e40cfe2c97145da23344d73ed0af09c5fc8a51027b31191ac78d869c354906
 MISC metadata.xml 340 BLAKE2B cbec7e93cd78a2aa9652b6aa68d8f1c4838fff7c44db75c3bf4f08aaf24d0ff91d3a20a73143263d079a8658b526ad58714df48306fb7a3f5d79b9e65fb543f4 SHA512 325f529a1181d96fe70899f2e91ed7eb9e175d2421e50947e1fe3424abf4075dd8b96e07711e28a5a3de51885efc80c26de2ecc81e62b3a4a690e02f924e87c9
diff --git a/sci-biology/mothur/mothur-1.27.0-r1.ebuild b/sci-biology/mothur/mothur-1.27.0-r1.ebuild
index 12b628475aac..3f5603e9ecb5 100644
--- a/sci-biology/mothur/mothur-1.27.0-r1.ebuild
+++ b/sci-biology/mothur/mothur-1.27.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN^}.source"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="mpi +readline"
 
 RDEPEND="
diff --git a/sci-biology/muscle/Manifest b/sci-biology/muscle/Manifest
index 8a5aea9c17ad..27cd7bd28fd3 100644
--- a/sci-biology/muscle/Manifest
+++ b/sci-biology/muscle/Manifest
@@ -1,4 +1,4 @@
 AUX 3.8.31-make.patch 922 BLAKE2B 57f112a4538b1b0a791f9e151e0e27ba8c6af2beefb6ce95f064edd183315e17a09d92a9cd0a368907e2b4a1571463669e5ef83e96758603fa4807780ea98bc0 SHA512 c948991ab4f7b7d6e05ab63df00ea6ac576587e63f808c377cc86f4e3863c7cee207569d7f0a8572a8fcf81f2e23d9dd6b1270447a0028910301d74554ab1fac
 DIST muscle3.8.31_src.tar.gz 515267 BLAKE2B 79a8517f7a14d8ee907104e9035e1284fcabec556544508fd9b712789759448969ce39ecbefcedac62c435dc91e109b3b5b7027120691310ffebda80ca80dd9e SHA512 2baf2aae354ae1e3f529e627be2ace86e89dd15567e1f642a625b63f08ebe3d4bd7315080c7d786d95e3eda8703545ec74af9fe83ad1523d55d00137fb7274ce
-EBUILD muscle-3.8.31.ebuild 583 BLAKE2B e8c673ec8ecdfcd6e8d490ecb5fb3ed8c15d7610764c35c7b83b5cbc8abffc51b59ced33f45be4d46cf3c858139358644c5944a95b9ce7f2767b9eb18614107c SHA512 66010e20d06b0c8053988ec6288d95f6df0f8e66e907e7d2592ef811290b0950f44dffec3015d60d8b73be6cc2fcaaad6795fd8e740ab9c18fc2edaa05055f85
+EBUILD muscle-3.8.31.ebuild 584 BLAKE2B ab2cbaa5046807ae92065e39b81179768f3b94eac6a28ffff1b9f670b8b74a9bff5ef6a4169c76189360bb7f7fe43a4804c95a837f739f66939e9a538cd4f9c0 SHA512 0f7f1a9f877cef9b54b19e884c315aaf03566011bfdbb3a0b061324382a581059bf756d1125db78dcbf8a83f92b57b425a555d2de6101cd8e2fe42cdfe8243fe
 MISC metadata.xml 341 BLAKE2B 6b03204418f247ef22fd3237509b77f74c4e3a8f2df5874c387fb0c63a8e36fc3fff55ee252409cf541fbedc1cef37a4ba58dd73b647cc3ae2e6ce5d653b5e34 SHA512 e921eda7a3135f20b64253b388af339085f7f5c020f72a082dab4a6600fbe8841f236348974886f177a3196c83ed0fb25954128b272c3e92544f1880f49fa809
diff --git a/sci-biology/muscle/muscle-3.8.31.ebuild b/sci-biology/muscle/muscle-3.8.31.ebuild
index 1638c655be32..e47f5f66cf46 100644
--- a/sci-biology/muscle/muscle-3.8.31.ebuild
+++ b/sci-biology/muscle/muscle-3.8.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.drive5.com/muscle/downloads${PV}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="!sci-libs/libmuscle"
 
diff --git a/sci-biology/pals/Manifest b/sci-biology/pals/Manifest
index fc94ed371cb5..cc4313bfca40 100644
--- a/sci-biology/pals/Manifest
+++ b/sci-biology/pals/Manifest
@@ -1,4 +1,4 @@
 AUX pals-1.0-fix-build-system.patch 681 BLAKE2B 8460ce718ce1a1a57970ecab525aa798e033c496a0108f44457155312653ce180ee700c76b1cf3a7b9f099a924cd7a8c0f027ba1cd65d96b688a67b97fe247a7 SHA512 bd95517d72cf567a4608878d556919396c9dd1cd77a4e49f2f8604f058c76a1f26c31760ad6ef6048ec12b76de46a6f4c56b5cb27b4aa1f91339c8f14bd963ac
 DIST pals-1.0.tar.gz 24895 BLAKE2B 09a24b3a2e99471378f33a84c447dea9153ddedd502de4e6b771c85ef99df5ca30f687b58d1d9d4726b29345215b617f1dc93a71b8be417d8c0c03e8ecd71015 SHA512 655e3311c63709dab1f8a13b193ed30a5ee97c04757a1e8408a74f6110ff3bdd96ba9eb07f4987ed5b83790ffa8cec67f722fee783c4ab4120483a683ebb9b8f
-EBUILD pals-1.0-r2.ebuild 497 BLAKE2B b36e2b2b6a59da25b6502c60e94effca3c077d3a4d5fb2c080242249060018902c6618be0858b87a3bc3ad636547b0d8d947aaab82c2ae04367dfe7157a16449 SHA512 4337ca026fb8ba1f103c49216235be329f55b5eca9fe8ab31d91939a239d5b03a442408745123947377956241f5ce9ff66f979308855677b2094f5f60a79a178
+EBUILD pals-1.0-r2.ebuild 498 BLAKE2B b97b685338ebb8a529c9584ae8ab38cd6e846eac0e675f0e72e6f268a04eba076d492117da9f8eab739d8b928fe3e00f0276a305aebbf6c55682b074ef56df89 SHA512 af9a842ec977c95b593357317d27c7d3687cdf00d30a8e72dcf5468d395e187ad9aaa4027360536a6f4726b0ee80ea31ff13c45c900e6de497476768a34cfd0a
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/pals/pals-1.0-r2.ebuild b/sci-biology/pals/pals-1.0-r2.ebuild
index 4e367283bf01..94f972567ea7 100644
--- a/sci-biology/pals/pals-1.0-r2.ebuild
+++ b/sci-biology/pals/pals-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0-fix-build-system.patch )
 
diff --git a/sci-biology/phyml/Manifest b/sci-biology/phyml/Manifest
index e5a4c6a54843..dab86d361d0a 100644
--- a/sci-biology/phyml/Manifest
+++ b/sci-biology/phyml/Manifest
@@ -1,4 +1,4 @@
 AUX phyml-2.4.5-fix-build-system.patch 1735 BLAKE2B 2ba677db3b00cc1ede4701652cd854aa8f92bc545668fae50add726fc5ddcc0694dbac7189216816026433d5c25864c819c77a887a03f6a75f111084611b6689 SHA512 95079d00d4a7373f9b6f9b17b707ae999db38a341e03f96b5f1b023ea4fd76a4027f6a46c6e33ecf7902ab4dcbc22d199b5c0f75a7b0059c90f7c11fbc9146cf
 DIST phyml_v2.4.5.tar.gz 92143 BLAKE2B f95b6b5023cd9b68e92e600edd9ee404bdec717d0b1e748c9e4f4667d732a23469762b847e4aa3c36e5cea7ce1d663ade031ec996cd6449ef1cf2fd55b96b2c8 SHA512 119716290eca0de4da05b0bacbec96139f4c89f6a033b861d1cb2655a620766bd0bea0675c4d7722a31d888652a28bf3544a643f39f11682982ede80dc5928c3
-EBUILD phyml-2.4.5-r4.ebuild 524 BLAKE2B bc347c764d77c74c0af028a7334897ca43c73607f77d713e2aad98c0d15655b39cfb5d17f50e3cfbf9f026e5168ac810affe15e71713d2a2c81b7fe99eba3eaa SHA512 d12bc078bf9f3592b2c44f09b3f5c9456d8d1574df0d98ba998cab21af68dae60dc910d90dcc736c1fe83f0e082ba4e88363d8fde3e79cd7eaf287c3c077f641
+EBUILD phyml-2.4.5-r4.ebuild 525 BLAKE2B adba2b7291564767d50378cc45e11a63064854a69dec496c33bc2476587dd56b4965fabdcdaeeb46c983fd70716986d3249266bf665d56c8ee0bbd8c0749c283 SHA512 0e3c4fdb8601b9780f269dc65ae53a13f21b0118dd11ac340d379679abfadff9818e807bae70241c1d8636ab70aaa073523c1108e548b50bccd289dc57cbfa95
 MISC metadata.xml 564 BLAKE2B 449bbc55fcabbe9a9fea66017ff48bdf5075345496d6cc9abc6a53966245c00894093b0852eaf1a74f6746db4093d8a3be36a4f9e00b6a245d38716b146247a2 SHA512 89b24d285a76e7826563f631b991ea871c7f4e5c2048ab47cb8d1d028abcf817b5e582bf93d3ea122b019e4b4a49f386f3d95f6103bf39c0979b5f6a3c19b791
diff --git a/sci-biology/phyml/phyml-2.4.5-r4.ebuild b/sci-biology/phyml/phyml-2.4.5-r4.ebuild
index d256370553ab..c0e9c38caf92 100644
--- a/sci-biology/phyml/phyml-2.4.5-r4.ebuild
+++ b/sci-biology/phyml/phyml-2.4.5-r4.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.4.5-fix-build-system.patch )
 
diff --git a/sci-biology/piler/Manifest b/sci-biology/piler/Manifest
index 6fc587829cfc..e93bd6f53216 100644
--- a/sci-biology/piler/Manifest
+++ b/sci-biology/piler/Manifest
@@ -1,5 +1,5 @@
 AUX piler-1.0-fix-build-system.patch 685 BLAKE2B 8df7772012b8809599d0c80d52ec60884ee086f69b6b9f185cfd8b9026d4e047bd7cdd8e4eebea0e5fe991434ebc146cba92721fa9ab0238803c69e2d2ed06da SHA512 e8a618615ce62aa6b4d7e5d0a4ec3facd13b6baf2573323a2f9c03d81171f1c32686bd7b82c4576e0b38cc3b30b201750034ab160cdb9170215ff480eb72a3a2
 AUX piler-1.0-glibc-2.10.patch 386 BLAKE2B 758ba0e13cf114998a78866ae4ba3b11cc27aad09f17db84ed7b295c14ccbc15e8446b49bfc425f0ed92c694e16dfbee33ffe9cc0618bbb92c142d4d0c1628eb SHA512 0773c9b6c2eb289c8dee3cc8db6ec0250cd8df3b9e5e729305b58b28db64f486571f2f54041c84d178bf984cedfb4d9941c5abd47f772ecdf29e9ec0bdb55fcc
 DIST piler-1.0.tar.gz 35220 BLAKE2B a3a5d9ab6885e0900c523db9d1248888cd3de50b18c2c4ae110a13d792a0faa60eefffbac4526df96b482b4fe6ed8bd19299eb96380332a57f2d60330ca40037 SHA512 35be1b445f1eaf26f96d0356a04d985fb528754677403df2061c0872107d31819c5fb355e7f616e953a997e67ce781846acaf3cc2a016097aca785b6a26de3d4
-EBUILD piler-1.0-r2.ebuild 640 BLAKE2B 30477b8cee6c18196e5f71db6a5ee4c786b1e84fdb8bc01768f03b3eacb765c3fb500bd8b1901f56a1046fda6f78c220d3b0658c02f82beeeff954e7fca72576 SHA512 88e1e8d19be93fa2325670e8c42c16b3bc19c193af20116e9bd60b8a00968c90088531e345ea1d9f6b9b54b72f021f10cd44387bf10dbdf17b4bba8ae7391fdd
+EBUILD piler-1.0-r2.ebuild 641 BLAKE2B a18f9440a48997755161346e4e04573779b0b150db54f84b5dddd5b2c7f48fe27de2302f7c7f632e8a5b746555e1748a81b944fd6630629a341b640af373698a SHA512 4949eeac5e8220cd31dfc3ad64c6949e2463ca94c5c1534c011626d0121a1d9717ae7c8e090abe23f2d5183983ab6e29036b412ec36c2cd8c30d42ffb6912657
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/piler/piler-1.0-r2.ebuild b/sci-biology/piler/piler-1.0-r2.ebuild
index 845be78e1fe0..6f419d040b89 100644
--- a/sci-biology/piler/piler-1.0-r2.ebuild
+++ b/sci-biology/piler/piler-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/sci-biology/pilercr/Manifest b/sci-biology/pilercr/Manifest
index bda424303fd2..035072135299 100644
--- a/sci-biology/pilercr/Manifest
+++ b/sci-biology/pilercr/Manifest
@@ -1,5 +1,5 @@
 AUX pilercr-1.0-fix-build-system.patch 673 BLAKE2B 53bbafb9d1433e78edb3568db8e1a810ba1cd1b08f3f1b53719b1b98483825a50ef5daf06226a4ad72e577e50d3e034f6c2bad6b53fa098c89cb7635166c8223 SHA512 b744c3fdc6e1ec152a27592ce8036de080c113b6385c5743dfca325ae8e0435d34418ca9f51830c540cf8efae710d842b89dd1b2b7b772379a4f527a72ff2c06
 AUX pilercr-1.0-gcc43.patch 854 BLAKE2B 2e3ffba380df1522f28eab7e48103d6c56d1548db3eb8622e9e5f77c098d420858b1f9ba656593f949454b43f2cee5d7a79cd9d2fe712749cc481f4f1dad61d9 SHA512 7e83a1c29f2b6b11e101ffebf99516c9da06f7fa7645aa619a89c365dc89d6ea2659d4610eea25b6e260328b56320e6d720f3d0d67a01aae450104fc9513d58e
 DIST pilercr-1.0.tar.gz 1709144 BLAKE2B 59aef12a10d168c8cbf4d3b3eec95dd4cd47b0ba073f19bd9f3954e6fab088af1c9f0328b0120c219034be07e4d13af4df17ca3eb7f40c19ff2a13d72000251a SHA512 c262ceef1d1af9e71f454809e940c2ad6d835a8404daa51ccef698b8348a504c697f5b5c268ec24df611f5adda2932e4982bcdabe4fbdf99d8c204f0f77f1be5
-EBUILD pilercr-1.0-r2.ebuild 586 BLAKE2B 56782b41777a8e3bedb47e2dccf4c4f5d1e92bd0287b1100011b3e5b6aa56b02dbb8e5ca463aea9041256c4a808f8963fe7a68427ad079f6841b4183c424b194 SHA512 c999f02d8e05561918a19428ef66894117dbdb99bbae6c722bb90211fafec4401667b756f139926b78bcd30d05492e0f05ffd4f77fc3c5c337340e255ca09e7f
+EBUILD pilercr-1.0-r2.ebuild 587 BLAKE2B 57061036e02f6a5bca8d5c485d353dbaeeb791507ab663fca8a8fb751cd16107d7f5a4c317bcdce346fd844ac135d242a1fd8c0843dfe1e9915b759324b2e89e SHA512 5445b17fd632b7d719debb43e610561523070fe6dc87f180df65ada5c0a3a5613103a75ef5344956e0275a30ce1ad034d509c3061e2457930b61b25fc6a83241
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/pilercr/pilercr-1.0-r2.ebuild b/sci-biology/pilercr/pilercr-1.0-r2.ebuild
index 819fb3fbb03e..46c5dbc2b944 100644
--- a/sci-biology/pilercr/pilercr-1.0-r2.ebuild
+++ b/sci-biology/pilercr/pilercr-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0-fix-build-system.patch
diff --git a/sci-biology/probcons/Manifest b/sci-biology/probcons/Manifest
index add7a8d4faaf..0b7f900ba250 100644
--- a/sci-biology/probcons/Manifest
+++ b/sci-biology/probcons/Manifest
@@ -2,5 +2,5 @@ AUX gcc-4.3.patch 1300 BLAKE2B fd74d2cb3311ef89cb012276a55025e4430b452cd603d2386
 AUX probcons-1.12-cxxflags.patch 1957 BLAKE2B 5308ee19d8bec42bc23ba8bf6ee38b4d559be0bbffdae032138f32a5890e6524d3025124f48188f4b580035b398e4957ba246a9305d05577b58909259a73f396 SHA512 033e92e414d3e2d1db867aec980d82759a662cf46692e3cc908bb7b3428d5eca105fb81cbdd8764c54dd3d759d29e713ef085fc48aac183426d26fe68a48a38e
 AUX probcons-1.12-gcc-4.6.patch 306 BLAKE2B 0b0dcba7749192be0361fcf2a0778e8a4ef168a1d867e9d1ccaa097fb75c8b580a255dacf25d1312e648bb623e5796370d695afd742304a06e2d18547ceac4c4 SHA512 f8a393cce2a860ea54aa18add7ba236aa43e21893925e4484b272190e29aa2dc27bf20b11edc5694446f027c6d8d6ff3c3f92383f0b0c8958b1b1d5b7564f828
 DIST probcons_v1_12.tar.gz 43200 BLAKE2B db59a4472e5ea4ce1801ca74807aa1b1bdb2861a9e52f9b3a4297b37d048ecd6e34298cfd181523093f8fb1cd9a81285e58098bcdec6ffa32caa9cc1117b8b8f SHA512 ce061ea5cca4204d6e66beb893c1ba508f094b7ea3ee08196dc75a5443ebd0afca14dc8d7cd6c8da4ce1578b8750ea1981e5815408c0b122e8f97ec27b3bf008
-EBUILD probcons-1.12-r1.ebuild 1132 BLAKE2B 1ed9f556e3d393ba41611b505cf6a8d682d747d7f0b93001793989d56c710564c77326cc704a50f80e3c9ca338f529f02bdd56536ef6f2083d51439de792640c SHA512 2a506f516adc4190e74d3d756a5a11779f1d06473e4daf132a34829cc9f07cdafa50bb1d3b908df984037ecef885698734c7c964fcd013b3af29e20e71158618
+EBUILD probcons-1.12-r1.ebuild 1133 BLAKE2B ab40f07f30f087fab76b88c26a1847850261bb11eb294cf8c9f79264a82f7e55920d7bba7be8c368dfadce0449cd27b29740ced38154c2fbf0fa58bc19d6d15e SHA512 914fe25b441c1bd798d5d1f8ef7b4987ffae6117f19c6ed8b01802ecceee4eb49efe20b0c2c90c6a85e2dea93867e75a234b8fa4e0854e3f6284f7d1b1b3f170
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/probcons/probcons-1.12-r1.ebuild b/sci-biology/probcons/probcons-1.12-r1.ebuild
index 15960982abff..3f0f2670b7b0 100644
--- a/sci-biology/probcons/probcons-1.12-r1.ebuild
+++ b/sci-biology/probcons/probcons-1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 # Gnuplot is explicitly runtime-only, it's run using system()
 RDEPEND="
diff --git a/sci-biology/sibsim4/Manifest b/sci-biology/sibsim4/Manifest
index b005a854599c..f4f8bc0957bc 100644
--- a/sci-biology/sibsim4/Manifest
+++ b/sci-biology/sibsim4/Manifest
@@ -1,4 +1,4 @@
 AUX sibsim4-0.20-makefile.patch 603 BLAKE2B 1d5bf536aec1c8d6716a2feeefc19d9397c8a8446899d40bdc58abe577ed5b4e7234b21bd428a831fcccd9ed0cdf6da70e9fda0db3070e3d51506b91b4324d01 SHA512 d434cf369ec418e29df7d34b139acf06182d84d1e83a7aaafe2d5df2ee49884ff86ad7fd5b6697108e7d1dea865652c8755459ff4ec0ae6395b1ec8c46126e55
 DIST SIBsim4-0.20.tar.gz 32118 BLAKE2B 79b1f080d547732ee6a5996885c26f422f8a1590fa37d525f35cfa3dee353fd36ce9aa4677fe7e570f43e8283c26541c8c9e76ca03788a66d1c356adb3d649d5 SHA512 3802520095e83d3c691804b661696095a4198c4b2a16385c55ccdc8e4e836f82cc9c2251a5d37cb5918c2ee80aeb81737d751e6b065fbfe9c64f1aee3e0ea0c8
-EBUILD sibsim4-0.20.ebuild 518 BLAKE2B 0999e252ed6713e462f04dfa6d1ee0c48982ff614b54aa4126fae1ab4bcb615153abcef38806a193e32bce14daf9d7b22ff71a86d005b7c222b497dd7aff23be SHA512 903d8d9a98e31197a9018cb13d255a7ce7ca2cfc94d40f4fe8ee793ef2f8e7736907a6f37633b900b02430a842fae11e55ad1880e551807dc40e8069c2aff59f
+EBUILD sibsim4-0.20.ebuild 519 BLAKE2B 5722f5be83f06fc155500fcf5baa4780874d9e84be2ed9e607fb1d5850c10af504ac62d807c5b3e4e905494d246dde0073262c3788f5c9e0873bb0368eef72f5 SHA512 ea2b8e53d2f12becd13e5fddcffa46e20ee05d1b88fc5cb1c756abc1ef7ead63d129abfb130761ae18b66b754a39fbfb66d6ebd6b3843bcc5a852c1290e1fcbf
 MISC metadata.xml 349 BLAKE2B 67cc5ec26168241638acef4254a0b8682d9df46e574871b9aaa114a5ba8ecf3bf2e3a6bf5523c145df33415e1900faa95e8d65344b861c18e6e9ee800b2fca5f SHA512 ceea81611ac099beabf355230b2df7e61e96fdb8823e992bc283094f182ca8b2486f50d016242f1dd21c1b4148b832f73de4af9cba57a108122d714313a8b5f6
diff --git a/sci-biology/sibsim4/sibsim4-0.20.ebuild b/sci-biology/sibsim4/sibsim4-0.20.ebuild
index 679cb462e045..c90c13dce7ec 100644
--- a/sci-biology/sibsim4/sibsim4-0.20.ebuild
+++ b/sci-biology/sibsim4/sibsim4-0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/SIBsim4-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
diff --git a/sci-biology/stride/Manifest b/sci-biology/stride/Manifest
index 9f85d690142b..9d769b29916d 100644
--- a/sci-biology/stride/Manifest
+++ b/sci-biology/stride/Manifest
@@ -2,5 +2,5 @@ AUX stride-20011129-clang16.patch 348 BLAKE2B 22c33a3dbc2c0a85d3ae8aaf1072e47486
 AUX stride-20011129-fix-buildsystem.patch 807 BLAKE2B df077f9234808abe3a9346af6c4a8bde92812cc9f782ad37b75b060166b35686cbcdc2f4b12c26263127dbd3c488660bb2cf70bc553c267cb3e9f70eba68082d SHA512 2afba4707d8371da1fc79c5bfa6f476ac76682d67e52287462eabfcecd394f89a9fe68810045098c48107ed7f33b8c44c566f609c647f71a7918375cfc9dc220
 DIST stride-20011129.tar.gz 56441 BLAKE2B 4d4cd3f9f6cef997fff10571aecb70cb21056e88c5130e7dfdafe15a6fb353656d0635b4d65895ef115479a87dcf600b659455d15460344c838543a2e356bfae SHA512 cbd40fce4684728f363520540132fc1a0003126954a145d59aeff48adb20fdaa66520bd12b56ee5d2906e8ea97bf78a225204105b820f7f368aee5e790a6471b
 DIST stride-20060723-update.patch.bz2 5621 BLAKE2B 266a7371c0963a996430c1f809b46196e8bf179fcf2afb4380f6eccd092c03b29d5b09b8a8438ee7848d0f411920db2e4465ef646c75a406197412f35e880179 SHA512 e06eb68b907615e12dc1a9981be157400e9ffed9391a906cb4eb3ef4067b7027c26cc600298053bfc5d2bbbebbbfefe0e6b18d0e4f6fef2172768e6f95498af1
-EBUILD stride-20011129-r1.ebuild 853 BLAKE2B be20a774370f1e3660958f4e94f40babeccbc2c4f99d20281828c3dc0c84da32e1b52ad7e8549f8ae3aa3fe23e7bfd66c97aba6884a333f6928b13f3b0f2dc3d SHA512 d8caeaa090636a6d38ceead5b7417f41cd9c44af262af550f67a85a5342e8ea87e95798917fae066e8c2700f9f87b7a94e3e6ed427c1a80eb2844f0ee266c57a
+EBUILD stride-20011129-r1.ebuild 854 BLAKE2B ff439fc25f22523b039c792b8d0af454740467db742945774bad7617aca732c0fd5e3cd88d359aefad58387e36b9f24597ff017d4782beb7fb0ea77b54e9976f SHA512 19460010484839b4051391460a819b64e7703c66f14764b54f16b48cd736dbda25f6142b88d2c18d3717ba523f1930756c616d74570a274c61669bea118418ac
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/stride/stride-20011129-r1.ebuild b/sci-biology/stride/stride-20011129-r1.ebuild
index 9638fd559b55..13bfc8e29073 100644
--- a/sci-biology/stride/stride-20011129-r1.ebuild
+++ b/sci-biology/stride/stride-20011129-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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="STRIDE"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 RESTRICT="mirror bindist"
 
 S="${WORKDIR}"
diff --git a/sci-biology/tree-puzzle/Manifest b/sci-biology/tree-puzzle/Manifest
index 47a8f5a4de1c..f89e3f5dc55b 100644
--- a/sci-biology/tree-puzzle/Manifest
+++ b/sci-biology/tree-puzzle/Manifest
@@ -1,5 +1,5 @@
 AUX tree-puzzle-5.2-C99-decls.patch 8138 BLAKE2B 94b8cc95f46d05b762e508ed7181a0c06fd05b98a06d1075d5e579cef6687bf7d617fe3ec69bf0cc57492079d628c7a636582efe00651deb44f7f9a976ea166b SHA512 30217da1f30615406d45795cda2d4a7210e2b845b54d1d05fd11bc403e02194767e11ec14eec9c0e44d9ebe0e5cbcefd1d12e71b1dcbd5a9588866b8ff2b51d9
 AUX tree-puzzle-5.2-MPI-3.0.patch 15029 BLAKE2B 368eb7e3d209515a94f1049da80ebf9f14824e44e8c0b1996ba9c5ac7bfd58c167c01582bbc0d058a57d9797d844ad32e8bf45ce921a13c6e217d7728564a4d7 SHA512 576ed6c4a96225d55a1def0c4912cf908d0225d9ad9f9e0974a98f24d8bce172406a11202b9656c23661f6bb27b51a0b4e3bf95634b3c11aa10c20cd9d68e648
 DIST tree-puzzle-5.2.tar.gz 875142 BLAKE2B aa13e9a7aa403c12aebefb94a1931baa8b17cbee56d20011cb06db5a7b1b7f78c719ed6c6bfb0b79e47dc652d7b984415694907fc6cd56bdbe9eebca4aaa96a8 SHA512 5b9a729b120cba59f59ba426acd439cf396826ea01e75361b23387ccb9baf295d2512f21af96071a5f7b7507db4ff4d6b135cf6c5b6233a8b438532d31abe751
-EBUILD tree-puzzle-5.2.ebuild 1157 BLAKE2B e2c54db875cc4f107b57ef94956ebf2c572c9594851125cb60a886dc98856c8c8527b20b014e68aeec6b57ac7171794af3d6c049f133839e23bfcb3255112cd8 SHA512 a572c010039f119fb204430179ab153c14802d3fe0911f14b21f18eaed45bf1f3ccf51c5b20192cb84a68dd219477185d5970b1268cdf58cedb07ab90ad1bf93
+EBUILD tree-puzzle-5.2.ebuild 1158 BLAKE2B 02ddee11b88843dee47e78d6d81ea50bf921fc206074a13249f3cff2da249d169fb8bb2ff8ae15c8482226031bf5ed8a23be5b9f4659617c600ed1688ab645fb SHA512 2775a89c697be45cb2f3e9cb7f362505ebbaa2ae11e74836e63010153803d09e277c47e25550236eb6a25f65ac1451f4e5dd922114dc9baa01c28434522bdd69
 MISC metadata.xml 1556 BLAKE2B 1f8b1d4719d156e9a9783adce70d8f4c0c17a7c855e5590bc796e16062066883a27f780946edaffdc04eb6f640ac7e81d71b075ebc5ed9759c2a5d4da20ac46e SHA512 07bd436f7616301172b07fefd72390a46778098baa3e9db949169850a60cd40e27a0e58dcafe5689923bc1e7cebb4e317a291f5caf2750651b76c447f5799215
diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
index b5e8e3931220..61e95bb658d5 100644
--- a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
+++ b/sci-biology/tree-puzzle/tree-puzzle-5.2.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.tree-puzzle.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="mpi"
 RESTRICT="test"
 
diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index cbc714766ee5..f2ba92caa304 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -8,5 +8,5 @@ AUX treeviewx-0.5.1-wx30.patch 1722 BLAKE2B bc7d24b8b3953316ea4f8cb9eb26ab78fb7a
 AUX treeviewx-0.5.1-wxstring-maxlen.patch 1438 BLAKE2B a2dc6fe39c0312559628b61d86975a21db846e4c7cc3a0bb5739dd971417abd3ab9187ea56ef44d37c0394b28d4017981073eb4d890622d0d929f7a4d428950f SHA512 6e02ac59e8a28da8e94d5d6fdea71b3db9bc4501d9becf2d7aa6472d3f9f9b571fe68730390fd4cf6e1e422d618c21c40d86442d6b710e8395db107fc3445392
 AUX treeviewx-wxt.patch 1716 BLAKE2B f869d1d90dd23a7f0e242d9c1d0b0b97e0e053b5b2f00b283073f6e7f2d714cd2bf23656e65af1f3496bef0bf681ebb0618024f259b7f4d6dea777b048a438e4 SHA512 97d074e9501000099d0c5b3e3f56a796b1526499d4ccb44ef6f0b851bde1c27fc78bbc64f439ba5ecd3afa531b752c69148d7cd3b1e5a08a01566ad6155ce25c
 DIST tv-0.5.1.tar.gz 426745 BLAKE2B 080c4e09f441fd83da3406990bbe97f9e29fa531f47a65533ca887580f8a3ec561bb4766e66e2ef4764f68eee86fdabf48481cece56ddda90f9ffdc3c80b3a1a SHA512 45a7ac6dff5b22771e4428d6b1ee528c0039956a462658d28d4f588b6df32620d8f69b3bcf5ca23643e2bdd5361da00625fcb1495bcf4f74d44ee22022c63143
-EBUILD treeviewx-0.5.1-r3.ebuild 956 BLAKE2B cd915d4350fb7e88aab942abe68916c8d1e284a8d75f28b0d356c59e1b39737ff6b5e7ed0767ae5876ecd70ff504ee2051e985be09bbdfdcf7b06bc1a6c33160 SHA512 78a6be94e42efcdc3dff4e54b3b775976f53a40482e4d0a62b9b024d981fc228228ad7bbfb49ca28d1307904fd13c6ff0742872fca9b6c976ffdfd60cd1f7283
+EBUILD treeviewx-0.5.1-r3.ebuild 957 BLAKE2B 6ce825eb0c8fe77bcf255d9a8f17f368f099263dd7c394703045f649246d3e44e2a18ef35c2f30bde461a1d05f0e6c197141a6ec3ff8a54d68084f0eb8868037 SHA512 d2e3f159cfa0e3c32bdfbbf464ca426c6f8db4aac39a53447b1d49015cb29d732429f3deeaadfd7de059cb3a779dca21818d54890aa136258997b672c3810033
 MISC metadata.xml 531 BLAKE2B f64e8c2245f0f7e72ffae3ba9f3b7c4aa0a33b769fe3ccea91c3584c8812fefaa96ad6a7745ca2afe18b1f8692e4dbf67c71009a43a2bb00be3643f2822f2b02 SHA512 66338bf8a4993325ed69bac97d1ffba8421aeaf6ceaafd6351f583fb8ab4528c0a0d70ea28b967babce004f5f3510a04a18e2d8bf549526939a7c8295d395b97
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
index 359aa98a784f..ada60056715e 100644
--- a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
+++ b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/tv-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
 DEPEND="${RDEPEND}"
diff --git a/sci-biology/trf/Manifest b/sci-biology/trf/Manifest
index 3fe00c412cf2..0a84708cdd24 100644
--- a/sci-biology/trf/Manifest
+++ b/sci-biology/trf/Manifest
@@ -1,3 +1,3 @@
 DIST trf404.linux 89853 BLAKE2B 36abf95c88a5b8793e875a276f1494af4df48ff3b3f095e07683589d84eaadfb54099c1764dcd437158c356dcd9d55dd274e7e41515ef098ee2a929493cc0d83 SHA512 c1aa05e394d47ea153df3082258f9a089aa59976963e9ac5d5816ef9dcd95c47e2e46861d1b2aae52b5ea9950a823a2449dd0d8426b04f2b738f5552c319393e
-EBUILD trf-4.04-r2.ebuild 615 BLAKE2B b12ca83b210055d3406af3d4b24e520b8a5ec347dc41df8cb89f976329799a38b218d1a6144011d6b59917460ba02577323b4c243e84508545455befaa60231f SHA512 21b4b7c00c4b56b2887ffdc00f91035e26343b7e4d6d9a46b31163124e5e539d309fdcc46d2f81dc37c15ea486e791d948b0e1df39bce547e161b526be3405bc
+EBUILD trf-4.04-r2.ebuild 616 BLAKE2B 3ee07517167ecf9be378d50c907b0a1633b24f14c02050f90b641a23d0902cfe8a922c7ddcc8f83d2455fc734a84b62d7ca76f9fdadc26e89575df2aa119a56c SHA512 dc8daf13e54aca77b1426d913bbd9fed0b8a676bb3821cbd61a308d98d11f15d45334bd83f2b3e19c018ffc8a34e4d597da826fc2b87adcdb586d7bb0aae2d6d
 MISC metadata.xml 268 BLAKE2B a4d67334cdad8626d60e46b677ee1c83f569e5e20b3739a7664bb33be1829f8478af35e135bf734a6ff151b8543ea6c4ecafbf822cee8189f7e7096bd9698711 SHA512 59d3d8213b1a219396b74b6f4188c01e1cb4eb1c63e6792ce1e7fdb8000d1a4625919337ff77288ca7f7e07d9753f481d2381a06f554012633cd678194c980de
diff --git a/sci-biology/trf/trf-4.04-r2.ebuild b/sci-biology/trf/trf-4.04-r2.ebuild
index 16cbb1c3cab9..79558a9d9f11 100644
--- a/sci-biology/trf/trf-4.04-r2.ebuild
+++ b/sci-biology/trf/trf-4.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="trf"	# http://tandem.bu.edu/trf/trf.license.html
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="mirror bindist"
 
 QA_PREBUILT="opt/trf/.*"
diff --git a/sci-biology/uchime/Manifest b/sci-biology/uchime/Manifest
index be60a33141c6..c109defbe49c 100644
--- a/sci-biology/uchime/Manifest
+++ b/sci-biology/uchime/Manifest
@@ -1,4 +1,4 @@
 AUX CMakeLists.patch 834 BLAKE2B 1d522463bda3a0dca822c59ade24a7443f7e1b5901a091e0a4a5c86221e4fce91ed968229ba752e5980e202b633ea762b5dfeb758b4c83add0ac15706b7bdcb1 SHA512 f4939dc4b211742c8e1b592b13ad2c24cd7efa050b64c8eedaa99d61a8f60f54645c0f97185a33d13976201ac55249bfdf7edabb14f08e8487412d1b63c20841
 DIST uchime4.2.40_src.tar.gz 66772 BLAKE2B 9133853d616ab6e1e6a397da78fc846ba00fc70c2c375eb16a98fbdec25ba6034bd1c876b7ec4a99305e76e47cf7984c1aa30b64bdc96e125f661a0150bae060 SHA512 c3afecb23d164d9c3db6229f54faa13120ac4d88132d9aef707f8d043091099db4205ac80f60242920af6efc23813b3e7e4966d562bdb75ff53244fd525e656b
-EBUILD uchime-4.2.40-r1.ebuild 464 BLAKE2B 24ad55ba2ddb2d67a1411936538938de2d3b0e67af516c372631cd38533abc666a712dc7c42f5056d199f1b5c4dface6f40e010ebb1f6b2e0514630423109ccb SHA512 eb8c6cafee8784f8a29cc4b51e6b2806d8c80332e9ee9ed9bb2db0c01bdb1ee472d606d00d02246a2f277862721e60b30a4d3b83cfb364fe7a3e316281d2f514
+EBUILD uchime-4.2.40-r1.ebuild 465 BLAKE2B 757bc3692bbd4d7f35f101ec9c3eac77f12f70299a3fc1e9ba8534bf9f9d9e521b00f7b05e70c5d747e8d157de860c1e8421c955743e058d7be4c3d0168efdeb SHA512 eb846f680069c32eb31fb8fe28adcb7a0011a75b2ee328f122625e9011ededa95bfe8cfcc5cebc6b81b3167a351618e3b8366c773b999df97a004f74fb442d41
 MISC metadata.xml 899 BLAKE2B 16ffbc562faa208febfae33bc97431d40572425fcfce460803028a5738dd82981ad805c17234f745f36a1fcdd395cf7b901dfdcea84f8873305ae05b9fb95680 SHA512 8c4a79bb73bad622a8fec3b7c044d4c43dd442cb36b21dbbddf521adb09409b7d3341d4949df5c1fe581bd2cea3a5d49d62aac840f114974e573dd0d44e93790
diff --git a/sci-biology/uchime/uchime-4.2.40-r1.ebuild b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
index fe35819b5eed..9742ee2575fc 100644
--- a/sci-biology/uchime/uchime-4.2.40-r1.ebuild
+++ b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,6 +14,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/CMakeLists.patch )
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index f1ef1953505e..3a300dfb8ee1 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 8918de70bee1..39a1d4d2ea03 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,4 +1,4 @@
 AUX galculator-2.1.4-fno-common.patch 2030 BLAKE2B 288c04e137cb93da6a7b49e074998621d1f40153ba6b2dfa4cb94f1f6244920a66913d866e5939f84c8a1469576ba3c5138604badcac495d6411a186b0d1e155 SHA512 9cdddad238c0b4c4ee57934cdcd742ee24efb6df80452462f447d0deed6039a6238e48d25933a8c69fe031e1fb5a57d464b7f0913010a3feda275b1ebde85378
 DIST galculator-2.1.4.tar.bz2 472989 BLAKE2B 2fa40aa0d04880e46aad89c79ebb221a13fca815af3540c159205690a65dae6c5ec9e52e48c110ecadc4a18b86d5bd5d363f9d77c162717c8bfd2a60b71d0896 SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa
-EBUILD galculator-2.1.4-r2.ebuild 788 BLAKE2B ccd92ee6365b60b166e0a26e2a799c14d7c3f901fd0d87c8ed026708ae934c40e7564187d7bfdbef184d33ddf03f6964ca3a04db2d9d9227224095ac2161942c SHA512 1e0a63ee2873994b116b554da1f66eb7ba26e06b0b8686471cd4794f48790232db950cfe1179f60b32f898d364d1e86ed3c8e6a12ebd42a104331f28240bc0e7
+EBUILD galculator-2.1.4-r2.ebuild 789 BLAKE2B 94acf0cf6192fec50a03405c0ecd271a7830305bac52eb51a48a1e211ecebf942a94ef7e9a98fe159a3e7bb6b2d8cc5607b276040a060d99f7697d509dc8eea2 SHA512 fbcfde742c1a5141e9b804cfbd9bc832f20cea74a74c0df2d760a67cc448a80606387b33cb37c32345b15ba26fa2044df0f24230152030711c29dacc512e029e
 MISC metadata.xml 395 BLAKE2B d2b5264505c250020e6d8ae7ef0deb47e68e5ad713f3e38e476ea33dc8d56f1466fe87a2e3dba461fff3768a37f2e5642c24fdb436e5b23319b8d3054fa89126 SHA512 9114f2f5e4c83e5b91163bfa835a1f6fb7c2f898f8bfe6cd2391284776bcab82d5a8071a9bb1fdc0e798eb5237aeef8d4e32b1ae63fc4f95e79d5c4fd62c2485
diff --git a/sci-calculators/galculator/galculator-2.1.4-r2.ebuild b/sci-calculators/galculator/galculator-2.1.4-r2.ebuild
index 9c4543ffa3d2..0afb93f584b8 100644
--- a/sci-calculators/galculator/galculator-2.1.4-r2.ebuild
+++ b/sci-calculators/galculator/galculator-2.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-calculators/hcalc/Manifest b/sci-calculators/hcalc/Manifest
index 522a5b362bf3..4503c6da3eac 100644
--- a/sci-calculators/hcalc/Manifest
+++ b/sci-calculators/hcalc/Manifest
@@ -1,5 +1,5 @@
 AUX hcalc-1.2-clang16.patch 501 BLAKE2B 5988063489ccd1409bcb545092517d781ff5694d8e5a0d324155e9182159f4aa7222f97d56c913d0520e24db78df37bdd48df6c866ea21b2d92c11abdc7f97ff SHA512 0abafdf244bbdc1c210d668a088efb1742558ab759ec6536c5f5c039a35e52cd5998176458e23da928baa51b544e42b8984f6898724374c86283836a094a96d6
 AUX hcalc-1.2-fno-common.patch 213 BLAKE2B 0800a555e6e4938a0b45e8231c43598814d9c0d427f8a508904a6b6811481063c74222558738820785eab9f81e314fe0e65a6ac881c1a32d9cba20e945b2252e SHA512 3dfa05c69df04c887931614367cc6a7e978ed57ad4ea1ddef897d9b7e71d271c763d7fea64291be3f06d1bf9e0b003c0ec09757c221d5ce71f479f6aa3e0df20
 DIST hcalc-1.2.gh.tar.gz 18601 BLAKE2B 72ac8e60fa4bacb106314a9b2712b296ab42684f2b7d3c05bfa5baf0541a679c542ea1cb98071479fb009c0a6b6a05a817f743ca45dffa9fa93ed1a4a68c4fa5 SHA512 3e341095aa099cd3c592a727ede3202cdf72a7843b51d57605c42aa7c28bf23d23baa3859152dbea107f247acb4b851fce9d5f5d671233f12f4396d02f5a4bc8
-EBUILD hcalc-1.2-r1.ebuild 634 BLAKE2B 5c35b9e4d2aca92fd893966dc964b5b6e078702e89cdb8fa336cf2c1323f3349330ce4ef922bddd8e5538368df73d644a967a4f3fff1636331972ed0f6c6960f SHA512 6ec40440ea4eeb0afa7bdce2646de75887a479bffeff80d4e0bd5b8cd2460f5b10ce0e8b84312f0ff10288d5782a5c4f5e2cc2ae8f6128417a9a6334d6ebbe8d
+EBUILD hcalc-1.2-r1.ebuild 635 BLAKE2B f7edf37207e8679d2136ed38b08e70d142a934cf84726a160928c01a9c30a4f7563c68b3ecc6bf80bcb54365127aa434e371523ebf2917fc31df1b11edc5bab1 SHA512 a5d0e43e3ed24eef6dbcd582afc139e08d18f6b231cac1048cd1e0e2c75a0ae1976cf849293d5164c11f9e55ebf288978fd5b20ae4fcf8fe4ba3f789f20fd9c8
 MISC metadata.xml 339 BLAKE2B 9462835edc3d09a15b8f159afc545e76d42ba4df117d032b34b55408e981f7d614fd3b435f541f4fe1e97a6ba843a3bdc9ba8fb80e19c41be7e0545f965316f7 SHA512 f237e25f3afd54b80cb3820cb4dddde3d6a88879daafd280f18cb327462c42712b96521df921e17b3191c2168ca0d73f07b58d8a1d9e3c0fe30b331d80f049be
diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index f8373f46999c..7f9ac30de30d 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jlec/hcalc/archive/refs/tags/${PV}.tar.gz -> ${P}.gh
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/sci-calculators/hexcalc/Manifest b/sci-calculators/hexcalc/Manifest
index 9a6875e2aa17..1941740211b7 100644
--- a/sci-calculators/hexcalc/Manifest
+++ b/sci-calculators/hexcalc/Manifest
@@ -1,5 +1,5 @@
 AUX hexcalc-keypad.diff 3715 BLAKE2B 347de906fa53ffdb9064e997a169e2ec31f519e0ed1d91e7e13c3681eef08abbbd8bce6ba8cd6d98dddd0e56b5aaf1073b1f9da16c2d208b7c6d755edf2f0cdf SHA512 812c6bd3b53a18a75b1ed553f1e58f6a08b48ba264787fa69f9577798b483797871ff47dd5ccd4c075989c9f9f6a6f00b7457deafc463b90e76e78e0507af259
 AUX hexcalc-order.diff 972 BLAKE2B 487e44a612c939879e168fbb67dea418c234197387923e58874e83e484166784ac7c6564b92bbb798b17985438f1d1a51bfe0dd17af223af6660a9e28269d406 SHA512 8a1049372f638822e7197ca56ee336d1b5ac4a0fcf24846705f14f80495c13bad390b7ddd5e43c84e47739521a5fab1a35c435125b4b919aedbd35c09ee583d7
 DIST hexcalc-1.11.tar.Z 18033 BLAKE2B 6f6c8102cd1a2ffdb325bc0805bea02d8e186bc3da7cda3dd4830882f384cfaecc7dc1d0fc8873718bc850f80010a875653864be92edd6519ae4fd5033e53498 SHA512 f684d6d6bd6df3f7f0dd626345d8ef166b12513bb378e74f8c59c2b92970f99c665ca32585217e75d55bf0fd93b5fc5c6a5b73e8b438f4821c13219f8ac74766
-EBUILD hexcalc-1.11-r4.ebuild 989 BLAKE2B 7c1a2d4593d8ea9c2d1f7571506e506b0ea094b08a7fbc26a572ed0b0c77240503dcda0600a190bac2c1facd977c7f8599009b8a81a12b27901f99d7c0189339 SHA512 6753b270d4dffea5c8115406c9a25d93f4f74cf43a6c39c518ce4b56063da9095e9c6c1b4499407de2f70e687527589994a0e5857d85c4c1c5492e7982758792
+EBUILD hexcalc-1.11-r4.ebuild 990 BLAKE2B 2239cd25bd6713e47828fe938ff74e8c9cdbc8810c67597fa6c54a6c326d0fbcf8bef258e75054beddb6c29a06d228240b12e26e047134cdb1f7980370c77d32 SHA512 ad5d1d45cde402712f55e3e31303cc21385c912126baed65bc1b5ac0e30fb3247690a1b39d89f180fefa925454ea3b8a2056c61104788ffa302d0ba3d2ce0c08
 MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild b/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
index c70fa19d05f8..978dce5e40d8 100644
--- a/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
+++ b/sci-calculators/hexcalc/hexcalc-1.11-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index 64f372c713ed..abdf0bbe46c9 100644
--- a/sci-calculators/pcalc/Manifest
+++ b/sci-calculators/pcalc/Manifest
@@ -1,5 +1,5 @@
 DIST pcalc-4.tar.xz 68948 BLAKE2B f7d17e3ebf76aeccd9b7c74fe6ecfa7de94d8450d302e3b094b57f4050e0be2448887ea131496ab00ee140d0a44b0dd8d5b5564feb8fdc47d2fbbe5010af73d9 SHA512 6492ca89c5f60549f9388d8b7edad21c1c912feea0ee1a1271d730a63832c3b562b1a6bc9f69a0bd3118407906646c8d8fbed6c6d9a62db6a6bbde22579c1fd0
 DIST pcalc-5.tar.xz 72148 BLAKE2B 8095e9f17ebb8a6271460e8aa8d35d8ae588f4e046e3ff60c0a8ee4fbcb05a8afa96095baf2656be47a45dda5966e89a71e25c651839837d366d307e9ac532ac SHA512 13a33ae5c3fb40632c89f7c0dc7b5a2fa497f090393022ab57ab15f866b1bf122558085cdd2b7ab42aae9018b7031fe0e85df4c9d31fc359b87ffd930e2f16e7
-EBUILD pcalc-4.ebuild 548 BLAKE2B 08fcaa3dfbd24e538e49d257daa0afb37cf5131d0fb83640bfb6a8e07ef3d0d691f8ea88d63b15fb7aa4fa4d4877c155d001dc1fedbd93c63c268fa58d0319d2 SHA512 4c949be7a9fcd040cdba01730c556071ef5f7b09f6c770c5fa873c087dc9eca7052624ff3b3be4d71d83162e492b863cf4acb486e55c3080881759d3fb953215
-EBUILD pcalc-5.ebuild 554 BLAKE2B 88bc76d72e0656f9840a75821138cbbc245f48f4f812875b010c8a4df38fe4d276262102eaa972990b34c90d8c9785e927440d07db69dcd4866eca633182f73c SHA512 bb3d0be87c09648321ac11b7e26367067459b7de4cb52ede661946a5dcb415a6053fac493fddfcf8d3b7fe0e27a18f8a1ee6460a9a4da914a8da4ab4ff0cd607
+EBUILD pcalc-4.ebuild 549 BLAKE2B 5ad0b4f3c00937ab67956e6fe2daae3e610fbf47193e1fbeadec47a3c94c2b70166e96429250d3b1d63f86b847e6383052b76c123f04375f4d75d51a36d972c4 SHA512 7b8c5efa5bf5deabba28adfd63dd5fde75adfa93121d5bb1f21a9f67615024dbed51c1de3cc78329978399e8f3a52b95251bc752a1f1f19af94f64574c58bff6
+EBUILD pcalc-5.ebuild 555 BLAKE2B 8d289f7e980a031146854b123e52e30365febe032c157a48522a83e05f50eecec04ab5c7358b81e287c9eb6302e089f15fa7e00802991e15a5e3a4350270b01d SHA512 80bb0e4a1720cee4aed1728fbb94dcff3e1627c00bfb74854b81c23aa2530d106ed1b7c380b199a266242dd0003d3d5791fd697d52220b9f316b07b7820877fb
 MISC metadata.xml 381 BLAKE2B 47c5c58353aee04da254383ab48798eb929a5833f36bba2d5f09d120425f4d37d9c25a63ac56b0ab34acf49a935635fee0b6e44bad3d12a63bac281c2664423d SHA512 10226bddb42ccdf85a678563d4c5dd0f4c22d9296bc8a65b5a00b931e73e9d17e98bfa8d580150b554db9fa6b77b4d592453b0fed166f85704f438417ce1e7fa
diff --git a/sci-calculators/pcalc/pcalc-4.ebuild b/sci-calculators/pcalc/pcalc-4.ebuild
index c8e7dfe98a57..9a7aecc55689 100644
--- a/sci-calculators/pcalc/pcalc-4.ebuild
+++ b/sci-calculators/pcalc/pcalc-4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-devel/flex"
 
diff --git a/sci-calculators/pcalc/pcalc-5.ebuild b/sci-calculators/pcalc/pcalc-5.ebuild
index e30cc630a463..c9ab49df570d 100644
--- a/sci-calculators/pcalc/pcalc-5.ebuild
+++ b/sci-calculators/pcalc/pcalc-5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-devel/flex"
 
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index c3d63ee2790a..fa5a474d4618 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST qalculate-gtk-4.5.0.tar.gz 2824842 BLAKE2B 4171a1dff8ed83d0e2521f83634ce3d99718483560915cec7a6ccbf95188d178fb8819f95ee2c72f07b8a33512641ba0e46ba139e02e8be1b1ec88ce21d80037 SHA512 c80e0a9b2cd8bda66c78cadc2fcab9bffbdafb16e27186e9d37ce3b1c128239f7efe58dc2e0ed44543f7a554fa2336a1050501c58cf6d4a965659a2f28baae62
 DIST qalculate-gtk-4.6.1.tar.gz 2829459 BLAKE2B cb0a2701be0e97b9e447135643d3659e47880f508301f481e95c43dd2d78cf678ed7f4c089829b307399ab06bb9b098c4f086df0f73e90f0d22c145f3cc3dcd9 SHA512 cdfbbbeb0ae9b427c664bc81b295204171bdf4094de969e56bb6ce99d271f57b7e55af133e63486307e85f972a04799795ed45a0dc917b36f0ccae5d6de65a3f
-EBUILD qalculate-gtk-4.5.0.ebuild 873 BLAKE2B 491bbdb8d7a5a92ec643d2db8a2cd1de0eb1dc51d01182c1ff458ba5fa9bc3560cf3a7705fa345f60a863161087ac15d2659d590fda44791c4392a9bb4a656e2 SHA512 702ae70dbd9e87b950d9d7858e55476f566dfe346b2078eefc2a680e971599f63623b7a02dab794c2a9da65e5677b30a46180403da34457ac6fa726143d55b6d
+EBUILD qalculate-gtk-4.5.0.ebuild 874 BLAKE2B 88c2c0d9cb5219190e8dccc9565f594547c61b974a798477decdb17cbb5cc05e30b8e54c205eb6a6ccd62b3eca4bd33e5a964368018fc7b78596500b78b50529 SHA512 32c604662df76596930066c8ad6eb6e8b9d96dc9df8ddcfebc3120d990a44a37354ad3ab4136a43eb85e57edb96c1bd3b035e1fbd6b42443cad021d58140b7a0
 EBUILD qalculate-gtk-4.6.1.ebuild 875 BLAKE2B 517d1f0cd7987f2395ca9871f7d1040aca5a28643347c91a37fb057cf4952cf58ecfd37b975f95b2cb754238af2e32f87a41224947c988bca6f871119f5f15f0 SHA512 c780dde177d60d98907724d76528eba5f10c95c8aba35a004a92fb0089d9541e21c02885ad3483babc383c9709b0d4daa8c4b2f1f1cc1af9596e2de18a662064
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild
index 16764db7156f..98fd4c48f985 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-4.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/glib:2
 	>=sci-libs/libqalculate-${PV}:=
diff --git a/sci-calculators/speedcrunch/Manifest b/sci-calculators/speedcrunch/Manifest
index 272a6126e42f..6793c87c5d3d 100644
--- a/sci-calculators/speedcrunch/Manifest
+++ b/sci-calculators/speedcrunch/Manifest
@@ -1,4 +1,4 @@
 AUX speedcrunch-0.12.0-appdata.patch 735 BLAKE2B ab1a2370841d37c5830de6352c7ace2f676dd8465331c52ef9faa0598feb92eef30e61113cb19c2c95b48815de2dd6faa7a19d17b47d8c368e997ef2f9481284 SHA512 245ed9eeed5c18638a91c7b14714feca3bc075ad33ab52945e4c1f069a4467524c717c6ec14b8f084fae0796bfbc31641779e5eb95f2f89d7149e4022c6bee4d
 DIST speedcrunch-0.12.0.tar.gz 3667420 BLAKE2B d983c22cbed9f3496bf7cadf670db3e7af4461a37e5fe151094ecaf6077cabffea84e4530c9b18145a220f09336d70567c96509b99c3b6a18f967aa97051d66e SHA512 9f93936311e227ed0aff374adae408f212e6d63174154931ecb19a31f1a6f360b9548989bbdc5988d03a7600f2d3e466ef18bf5f071002b99f22b22e773143eb
-EBUILD speedcrunch-0.12.0-r1.ebuild 852 BLAKE2B 1bc6284c1381b778b4bb0dc4f063b74b8d97cb5a43e75ad68e7a3809319bcc73d03f3c8a6328c01d656ca846f963baaf9cd9e44f3e301ddedbf0617681200dee SHA512 9bf2ed5053923b382094bb6dc177e6971dd938c237622cfad4e0b992b3d6f629ae6be61c3b72d3ed88b23a06cacb334b57b1eb7468eb2326d3a6339ad74c5dd2
+EBUILD speedcrunch-0.12.0-r1.ebuild 853 BLAKE2B cc71b297681ccc221d4771f6a49ecdb8cb851415c90528ec35a115910239881305de8bef1e0de281bd7460337ab4a72771732e8662161a758c56220490ac88c6 SHA512 3944cf30948d9abd662e5ab4fa5d268dbf8620846a7cb1d269485d6289e923f1b5ffa20b418bce52f5cc468279e76d990eed288eed11867e5d1d6696c1be25ad
 MISC metadata.xml 410 BLAKE2B e0f0fc84629b8bd33a52fa7dd867b0350fbdf8865b9432dfff0e9839291042105f92d646da32077364d0e7ca94b31fda0d6e44240cffeca5002a2fa4437ede53 SHA512 e21d46ce90c8fffc8ca1db148fee9cfb5ed1c5cd0bce64a740de13f2c2cb83b0f655763c8f6f00fb40b89060d1fefab1b96212dcb35a65ae144d2b1cd4ad331d
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
index cc9c48df2737..bc2e41ba3485 100644
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/heldercorreia-speedcrunch-ea93b21f9498/src"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index cd07754f2d69..eadeb500503d 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,5 +1,5 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
 DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
-EBUILD units-2.21-r1.ebuild 1158 BLAKE2B b2f374d31c22d1b5767afe60145683ce1b4ad903d96c750e7c9ae518cb1dd75c0df26831be9d2c7892e33d72ffd7bacf203d586f3e36fa7f4a8c039ca834c1bc SHA512 7afc725b3ba8e1652fada326a79d846f6703f22a25e7140a7bcc876e14c984d38fb9f35037684a3358556082a090866048b61c6596b63be13edf1d273a54ce55
+EBUILD units-2.21-r1.ebuild 1159 BLAKE2B eba059e7e228b0ff56c3eeb8aca6bc413f60d1f66cdc64ebb88d1b4798eef487b4ec241eee36e37ffb50d79f7ae1f67eb8c3bd855538fb77b83b1cecc54d31fc SHA512 c7a5bd5b22f6290dd9ef1a6a7cbbf2bac0f2aeb5db1f4c27276ca16b90b00d61113379086603416293567510fae8c431ed54b1f62b137c2dbd96f81d243d3086
 MISC metadata.xml 356 BLAKE2B e29e63011490681ea66a493a573fef96d45c5cc045ee87534380ba64c4bb56e14231f64b87527105d6ec560326c52c61e72746f8d4e61b820e3bb87a7b92086c SHA512 36bab25faccb86cfc0f2d8f864788dbf1a561d9dd94c76dab878bd9e7b29f55f74ed115f1d374230bd9745038612b9f6343a9a1832bf025ca0e654d4074bdf7b
diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r1.ebuild
index bd5a5772419c..3a90d34023f8 100644
--- a/sci-calculators/units/units-2.21-r1.ebuild
+++ b/sci-calculators/units/units-2.21-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+units-cur"
 REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-calculators/wcalc/Manifest b/sci-calculators/wcalc/Manifest
index 848413ec5ed5..7f53bc5b2f90 100644
--- a/sci-calculators/wcalc/Manifest
+++ b/sci-calculators/wcalc/Manifest
@@ -1,4 +1,4 @@
 AUX wcalc-2.5-AR.patch 247 BLAKE2B 915558fce783f7046e2942bdef285f1a3f5537faa4d215477c7a6d4dcac5dc11c059cb24d88eb252b8f1f8649ce5d394af29ade3f569b427addb7797cc201d03 SHA512 789610d5fd7ec215f76f082a337312a8c5cee8a76613a2c682c996040325f5e459a7a596c5937fc4f1a43c57bef8161b5ee39052493e7705f58ac7900ab9591d
 DIST wcalc-2.5.tar.bz2 413637 BLAKE2B 6093d73249548c90ba544b7445846bf6021cfc567fd6a7a269412b48ce8e4208ec19193dce878a5799f78f84e64fad59622cccae303d433ed58aa7d0ee0ffce1 SHA512 3eedcf8c93bd33ca0a4bb35867e3157adbde2999d9fc1826ad55281fd927546614f6b1a28900b4cae87a0d15888cd62a04fa2adca316d7cf309af7a2fefea704
-EBUILD wcalc-2.5.ebuild 767 BLAKE2B c4747c8ca4de310a2a9130dd617661251f6148dba94851e434b962079b7ae7de0e6c8527e871c7b6a544398ad6d9d87f502d7ffd92683a78a1bffd84c898ceee SHA512 5770b6062675877b7b6232a3f31f8f2e2e613acbcc23e6a59ebb92ccefee6d00f918a463ca2a0ac470b14ad70fe9a92fb24a2598ff2e0ac8a30ad8ea76b3bcad
+EBUILD wcalc-2.5.ebuild 768 BLAKE2B 77d0d86b6a2d0538e861c440b357547496076fe5db0d886e8b997725ac35ef847c1092ce7b1a66150705199b8363561ae1202e67e901f86461959caddf5f68b5 SHA512 ad20024f9aaebb96c07cb66b16d758a4f078f17d85d3d43cbef638b634deef3be8ac30748f6905ee7c731e68748d64a1083a0c0dbdbb580dfbbe8c355d7e4db2
 MISC metadata.xml 812 BLAKE2B fb50f03932be0021aa58823095c7d5ab271decdcebdae8eba59cc9ad52c97b4dbffbce46412954455f1eddf1ed0ef2e1891855296124bea6bbd8dfc663e6271a SHA512 30d7b6a999e2041c933a36cf7327e7c19ee20542e21e0a8be263cebda89132461e6b304317fc4c2ffaefdd71b7ee26eeade69a82b8649fbd284f7be74a343e1d
diff --git a/sci-calculators/wcalc/wcalc-2.5.ebuild b/sci-calculators/wcalc/wcalc-2.5.ebuild
index 484aafc04c89..e21f19c9610f 100644
--- a/sci-calculators/wcalc/wcalc-2.5.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/w-calc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="readline"
 
 RDEPEND="
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index c7eef081e0e8..22731953e756 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/autodock_vina/Manifest b/sci-chemistry/autodock_vina/Manifest
index 5c73178167ee..cb7c0cf494b5 100644
--- a/sci-chemistry/autodock_vina/Manifest
+++ b/sci-chemistry/autodock_vina/Manifest
@@ -2,5 +2,5 @@ AUX 1.1.2-gentoo.patch 2448 BLAKE2B f63add1d0fec8716672672af78fe8f34053bf060044e
 AUX autodock_vina-1.1.2-boost-filesystem.patch 2936 BLAKE2B 70c55e95e9728221ba80177989fde0cc6c93b479779aa0dda45dcad79b97018fe934ea56b4ede4af20ce867b6ed39c3958a5529b8f286aec33ec7ea53d339ada SHA512 4226fb0d7196362a02afa4e0b0616146ef816a439dd63e1bffbfef183975fe7e6260318f919e9d9835d2d47973542b5340e93ad35b070467e42c0990f9a635f7
 AUX autodock_vina-1.1.2-missing-debug-decl.patch 365 BLAKE2B 959b46facdce27850a1f9fd6c66ecc297e4ad089e79896b9fe2127e425bd1bfcfce5d676cf2e4336c47d3a72b0e8319c791fdf1a5807f244cf5b4528de8cbb25 SHA512 ddbdca76fca16b46fd042b57eb941b7ba67f59f46c35dc18428ea6873c8ed5f03051247b8c667a08af8de40fccb0caf851848bb9082536225cacf8eb3e313c98
 DIST autodock_vina_1_1_2.tgz 67366 BLAKE2B dc754bf522795ebfbfcf89a2df4e3761d941c1f0ce05cf56898720c1e855f5dd00fd2a583f5a8d218fa2e738d37e014a9b3239b9aa989b9018a6a33f8f0bd02c SHA512 f704af322ebc192117c49d0cf8a3f217105beccb7b47d6361665470894ef7a9f91fc4b5f07cc9aff56e497bfa80953e40e39090c8394a095c61597756e333ae9
-EBUILD autodock_vina-1.1.2-r1.ebuild 939 BLAKE2B c265e69616533cdba0f305a5d19a5f679acea72bad7617257184ad36e2b22b2a5c4712c1a93977d72cc416e35512ea5431bee9762ea6e5640a9f041548415294 SHA512 6045f4a5a55b1d237726af83307891dc60976326bbe275d9899e9cdf245f39a4b7edbbb613dc521810694a8df39bae2630e113a440731e977b5a29a1299a6d6b
+EBUILD autodock_vina-1.1.2-r1.ebuild 940 BLAKE2B e95924c2e5e22209425f00789578ecdf855fe766c912ba01b0f37a0f10e66d27dfabbcfaadae1be14ccd2bce1d96c00a20597cd215ed1921875e8d942f5f69a6 SHA512 51f59c04495b0e9d699d6687b47380e290f60a97660e6bc5fa77dcd1ec919fb6f7652771120941138febb9fa0a68d7b61d6cf454e9bc061b0a9ed9aeb697b6ac
 MISC metadata.xml 911 BLAKE2B 67eb0088781bf4f791481c993f50fa034759baf858912b50a6bd650e275e95317c2460a69aa925d7c0955fd6e3fe70bda421f656c418a6f974686b148075a37f SHA512 0614ebad142dbebe4a9577a8c4fcbd2a5b18d5267b3be92531e6c118a21a9ef71addcf972eaa5710ba88daf0257c293d769ebd7153eda200ce530685bec76f85
diff --git a/sci-chemistry/autodock_vina/autodock_vina-1.1.2-r1.ebuild b/sci-chemistry/autodock_vina/autodock_vina-1.1.2-r1.ebuild
index 5e1ce226e6a7..a6495591339a 100644
--- a/sci-chemistry/autodock_vina/autodock_vina-1.1.2-r1.ebuild
+++ b/sci-chemistry/autodock_vina/autodock_vina-1.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
@@ -13,7 +13,7 @@ SRC_URI="http://vina.scripps.edu/download/${MY_P}.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="dev-libs/boost:="
diff --git a/sci-chemistry/clashlist/Manifest b/sci-chemistry/clashlist/Manifest
index 2265366de821..a54b897e5cae 100644
--- a/sci-chemistry/clashlist/Manifest
+++ b/sci-chemistry/clashlist/Manifest
@@ -1,3 +1,3 @@
 DIST molprobity-3.17.tgz 26429898 BLAKE2B f2ed8f71c4f71c19aac6278eed40cba0db53e88dc1be7ccb6e3e831d4202456822efe93ded2cc8ca3226efb9ef10999895b191e8b5d5188d577b78c9fa5a8c66 SHA512 a6e986f285ff7e8d167e2d1c935a55b080446c9809d352c95e2ffa32265892b59cd1611730e75ca88aa28387495d3ebd84226e1a9cdd33f0b27b1a8a1b6a469f
-EBUILD clashlist-3.17-r1.ebuild 650 BLAKE2B 157db4a2b157a5da8046925420e7b1f0ed5e2dbc3fae07df137e676dadfb89d0710229e4562fca87a97348ba002a5daed25f435f246d03aeab267eebaf1b905e SHA512 96c83e6ea78acec35cb235722600f2bdbf3492e4b99f3dff9582ea05fe92fcc981ce0669bd729d1dd97f0d891a3a12f92d46b05f3b6274f835568d4af6d15a33
+EBUILD clashlist-3.17-r1.ebuild 651 BLAKE2B f30422ec1313a14729966086b6d09dd403c33b931dfa210865c26777ea36a5e4d9d284cbdfda2ac5f0ff92729f1febee38a8ed01e17a3f238faa7c1bc7e52ea2 SHA512 e63ec6b1750eeb67ba119529ecbce8aa4a81f68194da35184aae7058040b9b4f03c2921bdbba0ea138e3b6939c447d3a8f9d05e59d08b2d529f9ba757248c1dd
 MISC metadata.xml 731 BLAKE2B a5863a1f6746cd022f4ab9fe2d7b4c940f2499753c7472a5ba2a54b187385ffce478c4c57119b0a3c94e97f1c7b4996a4d2c6bdcccdcea89286fa693a53dab36 SHA512 8e0ce5f632fbba45e38022e72de42e7d07d6f95ff638106391565e9b7301a4f4863cdf6d8aaa26d485e967ab0b9ac1250807d2c61a528cc3a5635a09855463fd
diff --git a/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild b/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild
index 096a8047939e..c12d54790aff 100644
--- a/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild
+++ b/sci-chemistry/clashlist/clashlist-3.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/molprobity-${PV}.tgz"
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=sci-chemistry/cluster-1.3.081231-r1
diff --git a/sci-chemistry/cluster/Manifest b/sci-chemistry/cluster/Manifest
index abfd6db74ebd..f09a5b1b01db 100644
--- a/sci-chemistry/cluster/Manifest
+++ b/sci-chemistry/cluster/Manifest
@@ -1,5 +1,5 @@
 AUX 1.3.081231-includes.patch 245 BLAKE2B 6bbe0621d49bc7af8091a5594ebcd52d29d99cc00567eab523186b24c387f5c9af241c7ee53d235c1b56b6a6ea6759d3aeea814e87dd591d585413243be735e2 SHA512 a1261ed2b3f867fe464e1501fa9bc0b1f2909eaf736475e717da95ddbc34ae2938346c0044f7b6d84264a0d85ea5f7b1214caf1c2b12c544876912ff10e2302a
 AUX 1.3.081231-ldflags.patch 842 BLAKE2B 67085c3dd9ca5e97b28481fbf06a0f9b6294bd519eb3639c54b10cd9b11a4c44a48dbfa907cdf9ff8ec68761164e82d415c44ad0c3a551842416759c76d4b7a9 SHA512 9937f88e65ae94595ba2889e7f57d3b295e025d2ebd83817300a7f74a674fab84358e3b7fc9619ba473c586c51bd106e303b096cdb267d8fda05670f7815e9e4
 DIST cluster.1.3.081231.src.tgz 8860 BLAKE2B 4bfc6fe9efa3dbde106ad12df7b23990a748fee5446f16fe4e3cf9232697313bd513366a2283ac732cf0c7306ac65af578155328d0b04e4b5b99536553c9b903 SHA512 af5851ef467458d45ee5f2309c6344ae16145ac371a1b9d0a3d8b5769a18b98877cf7cb65b85f71108d927b0e6c363e06b85a67e7cb2e5e0b41af375cb2db7ac
-EBUILD cluster-1.3.081231-r1.ebuild 655 BLAKE2B a97073c0f49b08a1183f1459c439194773c6deff4e40c86bbd84cf5445a17157aa6cc771926d4b39d8519f086df4b2e6fc8673f5c1581dbe5805fd210c1f2270 SHA512 240111447ab33153123bd4c2ba17be974e495fb37fa6af000b3439adcae24624f9f030442d15c5fd2b40930b0f5befb7dc51b68d4952740a2cf0897a35259774
+EBUILD cluster-1.3.081231-r1.ebuild 656 BLAKE2B a1701e0cae7f246835c39eb48568cced6aac041138994f2362e5759d6bda5c7fbe66bda4f42e1697c5fd7345786de1dc5b94805351f07d9eb42213945fa5737e SHA512 dddfe8c1b7d333f1f472a2788e2a1c82464721a5e3dee622a08012c5c03dc30cbbffe396eef68137253a010030a194ff0454a63b5441bc4a658c653f222bdd7e
 MISC metadata.xml 678 BLAKE2B fc060fb969b660db3e27ff534b6c3a8b41b4d8e1f537d99d5858691587541224596210a278945ace78694030934344966bcb580e4e89730c122ad82143269021 SHA512 94cb1c446ec846342fd70008802adde5fad93e183b2aa3b6c10976f9e3bd95d2c34f876d58ea694f143530f45a08fddc918d8d9026929230daceb4e458df1fa3
diff --git a/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild b/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild
index b5f0395734e0..16ac8ce40728 100644
--- a/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild
+++ b/sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}1.3src
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-ldflags.patch
diff --git a/sci-chemistry/dssp/Manifest b/sci-chemistry/dssp/Manifest
index b4893b3251c2..4443a56326f2 100644
--- a/sci-chemistry/dssp/Manifest
+++ b/sci-chemistry/dssp/Manifest
@@ -5,8 +5,8 @@ DIST dssp-2.2.1.tgz 47141 BLAKE2B 34d8b2db8797a8c23763766c0214337f03584c4be52c1b
 DIST dssp-3.0.11.tar.gz 168085 BLAKE2B e1c42fd22cfb2287f10b5deae48b56a4583d4a67737a3485dcbd160d1597a15c2d5105c3794c875d8001abede1c014efb4f7f5b7c250f867bdf9ed95a0860217 SHA512 a0cfe44e517ff1f909ef2928b62ae2c639c6bddfd8a0fb538883f647fd2771e00da68e0fd2521aa02ba3c6d1b0c9b784b7fe142392af3a3abf6ea89f1546bd9d
 DIST dssp-4.2.2.1.tar.gz 144413 BLAKE2B 97c587bc0b4ef3d212ae81d568f817aab54f1dd2a77d170746e9b0d3f1bd63873d21fb0a7fc38c0300fc091f21241820d5d009d42a9e3e33dcc608c046185d9f SHA512 6daa41aea766940bf40afaee068daef341a7f79cae79d967b8da00e7002bdb602deaed40e452a5f0cea9aa2041a5c8678dfcae2e0f595cc5a0856392162dcdff
 DIST dssp-4.3.1.tar.gz 226842 BLAKE2B 86318f05b8381d94fa9c65a956f5fb607ef8072b0395d912e20697ba36836c449ddff31a4a64d0005bbfe34899f71853c0f15a911042389fc894934c08fc34c8 SHA512 4dc1a3f5c7ba258ebf548674c7b33c36b0e3a7d14911394eb8d2955c235f3cb1d6c50cb03f411db55a8a9d7aa93e4d03354c47f9f0126b0bdcbf40dc9391d403
-EBUILD dssp-2.2.1-r3.ebuild 869 BLAKE2B a0941bcc1b057c0a8fc8aede77313cd79d9a81ac2ac23fb3cd3c0b79dbd13d028fa24ad83227fb8b582e63cc4a62ceaddebf2db710757d5fa4cfee83ca5438cf SHA512 84e21152a4de933ebe82a5cdf7bf66992f871ab2e4d8c3de974fae066e191c595a4de43680cbdd81265c6b638353d7d858d117f5c532894a1da7fac6e6018a43
-EBUILD dssp-3.0.11.ebuild 874 BLAKE2B fb962065caca88ba6eb8eb8aec44c870b5d6a66fa068bf1f48e328202a1ad2deef717d6163bff8839b25545edfe5241fb4a69ea5bce73ff349f16e9959fd4ade SHA512 823ef9d37cf8793d9151770b831afa5f221906b3dfa57aa07aba8ddb19d6c95e00f88c9043c04efcfff1cbbad14931205d625523311da43ba5dc8eeecd4dc144
+EBUILD dssp-2.2.1-r3.ebuild 870 BLAKE2B 9b7542d9ec45b60f5671830e5068e1d1cbcca4b82cf22cc0e2d9804c221f9977cfade439cc6e41a67375b438faca3ffa64fdec23db2b417b58615513fd60ad44 SHA512 964bfd70d98a80e6afd7f28fc6bf7359bbde105e77903211cec04c5adcdce273f1d7142a6d206d644300a1185cba1352bf584499d864809dadad69b2023e50d0
+EBUILD dssp-3.0.11.ebuild 875 BLAKE2B 6344416239b93804755b1829dcfcb9e8e461606c217938945bb2fc75e9680f2849b39bdbf0ed361592e703fea493a2dacabca498b26e696c969735a585e5d183 SHA512 353f4f5d7b1b195753c738ecc9fb17b429cdeada757806f5cf9a3da65c6318e3885d2c92fa904d5b3a546756eb87ec90787d158e8a9450b4730dd97b45af970d
 EBUILD dssp-4.2.2.1.ebuild 788 BLAKE2B a5db07b22d8d27e6c3ada69a8cb7764a9ff0d9acbbb0bb308d6bc4713e08ea427b10179ec24ed8b02c5766ede5c9061b9620e3f2d6e6fe7ff491780c66eee3c9 SHA512 829f9775b9a11d09305a28c4ce8bc1cb050b2155a5ca10c5abb24e0831cd62d3005623eac95f8018dac8e3e182f21716ac5e89cc0b797a0e574e6d5721fcd0ef
 EBUILD dssp-4.3.1.ebuild 900 BLAKE2B d99a9024e58e5b2c53cbbfebb662a3fc546dd2a7b16a31394b312a2320bde8df9b62ecdef82295d924141e8427aee56a1e7277132e7767f481041dde6fd7c292 SHA512 1ac6d76fc9c37d5af8eecede2225d86517d27cd96a65ea4a6c9f1ce45eaf2e48fe0772838154639eebdbbccde3dd92bc6f5c9f8b2c37e3c9ca158534e5f8b8fc
 MISC metadata.xml 295 BLAKE2B 4355bbe00822cc702acdf70031ab9cd1f2a8f6e076d71016c1783f2a6c052c2da0a1a4a1860062562bb837161787f2481fa6f49c4319c546482a263ebe149bb0 SHA512 ace35ca21c614a7c0cbdea2496be3190a907295053566707c1875836a306cc9e9c96816cca6ce2b514935f6fcd494d2e813f4d94ba88552cd7b86831f30501f4
diff --git a/sci-chemistry/dssp/dssp-2.2.1-r3.ebuild b/sci-chemistry/dssp/dssp-2.2.1-r3.ebuild
index bbb138f6dbc2..fbd34792ebbc 100644
--- a/sci-chemistry/dssp/dssp-2.2.1-r3.ebuild
+++ b/sci-chemistry/dssp/dssp-2.2.1-r3.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
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molbio/software/dssp-2/${P}.tgz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/boost:=[bzip2,zlib]"
diff --git a/sci-chemistry/dssp/dssp-3.0.11.ebuild b/sci-chemistry/dssp/dssp-3.0.11.ebuild
index 8c0852ec98ff..9500dc1e3024 100644
--- a/sci-chemistry/dssp/dssp-3.0.11.ebuild
+++ b/sci-chemistry/dssp/dssp-3.0.11.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cmbi/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 # It's just cppcheck (at least in 3.0.11)
 RESTRICT="test"
 
diff --git a/sci-chemistry/easychem/Manifest b/sci-chemistry/easychem/Manifest
index ae5b2b37daea..446e3227b0f9 100644
--- a/sci-chemistry/easychem/Manifest
+++ b/sci-chemistry/easychem/Manifest
@@ -1,4 +1,4 @@
 AUX 0.6-gentoo.patch 1695 BLAKE2B cff09334811f4f7f40c77edcfd9c160885f906d616d1b36d0a0c61b0c4d03982ebab91cbcacd55fab1e7b152dec6de26e8f6584b8436a20a3d9e8f43621888e4 SHA512 02b9880ff2b8d9ec81ddd8d96f64a9e1dc38810789eedd18ad7cacc0c594914334971fccf735a7103878c8d32e0a3765d5ff57016b4a4feb2e572915bd7c3eec
 DIST easychem-0.6.tar.gz 265458 BLAKE2B 673100e6d01653ea16a70a8384dc8c598c8e113e241851b19882b333c95e6118fc180a1123e770c021245417640310a05a9026e55a57ae589bde59cf9e5b4766 SHA512 83f877d1813287592a460f4dc3769feda88e45d8f77cd728c4055b60521babe253b4432033941ff429c753cfe675a642714052a01736534147398d6972e47051
-EBUILD easychem-0.6-r1.ebuild 819 BLAKE2B 3d44383de6e9bb19e085d2db5e3382a02b1f03e3c67e4656bdcc94c0a768b3969bb8f488a7e2982cc945a97e454dc4de21743457655600241f2107ec01e83d8c SHA512 ed6793460232ffc5711ce05baea50916e0f3212aeb72322f52e39bdda2c3d0746f4b654affc98df633b3dd6de116b024c33083690055a4c6bfec34097d5bc4d0
+EBUILD easychem-0.6-r1.ebuild 820 BLAKE2B 2c81091ec52057ac62f22d924fb440f42853d2b7975bb4c989593ded5b9e20295200ce9eaa9f1eb3a5376fdc087de57ba8e0f4c3e998965062110f87158c2bfd SHA512 236a4daa6680221adfe660dc2aae005ef090173df14946d687fe0426415155ae603dbd2e1ed33eed22dd346cb69743639e525606ead7d6ce3d6b8e02f790851f
 MISC metadata.xml 759 BLAKE2B 8354c9d05f12cb927a6cf28d1c8a0744c672e33ed1675ca6443980c9e096359e5f5dc5b7e69e61a0fc82c172ff7dc74b86e1274734f9f2ff028d3264ca42b13c SHA512 2a20289c20dd606b84625814599492aecb89dedda57c7c43f58f88f6f4c9ec5cabb2ae18401a4aa5ec1a78c741b68300428b14b2f90b1d1659667148984a0822
diff --git a/sci-chemistry/easychem/easychem-0.6-r1.ebuild b/sci-chemistry/easychem/easychem-0.6-r1.ebuild
index 4d9d43bcf619..75b0372117e5 100644
--- a/sci-chemistry/easychem/easychem-0.6-r1.ebuild
+++ b/sci-chemistry/easychem/easychem-0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/easychem/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/sci-chemistry/elem/Manifest b/sci-chemistry/elem/Manifest
index 236bf2c8249a..7ea53fa12e3d 100644
--- a/sci-chemistry/elem/Manifest
+++ b/sci-chemistry/elem/Manifest
@@ -2,5 +2,5 @@ AUX elem-1.0.3-fix-build-system.patch 2544 BLAKE2B 174bfc3e2036a17d918534d02b51d
 AUX elem-1.0.3-fno-common.patch 496 BLAKE2B 90d5f78f7e1efcc9f195e432ab1f942f30002be476f0bf4a2a6ea92cc9f3c651c856aa5e1cceee66239e47cd84038417e640542c5299c55d968c7b3b62224efc SHA512 9c6a61667c23987fd047a649a178fbae75abf78fa6c974d1f6c1552790db50f5b4152d66af88afeaf242b77eb0d2ccb8862d2d69227fbf48f7c3dac183081e98
 AUX elem-1.0.3-missing-stdlib.patch 133 BLAKE2B 2ab00632e93401db578910b4e44e8f0ad4e899fb3afce5b9d1b6612ba181fd0fc3922c8cc229404164bdef562850337f006cce4047e52b2e459954419bc05529 SHA512 769c5e19928ed64b5595cd37f16d4df893889c3c0ea7e6673e182646bcaca89a6e46e7c6611c586c9213a417c439de043c0beb84a9543e478f78e4d9843a1c3e
 DIST elem-src-1.0.3-Linux.tgz 58364 BLAKE2B bdedb844ca62f928fdae5b01b13b88e5f43f5e37f40b47f7b8b9b1a2cb11053b9aefa7b1b4bb78a8632f3329f37afeadfc34eddee1b9f7cd109bee89aa9cdf32 SHA512 24b163c5cc3019c1beb677ce7b432b21289352f7cdbad686ab9161c628d3aadbb90d8abf9bef49f1c7d077b706bbd4ea6b381f356cc85adf907f3c15a4f4893c
-EBUILD elem-1.0.3-r2.ebuild 689 BLAKE2B 464dcb25ef4869d8def5c3b1444e586d56f30f9e9d84c8f8828a59f38a4f83e69983503be514724210d72c19ea88ba33d4f16f1517dccd724ee4e4e431da7f2b SHA512 0cc0d5b86907beb5de0317a58424d0ec2e230f59335bd80bf9b4329cef2fa742c44aec0e2524aeaacfc89d29643dd2be42e3250e8ad7bfefccb432dfef1d3386
+EBUILD elem-1.0.3-r2.ebuild 690 BLAKE2B e732f51a15f3cf2e7a8a2ded91888e9816dbce4becb5dc67005b53fec237ef6f07c4f96d6b50bb5d8630cf12e8d242c5b1c0118c8637bad8d54272b83f3f41d0 SHA512 2f6c6fae8b9d27373608d264e8934e4a1ed64db3e480d7d77eab619bdee49c1cad74b1b748eb2a8f01fad6538b91c38f53b343aa5c938b9529eb64adbff55e09
 MISC metadata.xml 340 BLAKE2B 1a764f9dff176031a6f20610e9fa4aa6cc706f1c2cd76c52c529f50254cc70b94c76dac3254a21f15a3af3965f4ac6bb2266f5dcb11161a00914ba1247d6c36e SHA512 a50dba6ad1704bb2c9cc4f7d8eddd2e23e5b315327bd70087830d7ce3d7d26758799be3f26421d5a60193d97ee81987827f8d5b97207d485dac5878c3aea4217
diff --git a/sci-chemistry/elem/elem-1.0.3-r2.ebuild b/sci-chemistry/elem/elem-1.0.3-r2.ebuild
index d74c51bd8f06..9770c520f3f7 100644
--- a/sci-chemistry/elem/elem-1.0.3-r2.ebuild
+++ b/sci-chemistry/elem/elem-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://elem.sourceforge.net/"
 SRC_URI="mirror://sourceforge/elem/${PN}-src-${PV}-Linux.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="amd64 sparc ~x86"
 SLOT="0"
 
 DEPEND="x11-libs/xforms"
diff --git a/sci-chemistry/gelemental/Manifest b/sci-chemistry/gelemental/Manifest
index 26b992f96144..c7c69b12f2fb 100644
--- a/sci-chemistry/gelemental/Manifest
+++ b/sci-chemistry/gelemental/Manifest
@@ -1,6 +1,6 @@
 AUX gelemental-2.0.1-pango.patch 480 BLAKE2B d6f274a721144f9e7c0cbfca1b152c25ac777450424c8fcd1444707d70aabc5c6c64f2511369dd46eff7a665cd79ab9efc63cca8c9e19c5ce555a96da7ee1062 SHA512 117daf965c22320599a8a33f9a5d3af5b373a528f3ce8db5ca2c1577bd77cc5d0b02f0dbe5ee1345b3c04e52f16dcd5e6521ed9e4f646f7eea9fb2731d5e9b03
 DIST gelemental-2.0.0.tar.gz 779052 BLAKE2B 86f98a97acaf84c2bd6e03e991e226f19e65ed9c06fc43c809278d5e6d8b93645aa64ac4983166fad6b6b9b3d0ad5bba7a7cbfe2dccbbe2ea093deaaa8bdfabd SHA512 86b0f59a3508560e3882f40b820d7b24b780bb4d1619df94f3410b0832255deec8e55d11c5ad960f96fc3e16d8a624279bf53bf178bf1dacdfe80a72181e48d6
 DIST gelemental-2.0.1.tar.gz 779930 BLAKE2B 99d4da62c10201134868241403bc3472c5d0c1d80ae2319cf4a152655eb829e9e1c4cac35e01b89176658e99ab872c74b7415d8a453f5b6970c16c88295604b5 SHA512 e3f8e1757ff3e7843f2a860ffd41413e15a8382a3d4bd41d850b629857764b1e1508de8e825d257e5232617395d56bc5f517797301d9fe13849ceb0e48a68da2
-EBUILD gelemental-2.0.0-r1.ebuild 818 BLAKE2B 85091e4b1bd360cf0c86790ace65e6f0a289bc21d76ac174802aac13127886d34bec680958b377107fb1a324b75c312b551cd01ce3fb26e471cebfca3e3b3993 SHA512 fb33c8b0fcdc207f42432857c79aeceebf6c4a52c53dbb29eccf27866003cebd88a75a00df89376901b6c49621908b673546c6cfb3a190f5cce9fcc1d99f9b08
+EBUILD gelemental-2.0.0-r1.ebuild 819 BLAKE2B f6d6fe55407999ff2b9753bfeeda01eb3537fa703f240ce4a9fafc24f7c535d1c088216930838a0a06dda57223c39c306be42564f8e1982a09ffbd1679787212 SHA512 caaf5ee756aa290cb4ebc0af4d3310467d642c4032a09c498fe102027c324d2beff3c07a4a928ecebd5b5e1d21034fdd353fa0e44c6e8c0d81b76ea3f695decc
 EBUILD gelemental-2.0.1.ebuild 866 BLAKE2B afe1e68c80e565377640e1fddaa47a71d59529cd58031459ab533250d592677719207b9762cbd0bc6627db34c873a7902ce0eab35e68c7cefadf410fd8f6e731 SHA512 9ada79052aeb38e2052dcb4c802e3f0dde086effd26ca73e7fd4ea7c4b6e819c215f8bc98a7531f46b7498780afab0b774554fff63dada57f8235773a5132652
 MISC metadata.xml 456 BLAKE2B 7939d6a87c0289b785df4559be9346e7c5a05d53fded5e0ea865895beb13562620c2c85a4bee23bb4dc4dff09ad4066a05c674a761010d135b435e8fa3e572fe SHA512 df24e4b2099bf9d9f91f04b00b90002ed9101fd54798773e931b7464eef7871199fd7dd5e381a5e42fc2a67cf5f692549be5df862afc4930827d246f43e31694
diff --git a/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
index bcad4a31e18e..229eb04b934a 100644
--- a/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
+++ b/sci-chemistry/gelemental/gelemental-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ginggs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest
index 659e15ddbbfa..569d688227fe 100644
--- a/sci-chemistry/gperiodic/Manifest
+++ b/sci-chemistry/gperiodic/Manifest
@@ -1,3 +1,3 @@
 DIST gperiodic-3.0.3.tar.gz 451559 BLAKE2B b91995046b9905a534e3b6f530aee0ad2b4e6ac42cd11755ea182fdaaf8970f34b1aea8a33870abb8767837606a42a0cf0d76c9a689236aa39fba686e1521ee8 SHA512 7226063cf7977f4283a199d4a3d1842d6c9be60c53f5a005541eb26f35cd6538b29f086dc13c28225779e1849a12d1c39150897055c03902cb00adc011bc1ce8
-EBUILD gperiodic-3.0.3.ebuild 883 BLAKE2B ed9f273dcc4a329720ccdc3a5b2211f021b450937119fb05fe889eeb51b51e19b0f4c9c2e25bffe944f071df74485cf371f406bb6f8a620f79a7e00fa928e41f SHA512 619ac80cdff0ca9600fdaa1b755ed8ea428818be3bf6c579cd636074a62195ac54e8f80136d5cd645f5a1fc138a8f783bd7d63e2723933bff894dee191312d49
+EBUILD gperiodic-3.0.3.ebuild 884 BLAKE2B 3d3389b62f81d204d39f846421fe87267e8cc877464cb7f93bb0355d2ac4e89973e0fff1364f60db9c4ecd38919a774223c0e967ca661835c87e05c1bc83a1b3 SHA512 7e0b3e5b80cb0566489ddeba299d5efceecfcc83ffc7faac61f4d0bfb0aa6bb68dd80cb8452e6e09f1f742a95ab0041e313047741b8be6e6a4ff45c475fc0c4f
 MISC metadata.xml 551 BLAKE2B 820a6c68db9ca1c8e1138fcd82aa998c5e9a06a93ec19e2c7135d522b18b5410597ca1074b594ccaac896fdf69efa1a962328022b78c7c3d12f04a9b32a2d977 SHA512 8e3c92beae849c975057babf305a21df19f42d07bc122db73023ec3cb7a52937906cd2dcde9e9bd29f9b4f54b80ad23c907840e38bfdaf608e9b12373c47a7cb
diff --git a/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild b/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild
index f4f87a9e8395..15197451cfeb 100644
--- a/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild
+++ b/sci-chemistry/gperiodic/gperiodic-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index f1875f06cde3..5d3bfa8928dd 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -29,10 +29,10 @@ DIST regressiontests-2022.4.tar.gz 48614599 BLAKE2B d41d59d4336455c87f3877be48ec
 DIST regressiontests-2022.5.tar.gz 48615858 BLAKE2B 6655946155291eb24f76832c76e21b5c606905e94426fd057ecdaa44d74844613ba288b651f94120553ef7d7f938de345ddaac7c3738d67bdad148359b7b4500 SHA512 8dd0c8a9b30f4c047fb756dee8eee1cb667803c231fd114717e3156c5694a195dec2b57d80b50b417312949bc4cb7da90027cc98102d84fa154a93862bc69790
 DIST regressiontests-2023.1.tar.gz 48613205 BLAKE2B b64716e08e5597676794209a0a951d2a5a46aab2b05bc1615d6f4ba666d5c81a7fe9247fc90ce8d9a5da1a9d52eea73d3d3cd4a4072a8bad66b8de0e06dfa599 SHA512 c6924ec75e456950cef0809ea9718be1bf9d85fe6e9ba5553b2df86ef604b0c7f54d41476f45cbc0ccf801ee0290a829bf4f9eb8d0773586bb8385efc5242d4d
 DIST regressiontests-2023.tar.gz 48620353 BLAKE2B 536550976dd761a59ff5684bc4928d534f7e45e69b0a86831e661887a3ad1ea72c1ddb72ab3a27237926083a711dd0f17ea60079fec201dd0992c1aee32ebd7e SHA512 f6b62fab39c77491698822b2f5b3f66c505e801266b31ea7ddc46378f69b524461187bba31b1b23d29f06bfc35630b0cae9a921aa92c0dfba46b2f1d904ce2b6
-EBUILD gromacs-2018.8-r1.ebuild 6675 BLAKE2B 46cd37f680b71e001586e88974f7a69bd8e41d07de2464ab0d8d80f7755a68da45b77ad28e01444cb48b0156e6f4332dc8fc67d21944c76768b9cbd18804cc46 SHA512 ece906b1c1d3b401ea85121b280f99fafe92f791918c47aab57f1094b53e95a5786812e414928ec765ef44fbecf6219e094dfb74d5a52f0b5fccbdf736a37968
-EBUILD gromacs-2019.6-r2.ebuild 7053 BLAKE2B b61fb0e08daec321b562e246275e1ff9768bf3e24428c127fbcc67ae36fbe6054b60f3cb0587fb711e9c050798086bcd7dece03a64f5bebd53db327db939acb5 SHA512 de3d96b9780667be98a519bb496eb72c2f02cb8aa9482d075d03fa1558ef2852c4daa6e8ef36879232604a7dc30722464e70886cb7673a371691bf93252655a2
-EBUILD gromacs-2020.7.ebuild 9847 BLAKE2B 5ac1c696c996e4d281d8e90b858982f9f6a475867ec94209b4a42a1018282752878f6d8a62827a06af247bd00b766be6bb52176ebbccb1c616190a38ed507627 SHA512 03044916378006f3d26e55d56b2fecf637680c80b3eef85f5427e3ac92406926ff9d22ad5b1a1450477e579cb41030d39c787566a2ccf9829c78cf795365f3b1
-EBUILD gromacs-2021.6.ebuild 10054 BLAKE2B 6a1a608a8996cff7b2d429cf4d7f8b2909271c6a83158671687619303904f5ead3cdce98d5ca968b05ac6fb8f16d764f08f111009a78d3132e88d64c65ca6c5a SHA512 43fe99bf2b2d901477675bb0fc30e244baeaf8b74b9736dc4e51d15c16544c4c8e801eaa2585335b32f92dd8a29d000aa1c3e511c4975570e573d28be401b324
+EBUILD gromacs-2018.8-r1.ebuild 6676 BLAKE2B 2e5e65df1624f4528c5af0bfcaafed549f5ae2b8a22d9e78192a57790d60f189fdf6f974906f266cbfe51872e0d7d3860e39d7d4b7f6489809a9c691bf9630d9 SHA512 f501cebf3a84158874b53d07cdf8417a223db835f8d941bf19bf391b3d6539c171816c23ebca30784a95554e7ac7322520a33a8b12857f6652c4ab5256d02657
+EBUILD gromacs-2019.6-r2.ebuild 7054 BLAKE2B 60f0cad724bb6077365e56bae32e260b23379ab8a66064d99777cc1ea81f953dc6da1e84bdafdc01b026c8f5f48ee986c97dccb5de3ad0a84ad51ef2f79f7ccd SHA512 bdd28079d2ad8c0ce1a463df54b869d9de41f7b408a136d3ed5a084e51490c776b939929cdd041e042f0a124254ed1d5abde540adf21689dbf8624ea7fcbdc61
+EBUILD gromacs-2020.7.ebuild 9848 BLAKE2B 8b93a2b444fd68583cd87273a7d00cbf24e6189de59c93e238bf048c963b4f8ed22cad9d401b7b633feb575c4d63f29dfd9fdcc151566eff14523c66ec349d4e SHA512 a907d50286541a1e4c8606427eceac6effdc6189f5ea209d5cf147c009beeb05065c16ea480277fd40d8fee72d0077e602e5a74cb9feb70ffeef6cb6e2bd32b7
+EBUILD gromacs-2021.6.ebuild 10055 BLAKE2B 30bf21addedf543188153211a8b89204bd86b18d7a3fda1d30bba80db5049e45d1113110eafd0ed5ee899481385d890b69dbe8c0b3ce3f7f75a1740b334c6960 SHA512 b171081fabae29c44e7827c36dcda8a4b787dd6a335c3ee31ad6c2a811fac05331381213b3a978daf28d62dd96bb930c5d1bb05182b2b537ad8bd56c2acc4d35
 EBUILD gromacs-2021.7.ebuild 10105 BLAKE2B a97146e3165e8ee528921d48375a7968ced93de69aad48a028227a8c418b03af044ec47c7674dd3e5adf89c85368cc53c18740ceccb9a4c59ec0631c23807bc7 SHA512 158aa5c265d3fd4a0b59a2c7abc467ef873599e12f07bf939eea56661b659b42d163e3c1363e772f86c112d41b1b8658df5499302f2584a5a69acde9cf57ee22
 EBUILD gromacs-2022.4.ebuild 9596 BLAKE2B b3e675f96621add5f81b07ca1ec6a6c4f4f3f61f69051ba6f6319bd5f5044bacb67554bd7e85877485163c4695cee7dc3246b024b904a0f97d2d858065a4a098 SHA512 f81d9732b050c4cd8d453031e3122e5c0beeacda352493e0acc0b8cade05b36fd4671f87a89036bcc7dddd098ebd825d3c17af3c06b391d7514d75520ca9368b
 EBUILD gromacs-2022.5.ebuild 9596 BLAKE2B b3e675f96621add5f81b07ca1ec6a6c4f4f3f61f69051ba6f6319bd5f5044bacb67554bd7e85877485163c4695cee7dc3246b024b904a0f97d2d858065a4a098 SHA512 f81d9732b050c4cd8d453031e3122e5c0beeacda352493e0acc0b8cade05b36fd4671f87a89036bcc7dddd098ebd825d3c17af3c06b391d7514d75520ca9368b
diff --git a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
index 29c88f0d70a6..bcd5c2754d50 100644
--- a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 	https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
 	doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
 	test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
index 9866591695ed..747eb39a8046 100644
--- a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 	https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
 	doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
 	test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
diff --git a/sci-chemistry/gromacs/gromacs-2020.7.ebuild b/sci-chemistry/gromacs/gromacs-2020.7.ebuild
index 248107e01ef5..9a4372f3f255 100644
--- a/sci-chemistry/gromacs/gromacs-2020.7.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.7.ebuild
@@ -25,7 +25,7 @@ else
 		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
 		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
diff --git a/sci-chemistry/gromacs/gromacs-2021.6.ebuild b/sci-chemistry/gromacs/gromacs-2021.6.ebuild
index 9205c7d1fcf3..b385c1a52f04 100644
--- a/sci-chemistry/gromacs/gromacs-2021.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.6.ebuild
@@ -25,7 +25,7 @@ else
 		https://ftp.gromacs.org/gromacs/${PN}-${PV/_/-}.tar.gz
 		doc? ( https://ftp.gromacs.org/manual/manual-${PV/_/-}.pdf )
 		test? ( https://ftp.gromacs.org/regressiontests/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="amd64 arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_arm_neon"
diff --git a/sci-chemistry/molden/Manifest b/sci-chemistry/molden/Manifest
index 2094e2ae6ff5..11729f6ec17b 100644
--- a/sci-chemistry/molden/Manifest
+++ b/sci-chemistry/molden/Manifest
@@ -6,6 +6,6 @@ AUX molden-5.5-gcc8.patch 328 BLAKE2B e098e680a5b75ff09fbaecf44609055584b0f1c49e
 AUX molden-6.9-ldflags.patch 3244 BLAKE2B d5ddd71bade94310d9aaebb71c49dd138af46abbf65069920cfdc3b204cdb7fe21ce049bed90faeaf23da3ec5b9a1121bcab97d012e9ff8af9abdf5619953299 SHA512 2a8235c1bd07aff5ce9fb79d5a6b09353c63bb9fc157d7fe1ada397e567018f3052286a93a04df13573f2e561a6c1e302ee91822338c024e70654ce7dec488bd
 DIST molden5.5.tar.gz 4934764 BLAKE2B 6ce71f928ed9aacf8fe9830c4c36a675f81d63e97d08e96519ff74d172540ae0a9af25ca966d6c02cdcbbc43633a0ef80be9d31ef98a80d59a8e1a13374c2f51 SHA512 45269d2c7a52b3b2bf4fdb5f4ca3912637b3414ff9dfcd0d4f23815b3dcf7a53ffee717420d4fbf286b71c972539e756a440f5e37b7b7325ab312c25fc6c47b0
 DIST molden6.9.tar.gz 8536291 BLAKE2B f50fd9c6303d215f3b1ea73136a8ecada07102a33cfc5831c412341731d00bd166f59bc260615d4a96c59d50a6a308087f02b637f8a8d36bf19f256ac407ba72 SHA512 dbb4a602f2957d0b1d5afb8748fb8ad012a41fb0dfa816b78e4d2748ea78ee39251846a549fce4b276641d4838a336ecd9cf02b92fcf9739adeb25bb550656ec
-EBUILD molden-5.5.ebuild 1735 BLAKE2B bc176723397f3d0f6f6fe35247c065f333e718be7eaa3ed04487bc9138dca53d6c01653fb99dee79f3098a2aeff5b41427171aa75bc4dc534175fb8e59a3934a SHA512 d4c537301b603b410fbb9637bf97a2f912765545e497bb850335a8d1013d71b394ff12a25bfce5a4293b830f46beaa75597df51ad06bcadb8ea63bf6b57ba6f1
+EBUILD molden-5.5.ebuild 1736 BLAKE2B b426f0985512921fcde79d669e82025787f0751b5cbb93b339040b8dc7d01e38bc4988e12ef7ca46f721e631f6d6a3a54fffb6349f41bca1c4d94f9d9e34f639 SHA512 f12acc17feac7679ea65d9446904655ab2a44e742943783aa43aa5e774031bde929de060a73203961a04ab7eb3a2bed00321690207799b76e4d158056e555a49
 EBUILD molden-6.9-r1.ebuild 1491 BLAKE2B b01b98c504dd7de6ae74864f6ad62b67fc36a0c802295db9e125626c3abb88c028451750bc175de6a9a4b999c91ad87e4c4a157ce446eb8fc95def9154b9e719 SHA512 7d1b31962697cefebb8b43e50bf0bbf59cbd775e19e2563205c7f8f74f06e2a8f92c7e144350a84339d2c5a666c13f6aab6ba7748b4309162b1685649b6a3a20
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-chemistry/molden/molden-5.5.ebuild b/sci-chemistry/molden/molden-5.5.ebuild
index 2587fffdd9be..0c0cb0664768 100644
--- a/sci-chemistry/molden/molden-5.5.ebuild
+++ b/sci-chemistry/molden/molden-5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molgraph/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MOLDEN"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="opengl"
 
 RDEPEND="
diff --git a/sci-chemistry/moldy/Manifest b/sci-chemistry/moldy/Manifest
index 486763e21dd0..7448835c0e8d 100644
--- a/sci-chemistry/moldy/Manifest
+++ b/sci-chemistry/moldy/Manifest
@@ -1,4 +1,4 @@
 AUX 2.16e-as-needed.patch 3226 BLAKE2B 777b34d43da82b036e401c398d0f59a5f268905a399f38277be73ba6bdaefd6f1de2ec748302edfc68c6389acb22fa50d72b465522b1f2d5bbd14eca289d7595 SHA512 b32461bb052c908106f0f8d74be4eba52daa41ba592a7ba6083edc2a54c4a14003cf33560572e57f2b370ad5ea1f703e388855e8e7fa67ccec40e3015a8f5803
 DIST moldy-2.16e.tar.gz 488410 BLAKE2B 44ff1dacc66922ba11297ca54c645f209b782b8cde50e427d54d1d249a93b718eeb865357ea47b820801fdbca325d5f0d6027fe11ce6e0a842e77d1970a0467c SHA512 b672f4e5c8843277d1b66eedf5f7ad87be0b4c014e0d6bfda4ef941cd9bfeec68d94a361e28531cc3794ee2e4a6937f15c462c69f9adcfcfe5254c3c677fe877
-EBUILD moldy-2.16e-r2.ebuild 1750 BLAKE2B 6924edf704cc7bdb5ca10fccd01857f9b4d5d0bfa0a4b309d8ab43058f24618901e135a2267979ecff42ab02e3688c72c931824f66be008574f2e48a24ed12c4 SHA512 cef8d56cba1f3455cd882d7fa51e105eb846e8d4105cfb62db3ee3c3366f4cbe990025590a7861224975b5eda22367b93bddf971c86c853973bd99ce4f6b02fd
+EBUILD moldy-2.16e-r2.ebuild 1751 BLAKE2B 415202b2440042a5a0adb48bc828519a2a10c4350d41ed717d371eb37acbf2c7b24a616ad6506d71a925ade0e9c47a9215ccd1460785a620bbf12a8c4f4888aa SHA512 fbed445fe4aa18940d05e60e8619723249e478d8f402e8d79f7b0c1a18b21f1cecf95279501d33388d98b73f585bdd30a9125ca958195e09617675a21bf69a4c
 MISC metadata.xml 266 BLAKE2B a03b1fcf7148cf43fb829f619c218219bcd4e66c45d12f563113401e3ae0b06cb0df9a8c0af01ea97e21453638d627d420e7df5b9b0d330ef1752253faa8aa32 SHA512 1dc293fa0d0296eba18ac2cbcd57f47ffc6cc822bf0d76e1cc86cb046700201f703d705375b5555b88cbe8780ef3750be05b8f9f8de092693e6d165c1734e049
diff --git a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
index e0c114cdbb87..ef28f26e2b29 100644
--- a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
+++ b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.earth.ox.ac.uk/pub/keith/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 6d6abb7e6ab5..c89726c20774 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -2,5 +2,5 @@ DIST molmol-2k.2.0-doc.tar.gz 1062297 BLAKE2B 082d4eea5544bab52ffc1ff6364c503043
 DIST molmol-2k.2.0-src.tar.gz 1088805 BLAKE2B cd649604f6ee491d3a4485391ecdaa48dc1bc4bcd82865cd4a01ca460a6653f8cbba636050bfab9027b9b95dbefa28a8deeff7065b9b461f518001242af4a849 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b
 DIST molmol-patches.tbz2 17528 BLAKE2B b91270a980f290edc169be00639e86b3272281c9fe237750f5778eab1605ed482c09bdaf90660a5edf74bd04b3e31adc755e77e39aea6c75d88b6db9bf47a6d6 SHA512 bd94baf0a378f40f854f396963edd9b9e4afc5c56462ee6f8b68889290afdb4c5d9b10878aa5619d0a70153453fe6ee8e7540064522c6db0291ae9162bba9287
 DIST molmol_256.png 22668 BLAKE2B c7d75b8e0d738b48790bea25e21ec60d57a8181253518c70d6f18d93c64eef3c9acf90213fdbdf2dde272e85a04a6442e4e4a9c375829f369380d88c9c0ca57c SHA512 5e7975f54a7462161dc630ee973e9a8126b9c120e0d8d6b62007384c970ce39792e52300edc25dc7a85209845801d749d9ecba02899f3e18b18f5a5fdbc28a97
-EBUILD molmol-2k_p2-r8.ebuild 2283 BLAKE2B 33b409840e7712e9ecbce08cc9dc620caca3311a327c3b56a220ce33acc69559571d00a5e6e16cf03cc6e546fe68c932b58be595432eeee7f8efc1bf17193cc2 SHA512 69e2612a151b94cb09a42f9b09bb3bde06c13a5dabdd79bfefcc3d2fb7399d3b30b948d1be0e979276eac6cb49252e9210b004ebd9db94b53348e7b4293d06fb
+EBUILD molmol-2k_p2-r8.ebuild 2284 BLAKE2B fa9954fca3dd8b52450beb1c0901abc71743672d7a76e2daa2bb05f52280ecf7dec5c401da24ce3e72f429cb69b27738117e33d41b49a96836b1b407efef67f0 SHA512 d813743572479b5eb0ed4181d42743402c4bd0a5a8e012f32bad03c4be68f38329722b749abc91845ba9c25642b19f5e2c4b5578ed9d3f7d03beaabbaa3345f5
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild
index ab04c60e4271..59bedaf2593d 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r8.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
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-chemistry/mopac7/Manifest b/sci-chemistry/mopac7/Manifest
index a6890701f24d..6b275a888424 100644
--- a/sci-chemistry/mopac7/Manifest
+++ b/sci-chemistry/mopac7/Manifest
@@ -2,5 +2,5 @@ AUX Makefile 387 BLAKE2B b0c4b3a009c8bf8c779953edf3e233434656033a661cb307079eebc
 DIST dcart.f 11044 BLAKE2B 7414804ecfab9a7cbddee664b85e6e2e8c1d8fe1e1f73d480dd1a387c5e349d26ec4ae1a37f27e38b7c051fcce2c1bdf77de12ec628298fd3edf79040a8a0c5a SHA512 788a184fd8419ff742e49c1a652d5ea093f9114dbe4f272665b8fb9eeac2afb7f7042628c288f2b81d0f54d8a7ef2f400490cd3aff39dda59a6d70a0deab5b80
 DIST gmxmop.f 38956 BLAKE2B e411feca5104e91ae8fd2008de61d18cc214beb3b2a7aa09a80269fb935e27ba1b1cb89fa30eedbfc4f6c4734c22d932e57d5905c175ae9f56c4affee7b0ca04 SHA512 38bb2e5749c4d3c8c24f15682f72e40cb4edb6517c7916cecee1d21675b1870c0fe331ba2ec40312408dec473141e7742d1e155d4b64f1c2a25bfa4e11885194
 DIST mopac7-1.15.tar.gz 764547 BLAKE2B 6e037862007221955d0ad65f3c002a3d2e461950a2bc0efac9d195cf1d9d856842d02bc380ce236c3d48f863a144875950f5c86f8f3ac936b8b098472f7f7a0d SHA512 e0ccd643caa6dbd7e156867530d79e50e10243f5e3b5f8bc57781e68e1daf26f2a0e6987fff00afe07eb0fcb98cbd9f01e4cfa5d20acc0d8ab3cca632968636e
-EBUILD mopac7-1.15-r1.ebuild 1854 BLAKE2B 5e841e2fae58eba4c64cd2afaf82f0ef05689a294c3fa9869e50de873a68e7678e64cc717fe234b24b50757075ac74c976f2c7e754b62fd6ac7a49730c073328 SHA512 66e78d9df9f1f4655b27a71eb16b9980ab77d1b440dccdb6783d316fd14068977487e7c563856b7510ce3f867141780ca899662cbb01d4697a33b83a7b4f3794
+EBUILD mopac7-1.15-r1.ebuild 1855 BLAKE2B e3ecda4d53b2d1f8161cf5fbac788149302e1fbaf972fdba2e372c2ad6535e2c55055f1486788c5e2e8b0027fff6d9532ebd5566c032390a507f0b5b072b2d75 SHA512 3dc54baa3559c0bc297ba4b50337255774a4a74ba3d4a2a38fe213325e13aa13f288b2d783ec082ce042979fe3f57d914d570a17e5d6858833ba2f7a66af145f
 MISC metadata.xml 435 BLAKE2B 12efd7ecfe6c9b07411d62992a225848f3787b58a59765e373fdc98ce22c3b50763243ac70efa1d7a7ec3309bc519dd433d41b778fe8f18cdfbdae971e0ee82c SHA512 d624b1181bdd0d66062507e7793eb25d24c447fa9ffbe8ee1645c88b843e6822e80af087bf6073ac191947074491159331f2021b884f8b7cd2237cf3e013ebb4
diff --git a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
index f78b305bf64a..f785669fe7f4 100644
--- a/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
+++ b/sci-chemistry/mopac7/mopac7-1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux"
 IUSE="gmxmopac7"
 
 DEPEND="dev-libs/libf2c"
diff --git a/sci-chemistry/mustang/Manifest b/sci-chemistry/mustang/Manifest
index a8f38458b35f..d7485a71f449 100644
--- a/sci-chemistry/mustang/Manifest
+++ b/sci-chemistry/mustang/Manifest
@@ -1,4 +1,4 @@
 AUX mustang-3.2.1-gcc-4.7.patch 286 BLAKE2B 93f16865b51cc5b510ac98a1f45bf02f0d0543c96df40ea54f9b33ce6905985760f201c6beda95dcaaa8a620f257c2d9dd448f315f5dee67dec1aae07d91b304 SHA512 7f2f113a28439c6646582ce154ccffea9df6a01254335a5915456609ecba2edaeefb9b16f02973624c3a046ae29865c2beb8eb6eb0c53d8209a56ea9f6946426
 DIST mustang_v3.2.2.tgz 141940 BLAKE2B b90b42df782bd1dbdb387d0d0ab42430c5212b439da84f56a33ca2c746c8937ae330dfb8d634e7d1c5ffd0f6959cd9e4be0efe8f569c452930a3481894c68ec5 SHA512 cb862f860f3cdb3349743c6005a29acc14cde5269df9d61f1100ffdc9a22c1d8e3dd46771371557b823724e79783f8fcb7356c63c6f0c0a09aac09bee407a26d
-EBUILD mustang-3.2.2.ebuild 1103 BLAKE2B 0ad8765b002984ea591295d40e7c9042cce717ba596984ce44c6e8c172ec058ed5086886bb205849e1836368adb2585428e2dd84e1cf52e09d185bd5f1bb0aff SHA512 03d60f1cbff023e27339cfc71bcd5015bde812760e615f17ed76f8286c360724f8e6d83fec5297fdb8580511a877874788aaf39f147e77c7d0148645b49695eb
+EBUILD mustang-3.2.2.ebuild 1104 BLAKE2B 99ee151c3d79fe17fd059b0de205b270ea421782c1e4072418458851c672aeb8f2d97eb343f67d641ffa6d1a7183d8884a240e44b6858ac12a33aa5312defff5 SHA512 a55f85fc5aebde488fda510799cbbb2fbe02cb99f904db189ba02201053794645b4f4dec468c4ca1ea472bfa3d0d39fa8c9a0dc4c08e99a50ef92bb00268ca4b
 MISC metadata.xml 266 BLAKE2B a03b1fcf7148cf43fb829f619c218219bcd4e66c45d12f563113401e3ae0b06cb0df9a8c0af01ea97e21453638d627d420e7df5b9b0d330ef1752253faa8aa32 SHA512 1dc293fa0d0296eba18ac2cbcd57f47ffc6cc822bf0d76e1cc86cb046700201f703d705375b5555b88cbe8780ef3750be05b8f9f8de092693e6d165c1734e049
diff --git a/sci-chemistry/mustang/mustang-3.2.2.ebuild b/sci-chemistry/mustang/mustang-3.2.2.ebuild
index cd4bec0fad09..8498b362b7bd 100644
--- a/sci-chemistry/mustang/mustang-3.2.2.ebuild
+++ b/sci-chemistry/mustang/mustang-3.2.2.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
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.2.1-gcc-4.7.patch )
 
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index 257d480c9113..dae6544d80fa 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -3,6 +3,6 @@ AUX openbabel-python.cmake 4402 BLAKE2B 36c325a26f9b23c3957db22110628a0a922ad02b
 DIST openbabel-3.1.1_p20210225.tar.gz 36674527 BLAKE2B bb82fc96f704249d211bd86c73de0cf4e7cfe5e2ba5c745aa8b4f6f19583837e2181d85101377810095f6b71fc3b91bf2f6f5636726fc8271c6905f1f8c59e7b SHA512 9ff7cb4acbfad7a9c5c8d0dd8930ac0390d0d0f2758d1a6120009071f47ffe718f92ad620d37f26f196babb14649c52b5eb7bb161c342ef36aec655e0a172de4
 DIST openbabel.jpg 12159 BLAKE2B b701df2b8c29df607dc2bd3997a282aa9a726d56c789ff2db900d33234dc691f76b6af12a4c9ccda4f09984504b863c40c39e8bf91058939996714ede2dd37c7 SHA512 998ea526c8c92f87dd203527fdd9f4e001357e951409209f41ab68e0b730fe12d97f9079c12ca289be413854ea2abcf8bb691ae5af823a6f29d6a590e1a3e2b0
 DIST openbabel.png 29060 BLAKE2B 8d217d92125cc73462437411dd4e0cc05179cb0934f5ed15a307acc6b549b8ebab250a48a05ef7657f48c6df394f37da9b659de61efb1477b79b573a5b393ad3 SHA512 bbcaaa37663b526c9038ccb9edaf05ccc3ad1a861739a737f05f363098d8402a10b36e341fcc0aca636e809c6c32db99bf987b41719a0c756bf5e31444d3eb70
-EBUILD openbabel-3.1.1_p20210225.ebuild 7422 BLAKE2B 94b3f30139cf37ee9d4d9679103607f61e0bef69db95ff3f52b54dbb9d8b1dfd03715af1ebfb28fc382eeea8c17f9f58a85cc1edb4879b2fc8a4b14514cf8bfa SHA512 7c42a9039d3f1c84d301ddc59304062d38ff1733a385f93ab30bfa1a9385ffbb317ac9e1224aab2c350c4355627da438d182c1b7fae031326d4a6851c25aaa37
+EBUILD openbabel-3.1.1_p20210225.ebuild 7423 BLAKE2B 6a75f9e1ae79d6f393be360db155d6e84047ab3c3cd74f521c0b9fbd0af4046e3400ac05e110c4b4bcdade559e07a886af3abc48113f2559a8658d10fbaffddf SHA512 f2ca26f007b1ee9861c6666912579a8abead4d99c83c44e6eafcfc2f7fb184a5e88d281ef0237808b37f070c9b65dadf7fa4d2ba36a4337ec7e5b33af82bc2a7
 EBUILD openbabel-9999.ebuild 7313 BLAKE2B b60cd763b7909067365a5ee8d202d3d5642c7ee3ea0d460a6d5c60edced40ab531da09e585ad997487ffe907390d47be98f1eff6dbb244063fcb5880b6ed94be SHA512 971f59c9ba38f0b360bfa3cd2abb58a7bc86e5a97b41b1c57eb65274eb61728c8675b37eff181e36f250478bf2a1e7368838c25b68d18bb2917a9ea0b559c5ac
 MISC metadata.xml 921 BLAKE2B c0797440e50f813777c4858cc1ce893546d7785e57243318ec7d2c601c6ec2ecb7ec5ab3dbacce960c8b71196eef51ddce07802257fff0d4cba0293f940a773f SHA512 8ee8a50230f374904a9ddaaf7337caf018788ab25a1839dbf5a48b0e5c49ac4e285a1fa759900fa6d993bc220d3586a923ae21158687be971fc51a6c302f12ad
diff --git a/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild
index e61c03450c34..bd8e887348d7 100644
--- a/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild
+++ b/sci-chemistry/openbabel/openbabel-3.1.1_p20210225.ebuild
@@ -25,7 +25,7 @@ else
 		SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${PN}-${MY_P}"
 	fi
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 SRC_URI="${SRC_URI}
diff --git a/sci-chemistry/probe/Manifest b/sci-chemistry/probe/Manifest
index 7bef8a9981cc..66454ec27f83 100644
--- a/sci-chemistry/probe/Manifest
+++ b/sci-chemistry/probe/Manifest
@@ -1,5 +1,5 @@
 AUX as-needed.patch 594 BLAKE2B dc558fa12441780347e1d751ed7a32a8030d5c3cfcc8b7c96c2e918d43e4dea334248e88807db9dab42178e75aa80341267c9c79f6ea71330cdabaf1a62e995a SHA512 6478862bc967614e8fc57abaa03b92f62943508ae77710b179bb71ae96d21c289b4f2836d76236297ba66ed97954997f4e6c8874f369af03200bf13e5226f8c9
 AUX probe-2.13.110909-as-needed.patch 634 BLAKE2B 91848bcef2330e1f394c7c21388db1b761facefe73cbd0e244636e5b899f032463b9e643f2a48d84d028973695f1ef9359137aae8e65290a9f3bbe24f6dae204 SHA512 24b291cffbc00588626ac9da3e38e9bbb9a9ba121a3ae74fa5e91c94cd30489d61a559351d5a4b89ebb4c1564be30144d1eec295032ed612fa6e80d47d9ba8a6
 DIST probe.2.13.110909.src.zip 131063 BLAKE2B da2cc9f43c96043b4cba0c628856e32aa7d5d9ca49d58d4e3f02c8d3aa106955d562c6212240d3d977940fc7301ce2bd27c86915517d5e5a313e5a7e459479ca SHA512 5efa066873d0e139da66bf8edb541fe42df94e99cab171ad8d06a8a6f5caada982ef5b18481e748b224dbed86f63c99237d04ecd107c82855b44de91fb6d2b16
-EBUILD probe-2.13.110909.ebuild 647 BLAKE2B 206b519d787e8ae995b5ede39efeb8a7b2ddb0f17330eea0cd3b961b49b46e47f91647edb93115063b47ff18b396ef6c679cf74c02607438078b9a17b1c22c20 SHA512 02ac1f439a73b25ce0c46bffbb782e5c703ac1780917c19b4095b2e65ff4ae02859b3da1f1e47abcedc25633f500d2400fc5abafb5bea1212e4376b93b860d68
+EBUILD probe-2.13.110909.ebuild 648 BLAKE2B 28ee6bd54d3c6030c45e2aa091efe21c170027f58d772dfa3703134dfdc2347108f2e62d1da2e5f677ab04e85b5dbed3b37e3ade202e012ded08e35ee9505602 SHA512 131ac088c77f209bd259ca1e61cc6bbed6ee078f2be167b5aacd4ef6e8e12a8168ac5b901e868798795ae27265e7ae2e4a9236d950f0d897a2f20b5ad613dc52
 MISC metadata.xml 266 BLAKE2B a03b1fcf7148cf43fb829f619c218219bcd4e66c45d12f563113401e3ae0b06cb0df9a8c0af01ea97e21453638d627d420e7df5b9b0d330ef1752253faa8aa32 SHA512 1dc293fa0d0296eba18ac2cbcd57f47ffc6cc822bf0d76e1cc86cb046700201f703d705375b5555b88cbe8780ef3750be05b8f9f8de092693e6d165c1734e049
diff --git a/sci-chemistry/probe/probe-2.13.110909.ebuild b/sci-chemistry/probe/probe-2.13.110909.ebuild
index cffb72dff83f..8952bea3d39d 100644
--- a/sci-chemistry/probe/probe-2.13.110909.ebuild
+++ b/sci-chemistry/probe/probe-2.13.110909.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/probe/${MY_P}.src.z
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/sci-chemistry/procheck/Manifest b/sci-chemistry/procheck/Manifest
index 818ab4be03e2..176af33f9d5a 100644
--- a/sci-chemistry/procheck/Manifest
+++ b/sci-chemistry/procheck/Manifest
@@ -3,5 +3,5 @@ AUX procheck-3.5.4-ldflags.patch 1649 BLAKE2B 64506db2dbe1eba43dfc07bca233d57364
 DIST procheck-3.5.4-README 6585 BLAKE2B c61606848f30728b67d2ab51e0beadec1c30aaa0ca65a68834bff3ed3e3f466e34a0e4b64323e80cce9cee83854650ebe0805abf0509c0a9154bf08e3e0a2d6b SHA512 c6eff94cef9b67fd61884e88fa77ec381553d4dba53f477023738e1e44a6191c4241b14543ee7ecb93b049f16f262db2a09cf5d1a63248057633aab290f1f82a
 DIST procheck-3.5.4-manual.tar.gz 517840 BLAKE2B 33c5da5888bcd263e900cf2839f9287373e032fdde234e0375af061ec1c588d1ea5d2718da2a050da8060ba4003748a8fef3ff35b22f424c1cf6a1892aec0fe6 SHA512 0fa9c7d50b7ca43c626d5261c524166938d3a92be1d02221721bc7ce7e91ac4919e7200b946ce563f9bb696d7dab9588c1d1b31a4d551cafa2f2bce4931a212c
 DIST procheck-3.5.4.tar.gz 522013 BLAKE2B be6764bc741ec3f868aee349fc7e23608c612758029d0b745c421f40b47c896dd48de84ee7df6d09a64a20695bd5a1ed0a96464e6dcaf44de03da1ae231787f8 SHA512 1dd78b53070484fbcdca51001fd147ab13fd5e51b3d1da54fd529531917c31012393751ee514f0c79d579b17a1701dde04f81b1c9ac27b2b835a43fa96785ecc
-EBUILD procheck-3.5.4-r3.ebuild 1716 BLAKE2B 3536e795e5d076dd4d3b2232c9e25578545584ec1bdde30d44692b6111cbd85a0d51db1ca90d1ecad40763fe0340732131c7285cf1e30bd7d97c45e295ac1f19 SHA512 87ce3ecff6d939eaf4164e976ec7cae9e23fd7de35a802432c987b3a37e5c320a4ecf996b7566b7b12815598d04cc48f1baac711d3264114d0df1b610a227383
+EBUILD procheck-3.5.4-r3.ebuild 1717 BLAKE2B 1919325faefdc9cad032d503166cdedc966f44c949bf1c2c34d3aa7b0132fdbb35a3a7e0f446a967166cbce66596143e114cea7b0c23aa9ca0c99acd9c29ec4a SHA512 04c58e977937275fd413ff217d97f7fa0dfacca2492c57b60d8f2d671565e640852c391e8c408618ed3e9da53f602f96c2863a009d8798011365a9b9f1fa93ec
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild b/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
index d7522b14f7c4..3db0e3f24244 100644
--- a/sci-chemistry/procheck/procheck-3.5.4-r3.ebuild
+++ b/sci-chemistry/procheck/procheck-3.5.4-r3.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=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="procheck"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="app-shells/tcsh"
diff --git a/sci-chemistry/psi/Manifest b/sci-chemistry/psi/Manifest
index a00e8dda54ea..f7a9725255c7 100644
--- a/sci-chemistry/psi/Manifest
+++ b/sci-chemistry/psi/Manifest
@@ -10,5 +10,5 @@ AUX psi-3.4.0-parallel-make.patch 445 BLAKE2B e98ee4f5d0feb639058c3b589c6eb6747b
 AUX psi-3.4.0-perl-File-Temp.patch 488 BLAKE2B 03c5ab1f1b801321063f389e3ae9989061013cb645cbfecbb94043b809d14df9dbac9b650c9ee5afde5eed88f2f8707d8d8b57713b0134311c62bc36b5247e07 SHA512 683418b28dbdaf4161b679a4fb6aa875ac7834fd4a1b3829c89230be6cdc4b92dc2e23ee3a59a1d5fd3008fdbc7967101a6249a6d42715cedddc2ea756a7e54b
 AUX use-external-libint.patch 1359 BLAKE2B 24fe9d7eb369f6c6846915cd87471d4f2bcf66da09105d73c4b75cebfa7138d318d5dfca653368d80eb5b39a31eabde60da5b439786ed00d95b31b90e56a44ed SHA512 8b4749b0c449dbc89067eec466d3d557da86e7f2d950cc0a94409e158a31a3fb8ceafefd090168acd97975ff3ccc7859e6f2df3c2cd57a3571b79f71aca6fff7
 DIST psi-3.4.0.tar.gz 7413072 BLAKE2B de8b5e0fb1692780446385bf13f6b9984f5be8d441730babacf6f59dd18be6e13b1cff17170cec87def1f743d7e634354b57afbc046e6f34c79c9fc52c31b146 SHA512 b13d2464502545cceec3a3b6048b505b918da26730c1614617b04ee6c1d637c9f799ef7fd92ad9554fa2db87617004aa810a6a81400a04df3c06787d51654ca6
-EBUILD psi-3.4.0-r2.ebuild 1956 BLAKE2B 91bbce5403d860bda96c14d6ca219bf52ace394b2bc1f3861ca6089bbe0e4cdad85432beb692da990fdcbecc59f174935f8a1100790cf087d863719c0a29155a SHA512 1474c58bd5ac950fecbfcddd8ecc09315f54efa42c2e0ef07054e806f47027bfcaa15e864d9d689147fc9f5cceb41f3af6ef961a1d8bbc7d2216db36a823a193
+EBUILD psi-3.4.0-r2.ebuild 1957 BLAKE2B 3468c07777a8d0c4abd067cb1f2b36107d2192fbe5c3a97785f5a79a06ba9122ba711e0278b4e8dfbfd7d3eb565de523f6bcd246606cb65a63a096f6acc0c8f9 SHA512 64c854b2520ea84b660950bc878fc55ee8dc570e285b0203a5d3951f8fa9dd432d066fa68fb9fc742c42796958db7b67b2af8499c7db19e20c56f9832a067988
 MISC metadata.xml 353 BLAKE2B 4205c6e944b90033531f13b347ceb80f0f4410993e400fafddce2501f73048f005ae73614bfdc10c41ff7655c4ce36bee084167ed984a5818ca050ab3be73fbf SHA512 9ccb40364500c7eb60dd1edb4551ed0e58cde5c4b52b184b0b0bfcf76957daeed1d098c7a04066011bf255ec869ba39316a875806329f2d4ec375955d69de5a5
diff --git a/sci-chemistry/psi/psi-3.4.0-r2.ebuild b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
index 2b73d442b470..ba12f8ff3fca 100644
--- a/sci-chemistry/psi/psi-3.4.0-r2.ebuild
+++ b/sci-chemistry/psi/psi-3.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/psicode/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 # psi3/psiclean segfault because tests were never run before
 RESTRICT="test"
diff --git a/sci-chemistry/tm-align/Manifest b/sci-chemistry/tm-align/Manifest
index 015faacd404d..dae1baac1bf9 100644
--- a/sci-chemistry/tm-align/Manifest
+++ b/sci-chemistry/tm-align/Manifest
@@ -1,4 +1,4 @@
 AUX CMakeLists.txt 182 BLAKE2B a6bd5aedcbeb2b8019d59123da91cf668c3717a3e41c2259b2e023a4661aefeb2e4334d10ba7b236bfb6fb1cf52c87aae393c9af8b5e3d2f12663799aeccab32 SHA512 1e77edbfb2184e11c09fc2133eb40bd9d4b2fb04a30139134939482f4e817ebfa5c316e8d75a6fd5aa866ef1f6f56d65df924dc41cfb698330943e0bc433948d
 DIST TMtools20150914.tar.gz 982948 BLAKE2B 788f43040c1262c7e9eae2b47b0035d320a30fe7194e340d682b78e5961b82e46eef2b0a43d1ae458b9d5da6570f9c0ec0aca51b6ec3e25f0447fd43d629f592 SHA512 5fda29f6437ac9b0216a037496a01502de07e5a36736815833cb09217158a959370e750b75c55a54a49c733e4bd28be53b2dcbb25d71e2897273a4280ed3b530
-EBUILD tm-align-20150914-r1.ebuild 623 BLAKE2B a29aad98e25a9538b9a0db2310c685ffd308648aa1309c7a393099aa514096bb648459cf01f690224e1ee0ae85ff6082fd0dc16bfb1bc6020353f0cadff53240 SHA512 5d48cc2e4736953b113323f732058199fa9ec71fecabfe9c6888fdfc74579af9dd99c4a9d28f8012d103a1bc977e7ddd7f8478f56c20deb6226f3881e8629fab
+EBUILD tm-align-20150914-r1.ebuild 624 BLAKE2B 3e76324c42369f02fdadef04aeccafd31d56d50acaf3a0c72f8c8609fe75298b4d1354968093ce9730b2898e5a78acc69b371a7efae06cf0705c9405c39caab9 SHA512 3b31cf047369b2d900ffa391e5b1226834f3ae1be796a0ddcb1741652e5a9650ce6cd34c9a886862228976cdcfc37c9875d14ebcc35af2a255eeb1ca723782f7
 MISC metadata.xml 1313 BLAKE2B 6602de0b8fd5cf11c31c8407483997e5d959fe073183e8ea7d26c092dde2348cb22b619c490ed2f905d217413cc2fd14f302fc2483b8263bbbae7bbec077c970 SHA512 90bd4b62d967961f18454c66d741fc4f00c286907e75f40466f2c13405aab796d044807d26f3da29584d2306c122b79a6273650f66c89b6c56a5bfa05895bf84
diff --git a/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild b/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild
index 0aa8d1461db7..800884db8138 100644
--- a/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild
+++ b/sci-chemistry/tm-align/tm-align-20150914-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="tm-align"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="custom-cflags"
 
 src_prepare() {
diff --git a/sci-chemistry/votca/Manifest b/sci-chemistry/votca/Manifest
index 9083b2db2003..4d9f371d4482 100644
--- a/sci-chemistry/votca/Manifest
+++ b/sci-chemistry/votca/Manifest
@@ -1,6 +1,6 @@
 DIST votca-2022.1.tar.gz 61692029 BLAKE2B c58023098f596d7c6f301e94883df3e442761b8c1009823ef5a07e788fabb2a0fa572326e0d614f8102104ef5dcec89505da1c911bb703126c123d2a25a2031e SHA512 dda5cbf1835440abd1b0b511275e10e5facfa9f133062ae082cca4f5654e4af0be0b574b87c70004c0d07920519927bac5620b89ce073de9985bdf792f0dd21a
 DIST votca-2022.tar.gz 61688862 BLAKE2B a6a8d1c34e2cd992d032730b2669c9ac5489b988fc334f730eaf1a40b275cc2fad8b24f03419510fe9fee7b0ad0bedf43f9b22b44ca1ae0178b16c9b255da53c SHA512 ea5b7405872a2c0c8d6b4b86148a605b5e83207f1953f0b7393dabbb106ac785c50b45462f6271fbfad04c0246704a92199943acc65eb30d7f1a0a6d6ee4ab83
 EBUILD votca-2022.1.ebuild 1870 BLAKE2B 708811b463417e17f6a6a81999d5a75270a67d767e8a833e16be5b0536ada4a6d0c2bebc450bf290ce3cf94d94db2bbee9cb681bb3e68d46d1b4e08359b3a3e4 SHA512 8ad3205ba04a8a6f27c4e903c4102e3f0072f603af005cce81b1d000f53d73ff8ecd3f627a605b1afb16b4c46c4bfcdcf29dcea7b73af7e774b0ed20435d4eb9
-EBUILD votca-2022.ebuild 1868 BLAKE2B 59e7eeaa1e2736f70d7e94c0a8f05591f256385dc4fa2cebbd245998d0923e84b1d4a459aed134d873b3108d3a3b335f2b037bbab817d588f687c538c1d768a5 SHA512 583df27280745d11e4074dc7ee2ef7118f545114f6dcd307112aab2c9d37a61b11eeac8eceb354d329c87a1823a7a4a5598004406849c3e8fc38ad69016c06ac
+EBUILD votca-2022.ebuild 1869 BLAKE2B 2ee927d81098c0859e39bc196e28147d8cce960ede8890381687bb1bfe01fa7e6bad2131c4f2d55567082a650355d745e12295a5fbd3b1a855a54dac3a27d601 SHA512 8e6349e5894f1841e328d5fa97d58203e104e5840fc903f625eb20d4caee82c718c1999debbf53bf1436d9467cb9b0502b751a3e2a89b946eab608b22471faea
 EBUILD votca-9999.ebuild 1870 BLAKE2B e5d1e62abd6493e209eb90e47e58bc23064d335f8fe2372b5ec8fd91041ad7aa27209234ecf2973aae6d0dd92e766ba3f3784a6db9ce67f9ce791ec7baf75fcc SHA512 4c4b8f94583a61dc47cb155d5da0c3dc4532199bbe2ff7949ffc96ab4ed0e9879ff1b97738ac886ad3e606d4f52b840faf1c0ce8eb4bde0938375e6e3f6319ea
 MISC metadata.xml 465 BLAKE2B 3fe0aa7dbb87cfe5ec1b5d1500dccb087f2f582982ab7d41687675f7ad38ce3eae1c12141ab8a020d467114cc7017da64ceaa65a10bb37f55ff3aed3e113378b SHA512 b204a6c45aea2fc428a0e421cfc22a218e59ef4f9cb8e352bdf8983272c9f28baf2beec4650ca65e8fb640d713dbdb39d2f43b1ccfce8329b0c3669e6b4562c8
diff --git a/sci-chemistry/votca/votca-2022.ebuild b/sci-chemistry/votca/votca-2022.ebuild
index 6fe0688e4971..89d10678c31f 100644
--- a/sci-chemistry/votca/votca-2022.ebuild
+++ b/sci-chemistry/votca/votca-2022.ebuild
@@ -16,7 +16,7 @@ else
 		MY_PV="${PV}"
 	fi
 	SRC_URI="https://github.com/votca/votca/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux"
+	KEYWORDS="amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/votca-${MY_PV}"
 fi
 
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 3a8a30700288..6f198660420d 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 5d09da469a33..2a8d0d4aaab1 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -2,6 +2,6 @@ AUX eagle_wrapper_script 247 BLAKE2B 62fb49b87be84527b983473c7f9876da75a037cb823
 DIST Autodesk_EAGLE_9.6.2_English_Linux_64bit.tar.gz 171780187 BLAKE2B 6fb627448068b8af8fb2a4117c84386a300acef769afe8524cae703afb09edf719f19fc4a5298d091667f3d4c09e8ec06a0da4a16274cb6e6c64a1ae349ed014 SHA512 4ef17dfa52b1ee0f5ba68896bc3821616a1b7d1a073a586604271cd7129e29671c480cd324cc5eadc517eb300ca4be6efa69423a306944e36732c2aa34cc59a3
 DIST eagle-lin32-7.7.0.run 51488593 BLAKE2B e1556b7abe6fb405632015f39bdd8e8c61891ebab7e3f59d41aaa0c6ecaea2f050ced62552656a2311542fee497dbe8fbe43c958a8e76a9b00217c430f678072 SHA512 7ebe73bcd71857c5b8087e911ebfc45507715725abab15b80c9800476128790f8e373d01c52c05a87102597d355390ca0687964eff74af1283b162fba8dbb53b
 DIST eagle-lin64-7.7.0.run 51108322 BLAKE2B 1458199821328e811632cdb7457f256b9d97c40005c0ce71eb65d9c3f75049618e76e0c7e3cbb2e3171649bb412270409fd601bfe6f51c79c6cc3d01c12fcf66 SHA512 1f0b38be16b87f67f64709e7e39b888592240d98cdcb7b81ee77f236d9cdea5127e661db5cff470d9673f8247bea49732be3b443cdc5fbd1dca34e26896a6770
-EBUILD eagle-7.7.0-r1.ebuild 3579 BLAKE2B 505c8e4fa0638af7dd87044d2624962a1122448617b0b32cecdff121afec3c64c729438c186d4ef5b6a250f4a09dc37f5dba6ec5a0820d39eac306f50864ad80 SHA512 c1e9d5d945c99c8c75aecf9e8cb8338ee5188a908e7858b63201a94bb297ecf72e384541ba48e358cdfb17afa6adec9f588762f50e06728135f456c8073c8237
+EBUILD eagle-7.7.0-r1.ebuild 3580 BLAKE2B 7ce40733c65fb8b4c9d11706520f42247cbf576c0d00f0540eb53373cebe8d7d6f3df9714b5eda988f12432a65919709aa32db41c74eeae517f52d916bd15517 SHA512 5f132e0c2a4b4bc5037e448f5b7c0a6171349861aa28bcf158aed484d371ac4684082fa1809f76270dc96665c5d8af83cfd331dec81140c975cc22661bcdd50c
 EBUILD eagle-9.6.2-r3.ebuild 2247 BLAKE2B d684aec4245992eaa811f2387ff199a9bca642ffefa627f35b32e1cfb3f3bb6ddee6566a5a59c0fb6090919bfeff6eafefcab15318251e0022ecdecd197d0fbc SHA512 c353ae535bf3fbafde58d3429fd874260b2dfade1766f99e285f54ba80d6c93a34fb6bdc753b8b6ec39af91ab992cbf44f3271be359071e3f25c3bccf1c1756e
 MISC metadata.xml 672 BLAKE2B ff4a5feffa8823f7984b1e59111b17359a8fc8fd01b2e39becc437b39192b0a4b8aa5416fea2aeb2027df42cd892261dd482c627ce8abeb80886b13c14dc8283 SHA512 33949d396dfb4c87e0dcf8dd4ba677ecb0535e512e295385558f1abd8a5808572727efbacf5996aaf1b2bb1fa4ef65cddf7385a433363b2030cde19551ba8334
diff --git a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
index 713f28d478b3..dafcb7dd3a24 100644
--- a/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
+++ b/sci-electronics/eagle/eagle-7.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="cadsoft-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="doc"
 
 QA_PREBUILT="opt/eagle/bin/eagle"
diff --git a/sci-electronics/electronics-menu/Manifest b/sci-electronics/electronics-menu/Manifest
index 48c3a59cc920..98306804dac0 100644
--- a/sci-electronics/electronics-menu/Manifest
+++ b/sci-electronics/electronics-menu/Manifest
@@ -1,3 +1,3 @@
 DIST electronics-menu-1.0.tar.gz 12284 BLAKE2B 767aa286375b509879d784f82290f3fac8bad0614466a566405ce67f2f06e5b04272cbd58410655dd258dfee9eb6b4cf3af0e9b5a00a247cd79165968dd06dd6 SHA512 c4619d6dfd0641da772a7026af50b0ba1ededee6a5be84ede1c058671764f8c9a7d55e44a018f6bd42bbef0a29d513df5e9056a9a345999a2493fa62d2300b0a
-EBUILD electronics-menu-1.0-r1.ebuild 340 BLAKE2B ebc2e9214b46dbf2d52750db15803be2567b9f5a435b17bc08f08489245912bbac473efb9ce8a7f027c98e407c79f9e06675f7ad444773923db45c20a93eadad SHA512 5253444d261d3d2d8fb14e9da4c0a78257a4c8ee4ede0ea98bed049271db8fe0d4672e574fec72d4398aa03e9ab698a268268c9b1a3f9c303a4aa84da158d57a
+EBUILD electronics-menu-1.0-r1.ebuild 341 BLAKE2B 0a304061408544562ee34042a25040f50af74ed196079024f78ef59ea9019b6ab59ad286bb5b8c2a21a194505f40af5db892254c9e829070a7e4b881a92a28ed SHA512 4d1192abfba19857eb5815081db1245ec97634011b1a804269be96bcb785adcf792b014a6b1f9de6613b27df68220f34cb2b61dab6eed8293ea16e06b6c99e99
 MISC metadata.xml 511 BLAKE2B 9c3d4f7b671911fae37edbabefbb7f937ea42f321d41713e7f276df9ab31a655a9964eda0a33adb6b0cac13088315887b12806843f1509adb4cc37b5aa0256ef SHA512 3bae2859a69e91b51f09e1f6779007de7f0463220a39ac2915e0b8d86b825693de0b2544e6517cd836e9cf8aeb56720aa8d998ee85710b2801b189a679ddcd9a
diff --git a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
index b672831576b8..1eb3d3d4e2cd 100644
--- a/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
+++ b/sci-electronics/electronics-menu/electronics-menu-1.0-r1.ebuild
@@ -11,4 +11,4 @@ SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~riscv sparc ~x86"
diff --git a/sci-electronics/espresso-ab/Manifest b/sci-electronics/espresso-ab/Manifest
index 0aff305055e7..f30cb50808d3 100644
--- a/sci-electronics/espresso-ab/Manifest
+++ b/sci-electronics/espresso-ab/Manifest
@@ -1,3 +1,3 @@
 DIST espresso-ab-1.0.tar.gz 146662 BLAKE2B 216a32ba234d1410ec1a391231700fd9846dc1ee7beda126d5221ae41967810ebf55d4b9fa6e74162d466c1e51a766bb24acb3cc32252cfebedaafd7a9f1aa13 SHA512 360bdf3c9d2cc552e9af6e9e0ac543e96c496f182a1f8eadf8925aed878425a158a10672feaa50e970c0df5fe7a754b0c7496c5d7f6f729b27f34a7cdf0ca12f
-EBUILD espresso-ab-1.0-r3.ebuild 524 BLAKE2B 419b33cdbb4897b7affda1c67171b5f4af5468944cdace77dcdd859d7214709b6ec99d057afdfc65b6d02da1798c2d7bd98726477a1bd9c501cf9e00fe20e509 SHA512 ce7ea1dc51bb8b460dcd0a222b7af14d2937830b46b9f0fa9ada0cea943a0df7d4de35a5e3f2bb461120f4eafe4dbe79340af7cdd19a0a918d3a626f3a3c58d1
+EBUILD espresso-ab-1.0-r3.ebuild 525 BLAKE2B 49e3c783902f18235dd081750a9474fe012a191cd976c8a058f32ac8007aac4a8ddb3366349ffccef096c1650b36c6462ef6d5409c4076da43a37a9574e1d3eb SHA512 e25024cd47ac05227365772ad84cec4382c07bbd7214b44c0a1039b4e1a34db11f06c65db715640723f07cab9058fca0a8a20426136bb09faf521134ef9cfc65
 MISC metadata.xml 276 BLAKE2B 9d8b67ed1b8366fcfac372b052f5cb4f1de2f6e5a854be1a970adb10fc7a1714c8090068e7fc767eeef22956db5b9d9ea03d46dbc4a5fad48ea07ebb47c86813 SHA512 078215df3a759c8b6ca887b906d07f4c0407b119e30d99bb57d4539229eb423b985461e16775bd3d3f135f3980b0f5aade757fc63bbc8e41a5ecf9f2da37c5ae
diff --git a/sci-electronics/espresso-ab/espresso-ab-1.0-r3.ebuild b/sci-electronics/espresso-ab/espresso-ab-1.0-r3.ebuild
index 2937cb028c81..2067bda91c74 100644
--- a/sci-electronics/espresso-ab/espresso-ab-1.0-r3.ebuild
+++ b/sci-electronics/espresso-ab/espresso-ab-1.0-r3.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
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/other-software/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 
 src_prepare() {
 	default
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index babb809eba58..9641570bb1e7 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -6,5 +6,5 @@ DIST geda-gaf-1.10.2.tar.gz 14441491 BLAKE2B d6ecc4bc1390ff457396ae406fdeee90941
 DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3
 EBUILD geda-1.10.2-r1.ebuild 2228 BLAKE2B b29c878b05ffe7879b7107d546071044d7dbb790d7e1a18b9afe1d255babd4235f9df75eb47cbb3566c134f30fc2466c7e6e4cd54b0ec45223e39acf415f4b4d SHA512 361ab53aeb6bd90b6430cdff30ce308ef97a734d6a968b330f9a07085c4640729eb626a50a411a06f81123d50973d512a02e50bbb89bc46ca5ba05c4441f4755
 EBUILD geda-1.10.2-r2.ebuild 2278 BLAKE2B 5c46a6f5dee7ec8fb0aa66f0faef04aee88c9a4fe263a63af035aec2d25e2d90eb08ebcffbb0cfa7524fe1c096f6a204d8abe8016e800faaffa9ba71694b0142 SHA512 f4f1db56808bfcba4db18810e8e323d49f47296c1fd443c95c50ae8e9567c22319477aa87a11bb01b8b2277630c3766398837dc9da9cb34579ab6a1b12dd176e
-EBUILD geda-1.9.2-r1.ebuild 2031 BLAKE2B 209413b23a328e3924aee86909adb88ae59cf0b4c2462d9f9f1e000c6718b5742da39a54b75aae7f8aca6c72448577fbfd94d443559927da972967f5dce5b025 SHA512 f6267b9a7ef7a995de3e83abcd2b1f72a2de51d194d29eb9a8cae3291921ce2ea3e5588b9edf5c89d33dbd70d7d57090b3aa1ff0c83540b94a2f1df608ac7ed8
+EBUILD geda-1.9.2-r1.ebuild 2032 BLAKE2B 1c2a55979d12c8c8d942f6b2d2d23bde9cb4a3624bd86df5e70c1116b93802cf4bfb48d94535ef7c53c63be16ca7e32de8f6e4cff5c5bac19398dc8b8ff5d656 SHA512 b7115502572657db48dac3a0420a22f8f4c08501f81b8f94a552cbe8faeb66e008d23fd8aa96c0bf06f30c379ac62f9a692ac8329f4117df3b2cd5ea678d7086
 MISC metadata.xml 1108 BLAKE2B 4a11952f3543eac02bd65619442e3dd333c550c93969e5c8032d8f478b19a37763f23d353b9f7bd6b61783c70c5eafce10e493e5fd3a594edcdf93dba926d766 SHA512 9f4527cce78e7e5a69c7cd3f655be7f51f23eed736e94f63ec84dfe19ed7b409512e357f4008a2271f42f4d96c6b86a5aeb244efd6ce10d6a3bbeeb8f65be2d2
diff --git a/sci-electronics/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
index e4657a2c3eeb..06fbdeff605a 100644
--- a/sci-electronics/geda/geda-1.9.2-r1.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.geda-project.org/${MY_PN}/unstable/v$(ver_cut 1-2)/${PV}/${M
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="debug doc examples nls stroke threads"
 
 RDEPEND="
diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest
index 4606fefd1afe..15bd2703fce7 100644
--- a/sci-electronics/gerbv/Manifest
+++ b/sci-electronics/gerbv/Manifest
@@ -1,4 +1,4 @@
 AUX gerbv-2.7.0-fno-common-gcc10.patch 526 BLAKE2B cceab2910ada8bde66987e403bdf765e98b62bda66cbd46ee50705c6be539e971eb7e0420b261b97ef3dbb6e0280fb351e425f2b4391bc1cd3af91ee0ba1251f SHA512 fba1f40ac844268f2d81ee63c04509a64cd9b016c0fe3dd8736c3a4faa3727e5ac9a9f6c0bba5a8d4f5362e701a33c1dbc93409dec630896ad06c80dcc5f13a3
 DIST gerbv-2.7.0.tar.gz 5691407 BLAKE2B 458440dd69f20fee18ce09953c7403d783b2b7df1bf977e192b1ac877ebd9ed535ef7712417e112cff82d95e1c3752ae1dd4d88dfe14dea45df7c959337cb6ff SHA512 a940de027a9cdfdc513b0740cb402d312ae33bb7f002f80ee5f3e800aa5d01b86ff277538d8a19a309d852e248b2c8136645ede2d5d33456e5bfb49336c1256e
-EBUILD gerbv-2.7.0.ebuild 1033 BLAKE2B 2bb185d77f4c3b5318d0e5161891d7fd96aeba294ac2f288ab9cbf0173965823c9c4fd3f4b698611a68166f1254d0a334b46dbe61a84c37ac23fc4a5a98ae2e5 SHA512 6b671948013de422e391e07172ba25c9bcc64822bbd968ba628bab1dc3c89f2662a7ec87c22a82cf757218b02aca63e4ca487607fd8602e4f6ba716c7611111e
+EBUILD gerbv-2.7.0.ebuild 1034 BLAKE2B 9ecb7ce9805898a7f9dd0a436b7f38bda89530ae333c07ba4f1e92a8805923f82b836000cd3825da49d66bbd498f124ed342229660d668175631c8f987b1c702 SHA512 49d8f805220a2ff3f5c5adeab3ea3fa63a2ff02447de4ccfec3428163e5d84eda52e5a8af722e0998f4168a238ed89063c6cdc71940d62786cb5e4f0e2175ed6
 MISC metadata.xml 803 BLAKE2B d9038af386a91a0890d45fd7f90e9bfa7ef0caa85cbb6d97c3686ad1fb3adced642114e17e8cbc645e462d15ff8694470e16edbcb794f8b2c583655be9462de2 SHA512 d26fbc758c4af9938c552ca131d04e20433ba8de527d306bfdde5e6a5b552fb20bff8c5223227fd1605e7f5940b713365041adfcc6754e1fa3cbab0070223f1a
diff --git a/sci-electronics/gerbv/gerbv-2.7.0.ebuild b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
index 48219cd522a6..8bca34e8cf4c 100644
--- a/sci-electronics/gerbv/gerbv-2.7.0.ebuild
+++ b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc examples unit-mm"
 RESTRICT="test"
 
diff --git a/sci-electronics/gnucap/Manifest b/sci-electronics/gnucap/Manifest
index adb03910dd05..393e31c5a5a9 100644
--- a/sci-electronics/gnucap/Manifest
+++ b/sci-electronics/gnucap/Manifest
@@ -1,5 +1,5 @@
 AUX gnucap-20210107-fix-paths.patch 2683 BLAKE2B 17b1eb4e0907b0e29e9205118d718f4da791f607fcbe9b63200c2c033e15a54fd305a25a5ba6c8440a84c15117175c912b53f8420e11b251ffe98ee505982faf SHA512 8d3be906e263e5444c4dd9ae9cc3ce241ab49a9fe9e4ee947a0ec594336f980a79d9a62905391d2ba2f510e2f2157dd8b9482bd384c7042ed8b893d51aefcfea
 AUX gnucap-20210107-respect-ldflags.patch 4151 BLAKE2B bb169c64b85625151d1edbdd06de0922459a94a6233164f11f1673d5863abf785e919e5a7484127a1ce6b2892eb3aa44c8dcbcf7e6c58e8538846e187e856e0a SHA512 1df0dce4e1aa44f540f731dad1bd85b72b90422b38e29a7c1a80f3d79e83a0fb4501895da2783e6d92e9301e5921e8a75940bdaf633be53fe6fb2fd22a200a56
 DIST gnucap-20210107.tar.gz 801944 BLAKE2B fcef1e234710575285446c63cae85e2ef7e82e74ab65627614b8cc2bd0511427b63aa352a335c2b56c159b9129ce4cac998b86ddd29c19f9c57a63cfc2354676 SHA512 7f85a69f73808091b0826bb671174ad2515771c36e624031fb2fe79671366c57cd20ce9c973359869146a90fc568bc0ae1c354655e9d5cd75507b069f45cbfb7
-EBUILD gnucap-20210107.ebuild 490 BLAKE2B 1cb1354e3a712b0f0541d369d5dc3fa178a607f4314b7ece1d7da2ea9a077270120477b9f92da2a0286ff1676a032fa3b942fa4b9fc8df3b574554189e87ceff SHA512 4a3c5aace4d193488177775384978f958206e37213c6d7958e587612eb422d66f3ebbf6a35c346152d3b19b82e3d314efc51c8b2639993129be3980998b2b7d7
+EBUILD gnucap-20210107.ebuild 491 BLAKE2B c71f0c509a5ef57034f0813050f4b6501049bb8f6dc3dc6bfd74723e3ce3b7e4f98be052522c7e9cb351e9db4a2203693be1868ae7651e4ce7768fc3c9136ae3 SHA512 d5fe4da2b70ec20c1431cde591d05632eb790157279ebd8689c299652bbcab9f2da26d3766cf14a02ba745c900f4e6a54b097bfc934708a62882d0823fe5d078
 MISC metadata.xml 745 BLAKE2B e60b11b8af54db5c7f8080f7397a82a2c6583cf517cc5d1f4a0db7af846015d385584a05e3725d2a60b448e448fe350ed020806ec5ce66f4e42e4b830dd8fd3d SHA512 55022ee6b895bcc4ffe24f2d784cdec87eaa66965b27017dbe5ce993daa829d667f5e22df298c31e3df4d73d120a3293f7d68a59b66b866015fa502afb5b6eae
diff --git a/sci-electronics/gnucap/gnucap-20210107.ebuild b/sci-electronics/gnucap/gnucap-20210107.ebuild
index f29ea8e434d1..9958fe58fcee 100644
--- a/sci-electronics/gnucap/gnucap-20210107.ebuild
+++ b/sci-electronics/gnucap/gnucap-20210107.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnucap.org/"
 IUSE="examples"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="sys-libs/readline:="
 DEPEND="${RDEPEND}"
diff --git a/sci-electronics/gspiceui/Manifest b/sci-electronics/gspiceui/Manifest
index e9ae3d3717c8..5667da9fc9d4 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -2,6 +2,6 @@ AUX gspiceui-1.1.0-flags.patch 1017 BLAKE2B c240c7d48a50b508b1f4426ab63690985694
 AUX gspiceui-1.2.87-respect-users-flags.patch 2257 BLAKE2B 54d18a89166b45fc121fc6f62cb346ef7cb8a6ae7ff5b5835a10aa2de4134ccb872c2cfc988a45636d54622912af9a1b9762b6964f2daf3730592b982cdff9a5 SHA512 a03dd8f0f150fca14f8fe26155920fc3da535c8313b12b5ff8746cc61a1fed765f86ce012e9e6639eb77b1a854acc76c4b0f80fe224cefbd9e3df97c72143412
 DIST gspiceui-v1.1.00.tar.gz 1048236 BLAKE2B cc3d14137517cd26687dabac7e001e7518fee91aedc74f1995ac763873345f2965c3edb4e037ecb6ac8ca874289b2e658fe3185d95b3eeaf2b349efab151f37b SHA512 46ccf3dd7a5dd9ec1cac1eb742187ecab15a6c0033467d52a44c916e239696faf7b8797e1a155191cf0ed37b04619b0666cff51e78912a06ecd2c63d377cba93
 DIST gspiceui-v1.2.87.tar.gz 1089733 BLAKE2B c1801bfebd5d42fe9c1ab26e6fd0cb06b56cac53bbad272522896325e5fd979e6fcc63d6f99262b152180f249b5b2d4aa119aa83254a2fc07256574c9ebaef10 SHA512 081d04c39f4fb96139f12fa063dfb888e036948a00a6b55de3b04a49b2b4af01b45fd9b7f903855d798a71957452550dfa8c8505c167c239e27ada29cb6fa747
-EBUILD gspiceui-1.1.0.ebuild 1892 BLAKE2B 21d35e599d7187a7580cd96fc9fdeb00edb48dc8a0eaffdf4230f1a309e3dde514f78391c6926917e95126d320c7dadcf00f905373c0a495b0e1208d9c6e08d2 SHA512 523ca58e4db3a28529f7820c1322cfe27b88457412374b8c57502a9182f23004e3ffd659545958a67f9734261f30e0b3a740545098923478ce227263bab1a044
+EBUILD gspiceui-1.1.0.ebuild 1893 BLAKE2B cc40af6cca78603f21fcc66e5db237a53fb7d658ad53c5193559dcd6b4f1353462c95108741c5962cf590c8ac9612b08042cc3912eb7ed1206a249ec4259a126 SHA512 dd589828b75d4789c130f1a3702233a231b19e6862f43e89689d3766dc1af7bf74f58baf488711822b497327d967c675f6e589b1304b9825c5bb2388413d2e7a
 EBUILD gspiceui-1.2.87.ebuild 1838 BLAKE2B 1c933f1a2502d50b23a07531ec035d1fc36a161868184f8956c4e243da280a5fbe20dff10da89770d480f377aff52a536b5f57c590474115526d7795226be749 SHA512 09ed1215672d1926b7ede1990ed7746cf9c7752be3c8168481f0943d5c5d1f636f724d242fa54d7b6e84b4dc27260c8d277ae032c61283591f12a8ae190acd8f
 MISC metadata.xml 560 BLAKE2B 7bf55c85b52ee2e7b7627cddf9fed3aef875057b32348cc770ae4f1765e415f24184769ddf4c308b107f2d3d87a53f0bec0aa0e7b67932536a669a6e1e447f0d SHA512 6700697e40e911690b27fdf068d3cb15c0b03c59e8af0258459109d27a6e709911f60fd555d59ce8b02143f36d1d462e1e6f336a8573e45537c6a6a6c3d4b67d
diff --git a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
index 81c6e4c2d621..daaf5cffbd0f 100644
--- a/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
+++ b/sci-electronics/gspiceui/gspiceui-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples schematics waveform"
 
 DEPEND="
diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index 3666a57aa157..ac69750af35f 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -2,5 +2,5 @@ AUX gwave-20190116-as-needed.patch 4951 BLAKE2B 793ce3ac5eef8bacc7bd2959efcf6a22
 AUX gwave-20190116-fix-configure.patch 704 BLAKE2B 095e1de7917fc391d95ae867dc07990311f214495704d47d715ddf678edb12c748d0b9bdd98565f6efb0a1b3aa1fedbf015abe620b8fcfcf32c869f4a20700d9 SHA512 60e616dfa86c055d94ab0f9fa5add1fe1c15771c5ab084fbd351e60d6233cf429d80cddfad55ff5e0d7ae2e5d2249c4c402a20e2808c62fbabbb390ab2f0a703
 AUX gwave-20190116-multiple-little-bugfixes.patch 4003 BLAKE2B 328eba93e6f8a8c4df62cd47ce411550cd2938777201fe8bd72457f867f373cb70683d33ec7426f97c937c86ada314aed6cb94d287cea57726a995324d93e6cc SHA512 878a881d33898111c6bf528a6be8ee496fae5a07553656f1c64371cf191b2c80f85e51b72c4ed39fac54b961192b5ba774600c74515e2b0682ff139fd809a877
 DIST gwave-20190116.tar.gz 472342 BLAKE2B d3781a757d288548600626c2105828162c9eb72930b1a3c741adc63eb275097a98f75fc73c31c4d57bee2e959952ca51e8af54090ff5ea0a2b780ee645da7e4e SHA512 5c83306dfa4aaf7a0e9bb27be3c8a0e9e47d02b15afe78938e23b815d302bb162ab35aab05b67ede132d0a7c51519b15ef64a7f87df4b8da9ca9b93b82410b7b
-EBUILD gwave-20190116.ebuild 1135 BLAKE2B 76ee0d6b232e498b7dd1e96a490f88f4e630cf0981d121a2838f06bc0976c5981449fca802b4743a659326c5cee7d9b12fe706bce07bbfa6a9927f054176987b SHA512 5611162917ac1e95a446d4d1294deca88c98885b2d2970d37110b7486947afb19a9a6a24c1193f258090f8c0426ba6cda8b15f04345aaa035d905441fefa8d96
+EBUILD gwave-20190116.ebuild 1136 BLAKE2B 2b5544d814f1d6a11c5684606ff6f94537602d9fb4aa4d5bfe2ab8ecfbba4daee11a6b1f488a08bdc3071fe3c5baf7417b59c4fa0863ab9a832b805a95b3c228 SHA512 25306b362e1dfaabc92791a81ec27b9984f314d33d6d49e6f1be25e10ef2ede2daf1b15af1b5a503e9459c8af825a2e2a01771893ebf427b5a7beaa88997fdab
 MISC metadata.xml 730 BLAKE2B 845a9e950954f0d44a5a8658e62b5f2751a06921becfe8daa75a9014e949f4da16f9d3593ccdfa2d54ca70305d7600d4a8f8843b913a8fa607eac23942af82b9 SHA512 0759a2afb347e0b2fb9dee6ea17740bc6a7d916af65d74954847ff8fbff9880e9faf6584ab410c3fe56dc1c9a1d8854171b3f6bce9ae8f0aaa6f8c689a413636
diff --git a/sci-electronics/gwave/gwave-20190116.ebuild b/sci-electronics/gwave/gwave-20190116.ebuild
index ff747645f0c4..e86b222f850b 100644
--- a/sci-electronics/gwave/gwave-20190116.ebuild
+++ b/sci-electronics/gwave/gwave-20190116.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://gwave.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/gwave3/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gnuplot plotutils"
 SLOT="0"
 
diff --git a/sci-electronics/iverilog/Manifest b/sci-electronics/iverilog/Manifest
index fb72db9ed7c5..3a29a02eccd0 100644
--- a/sci-electronics/iverilog/Manifest
+++ b/sci-electronics/iverilog/Manifest
@@ -8,8 +8,8 @@ AUX iverilog-11.0-autoconf-2.70.patch 11616 BLAKE2B f753698b8dfc21914ac68d092515
 DIST iverilog-10.3.tar.gz 1600835 BLAKE2B 107c57c61fb27c18f4020f7853bf6ca83d1a86fdc73c57ea207828baf6b7a26d42e43ce7b33580f050a4c0b8f63bca6accecf678323a3bbbee1eb9c1d8fa2caa SHA512 67076e19a208576c21a0462ff7d15d00a9d47740c47518a5523bd928b3118360d85eb84c317963717d15e5246ece3727259f6ff3baf59e195340530cc9086a1d
 DIST iverilog-11.0.tar.gz 1682457 BLAKE2B ba90574e1453a095143e76e5dc79bb2357a721fc62c24f0fb23d220458819cb3b8ea8494410ce956e68831b682b61f27f64e94e9c166a69e5f6d5d30a8269a11 SHA512 5d6a65e1c3b6b62e99af708cd5a259cc69c6b789dd6eff69e225903d9b8c115d9e5d6f7635b30c6558197cd0ee6fd8196a163fbd98956e24c211d97328b85056
 DIST iverilog-12.0.tar.gz 2995096 BLAKE2B 7e1d4d8302168da3d38aac113daaaa62b80e59d7485be142443cd57ef346e788d9b58564af491a0ad58f64c06e475696238205f3e673f10da3c2cd417020fbed SHA512 a8e112f760903335ef2fbf00529e5fe282b83c1f583c4316373b9410d7fad2a53d5c4adb82dd62491c14a620cb5b1fab117cb0cde638c86b65fe5b7b0dd07152
-EBUILD iverilog-10.3.ebuild 2126 BLAKE2B 9336f71dd709a922c6b20b8523d2c0bcef3decff9fa186b5d01993e411de497136212496a848aa8b732bb46d2aff8f230825014d2b2723c833b5c1c02dfdd1d7 SHA512 31ba90af04135da16bb2b6c6f239a0105b213849fc7bfe68ff73580683d95d03e50c5e018399a639d21c3010f89548c5553e0fd20aecc6da0dfca07d3ef317e2
-EBUILD iverilog-11.0.ebuild 1543 BLAKE2B 68cf06b5f5d87fed8fcdf90a318ec6cc7aa8c4075340fe275506ce694f3aa05e9a5d621ddfe7122a20aeb6574c55120c96edfbb75e6653cb8292dd08b488c76e SHA512 b9b992193f1e1a5381a13238cf6bc69c0132d18f637f6abde44be10696b2c4aa38219d07f1ad730deb1b24d75beef27bb2da80b5fca3e4c8230ebbee323d2f2c
+EBUILD iverilog-10.3.ebuild 2127 BLAKE2B cff10bbaae8e0958dbf2d8dace25cfc570251e27ff4bc17e11bfe20dd58b3a89e65b887198e3d0f366860976185eb0e9c3028c34489ecc0b7924c9d6b2aff659 SHA512 c8e545a19927d35cde74dd4bbc13d8d0d3c6b2f92a84634d89f37f179407863874185cf760b51dedf2926a473d5f342abb55ed141e558069db5705129e1c59db
+EBUILD iverilog-11.0.ebuild 1544 BLAKE2B 66270eaf274860de7cecb2fa4092e92f3807df0dc79fd16a6977efaae069ce759d18c70dc76c77a814230301efdae3c0f9b02c44ce5a13097bff1f2866aa45d3 SHA512 9740f845487ee40233f9e9ed3a1a1be416a862ac1174d0d410b1124052f9b44d8d7bc51579b2ad31cd4d8b23a99fc4b38ad38e207a69ce768b875081b858f0ec
 EBUILD iverilog-12.0.ebuild 1493 BLAKE2B 563796d9822f01289e5944fda05b44a96fabc8eb5c37cf116138a286d66c43d97224cc3cf6605283ea63b6c6fad9adcaabdad91e1969bf8cd8584554c09c598f SHA512 eeb3b772295b2e167f81fc1a795e142ee7606ae75cbf3a4b4cb999fd8fa9ac49eba25a92c211f7151a360568f4a48b8d10ae601787927434e6416abc9382df86
 EBUILD iverilog-9999.ebuild 1493 BLAKE2B 563796d9822f01289e5944fda05b44a96fabc8eb5c37cf116138a286d66c43d97224cc3cf6605283ea63b6c6fad9adcaabdad91e1969bf8cd8584554c09c598f SHA512 eeb3b772295b2e167f81fc1a795e142ee7606ae75cbf3a4b4cb999fd8fa9ac49eba25a92c211f7151a360568f4a48b8d10ae601787927434e6416abc9382df86
 MISC metadata.xml 935 BLAKE2B 43c8165799b301c14618858df3e2591578aa4b5605e3ce0ca08a15337b6a53376863db9c07451d4fd5849d71fb2335bbefc9f2848b257079c2fe5b7d731361a2 SHA512 2508fb58d82acf9f8784197a03874cc73cc99b46c3d41dce2f2aee6e75a9a107bcd66530c942cf2d329fd31e48ce670764cd3042f8e6af2027e4c4e1fdaad2ef
diff --git a/sci-electronics/iverilog/iverilog-10.3.ebuild b/sci-electronics/iverilog/iverilog-10.3.ebuild
index a0e95ea74ac9..ad66c40b299a 100644
--- a/sci-electronics/iverilog/iverilog-10.3.ebuild
+++ b/sci-electronics/iverilog/iverilog-10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
 else
 	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 	S="${WORKDIR}/${PN}-${GITHUB_PV}"
 fi
 
diff --git a/sci-electronics/iverilog/iverilog-11.0.ebuild b/sci-electronics/iverilog/iverilog-11.0.ebuild
index c8842e156a9d..216f953bb8fc 100644
--- a/sci-electronics/iverilog/iverilog-11.0.ebuild
+++ b/sci-electronics/iverilog/iverilog-11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/steveicarus/${PN}.git"
 else
 	SRC_URI="https://github.com/steveicarus/${PN}/archive/v${GITHUB_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 	S="${WORKDIR}/${PN}-${GITHUB_PV}"
 fi
 
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index aa23025dfaca..50eecc0f18d3 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -4,7 +4,7 @@ DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b0495
 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.232-r1.ebuild 2245 BLAKE2B 763ba17c9caa35a3dfb22ba878112f6a4398483f5187105fc474629ec8054753b9b3534f5d57ea51ad6a3515ac9a89973c6e2014d7892b81a38d4bb0f8e63099 SHA512 f558458beee5a56a5fe4a79fce2cfe6387bfb64e8e19c09909e543d6b88db7ccc7baaf567dea9791e79ee52d4e192bbef71e76f8d5c3a5d5ed9944df955e55dd
 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
diff --git a/sci-electronics/magic/magic-8.3.232-r1.ebuild b/sci-electronics/magic/magic-8.3.232-r1.ebuild
index d3876aa9ad6e..0dff7656a79f 100644
--- a/sci-electronics/magic/magic-8.3.232-r1.ebuild
+++ b/sci-electronics/magic/magic-8.3.232-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz
 
 LICENSE="HPND GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="cairo debug opengl"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/sci-electronics/ngspice/Manifest b/sci-electronics/ngspice/Manifest
index e17d177ceb56..4b75a732abf5 100644
--- a/sci-electronics/ngspice/Manifest
+++ b/sci-electronics/ngspice/Manifest
@@ -11,6 +11,6 @@ DIST ngspice-40.tar.gz 9431981 BLAKE2B e45d5d7a9e8d9d3fdae4eb076090a588680055a74
 EBUILD ngspice-31-r1.ebuild 4510 BLAKE2B 88b9e231cf3a19bd83f554ba235c86e081df699b5fb0b9d481eb5ab60a5c421202fe56dc5a2bafd5e82ff54ab1b7e2ac77f06eafdfc7f12284165636afd794d5 SHA512 b8ef7664e175d802dc9ec284cd0f40e2ead1810c78cde01f5a9d7d793f488d5f686603e8817f4fea6be1476af5ba3dd73a00735a9b0fa89df7225615a7ea0a60
 EBUILD ngspice-34.ebuild 4620 BLAKE2B 781dd445ce1e14499d3f1fa2aaae4026520e6c8194f5e7a9525c61d067537cc59ba774b914c131553aad8d9e18e5b2904809a76c01a35bc7dc9d082dfda9f906 SHA512 79e036d956bf02f544f833a35ec229dacf37e851ba76c3e931fcb3edd52a8e79f3d2e9d3ca30fb05f103caf94954954a8412ef10b0ae1839979b0c1572c83836
 EBUILD ngspice-35.ebuild 4587 BLAKE2B 450987f87ab81dccd90bf79e3a470ac54fedd47dc9b4c1b78bef07cfc39b22ef088cc110e5303f399e9e0b2e83b7d2a5247dd8d98d040a82d2b751db6ac7dd3a SHA512 02c78a4f942ce452ce19e6a2773f8a790be8fcd9a035df9a43cabbc3ec6c1bc79bd3593b40935ec141423c61dc0d9f06344190bff437bfe2c6722c8a11cfa11f
-EBUILD ngspice-36.ebuild 4592 BLAKE2B 8b774b0cff6f3544f3b1ba5713c2ace05f9116ff07692a7b01a98abadba841fcff08ce9f6a44469259016b5b3356442acd58f177777d8ecd1edb39ef2c98e86f SHA512 0aec985436560bf6a5b606b1afa79ce66ea8ac09178ba7029f5a4eb0fbed8509cfbfec2003c109fe0b23519fff19d18db7df657a02e43caef9ec7f779db63d5d
+EBUILD ngspice-36.ebuild 4593 BLAKE2B bf6fe45a2e52c1c7273874d0ac901b3daa22c2fc131c174dae4e3095a178f64434bc91c3684a8424c817d6dd8a5bb31c345857e00da5129b52f2bdf8996b7ec8 SHA512 3669142875ee68383f2bfb027d4d574c056aabb564d628c119965306e57bcb4927ab0975ec8d6f21ff548c385bad5452bd252600d48e8122ca95759d9d94d82c
 EBUILD ngspice-40.ebuild 4612 BLAKE2B b8d675588b1d40f17834143e769c2471dc2fab971d43cb39291c1a42ead3f24c34bd0dc003dfbb1572ad5ca6fa67462797e8c008ab5257d0c295288ac48ebe5f SHA512 3707608175b72e01d142bfd7b4790b2b5a750a386e7b94b08ff78659760ecd0d656e15445d8c1ed5e73c41aaa43e5b3ee184e216eb3964fbbcd017f225fd2756
 MISC metadata.xml 677 BLAKE2B 541ff3e8439b8e222916341bb9f973ea2189a5b2aceeb1bd83ca7a73af7161f38e272a93fdbab51aba4f14be53f556c10a5c10be2a807ef07bca9e39fa73b6ed SHA512 b439de3838f17c9c21e50cd80d74b733d0061f79a7e736c82295c3db433bb786cdab8dc73ca1b40f6a486288f29f82b677723ea1e13ca583b0456fcfa82de206
diff --git a/sci-electronics/ngspice/ngspice-36.ebuild b/sci-electronics/ngspice/ngspice-36.ebuild
index 254b93c83e34..0a20c0490177 100644
--- a/sci-electronics/ngspice/ngspice-36.ebuild
+++ b/sci-electronics/ngspice/ngspice-36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="BSD GPL-2"
 
 SLOT="0"
 IUSE="X debug deprecated doc examples fftw openmp +readline +shared tcl"
-KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~x64-macos"
 
 RESTRICT="!test? ( test )"
 
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 43b94c4e81eb..7bdb31403d69 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,6 +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.2.2.ebuild 2747 BLAKE2B 27433604fba8974a1a72a72f98e1204b675011369741b9ded01ba43f1f49215f182503e182c0dcdc69c3fd6bd1e919c5232c68af9fdf23a09d565e4c11ca587e SHA512 63a085c69cb94fd87905783b121d1d80662f045be564418b78d1ced804840f0632c67f713c92c9949268d882afac6df5f39906dfa42f46ec994ae6342cbf23c8
 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.2.2.ebuild b/sci-electronics/pcb/pcb-4.2.2.ebuild
index b51e7ef4e3cd..8c88c3365640 100644
--- a/sci-electronics/pcb/pcb-4.2.2.ebuild
+++ b/sci-electronics/pcb/pcb-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+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 )"
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index ad0f921dddd4..f5883f27037c 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,6 +1,6 @@
 AUX qelectrotech-0.80-fix-paths.patch 2412 BLAKE2B 66ec413d1f69f1621dc9776afa91f78b7fa0d17aece0ea0a122616503319ec98df653b166f81196b8d891f327e024a8e19207e3c9ef8567038d186b1440babb2 SHA512 828d0677b1d5a0ef4049d3fc7c9fbc47dfa810252c881a5f1c7e2841f9676710b69ce1a001cd6b44e28980445782affd948cd8626e43e37f020a2247ac31f3e5
 AUX qelectrotech-0.80-nomancompress.patch 436 BLAKE2B 9f8d5491c4076e8cf1fea993180cddaf7a1f6d34556a75131c2a4799bd54228ce5936145c30f0edf33626c90eb9fcb3134ccde0685ce6091706617ccd408dd99 SHA512 6de49a59a605bff6f9eb3d375f698adbb15deec77a3d2283ba53fe63e73ec23098baa6dc5530f0f2c9f92de8f400d66e71c6024d7929f1b2a343720afe54597a
 DIST qelectrotech-0.80.tar.gz 13835653 BLAKE2B 1efb22c9683c01c3cc449a3c1deef1990825b16f11dc15d93e2d7c0afd026486ee9772e0d8637efcb576fb20a8dc79235cdcabc94d293b9bf8c2028818645734 SHA512 732101130e77849ed0a56bcc7b519a1ca032e8f203951a50e1dd5fd488e96f1ab69ed0854176604f1947636b3d8fda1ac8aebbcfe01e63dfa263d8f646224f53
-EBUILD qelectrotech-0.80.ebuild 1423 BLAKE2B 3def2ac1e87731b367926980c294fec104dd6257283da104fb1546b557c98887dd17307f2bc0cda0b268b917bd999f8ca6c76dbafe13c93a1abebc0dabd8ef99 SHA512 8b32aa90a8caf060d78c6a0799a397431438a7e5582428a342be2cd0f39996b81a347206b79f7b225b49c22f692a3ac7abdcc9205e719291a9982c95de5a7b3a
+EBUILD qelectrotech-0.80.ebuild 1424 BLAKE2B 4598cb75755ef4639b7ecf20fddd28e2e4ab6884a835c54baf5c02a0499fb8821cb6dd5f5dd24710597db5781c8c4dcd7a9603edf20d2954b38057483585f8e0 SHA512 fa8af8711d44454fe666128461e4e33fe069660c6ee39446b0713d73a7caa7552915d79ac309d7a02503b8b4dc30ff38ad0f48881a6bc1a3ae9ffe0a227c8983
 EBUILD qelectrotech-9999.ebuild 1437 BLAKE2B 3ee887677a71db332885adb0b8e5ba8065b7bf771cba3820bc028aa9354ff6cc5bb9c85342d2a0fc30d233913a112737a028f3d7bff0251d2297995432fcf796 SHA512 1c1a5125793c5122ff1cc1df095bbc06ab32616375c4fbc5fabc1a070e5e7d873b14ccb2eb5ce88f1866d9a6b86ee02939cdbde0c4f866f8d88b709c207bda61
 MISC metadata.xml 248 BLAKE2B 51adf67bdc3e6c30f18cb7c177694882c71c1207bf4e6b88aa0eb8d5f6fdbaea0c364777967125219ba8ea4be4a9ad3eb41269a7139cb211ce26f2985ac103ac SHA512 c2976d1256f14d4dcf6ea53ed248a43e9b76530c19eefb0e586d64b1080b75d1f4ac17171c6c27a491ce6623d34e9318fcba5ce3f78039f21ccaabbebf209345
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
index 68f5ed0ee26b..21b1ebfe0716 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-0.80.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2001-2021 Gentoo Authors
+# Copyright 2001-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MY_P=qet-${PV/%0/.0}
 	SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest
index e94ff6a2c0e4..a6ffeb032ac9 100644
--- a/sci-electronics/spice/Manifest
+++ b/sci-electronics/spice/Manifest
@@ -1,4 +1,4 @@
 AUX spice-3.5.5-gcc-4.1.patch 2511 BLAKE2B d9bb215dfcaf595d9f62a4748507342c3b6242f551a8458965e37c13e34432d686f00b91ee27d80451261b8baa9d0bd9616b378b246fc895b0dc1fff0d4975c8 SHA512 9ae98c77d8a95b2ccac03e48d778b431a449f8383938ca2d71dc1d77254a0dade6c159f1723aa9a00ac921379ec210584c32ae7e63a849bd07691d34bd92d5c7
 DIST spice3f5sfix.tar.gz 1377263 BLAKE2B bffc4ae307c8b02db998e412d09ae52cef1aea78ab28d0c0b040f2c253032d0f42978c2d3b0bb0500e78016a35e2064bd50d6f86abdeb1e885bc7f7f0978864c SHA512 a515dbfcf81b302667e4a39b0ee7f02715c2a6a3fb9b3d320d9a4bea81e557c85f14d1e9d01d598d8ad3a6a67a797c2096bc14acc8e5afb41bef51f56b400be8
-EBUILD spice-3.5.5-r3.ebuild 1915 BLAKE2B d20197821ec5eccaa74ea8762d9ee8515aecb58dc591ca73733d0701e0f785bee64c9cbdbf7ac48bfb4ec8b94707da44bdd14583e74a823ed3b449934999de7a SHA512 aa78ed2b99c825fc5741854a79340572ea9b81d17c8c654b310097f9018f6ff8a3ddf39c3f52ba832cd573a242dafe95bfd69d4767f49ed1a22771ae8ed939a1
+EBUILD spice-3.5.5-r3.ebuild 1916 BLAKE2B 8477f1b3b5b0b0987ac937bb81cdef1006bc2e3cc2098632c8c32be273055f6992af0fac93bf5bc28afe588daa87cf8198e2ff90f9fc1adff17d2ecc10e8ebf5 SHA512 685d2466f6450696cfa55975c29440f536680a99e5625c3471b357df4ffe1eb7ec48d735b7a1a8296339a4a384e40e57dfd2c06f5df606784baed3ebca3b843a
 MISC metadata.xml 796 BLAKE2B 895d71188de1aa825622a54bc39894209e783a14bb7d611d08f54800c02cf42869d10e56827c864ebdd77599b1700a3814e72f24dd25beb162b8cff677f7699d SHA512 0c661364645513cc53a25ff0d292b86254c1dce6cf0336210980dea9c47f8ac5113b4760a61237da27a4f167c822452e3a227ef3a9023b33604732fe3acb7eae
diff --git a/sci-electronics/spice/spice-3.5.5-r3.ebuild b/sci-electronics/spice/spice-3.5.5-r3.ebuild
index ed2fa12832f5..c1b8851af6c0 100644
--- a/sci-electronics/spice/spice-3.5.5-r3.ebuild
+++ b/sci-electronics/spice/spice-3.5.5-r3.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="6"
@@ -12,7 +12,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/apps/circuits/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="sys-libs/ncurses:0=
 	x11-libs/libXaw
diff --git a/sci-electronics/systemc/Manifest b/sci-electronics/systemc/Manifest
index 4f6df16d8649..7c8000b5354f 100644
--- a/sci-electronics/systemc/Manifest
+++ b/sci-electronics/systemc/Manifest
@@ -1,4 +1,4 @@
 DIST systemc-2.3.4.tar.gz 7142529 BLAKE2B 8a7e7e9f49b0131c1536d217dcc4fc420bc72ed962736a457cdaf3e40390be2a5051010317a62ba1eca17ee7ee4a171950979d2f07cb7fecc7286d028675540f SHA512 77fd1810fafeaa639cb21fcd77c7132c0ba3cf42309d3e09953c62c92f83b18e6de2e26620cee267683ca851503e5a8419523e7c9161f2ae33aea372af0be966
-EBUILD systemc-2.3.4-r1.ebuild 1181 BLAKE2B 06a618a1bd4c1951989b47b564cc6de6b29ef7be1483a0c934fa0db6caeba00bdbfd6afaa93e73e2e31c3268d2cd97a081e7142b73092686d20eea000e12727e SHA512 f21eed02ca3405c4dcd6715da92897f113baf6d16fe882626c31f5f3a5ce2be086320cf8b50edd6f46361724fc3a0a4895fdf8bb36f8799d550d0a071448c046
+EBUILD systemc-2.3.4-r1.ebuild 1182 BLAKE2B f239a73bbf18ad782440cf3c20d1b27dc6b65605c1c0786ad88da50da5eabcad225c6f1784eaaee338c5f3371990fbd98efb8310248b446fb579c45609adfd55 SHA512 91aa7cdad82a3e4b0bce5ed6d87887c5cc05f25ca5ec72326cf637f97d874026b0d898b2c6dda113a102e32b7512e8b4f6b58c27de3d085ff2e457f23d0a55fb
 EBUILD systemc-2.3.4-r2.ebuild 1223 BLAKE2B 8b15e91d089f634c838eb52e5dd413a7b10870680f4dd1fed4e50570fcfd7fb7cc0707248752d55348bf0373b1c623fea3f138151b05a81ca14579949b872009 SHA512 a2250d479f35b6e3cb6d41cf19a81e5c87799db4027daba948d91ca66f25cfb6b6b29d94d4143af80e7c1d3cb56208c86db9abdc559b7ac2125a34265ec2a194
 MISC metadata.xml 1094 BLAKE2B 8edeeea6726686d80ea047a7829ffdb313c8e31b80dd6b8c7e6da98102f66635807d4049da38a74197b270f67f25cf875a36234c7cddbe25649039f4fe5a5364 SHA512 e41a951f37b22345d5991e588d9a038df08fa379d7bfaf2b9860aeb2c6dd4795413d9d411a70bdce6f71a624c9b24c329dafd18aee9f2ee1d4368ff72376cd1c
diff --git a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild b/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
index 1b392e0ac3e4..ad0a4ea125bb 100644
--- a/sci-electronics/systemc/systemc-2.3.4-r1.ebuild
+++ b/sci-electronics/systemc/systemc-2.3.4-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
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/accellera-official/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/sci-electronics/voacapl/Manifest b/sci-electronics/voacapl/Manifest
index fc9eb89170ba..2ddf5a4265d8 100644
--- a/sci-electronics/voacapl/Manifest
+++ b/sci-electronics/voacapl/Manifest
@@ -1,3 +1,3 @@
 DIST voacapl-0.7.6.tar.gz 2114486 BLAKE2B 2177ccb93e83a2fe29ab14b1884c0a4adc9de02dfb35ab0d4e854405110ae2583e6d12f6d646e808f39e77e357639ce5ce3a3d8c425c86ee3d85f6050ba22e47 SHA512 192a974cad059ff265af272c195c8184e18785650e194d25906bc75de0c3d99b9730f2e8131e619300b5fe9f6dfb25cf1437b6701d019c5e6574340d8f6e113a
-EBUILD voacapl-0.7.6-r1.ebuild 556 BLAKE2B cc2d2c6d045ea79810d465a72e111b631d11cafa071490ca86658791302c4cf6f2a5be61df1cb20088e2a01b153047b166e26ad99ade39db510e83b98ce09738 SHA512 ef5e1e156b40e26997412dc7450ea26736e30a8c75a7d6fa9ed5924b804f16ae0246710810cd2843ac04214fa254d454afc4e707fa8580d9a08ef533b10b0c53
+EBUILD voacapl-0.7.6-r1.ebuild 557 BLAKE2B f5835729b0aa23f9954f7f803226fee9c1af2aae3c354b22def06a5a7d7e4aa00f4bf40686473dc1638864388d15a0a63de4abcfb7d0a35e6b15a64082c888c5 SHA512 b3931b48a5f5c594e18256bc1973c2420f0b73ca79d669a1c18156e1a9d9f1b8ff013cb2ab4cde28823f59279b36a6f2af221409113f2528dec47df6585ac577
 MISC metadata.xml 331 BLAKE2B 1246824081f9a6a855b9ad0fad3c961996264c78949f1000f757c71c21afe022960b800d255088c7ea019ffdce24019b61f7c8eaf6b5b0239ac08961d991e686 SHA512 0072bdade52bc3d991b820db5af5c8f51f1d94034ff6ec4f272178b67a0539da633fa54546cfeb2fa2b782fdae9a3e1503aa70ce15dc7da18d2fbe06c577c547
diff --git a/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild b/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild
index 829abdbfcb48..f9d44130cf38 100644
--- a/sci-electronics/voacapl/voacapl-0.7.6-r1.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.7.6-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"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jawatson/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RESTRICT="mirror bindist"
diff --git a/sci-electronics/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index 5cbb1d2c4970..f440d9f07429 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,3 +1,3 @@
 DIST xcircuit-3.10.30.tgz 1619256 BLAKE2B 5316a2dc7d9864eefbdbf1647920c322c85adfbe27289a7c4dfc719940921754a6e616af530b20b3ffa159004ce6808cceb6e4d9349dcbc110e2e580a574c7a1 SHA512 52bf65fa9b5c095092f60abe32b3c88180365cc8043a8e95652ea9ab20e01c3e790989fe41171ecd1b2c60684016f6963c4851105b17a1c8a3bac8d75db84a8e
-EBUILD xcircuit-3.10.30-r1.ebuild 996 BLAKE2B 31d6d8afe9dc452bcbf13dccb297e17b1494ede4a6962215e9c93ef65f27b74eb910e075f106157227ad0c3f6b44fe4b67c3c6868bd3b586c661384f2602d156 SHA512 3efe219efb77588fd99f0a6bbfc751361ee5f27a16f4357ee56149c5272ca062972ea874242b7d43356921a3612ed3f1f01274ea483e09cf72335c4fc85dea71
+EBUILD xcircuit-3.10.30-r1.ebuild 997 BLAKE2B 4baa4b68cae16172cb45c99b729ee8434e272761f90f294510f12e9d3215d0a47a3d73e376a1cb236382eb834c5145412f473f3d17746721875670da42edfe5b SHA512 83436efb984085e794bb58c6aaba2886f7b8fd290459d5c1e048707ea5a89b021b069590d0d1ff75a10ef16d0d6cf45a747017c013ffc52132df72d3b0065dcf
 MISC metadata.xml 1333 BLAKE2B 1fb547b0d383602672a1152fbeb881a135405ff0f3c95a2a533fa6e40d10b94437e6556fc75d8c9f229d2d17930ef8da6a737d001f8cf515f2f6079b349ddbf3 SHA512 4baf29f0b6edbf09c2e53f3787d8e288b3efe288d068229162106f5cbe108c3b9df14cef6c9fa9757c5f1586af4a83c6bf5c4661b32643ffcedfa2334c9b435e
diff --git a/sci-electronics/xcircuit/xcircuit-3.10.30-r1.ebuild b/sci-electronics/xcircuit/xcircuit-3.10.30-r1.ebuild
index b4cf6a10fb70..99dddef08239 100644
--- a/sci-electronics/xcircuit/xcircuit-3.10.30-r1.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.10.30-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
@@ -11,7 +11,7 @@ HOMEPAGE="http://opencircuitdesign.com/xcircuit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="tcl"
 
 DEPEND="
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 0c2afd3a2f14..e8b09adbe998 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1,3 +1,3 @@
 DIST xnec2c-v4.4.12.tar.gz 1496988 BLAKE2B dbcea1e24382b9f2bb6e881007b44dcf99b9caa7f970ecbb1363e1a0e232d9d1bda6fe68f90622d81cdc69b3b9ff6019dd4b123d6a79f8c6bd088dbd804354b8 SHA512 0d1711260d7f69633d9e6bb559f3b56c2a25414f75ed913c643c0aaad5e4062834ce6c7c7816741f65436173b331e6f8f957c4a624a77214414865bac94ab7e8
-EBUILD xnec2c-4.4.12.ebuild 1060 BLAKE2B 855ccb5dbb9718bddebf69a5289c6e758fa2e5cbe942735d26e058a05e9f58f5e8890c8cb76209278a0b94f4039380be521687f0e2ceaf6a04a9c500eba6673b SHA512 e0cc052099c41cd2260ce564df70970db640c8d3d2e46cd796ee7988337ea41015ee26d4099d779d41960c13b15677f6476629dd1123550d7aa96831eb249830
+EBUILD xnec2c-4.4.12.ebuild 1061 BLAKE2B ff49968725592577e469900b89b320fa00d9f0150237995be2c7dd05192dd44163bebd2a4be31b5f4446c68805d39cba993470dde60b81b2d93fd063317392dd SHA512 83ee7d3ec855c3e4936528c8d814b971eacd77f3489dc52dfd9298950f54846d35f67822c9fc2d3ca7b69abfa1cab460e13cb78269b0716113cfd370e46528d3
 MISC metadata.xml 1635 BLAKE2B 97a6599a38ecf5914360b4e5376fcb6be56890a91e0274027c327d69fd41459a740a5ad4e2255e48c676bfabbc60a5fc3abd13fa7f9157ac3572e24fa11752a3 SHA512 7564946c202c11ab3be96071962e07870fe97433fae5a9998dbf0cc62de0c83885fadb71741a824aa45e643641baa77bb887ea70687fa15559119fd22d83eed3
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild
index 7f956b3139c9..cb4d85bd034f 100644
--- a/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-4.4.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 50362ae45d82..fb72538c75a2 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1,4 +1,4 @@
 AUX xoscope-2.2-man_no_-Tutf8.patch 421 BLAKE2B b8ba8523d7d6d717de4e4fb1a60061c1f929b095cdb9349b624ad589b39abae48f59cef33aa67486c3550594945b0260b8be494a950c6fad73dd597d1826b99d SHA512 54b39e8565cd464e014d111441edc8d191d85d07d4bd04679df3c771b9e28b3d7b619ae90ee532dcf8ebda6e79b5a3452130fc7157f79619e74cc8b3600d398d
 DIST xoscope-2.3.tar.gz 390105 BLAKE2B 140dd39a9fa754c9ec274041ed0f64124f58b68fabc56a940498d81698146e8474040728360b25ece367cf64bf6b31e2e04b246529d73d4829242b8570eadc3d SHA512 9f1c15a240644027927e1bc39d2a0204d03b8dbe9d1d2aed974d062777562c6877d46f6e3768cf506799d902373fd26a090d94821b0f791f8f3151f7bb2e7eee
-EBUILD xoscope-2.3.ebuild 735 BLAKE2B da36bcd8d94931034088d384e0846e37c6027d8b33d8bcc1dffeabd433bae41080251405b5541387d5b48bb9d3b6268eef2cdedc478ad15a2df7444b57f2c138 SHA512 cfd508da6a1605b5f70e47728d7b5b2c6828167d86a05c4c88a0b1577dedf2a2bff7a2071896a72a68cb6d831fd7bd8b4ffab4179ae2fcb9f7c218e44962b12a
+EBUILD xoscope-2.3.ebuild 736 BLAKE2B 88520f7ed1f121e5681ab0447750976be99f625c2074f48f4d0d0f56e283de9eec34aeb9ea99f6be4aa6fc5e1e8824ceb24eaafb4522daaf65d83c0a70d80fab SHA512 2868f5c510514fc2c20dc2f1202cbdd23a763130f1a2939f666391d7185ebffe048084b7ee8bb51375609205b674cc25bec06d4eb0575cc5bd65d05626abb354
 MISC metadata.xml 347 BLAKE2B aecfe7b1030fd3a5a89713b979d4d9ed8918911ee1374ca84668bde476cec9300d7b71c1a6630b8a34f9655c71220e1fe18033fbbe084b937f128a510541b0f6 SHA512 094f7e3c45044bdf3eceb9d55d4ba9828a6e8669caa0981aeb556f95d9505eb295330ce41c437dee88d8ce83e8bca5458b24453b5d611750cd9fd4f0fd8ee004
diff --git a/sci-electronics/xoscope/xoscope-2.3.ebuild b/sci-electronics/xoscope/xoscope-2.3.ebuild
index f2b41d1c55c3..69434a3f9cfc 100644
--- a/sci-electronics/xoscope/xoscope-2.3.ebuild
+++ b/sci-electronics/xoscope/xoscope-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index edcabf92618f..402a88600b8d 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/dcw-gmt/Manifest b/sci-geosciences/dcw-gmt/Manifest
index 1b3f1bee794b..5d6b225fc349 100644
--- a/sci-geosciences/dcw-gmt/Manifest
+++ b/sci-geosciences/dcw-gmt/Manifest
@@ -1,3 +1,3 @@
 DIST dcw-gmt-1.1.4.tar.gz 21117179 BLAKE2B d5aebb5251ddcb82a6df28a9ac0a8e37ad45a8ef48bdf5e777c85f7194af7710e83e7ff3a204a9325d7b9c62ad3e3d41008f106c127a8d710f29a4b9bcb10c13 SHA512 3ea64ce9cc162030b40da859e8617e6c724c3529a57d2e6ae8dc311b4397532d8946aac7f66f49707dc85d046e892faa77bf1293a66c949fdf0473028dc4beeb
-EBUILD dcw-gmt-1.1.4.ebuild 451 BLAKE2B afd13b43c9c51358599df8fa3730f8734542195b15293cb8708b34d2f68a52f99beb3232d9a417ae63c357b294d939101edcf9af6eb946025f04e4587da5a696 SHA512 64308f4bc0a6e18fc286708473ffe52a1bdded53da2d60519a4d5e2dd7feaa3479f8d5968a6e23ad7aef4ecceca34fdb414bb2d9ccfcf9f4a0f0a07e09286508
+EBUILD dcw-gmt-1.1.4.ebuild 452 BLAKE2B ae90af26c9f6d81b62c3e882fe44ae01fabff2440917e07d63c56870f73ea9156fa6af90f1251c8645882dad71caca0fc2101afbb7a5609bbc5ee46431c1ade8 SHA512 8e70a0a287806e5e34ed67d294c8a9adab26f73812db03642f0951cc446a16723674799d68ab8f5fb1a01771004968baca4b71498ed31a68970419999d390cf1
 MISC metadata.xml 835 BLAKE2B f4bd13aaa472a6635ae35ff7f715b4b6d980c76f1228ccaa6d7f99f0fd8e6a2b12cd05b1de1ff8888b5717eb15587bf4f4ccddd5c8be46458a7f73609b3dfe38 SHA512 dd8e1384275b3bf96336d644943148cce233ee86f72d8c7d3fe09b06d8177c55990368af9e8c8cdd3d2d6d939643adbc0c61531f02ec88f112884f247ab501ca
diff --git a/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
index 3d11416ab7ba..38d659823262 100644
--- a/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
+++ b/sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.soest.hawaii.edu/pwessel/dcw/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 src_install() {
 	dodoc README.TXT ChangeLog
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 6f5c9b9b4a33..9ba28f824d7e 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,6 +1,6 @@
 AUX gmt-5.4.4-sighandler.patch 573 BLAKE2B 1df9b28c9a23c929c86af060845a1e5346f366e4469656c0cc405c2979819870734666c5c777a725a04b2508dd85d84cbccce6ca8000ddd0b1e32f755038e17d SHA512 3e5b26234ecaef39658ef1e82f90b5ffd86ff5fd0a91eda829c92fd11a886e1c4106f0a578b5bd223e3ae9b75dec0c44022112197bed69fae09cd534f7e535a8
 DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22
 DIST gmt-6.4.0-src.tar.xz 55875004 BLAKE2B 887ea35708d354f3812822b1effd4906ead129a186b0117930bb46e057671645e3d2eec3e0a104aa3e06092c6c28857f5dba2c8828b61847e618651eeaa5f146 SHA512 0748215cbe9138a0ec3c7168019fee438e53c1d80a836caa33fa82d4d5ba30525e636a4a937ab9cb1c90cf07181c610f7ebcb5e844f0019f51523613878f7e40
-EBUILD gmt-5.4.4.ebuild 3084 BLAKE2B 7ce77400d0aa0834c9681581b88fd8c27c01c4e1c3bc12f5973aa3ea29d25f00dc18f7462d5c55cbc0b17a64d2ea95b53299b69be2e56ab24ce16db888c8cb41 SHA512 8906114f67a3210de7b0d08f6012b6b19b88dca0fdd621e364e627b96d0642bd6c0bb8ade05d06548bb8c8e631ff5838525e8f9ef86612f943ad59af5c115fe7
+EBUILD gmt-5.4.4.ebuild 3085 BLAKE2B b948907dddde73aa76be9c5c6ea4d46c7885e7fefa4de8fc11210cb9e0f5f6bbd8813608f9bf136838f73bf505fd28282cbb4937285fc74bdc49e84b917e8070 SHA512 1dc699f0e7711d4f72c0fe4db4c26d90a34f1f3cc7a750b11af537f92551ac86e3035346417df87e5a2ef33afc962517209ff895f60308464af7f5ffe0feefb7
 EBUILD gmt-6.4.0.ebuild 2615 BLAKE2B c104e6c6382f4caaeb47dfbe176c5de29ab6c8fff16e251b86467caa8a593494d4a6e8495b1a86fff58b41d5a267c56c4d0c3822ce793ddc9ea223422043e436 SHA512 a36bd6550fc700e9199d0a3b3939e5cf27ffde48959441975122b4d49490c7844a51a999d3d553152ee7d8f67fa76d6e9fd77dd4d10e1a5d0304973091d13f95
 MISC metadata.xml 803 BLAKE2B 495348da16fac57337217745efbb67a20ddf05d208136caaab926434b84f765c7c7f044dc026bf5df7c09fbaf443f210e19f3bb8e3bc5c1b68b5bfb2bd0379c5 SHA512 09e8b04766b871f579b84541de88f19c8f6bff63a9b6b36bbc863cedbb0e3bb3eeb13becac2a793b88dbb2ced592f5b8d80f7c421c7491be4a48cd56fb402205
diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild
index d82f8a96ac37..15ac033c5501 100644
--- a/sci-geosciences/gmt/gmt-5.4.4.ebuild
+++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gmt/${P}-src.tar.xz"
 
 LICENSE="GPL-3+ gmttria? ( Artistic )"
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples +fftw +gdal gmttria htmldoc lapack openmp pcre pcre2 threads tutorial"
 
 REQUIRED_USE="?? ( pcre pcre2 )"
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index cf1026f19bcf..20b83b0f5769 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-maps-44.1.tar.xz 2349152 BLAKE2B e544427972f98d13c5c072c234006c081fc000048956cdd795f47225bc73771d655f048bd3ca7d2478f9afd23d50b6f26df95a08ec24b92c1d80a2280a9d2f60 SHA512 918a490491b86aa2648dae844dd910be5e4dff339544a6286d35c341bb11acfa1587de04fe2f2b3aff46c57c4175fc0bad50c28a253ffea8bacf274c0ca42f72
 DIST gnome-maps-44.2.tar.xz 2349116 BLAKE2B 52fd29cfa89ab76c6b041d9ae77453b75e5f9d2fe2de12d0ba1f283c4d16920156e9dffd54dfd0add9a37e66c3a4c49bb4ad43d4733f41301325f281e15fe458 SHA512 ea435f3a5a3ed9e4c3054e3fbb2f3dad253f0150f7555c734d06db3a039ece356c61294a664945b5165b004001d8724428aaed527ba0ca55fae2f7d37833e6a7
-EBUILD gnome-maps-44.1.ebuild 1212 BLAKE2B cf3df69380ce7050a1b0bba86c7e8ed8b50f6d11f7cafc66c18a841e66b09d3780d3e0a44bb205593f465f01026654f4fb5546d6b0e4dfc1fab6c685ceaf2f63 SHA512 787f09f67d58f3c5f2dec635eace4aa8862a3d53a6b3ee6b194f81af9776bc596181bc8964d15674bc88f1ec0a6a0889466fe36fd50582c8b58551c3f9e50df8
+EBUILD gnome-maps-44.1.ebuild 1213 BLAKE2B 7b47ebb65be672b5f03c23c369072ff383634eab2900e2b0a5b2970ce9586e6596ffac181a1579ff7a6545af9b82a1895acd9799df278d0cd247a1090b6e0a31 SHA512 32f4b499e7b76f5d3ceda4742e6c8f79b1dd0c491c8acff1bae856238c3f324c8e07fc5b4f2b6b5909bbd4a30c800b0845d0149bb9af2264d149b8fed1145ce5
 EBUILD gnome-maps-44.2.ebuild 1214 BLAKE2B 2bd90c48cca20d84ef7573502c3a51b43049fe7e415eb85ad824a7c45e28e37a41fb6ad53c96c4b5efc4c9ea0600dd1cb1e9a8e5e52b4752c3ebb797f555927c SHA512 3b05fbf10b4f502b1a27154a4d00ff6c0e4e8edec78c1ab81bc00ab0f60e9cf2e12a293adc08c79469b148a5a039d7c225e439b33d3001cfaf640e179a2b0531
 MISC metadata.xml 351 BLAKE2B 720552be0df0a6687b1c65211e4532bcdf2f76a1dbc2cfedf801876006bdef781b6e7a3caab9f61a6d5a17fcb73caaa194bb54d356fd903c6ba3d8849c1e8ae5 SHA512 cb4a26c3d4dbcdc7e6ba7cd7136cddf8633002eab39741c4fe5d033bd3154d17d002d475c8f5370aae652ba1b34f952ce1401ea8d71d22ad4ea4aae364fe9645
diff --git a/sci-geosciences/gnome-maps/gnome-maps-44.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-44.1.ebuild
index 044ce1fcc1c8..81cfcc430d43 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-44.1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-44.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Pure introspection dependencies found by grepping imports in ${S}
 RDEPEND="
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index d48b5cda0421..b0790915b5dc 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -4,7 +4,7 @@ AUX gpsbabel-1.8.0-no-automagic-qt5-qt6.patch 1382 BLAKE2B d0fda148f51ff575dfb86
 DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
 DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4
-EBUILD gpsbabel-1.7.0-r1.ebuild 1769 BLAKE2B 9807d1fedb74f998b87b71b9fef86e8e2b32fa3d517aa9ae0935e2ef5813e326039cc1f662c5d6645306f25e0c0e834225489d658e9e94b1ba66ae1e91654c12 SHA512 60a3988906575b57e7992a086f421de995e32849eb1f457c537ba8a17c9de4c6fbb7ac66b64ea1d4443010a5ecbe201bf44f30665765ebadcbde6e2c419fab04
+EBUILD gpsbabel-1.7.0-r1.ebuild 1770 BLAKE2B 649bb9a27da4c58b78bfb04ce02212a4c8f0a63ebc8d092bdbfe0ad594633f9a1c81d2a2af953bd3c81a774408a1e35a6afe76d4b4ccb55be96f84fbfdf6ca34 SHA512 a5c9f59aa1f752eec82eefd59d39447bab7cde8308158e91c017dd6c73c4c03c5cfd6ca69bbb6188fd65b4497691b64dfd32c211eb28ea9cceb7926ed1c3ee10
 EBUILD gpsbabel-1.8.0-r1.ebuild 2192 BLAKE2B afd4fa6f9c9042ce43645b1bf37060b2c94b14e4f9ca31207ffdd1f4d6940c73c1cdd07aebf596096f19c5dff7ba26a07e08ce6408e51abb5a31aeb4edbd9474 SHA512 56df45e4ed2b1ada5c8c590891c22d76aa8feda4bd65e5ac24ced75c33113243c8e40f8c45454bc0975cef2d2a0e5824ec5e3fd56839ad9ccaf67f6aa79497f5
 EBUILD gpsbabel-9999.ebuild 1771 BLAKE2B 320ef893e9dd23777a2473f1bd62939c62d1fb5992e07512139081ccd5dfee8fb68a240772f080ef4cc4082d2a948cbba9a48c3c37356dfcf8bdd9dcd48dc9dd SHA512 4ec6cc28126be0cd7acfe2ccca8fca10d083afb24b1e97e2c8dd46c6db9ea93389e7bcfa3378e027bb1e12a52759b2a1265b473fd9abca683a838d938b144980
 MISC metadata.xml 352 BLAKE2B 1b6ee2c488060cad27a6e3c0e6a0c767f0fd29664ae4d09cf3e373194e5b102e234f2d2b6fc80f6385f1d49bf581b8ae8bb591be9fea966e3f75a771cb0a6c12 SHA512 b7558f62d902eeff8165c7d4eb9b9dccdc1a8740b51de5a7283f83378974a6b375b04e3d01b48344eabce23b8b6a127a8c92c87ac49956225d15418ed0fdcfdc
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
index 809c7f441b8e..f6c49d49af26 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
 		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
 	"
-	KEYWORDS="amd64 ~ppc x86"
+	KEYWORDS="amd64 ~ppc ~x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index a1ec92019437..2615b8b4571c 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -3,8 +3,8 @@ AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee5
 DIST gpsd-3.23.1.tar.xz 3450632 BLAKE2B 5057d2ee4734be169c909fd4b8fbe9b5bd65c99ab3ee7e5cc843ffc3e3a033f29f7a677e7dc0a09bbfba28a9a95336e43e4dda09455d90c7ad5a548848778cbc SHA512 21a14e1d8dfa7bef08560107c333c5ad8381914c68ff47ce091506733623a3e5c1dc79e1af303105aeec96490e17d2f10ba0a359250a58f9101af157baa5479d
 DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a04b169b1984bf61ecce6b20e4fdf112ff23c54d7647bcec374eeb285f377833cb303dad3449e4b3a028f07 SHA512 96b1967220ff8837271a8974883081a8254fc3b7f3ab3a111ef49ccfa88d86bc82081cf24d33ef849fb5867d6263bb4ec798972e15095501e1feafdc4c14777d
 DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6
-EBUILD gpsd-3.23.1-r2.ebuild 6113 BLAKE2B ee5ac62e67b40ea7b61ae17cb93bfd8cd7c48586b5de5567a9782bb64022d4d4cc265ae7aea6ecbc81c8906ce4c31eeafc652abe4b3c731ed3e8ae8de3cf4bd4 SHA512 8958778a2b5e30f85207b14ed8190b9cbb0d95d59acbf4713b2bee3aa93ce5dbf4554959437159d6f869f4bcda330c0f4bc14ec108cd40f5f75fcc98f81e9b62
-EBUILD gpsd-3.24.ebuild 6319 BLAKE2B 25176846f3f04f94f2cd752f8a627ddffc649ad1eca2111d23c0d1548108138e6518b57681c7a03ec6dbe6bedc070c1b521bca656d133d15d06d535e41f41497 SHA512 feaaa3d229137dade98853bc3db459933d0487065973d3f1d1be2be5287e21d7e19148a999805ba6e5a4b712c3d415d0bd5fbe5590910f40c90b198e9664238a
-EBUILD gpsd-3.25.ebuild 6310 BLAKE2B ac967370f29352c9cc0ccb84840b8c870e059fc81ebb5e2811ae18dadf0d5a17d877c8daed8ea2d1bafa58855b1b58145b539f195dc1e734db0b5f749b4d0b33 SHA512 4729f16fb515de292aba41eaa0bdeb96578711aa3cee42e3ce5123d5928d4d3a57f0c57e3d0515d7da5dd02f7b5cf233de1f379f340549324a38dbed13ccf82f
+EBUILD gpsd-3.23.1-r2.ebuild 6114 BLAKE2B e8f3db65468308a230ebe728c77d01453a9b7435ef6746ac3f36e6695325e74ec8c88649da719dd23a1d6be7791bde4860fbc264601b75015e1a9ccfb0196e14 SHA512 75be3e17e87b266b8f1f32a2fc429d4c9311d4a5460d635c8de83831fb3d4449a834f390213d865684736be624bab94e6917e53a606a3ea98cbf138137b4baf5
+EBUILD gpsd-3.24.ebuild 6320 BLAKE2B 0380b353ac5ed81b0764fb1796c9640f11a03d0ac046504995db3c12229e47482758c3f3946c538e130690cf648ced96d64579a2eb5ee9f6ce3f365ae9159a4f SHA512 929071862cfba2acf964908a01d2b18f108cf80b5dd2bbe434895e54b131eaa05c123bfdbca889d9b9a84c6c9203669c82a6d4f328b9614d98673a58de46c111
+EBUILD gpsd-3.25.ebuild 6311 BLAKE2B 4b1d2caf94590d57b325079dd758e1e2d4cf4f51d7fb2dde8a07bb1d8a07a26ae284fefedee07816bb11110262f90d1355869b5d4baf0dd565a018b92ea22a24 SHA512 bbdeea8bfcabc3e393a5c51d2f593b6d59b553b5db716fcbb35225b17a5be313919d0f953eb2fb0aa80676506d12d491e974bf19bab4a4af917771ce762e54c6
 EBUILD gpsd-9999.ebuild 6314 BLAKE2B 1f3ef0da5c61c0cbdba65d316f5fed2330416e4441e046e3a996d9c3d242de0307172736b90a94fa02d8cc2ceb394755f3bce33ce808193432898d0c6fc1fb83 SHA512 93b022583f0ed90bb1391b4280d55ef2802e8535eb807ebeab7d8b737bfa5d5144624a42f1e63886e2c54505159db342eb18564e49450f2d350ab9e7035a5b3f
 MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397
diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
index 56d41a9013c5..65b0b1bf3424 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild
index e484dcef731e..b53f262d6c8e 100644
--- a/sci-geosciences/gpsd/gpsd-3.24.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 8186bde296b2..95012f056712 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index a6ba55b76507..12baa9dfe456 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,6 +1,6 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-13.0.tar.gz 5494687 BLAKE2B 819d60204d491443d68c83f1c3849cf9aaaaaccec00e357c03723ba9e86db2d79aca9d03fb142e23bd596840e05705a76b340dd036bb3cf4d06c57a53d83b28f SHA512 7d2dc37d52d6f63dc1377e52b6653d95207ea176c2564c613e01375a506b8fa9fa22ed5e2f506a607cf24b164758353cd404f9f86d64b51e4601efa744fe9632
 DIST gpxsee-13.3.tar.gz 5496128 BLAKE2B 9bd13e84977552f47cadaaa4eea6b73695407acfb8175dcc596098a98612c6573fbf335ebe93c8b072884569d9991321f2d2bf7bb003993ce4c650a1a492b208 SHA512 a2e017f90a14b558bc72eec6ecc27d5773c8b17817ed4bb36335ac76639b89ce7e6dc25ad396069be8b00239d97e2fb6ce20e6d6d4746f1e0e06c7d9772a23ad
-EBUILD gpxsee-13.0.ebuild 1215 BLAKE2B b7dde440a5960064cbc971fe1f4b21330272afa068e28286b5a422d4057b1b89b46b6895e4c389c90e01b4b5b6dc2fe444fd0ee2396f2a5cee12af7ac070b08c SHA512 5ac8562ce8b8eab7bccbad3d50e6baa37bf9fd103c67c6806d99679418931e455d0e4f765a7ae1b8b8150b69ca4562a2bfe8fcc135ce6f342f49154585b83141
+EBUILD gpxsee-13.0.ebuild 1216 BLAKE2B e71e366936ed4c68657102913cb297c6bcca2d9a370dfd77e0925f8c6f5d8f1308ef4fb0336c844c7a83200a10be4b293be2b9fe3b652ba11e5f9eef40f52e09 SHA512 936d8409e107ff8ee697644c19084835e7b418c8b9153c9b7fde5fb1194319d3fce2f23dfb8ca195009580b1e44ddb79fcb90d01f15317d004d09f7712d0d2d6
 EBUILD gpxsee-13.3.ebuild 1217 BLAKE2B ef246596e2373d83ec6285052e9dab105dbfa3147f52c15bb099a8bfa186e4727019dc02dfeac67fd358c1bf7a93a059b45b3e9efd41399af73775e778a88224 SHA512 25378bcd9d5eeb2ecab0f72b06f624b1322c61f5df0d34c8b6ab8b2e0228393daa07ec47f13988b758b3cab095af7fdc5d89a45a437439fa9bb1f53a2b5d0518
 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3
diff --git a/sci-geosciences/gpxsee/gpxsee-13.0.ebuild b/sci-geosciences/gpxsee/gpxsee-13.0.ebuild
index 47317e48601d..afe33a42226a 100644
--- a/sci-geosciences/gpxsee/gpxsee-13.0.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-13.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 822033882088..da4c05bc0c28 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,7 +1,7 @@
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-8.2.0.tar.gz 66819726 BLAKE2B e4398368dd8fd26324709202f42556033a0fea12b6bf5b300c9c416e8758472ceacf40e1d3d540b1aefea88199c0f411462a64fc5e09864582e2e4ce743d67f3 SHA512 8179b8704ea688ba412496d0e149c5a47b89fd557b613a49f3addb9721f166cd3aa23ff2549832d9940e5065893e3257ce7287e75018a3468aa7847392398930
 DIST grass-8.2.1.tar.gz 66827246 BLAKE2B d48e9169e7a444ed378b968f7d3cd76a6626c3a8d0ced9191c95842e2180178f9fa40a85b0c6a07742f22029b654f93909cacaef2ef2ed017b545183c7f163a3 SHA512 3d48519881d2ad0862185aa7541f39fd5ba19e53918655962b66855b330d693a1cfe9370c0283eefd49a2813e5e9f3399edc03e4e1e15518106342b3b105c661
-EBUILD grass-8.2.0-r7.ebuild 7039 BLAKE2B 3a3d71eab47f8b6e756461698ca002b59d1c7d68de4b0c9dcb336ba7a20345eb0e0f564f2fcc30ad02285c235b899f85531a19dba0d204032b75c051db4c0a1f SHA512 4a45392b214a476579dbb7e71a3fe6e907498d625ca8a4659c590dbb1199c343e7f83155363b45f682411390c60554d8b5ff2f157d1f5d8b4b8c57e9ad53c920
-EBUILD grass-8.2.1-r2.ebuild 7476 BLAKE2B caf0cc4956ecf1c1e546fa94375694af9c04bd2402b513b50943637dd34802fc0458a72db13a53c31dab8d541db2abfe3e8f67b2fbbf7a683dfa5edce1f353eb SHA512 96b263115bc0e719d6d8d6268dd704a37c5ef1011c247529a57103635dca0154ca6138983b74d6265becef849cbc75207c962b47861ae3484a19ac9e584ad4ed
+EBUILD grass-8.2.0-r7.ebuild 7040 BLAKE2B 67ec8b86b1d142b6cb65626b8acb67b3dcef883e4d106000ba60e15a12d38b31d996d22e14dacf19a0272e946ddf463a420ee159f8017e0c7413e42499aacc35 SHA512 79a2f8010fa35e770aa0d294db0cb65ba7573c0eefa1541b2d2677d5e1f37396cbd99bc9c00cdd15ee9ad426547bcf2fc26bdeca394b05290d200ddc57f2dd88
+EBUILD grass-8.2.1-r2.ebuild 7477 BLAKE2B 0a046890bdb1147a5c1c11942ac91be79ae19876508a32501926a1c436f1acb5112d8b4cb1ef9b8f14bac51b233ced8dda6c2686b81b011ca8c0b786a14c6de0 SHA512 2c25567c04f4367f7842181e23d977c06aaa644048e0e2cb6111a6f57e8551125b1888703ef4d32ae1e44b0a49319b5e67256d45d26965499c0176486b718cd7
 EBUILD grass-9999.ebuild 7418 BLAKE2B 6b5c73b7c4d1b271dda2a6b96dbf78803440cc9cf9cdb502648900fb6cfc42e71c70d2da85b4002acd326a0c4af65b99ee4a0932b1d39e47c72041ee9871d7f8 SHA512 0ecf99a2f65a740227f14fcb4cc7cc6c0eae27b1c3cd49db133096e553e46ccc864ca9ded025a087939493830ad9c7b1096f28c3f771b94c5ce96bafd8b2b546
 MISC metadata.xml 1260 BLAKE2B f1947bde5f78b608d59997dfe2475021e1646f3c70d78ba9d9140642bff040107f0b202bf91f5ebb05191169274c2fd564889992dfadfcada6b95f4bd1c08e9d SHA512 6bcbe13f8daccb68ea167d7cc9797643ab9b50c1c183c52d53a7cacc4f9ddfbaac583426b13be47bed67bd5a3d6b99a9a8447886749b3f87e8d45420ce111538
diff --git a/sci-geosciences/grass/grass-8.2.0-r7.ebuild b/sci-geosciences/grass/grass-8.2.0-r7.ebuild
index e30ecf9a377f..356ff4cb62b9 100644
--- a/sci-geosciences/grass/grass-8.2.0-r7.ebuild
+++ b/sci-geosciences/grass/grass-8.2.0-r7.ebuild
@@ -25,7 +25,7 @@ else
 	MY_P="${P/_rc/RC}"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~ppc x86"
+		KEYWORDS="amd64 ~ppc ~x86"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/sci-geosciences/grass/grass-8.2.1-r2.ebuild b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
index 491dfe74bf6b..0dbf5e7b2da1 100644
--- a/sci-geosciences/grass/grass-8.2.1-r2.ebuild
+++ b/sci-geosciences/grass/grass-8.2.1-r2.ebuild
@@ -30,7 +30,7 @@ else
 	MY_P="${P/_rc/RC}"
 	SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 ~ppc x86"
+		KEYWORDS="amd64 ~ppc ~x86"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/sci-geosciences/gshhg-gmt/Manifest b/sci-geosciences/gshhg-gmt/Manifest
index 47331203a2e1..d786d74daed8 100644
--- a/sci-geosciences/gshhg-gmt/Manifest
+++ b/sci-geosciences/gshhg-gmt/Manifest
@@ -1,3 +1,3 @@
 DIST gshhg-gmt-2.3.7.tar.gz 57052180 BLAKE2B 5b618c874cca97da819263c3c436db1235d3293712a72c21ac4ca3ae78e95b5d36915312de3df361f978b14c697884ca278bebc41ac4c1d054adda6c417eb5b9 SHA512 27e97efe9d146a58d1c6674c5b6cde6b7545be60c1f7d3d93faca1034986d1648e73b589de571897fc53cd0d050a5875dcc9923e3f861f8473ca568a8142d727
-EBUILD gshhg-gmt-2.3.7.ebuild 444 BLAKE2B d886fbbdafa72f48940754457b522bdf857d2fc46001720b9830ee6d0ae93a81093fa44d904f84777cd31268d066550091b51a983e8ebf99a85f5ca383d1c163 SHA512 f792cf3013610dbb80bbc1ab3d67f703273c367d4e1cfbf1bce42d5ecf2f4b8b236f708c7559e731b09ab69f028616363ff01dee36809f279aa0bae848567530
+EBUILD gshhg-gmt-2.3.7.ebuild 445 BLAKE2B 818192911401fa082cc17fc9e0646e9d92d30a7ffb03e99da68822fb123f31798182e80c414e9e2f09ef343125841de69abc75402d319f5ca44594e899b84f03 SHA512 e3da6548a228723720347b93c1e8e1280ba435f062c12cee74b6818d5ce4e2eda6c3995e692ca0c84492beacd3371bbd9c72cbfbdf3973e42cccf3e617703b37
 MISC metadata.xml 793 BLAKE2B 13f41fd9d6c9d74c48463c055150a4a54dcb91396c74d7c228150be330557ca3ea2fd572cdf69b04ef7ab41ca99ed147da78700db102c6373eecf4e62023df8a SHA512 9cd2406b946cacd18c29cbbc1c59dcc5497f615ecff6353afb4956cb4c6ec70e83cabbeff57cf9bad4362d379cb5dc4566bd72b8e76090bbfefd3d53bc6e3d7f
diff --git a/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
index 5dbb1584670d..98d5752ac303 100644
--- a/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
+++ b/sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.soest.hawaii.edu/pwessel/gshhg/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 src_install() {
 	dodoc README.TXT
diff --git a/sci-geosciences/gtk-g-rays2/Manifest b/sci-geosciences/gtk-g-rays2/Manifest
index 3c207e47a41b..a55d8d94c32f 100644
--- a/sci-geosciences/gtk-g-rays2/Manifest
+++ b/sci-geosciences/gtk-g-rays2/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-g-rays2-2.05.tar.xz 898216 BLAKE2B aeba28398ba4be7dcbbfdae48dbf87ab4f6e9e9401981e4626187ccccc352793e39fee5518ece2197207c260b50b76cbfd59cad716fecb12e789a7577b4f1db7 SHA512 673d6e756f1a827e1c0de5384f3228e69a00a56588b81528202e80f5d2067213fd9fdb5af22028fcce0c4ea9e4d1b708accdd5777628ded351e3f2b6f2f57e41
-EBUILD gtk-g-rays2-2.05.ebuild 767 BLAKE2B e49286df90eb47511a3eac42c7032db28bd4969423ac6d4f97d69f701f7256ade2019610fa4eeafb9fb4357d5c54ed8965890307e74bfed85429db340eac5555 SHA512 5aa91684377f437d5f077dec14a0e32ea8115fc8ef9b1c89ff1a338bffb6ad7c25e877439c6da1ad21f0c05f38af69f0ed167dfb2b50afc27c2ecc68c3b7881f
+EBUILD gtk-g-rays2-2.05.ebuild 768 BLAKE2B 846d1890a457884ae3b51ed5eb5b1c22f0bf3c2538bdb6113d1985237fd6c72e03687c1e06404866e813608e71b5d5a8964e3f4d4d5ac9742a32f8cdfbb956e6 SHA512 484df4eb9728b9bbdf420f1623bdeb29f2abdd064de0b624a4f3a9f1ee8426a3d09c77792e4ce53a1871223ceccd79f8b4d70c292c7046271f8edc745ad637f6
 MISC metadata.xml 276 BLAKE2B 51ed91dbe57f48aa4af2c9fa6fc16fa70996a95e31096505ec3e9288f04182aaf09feb0cd3e2e1c45e37dcffc528c788995ee4c89ea73b3c736dd9ec6172788c SHA512 b0a243998a4962647e6e5bbf04f9d92837c969c5a2f44d1c752a032cf3f0308d0ad82dcab968781b8edb88aa49748e27da617e7c3587647d4637db0912a4cb95
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
index cc7fe5207ea4..7752dc2afb2f 100644
--- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
+++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.zen35309.zen.co.uk/gps/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/dbus-glib
diff --git a/sci-geosciences/harmonics-dwf-free/Manifest b/sci-geosciences/harmonics-dwf-free/Manifest
index fe8dc2a4ff44..d33f3c0a4f59 100644
--- a/sci-geosciences/harmonics-dwf-free/Manifest
+++ b/sci-geosciences/harmonics-dwf-free/Manifest
@@ -1,3 +1,3 @@
 DIST harmonics-dwf-20131228-free.tar.bz2 511292 BLAKE2B fe1e36da2155bc3b94bf0df2e6f17eb718dd4cd94d6b2aa719564c672fb1b7f25b6c1eca1900f4e28c37e7764098be806f33b3d72f9a07e615523d21ddca85c7 SHA512 b36ca3f432a455fee051418b7eb427bfafc7cdad929765ed6d44f6f2583e6b8c1d4992b21225d07636c418cc4dea2e353f3276511ba7b331bb8709bf543fceed
-EBUILD harmonics-dwf-free-20131228.ebuild 453 BLAKE2B c45c882b9b467fff622e4b63194577d0a613914addf05236df5e20512e16080af8f8c7d6efe29e3f99a99bb6a4efe39cb7906f010b66f577525a32355348b892 SHA512 b3df2b7f31b99e2ae970b5843cefccf3359e9d127da007cfc7a6433e75be60235a70792e3224919f4bf78b828af16a58a40b4afda10ec37c389e59b67fc46be5
+EBUILD harmonics-dwf-free-20131228.ebuild 454 BLAKE2B 61312796468984d04ac3d51c2de6ca1595103275f90c0671340052646266d93aa4fb7445d1429f756748b82ce26f016911d5b1b4826bba0087c202088232fb94 SHA512 3e90a354d9c5ab6313f9f73982bd32e27f5711f93307c34f17bec65280aa53eba0944439bde60546988ddb5aee70a5c7e5cf19fa78a763478cc2c88d13bcaa46
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
index c9a4f301267f..54fd46dbb772 100644
--- a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
+++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.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
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 src_install() {
 	insinto /usr/share/harmonics
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index ed46a4160931..5fe8c2b4f224 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,5 +1,5 @@
 DIST josm-snapshot-18700.jar 16421003 BLAKE2B 67310f9e1d2b64646f543573ee9aacac6f62ff40597e069e756d34bf4699755712bccf5dca8bd89c8185db5a470dd3d1c4242b02534e416fe04c62ca7f994de2 SHA512 7d6923bf3d5ba1f7331a3904d1b54920a301eacc53c720991132cecb00bfc2dca2e0fd9d58d90e88ff0e3f46207bed06b6ac002e13baa69e95cbc0c11b4e191e
 DIST josm-snapshot-18721.jar 16460468 BLAKE2B 6c5e86b31691a366211ea93e3094a8650ac6e2b42f4f72883ffc17819108cf717f1b29f2918788acfe07aae946f57b4b88be637069fc97b830af067de9a69de1 SHA512 53244e668d5269e8c20a0efadab9ab7ab665f40f1e02366e3491b3dac9ff1595a2a10ba34e063f56bef1c8e3c450abd237f6c02218484817960e8dfd7959db41
-EBUILD josm-bin-18700.ebuild 976 BLAKE2B aaf25951cb28d38145349c597d78289352b8f67583009721e4212953b6c230f40140542da3a5c6e426a1bbcb5a31d8f607af2a11b66cfcfb28af5cd5db71e7fc SHA512 4dde794985c520f37d8a0ad83de71cb2d0cc5385b156c4337fd52e2193c705788015aebc6028dd42b0504fdd0ac764a00c600b4c041003ad448adad4d462355a
+EBUILD josm-bin-18700.ebuild 977 BLAKE2B 1d92fa177bc617952c90e55c7ed083591cee3b6a58e36070ee0b1f11222452575b135d4256da94d4b87829e0b02b236064c82de89f4754e80e4159c91d7c53d2 SHA512 89436b6f1f3cb3f0c324054be45197e28bdec03e581af4cb36b9d6593ae47cb067b3ea5e28a1326c606db4f93c23ee77624c927a1d70745a0d87ff77a05dddb2
 EBUILD josm-bin-18721.ebuild 978 BLAKE2B e601ff9462741ef04a7e52d9afe1c2ead273f61854f87f3a770ae37f75cbb680bf09307439c39238b3fa36e8423465b6f7dbe205d2158f9a2ad032fadf4237eb SHA512 02831baa1bb0501b6ba1bf9a4ee04e0196cb76f53ac686e9d76132ee683dc7e6530115fe2992eb26373b7dece1d9acd872eb2bbf7abdd99cdf28b4558f8a4072
 MISC metadata.xml 645 BLAKE2B 53c16632c20c6f6c592d340c5dd466632489b9427c30ce13a427241e6e5e366120cbef12692363918e4ed0c4c0e26f3b0e55ec762d9d9c375ac2170674b2f55e SHA512 a87e8be8d5a9c404f1acde4c9fc77c820b4c1c97d9b3a9c42a92b5ef497c45d3cf3c4f33fa7226ae32370381de9c5373e65e2560246cf597120d2b8557c4258a
diff --git a/sci-geosciences/josm-bin/josm-bin-18700.ebuild b/sci-geosciences/josm-bin/josm-bin-18700.ebuild
index 60cd9ef522d0..d13df482faaa 100644
--- a/sci-geosciences/josm-bin/josm-bin-18700.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-18700.ebuild
@@ -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-geosciences/laszip/Manifest b/sci-geosciences/laszip/Manifest
index 19291ff49ddb..9719712f1ae2 100644
--- a/sci-geosciences/laszip/Manifest
+++ b/sci-geosciences/laszip/Manifest
@@ -1,3 +1,3 @@
 DIST laszip-src-3.4.1.tar.gz 219421 BLAKE2B b1bb3f66d9209c6a137af84c8d220ee6a50309139721b8e0befb4f56991e8153fc6446666ca5c2cdcb57abf297694f1f679a3961dabdff6450bc6dcc965ef6cd SHA512 001602a602dda1e43a08ee306b9c7c23faaf5777d551c269aac4a21b1c99449d2f12f46a0f95ff237003a0ab691eaca15b43b2f4d354651abc5d54930a39a134
-EBUILD laszip-3.4.1.ebuild 441 BLAKE2B 443b12c45144e706947906f88e069e0f62a2e805ffd2f13452afd09e7019f5f9fb526625c79f369e2a8a714b034ba57feab6a9bd9e7b3ef3d7afc9ae87cfde5a SHA512 52a7835fba07a0bc39a915d8985891e94dbb06ff2976abae8f2ef43e51f1078ab52d5e8c64dca7f69157b517d6a2ce75751f4080c9f69aa7ae793ad214776633
+EBUILD laszip-3.4.1.ebuild 442 BLAKE2B 6991bade3bbb8a3edb16021c668951e12012a8979af05a33ce262c497742fdddf52a19d684874a6cbc20662e5f5d48007560a487fa46c2c83edc64bca08a28b5 SHA512 a74c7f6fa4d2047af88e1632df10e34d14595958941d9fa6a4a1cf4215890714c7c4f3fedae19323dfb775795257478c278ce462cbe1570f13185a7bb507fb15
 MISC metadata.xml 348 BLAKE2B ed0e51225825d709f9058ebe57b8c4f7922d7ab075d7df44873fd6a84a7612c5490ae842bbab3a03fc4e1b0fd63cff18d2fe908a4df5826c3ab8d254e533bbc6 SHA512 1fd420bcfde5ba8f0929d79d88c9a977ff121b1ebce0c9f059257a8ce744a3605367b6e9d91698d2afe5d4c964488a2a5bf37a0997ac9670a28aaacae9a69002
diff --git a/sci-geosciences/laszip/laszip-3.4.1.ebuild b/sci-geosciences/laszip/laszip-3.4.1.ebuild
index be7c6bb38a1d..2d95b957e3e7 100644
--- a/sci-geosciences/laszip/laszip-3.4.1.ebuild
+++ b/sci-geosciences/laszip/laszip-3.4.1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="https://github.com/LASzip/LASzip/releases/download/${PV}/${PN}-src-${PV
 
 SLOT="0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~x86"
 
 S="${WORKDIR}/${PN}-src-${PV}"
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index 12d36e063ca6..f977da3acf67 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -7,5 +7,5 @@ AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d275
 AUX liblas-1.8.1-gcc11.patch 1332 BLAKE2B 1efbee0111a2368aa3820b1a6fb34b77c1bd1231fe381a892e0e2930089b101114f6b0b756cedc1a9c1858b094955227494ed1246df71b91b18be981065601a2 SHA512 588b65702580a851822f02068b9343d901c5794920f97120617c35cc2b4eb9ed71ee8c34351301a8a78b51bc36794e51414595e3ddfe5077c1371c873c3d99e8
 AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f
 DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r3.ebuild 1439 BLAKE2B 2643ba2d23653c716179e7341a338d264ee009713d003d957f2187e3433f9209d781ac3173f92a6b347f1c3993fc90c071d1f9d7fb3343c428b0de1652413235 SHA512 2ef7c0006adf6b10424097dcf8e86c5cf125b46e7726d124272598fb02dbcc4cf2bafd121bccc6105bcc22f969db5022cf42daf0fa5077abe7ea04c7fa50190f
+EBUILD liblas-1.8.1-r3.ebuild 1440 BLAKE2B 6e5a061486349b6a1350c05cda75c8160a30dfaff6cec549b2a7e50ffa6788b12d48525e22bc8ae4d286a8ceb82ce53cc1d347197b719b32a980a9c4d3e3a008 SHA512 6cce893f939f5abef47bb6e57c7061866a2383b24fb039bfc1f1fd6467afa8fbdfee012fa002044ede7977e568b5f7b23f2beeda352ccc51583bdfa690f23dfc
 MISC metadata.xml 377 BLAKE2B 94c501fe1092abff6c2020cdd2e38a55e6ee24f893f8fc97e25bb24ad711a5d639594852b09fbcb928743ba4f20916e7cdc7835b59fac14ef397027d935deb11 SHA512 8b557877e63bc6435d3b0bf9c40447201d3c044c110acce6ef7c98922e9d471e3b4898ab50318f4f8315d8ef7a8b8586abb3bb416ddcc268bf2e8b873188bb0a
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
index 415dc88ce077..0dfb99fd44f4 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~x86"
 IUSE="gdal"
 
 DEPEND="
diff --git a/sci-geosciences/libtcd/Manifest b/sci-geosciences/libtcd/Manifest
index e78e2183c562..b2992a692730 100644
--- a/sci-geosciences/libtcd/Manifest
+++ b/sci-geosciences/libtcd/Manifest
@@ -1,3 +1,3 @@
 DIST libtcd-2.2.7-r3.tar.xz 272284 BLAKE2B c0ba7c969272177d5388cdbc1d7de2cf05f54355aa8b1230afefecccb1c1f7ed40f30bf1e383ad75a2a4336d61b81d6163b93eb938530e98b9be789e0f86ecfb SHA512 741bb28fdb3998c75439151207fe1d85ee425a4e75286c0a8c68ee31b5fa79e097e7e6d2113315ffc90c11305df41aea022e691d1985c0b6b0d44a720d211e36
-EBUILD libtcd-2.2.7_p3.ebuild 789 BLAKE2B e98f35aba88169790082c69d942dbb123d23e536c03aa561b47095d9c8c1006cc3a2bcf50350f13229bc692bb60d97e5b3e2d921bccf12446250a086986366ad SHA512 ff3efd6b0952b10d580e17b2fc44c1d0af430fbece61fe1dd7b501cb25fb76c82f1f91af6388336f180b099f75200ad606f5768458a9251969d2fdaf996f18e4
+EBUILD libtcd-2.2.7_p3.ebuild 790 BLAKE2B 99ca119b606fc285278c8a64ed6928c42f64cb635fd47bf1fcbe2e2fecb61229ae24b9501010076645c167f44a5c64d585b83b26fd6cac4562c2abacbfec80a2 SHA512 a096934849582576144e5183e7f26f779dad61ea356cca46d44d1ffcae99a8bd896d37d197256b00127f0ec03f19c94393edc0bc8f7543738f80eeefe489540f
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sci-geosciences/libtcd/libtcd-2.2.7_p3.ebuild b/sci-geosciences/libtcd/libtcd-2.2.7_p3.ebuild
index e5729e417474..3ff5a581edee 100644
--- a/sci-geosciences/libtcd/libtcd-2.2.7_p3.ebuild
+++ b/sci-geosciences/libtcd/libtcd-2.2.7_p3.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
@@ -11,7 +11,7 @@ S="${WORKDIR}"/${P%_*}
 
 LICENSE="public-domain"
 SLOT="0/1"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302"
diff --git a/sci-geosciences/mtkbabel/Manifest b/sci-geosciences/mtkbabel/Manifest
index 01bc6da05a18..1ce5c5d9a2d4 100644
--- a/sci-geosciences/mtkbabel/Manifest
+++ b/sci-geosciences/mtkbabel/Manifest
@@ -1,3 +1,3 @@
 DIST mtkbabel-0.8.3.1.tar.gz 28472 BLAKE2B d17363f0b4e95360910039421a26083ab088f12b56c65b0687f7ee89dc9086f8c122ef7d62091cff9df1fd2c6f34835e6712dd0501d95517963c287e8ddfe1c4 SHA512 795d058bf622b5381600fc82a67aa32258db0ce2d1c22f148b6a1b34a6afe585f31fd0a5fccd2743602b55f53fa3b6b0f8c7269ebee1555a58374e33a80d22d7
-EBUILD mtkbabel-0.8.3.1-r2.ebuild 524 BLAKE2B 7bfbb103923c1a7f8819a0917722089eda580cbea2debc6525b8d3d0c85a1b530fde58bfc6ebb603e9d665a88c3ad01491da4d0e893f57b1c59c66f0d171ff99 SHA512 72f9da753906abb447ce2f42511aeb41cd667c06e609d87475703ead8ac12548a9e37a3574db9ef10e262dbf2142633148271a6beeb76b5175456feea546f84a
+EBUILD mtkbabel-0.8.3.1-r2.ebuild 525 BLAKE2B 917de75b65936990a819cc9782fd1746e0d8b92de0a4d2c79c1e682bc6d62f17664b0ea6844b8babd4a5db9608a5bd119695ccf82db7eab786c9516c3b06620e SHA512 84e1169fabf4f8324004dda686c6487338c6642d906696bf9a274f57283ddb8496757f8bc5cb54f1cb4b76e7e585cf3d482a0e92f055a3103161d83b1e7926b2
 MISC metadata.xml 547 BLAKE2B 476562efc37b6dfffb4a01e39e2fea3aec0ecaacd05fc2d23af80e5f009cbc0c826093210b21754e04a9f83fd4ccab44722df3de5841d9c8b283b26cb9f34e1e SHA512 ec55e4319df9a612f7ef13cd67e475ff09eaf0288ddfc8327e1b0344db5b696cc5494d6c9bab9bca09b2351c5c81ce141eb3c90bf84f0b068cc541a3f35423b1
diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r2.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r2.ebuild
index f6b774997b0b..f0924f4684f2 100644
--- a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r2.ebuild
+++ b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-perl/Device-SerialPort
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 33bd5eb0274d..2836357df828 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,5 +1,5 @@
 AUX osm-gps-map-1.1.0-gtk-doc-module.patch 392 BLAKE2B 73bdfd92240b7e96b05a3cf1c6b77075e1b2e45f47919b3123a036f71c43ef6530f939f40609531287594802f37d07d59cfc8de8fb558e99f33710954acd179c SHA512 e49ab51ed248a2e05130bb7c7774c486a71af46207e855ad95d6373d3a6859bd52d56cf7957a3b16f5d65114697f27aff1d3a18a398ea846b77d25c35752c404
 AUX osm-gps-map-1.1.0-no-maintainer-mode.patch 1048 BLAKE2B bd95f60bf9ba525e7bb9ffbc46a4003a4f00a19e156ba2a288aa0aff0a72fc2d5363004ef3e91aeb6d3c2caea43f710cf77dc76d61b26834be359558baae7af6 SHA512 e6cd05ca74d77851b4b40ec167bad20f1b06840378ef93f4f961fcf795212d5f0f5ae4198bd345143e0eb0418c4bfd9e59d62b69936ae68cccb24fb84d9f87fa
 DIST osm-gps-map-1.2.0.tar.gz 466817 BLAKE2B 727c5969b1ca1c681a6629cc0d35f5124e99de7116267e3135dc5dd926df4431b16045df3e1441eb1f7a68252b3bb451c26585b9907f16aec7800b9531631eaa SHA512 7d19a3f2afcaab6dd5d2fcf62a552f4f4481d494a8ce6a88f3db94d0037ade0679d1618107859c63cdc0cf72eb8c9380b435a4c3d9af68cd3f2595cc66bba747
-EBUILD osm-gps-map-1.2.0.ebuild 925 BLAKE2B 4fd22bd55f2397864973b1a03d7d87e44bef1ca06e63cf76d51bc45e47b5412125437f30a1e3922ea9c6dd4bee9d60100ff059b9d1505f4820f75bbf09f481b5 SHA512 0419e696fda6cc86d078881216f42eacf9e9662e2150456871629135778d54b40a3cffbb556b27575ea7eb08499299ba3f977c1f53ff0a0e0e08743822014795
+EBUILD osm-gps-map-1.2.0.ebuild 926 BLAKE2B d4491855c2d163deedf75044d68df53d04fd4d6cacceb812e6f4629bd903563761072722866bb1405a860256c73547edb6bb578310d084d47baa73198ee1d00f SHA512 a2c4ed795fe54884cd23e50a0741e197f534159ac88866448a5919d4503b3be690ccfc2ba196794f9f3f7e81ee4dad73e935ded81349465f68f69731765c17e4
 MISC metadata.xml 328 BLAKE2B 44e8606a488dd6ec51cc32435e190db51291a5777ce18665adb42b8adc73309165d62a55b41491ce7f866dc295defc54cef6d482da6178b1568d5e7a178be86b SHA512 f6ab0806342f23e1770ba196718e838628bf6d7c8cf1e8c80f52d57585a01676a59f0e69d6891e3b07e7a092ee2eec998f7bcd98feec38e8553c08481dee5e13
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
index 8aad36d2bd37..ac385b580b8f 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.16.0:2
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index f01b0a449328..79cb176a3c70 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,6 +1,6 @@
 AUX osm2pgsql-1.4.0-cmake_lua_version.patch 344 BLAKE2B 4edd5c655166104086c18cce8a33e8ef46adb94ce381a210f6d0d241af17acbe7cd27b2a4d5c28985faeae472f828f95fe11854c18db787f89f0624b4bf7c36b SHA512 47184a4cd60cd63dc4f2f72263cdc9c84a5f2e2d4b4f9e567fe3249113590f78894ec11ccab52d762611750e8cd331b56cb7ceeec5bd4dcde5c72ea53e20335c
 AUX osm2pgsql-1.7.0-cmake_lua_version.patch 366 BLAKE2B 66515e27d294ef2730481498a31b7b3d2f7980163f75d8470131026a255fb81576f2931214c2c6725be536216ae249ee7b498c133e0fa56d1a0ac16321e22232 SHA512 a98cc6b2c273784b1f6039f8de55a0e2b886e8d908f6e54369d5e1041f03c8113180dc3027efe85a9ed314c642bf6b2574b0f96ad8323e195791ce0d6d50e438
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
-EBUILD osm2pgsql-1.4.0-r100.ebuild 1276 BLAKE2B 62ebe35d5f761d43885bf4409a40e2a4eea93274b70598587fefd3479f12c964d0b9aba08a96deb644d11087bee90d935f23b5e689bef43a8f783bb8f05f4944 SHA512 3dcbd987148d24255f0286d572065d46052c94ae0e917b0fde44e17b059cc6f771fa1867e3f258d56479a1f45fc7a81f4799d6b337b90f0209590b42127d1d7b
+EBUILD osm2pgsql-1.4.0-r100.ebuild 1277 BLAKE2B 64e9feb460d2fb5a7fa5a73fc45cc253758a51d71197af07a0b03cad5cdc83a87e77cf7929e0b624298d872251686e3bfc5e19e3ba41153b1f0737edc68ab9a7 SHA512 4be2b264d763430d231c0950e7cdf365e6b123d2bc32bcb752d7d36210ea4ec4a2853756c97801e5cb8a7e738898c117b60b1db7168192141e8c3a78a82edb6c
 EBUILD osm2pgsql-99999999.ebuild 1260 BLAKE2B d9ba30cb416e2125d11817ea5b7d0cf316f67632aa75eceee45b93ced9a510b43db53074010dbfffcef55fb51054c9ba01f27f75fee642bff4d5b624356fe7ca SHA512 b5c3038921a9c08d7a984a1a81086f5924eefe9c6f71f5b5638a857f58f1dba686f6d659fd4efbe9f716d11c2af7d51ac7db23c9169f7fad84b8312e9c21c606
 MISC metadata.xml 794 BLAKE2B 4f79008b159c609d7727d64873db8a0912933af66c8c78521e43e59f5e1a6c6072ad1f6819fbd107a6491bd46629f2f9e48d57df6546bd1abb3647737323b493 SHA512 7fb0748e5b053f8e646a9d7883440eddec6cf3a6cc80ea78216f7bd376f17440c667c5a6fbea0649f2fd22e0742de106595fad1730ab64e8a43a4a9510369f41
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
index a377b456ed4a..accfe28a233f 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+lua"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
diff --git a/sci-geosciences/osmctools/Manifest b/sci-geosciences/osmctools/Manifest
index a48077bee965..9eb58af1db5f 100644
--- a/sci-geosciences/osmctools/Manifest
+++ b/sci-geosciences/osmctools/Manifest
@@ -1,3 +1,3 @@
 DIST osmctools-0.9.tar.gz 181447 BLAKE2B 98b567219f712f282c37db6488863a3ae28c537cfdc5198f7457121a1e95a5edfb3fcc72f297a792485510a5fbb4d4d64be927b647d899f2c09648fbeb4419dc SHA512 6e51646e9291b53ce109f579c555c1eb9e6853452c81caebd530aa1be56aa3d313331a3544375f187c9d26888e4a330774f2acd6bdbb3baadf1a2db330430940
-EBUILD osmctools-0.9-r1.ebuild 466 BLAKE2B 9c40d671698ceb996faa00aecc6272ab2a4a38b5d17e601d4ddee46d05ce2f3d686b333632126229c2259b349bfb7082c510415189a90fd437117c0e03006c5f SHA512 b86e8e26640a83d00977065ed24b41a599cf26abce3446c88594b777d7e63151ecaa7ee7586819fa2cac4ec79b85d5e3ee936fd406c99b72697eb5a4c47054f5
+EBUILD osmctools-0.9-r1.ebuild 467 BLAKE2B 84a3688b09a4355cf6745d1c712e0e2ff2f64eaeea387cc234d60f111188d7858186d00c4942943af55aa704c227b42662313fe1ea2c3d8b6a22091c7a5927cc SHA512 9b305876b1efeae6b088d79269fc2b76632f117c4f2ad86e5ecd13da8e4770a14760cb641967792ee95ba139d0f4d3d743f858fd6bff41c0e2c5c6b17c4c60de
 MISC metadata.xml 586 BLAKE2B ef415e4141e2e71a96a85cc1f18781b2ef9c62ffe6c8f489898c74f6ae3081d55228175b96d434ac47159d0dc5898b420aa0dfcf4a32bbb0ef1c5fbf3e8a5089 SHA512 a268d7e3406bbc95bc090e13d99e4a08346184ffd260791d2b8dddeae22fefa79aeee6346239833b8b66d9533da726ad82d8cbb3af3ba624403fef9d70446531
diff --git a/sci-geosciences/osmctools/osmctools-0.9-r1.ebuild b/sci-geosciences/osmctools/osmctools-0.9-r1.ebuild
index 6e0312b536d8..68159dcac4e6 100644
--- a/sci-geosciences/osmctools/osmctools-0.9-r1.ebuild
+++ b/sci-geosciences/osmctools/osmctools-0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/osm-c-tools/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="sys-libs/zlib"
 RDEPEND="${DEPEND}"
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index c411ab6716c9..f5c38c40eb53 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,4 +1,4 @@
 AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e
 DIST routino-3.3.3.tgz 2564198 BLAKE2B 0476e4afb2279c6a93b3d5192a1be580b0ee20fe07b5101c7d590bd3b74873e0205549c2fa621c6444eea0dd0cf0545c9fc054454e04f434d3e57ed750b1df3d SHA512 b037f6ef38b3abef4639d639c3564b42adc742d225108905d0cacb790e4a07593245c537b5550c43874cd6083f37b710b7aec02a0b0669c927804cf30ce34386
-EBUILD routino-3.3.3-r4.ebuild 1652 BLAKE2B 016e79ae1bf1977289f208c09f37c91d6f83640736d8ac79bbcfbb4aef5a379c1c8f24917c8603245eba98bda8403da3f7b4bffb9869b15ddfaa3bcb7897c2c8 SHA512 e34645f7515ced7e112a6659f223784d562b598bfb0872d20760c41565024cac5edb2210f00432a72317bde5ea1db61ce02727db55e3efcc0bab48f8919be66a
+EBUILD routino-3.3.3-r4.ebuild 1653 BLAKE2B 816fc0fd22080103c441d068b25a2800551590f2b3fec8aec09ef735b2665b5b2bf7e60808a9aec1f982969450072b0467ec07a6cee054550716307cfbbcfd69 SHA512 a5d22cfba38e2b2ddd2c0669980a28a8b84b223a2a1fc237b02a70f8e4e38989a6bb4719145f5b89b2b5132493b572655882d4c4f4922989f8a80e180ad69afd
 MISC metadata.xml 894 BLAKE2B e9854b11005fdab70046e42a963c65a4e921f2d05572c4591e0ee581316a8ba3d3a5a0df39cf2aa500b1a89bde29fd1aaa459962abb68fdc71b49abd9681db54 SHA512 1397fb38a051f523925f04ab1d77044f2bbbcb2957a724696b54d6c057d49d67e758ae3d5b3c925fbce95f35e95c8b3a191724021bb82d4aa35ea61bc2c2153a
diff --git a/sci-geosciences/routino/routino-3.3.3-r4.ebuild b/sci-geosciences/routino/routino-3.3.3-r4.ebuild
index 0ee1d6ec0788..5f057f358f70 100644
--- a/sci-geosciences/routino/routino-3.3.3-r4.ebuild
+++ b/sci-geosciences/routino/routino-3.3.3-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://routino.org/download/${P}.tgz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-geosciences/tcd-utils/Manifest b/sci-geosciences/tcd-utils/Manifest
index 61b11b6d9494..559f15aa1b63 100644
--- a/sci-geosciences/tcd-utils/Manifest
+++ b/sci-geosciences/tcd-utils/Manifest
@@ -1,3 +1,3 @@
 DIST tcd-utils-20120115.tar.bz2 118652 BLAKE2B 123e58ed9fea569ac49e21661b61c017d67d05b13694351aea74eb6ce945ac861235e569955bf27a2dd883598870b59923a8ef63320376fbf481762ef0340d9a SHA512 be4f4b17e24d378cee45c6de20aa4727648f9b0c755118094a06fd830fb4ca78bf467cb4c5b0f430917ae124b2040fef83dcae60186893baf785342585b5d8aa
-EBUILD tcd-utils-20120115-r2.ebuild 389 BLAKE2B 2544c8e3bf2aa95d1b2717013a0c98a47ce85e9895fec763a9cf171cdfc35d3e62fcaa1d78f84c39d96d459988ae7c732e421e3fd8a607bf11b95be96e27319e SHA512 2d505348b5f56927c13e2f4c4eb8fc5b3342fcd16cc910a33b0a52c1aa116941e4bb4848a2b5260eca4cf85a7d9b7db1fc521f60afe541e3f222a134a18e57eb
+EBUILD tcd-utils-20120115-r2.ebuild 390 BLAKE2B 8bd23f67f3b1d3e5b3800c275c525da94699cbc96d424ad324b1852eb08f2fda0561195ceb215aac44fd7995780fdf1dd3d97155901b88eb8c880ece7135cb54 SHA512 390411d80744af46bda4b45bd191e53fd0d4da3330c7c217fc56e29920252b87033d5e81e2291c329f3294bf8ccb03ab4ecf01270965bd249f4026aa77f87ffa
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sci-geosciences/tcd-utils/tcd-utils-20120115-r2.ebuild b/sci-geosciences/tcd-utils/tcd-utils-20120115-r2.ebuild
index 940833ea9514..3d8b09c28e6e 100644
--- a/sci-geosciences/tcd-utils/tcd-utils-20120115-r2.ebuild
+++ b/sci-geosciences/tcd-utils/tcd-utils-20120115-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=sci-geosciences/libtcd-2.2.4"
 RDEPEND="${DEPEND}"
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index 718a71347fc4..db07902d766b 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,3 +1,3 @@
 DIST xtide-2.15.5.tar.xz 574972 BLAKE2B b03a2d0b4c2616b0a81fc745a7781dba74e0d7977c84790ab5fc3aebaf3a04ae51fa9bd5b79166195e0b6cbe736efa3e31b5203a25bb6f60df385c0f357294f9 SHA512 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43
-EBUILD xtide-2.15.5.ebuild 880 BLAKE2B 356469114a8970dc978cf8ba22e8eddff1324d9e689670d397c931905f7632a56d6f4dc9fbf49bd29a0e21a4f06e1631b30d42d70b4055369044c5cb9836ee2c SHA512 e919332869138035c5041e202412ebccb501473c5436f5416da908f5f9edb147f01c9c5054aefab04702d54b5d4700823924a264f11d178f7844ae8a0fc60eb8
+EBUILD xtide-2.15.5.ebuild 881 BLAKE2B f6c7fc06eea2da36c0062991c676cf50e9f5995201b1135ba088c04abf3eb6398a11bd71c84018f069a605ec9dedd937e029af71bb5025318d3e13a9fe068f57 SHA512 49adc430443238f61788c30302d1b2332b111687344743bfa05f47719ca9996ea9700c8fc38574afad9accfe3d03d593824460ae78022d3b9d2150948110e6dd
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sci-geosciences/xtide/xtide-2.15.5.ebuild b/sci-geosciences/xtide/xtide-2.15.5.ebuild
index bda5dbc7ee96..3a83ea5ebb4b 100644
--- a/sci-geosciences/xtide/xtide-2.15.5.ebuild
+++ b/sci-geosciences/xtide/xtide-2.15.5.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
@@ -11,7 +11,7 @@ SRC_URI="https://flaterco.com/files/xtide/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="media-libs/libpng:=
 	sci-geosciences/gpsd:=
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 87bb5df919e6..79743ab9bfae 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 2d2cb12c45f6..15c36037dba9 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -1,5 +1,5 @@
 DIST adolc-2.7.2-patches.tar.bz2 6227 BLAKE2B 6ed9ca3c3128233308b6f4a57d839ac668a031a4d48e612b79929541b496dff67e463197c3c5233bda459fba17422827df6c81fba986ea7fe2affbee2cb8cbf0 SHA512 b468753efbde773c5c7d7f0211abee049193d9b64405ae57a4a902a93a4c06e4f205f531aeee9f30d7dddef19243e1a76b77a8e8727d8e36ee3867f5990e2fbb
 DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6
-EBUILD adolc-2.7.2.ebuild 1794 BLAKE2B 96425cab8fae09ec118937d2de82eed9f6ae8a4daa3f57d74992c9c53d5c684486876760ba9144e083b8c08ee6024f4dfbe850afed9a43071985a2082daaff6a SHA512 0d6b369ca467179ea8068f15c154c3907bd113fed28651b2b96e5d12897f66d5a7cccf16475010430fc5e1b46deacdad3788bff6fa352fe4e2a8efd1e9cd5d4d
+EBUILD adolc-2.7.2.ebuild 1795 BLAKE2B 00a249715601a28593d7ae0fc7d14f87b9d9bc6466ffca634e0d1e3ab4cbfa5aa68891160a275c83afb0f29d6cae0e1adfaa70663d971c8908e27c3d980792bf SHA512 504f322a56ec79b7d5a955ccefc7b028d3f5cfb84f790c13f9240979d75b90ec493e5ec9e3db0e592fbd762c2e691f7f65b498c0e4534112c440386cfa2e5dee
 EBUILD adolc-9999.ebuild 1624 BLAKE2B f1e64371e4486df1a6f539c84b81806cba3c38a8f253d016bc1e6cb2a2314207ba6a1bff16e0c19379e7a8a74d999fd7a05c96ae0d724d8b9e763d401985f18d SHA512 bd39f39008b77d8cf99a67e652a8c5357954e9dd85d80824ed521fad156bd852cfd8cf13b71146f4110154508aa800f11e457740325868e34551e2e66d30f272
 MISC metadata.xml 739 BLAKE2B a78d7868b09f34f56e700938a8f1c11603d9f6df1688d1f56aca8fd93d865c4525898c1883f1218260cb0b4c267ab9fb511362e9a38370223482074e54cbbcb3 SHA512 b787cd45cf0a7a152cbbf09d575c1badf0f278616b6259109b421940575a54c1fe6a1c4008b3f97985908324d2e637b3eb6067205f56fd5a85d1a115e0294836
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
index 319992e2bc19..f3cb7554fab1 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index 5c8e330172a2..234fccdd8d81 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,4 +1,4 @@
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
 DIST alglib-3.17.0.cpp.gpl.tgz 3065026 BLAKE2B bc939568a6bfb5e2717995e31b9d7cb485885217ff8d15c2bea3185b1ef62536766f80e02d43999c016e24b10181bddd4ad4ff27611ab19ebcc778a5cb15d55e SHA512 0e4b943b03707950813aea707ae3569ce75a22216c9a4b256b646db16609995b3b63a958b0b8fbe3d7d623d5ac03efbe7c4b1589961f2ca9cdefbd7e1cc0c721
-EBUILD alglib-3.17.0.ebuild 668 BLAKE2B 1ba7311c6e907b70553362ab8a8147416364c23cb51421142cad4235c6e8789f4b99765c7843e6e4a87e707e1af95624cadf9759880c9200972da08b60bd870e SHA512 c338df5444fbcc6a50cf60dde6e2979372bdd95dd90a765ca11c5f39bffe1983f434058bedddfbe39429b5debb9e050ca22d32c0ac7d10210be9c38cf0473630
+EBUILD alglib-3.17.0.ebuild 669 BLAKE2B 22d00599d76dba4f0150ada1302d81ac8997dcd599848a704b70d788d90d4e7c6b468a3add12aad62d2bb44fbe5a56aa031aa7fb0d478c3f371451aea3b0169d SHA512 1806679a297b538b469bed746792da45fc1baba3f37443977bcda72c03aada392144fa99118bce45d71a2e50c2ecbfe13970b6cb0bd4db4f57c6023f868e85e4
 MISC metadata.xml 1638 BLAKE2B 0fc627c7c730dd882aa8d96e0beb0256d80f37113247f099a5fa1ecc7f1eeb347fed8f2938de0afc6d7df86743979709df0ddaa4fe6944cd96638b8f84952055 SHA512 78967bc174220030fc84ee842f2b4af9abe1ffc6cff2de588447adef4480020b2c049ebff022c4012133d426dccbf407d0b690417557f73bcb64d7895a89695f
diff --git a/sci-libs/alglib/alglib-3.17.0.ebuild b/sci-libs/alglib/alglib-3.17.0.ebuild
index e8fbf3344823..1b837edafa87 100644
--- a/sci-libs/alglib/alglib-3.17.0.ebuild
+++ b/sci-libs/alglib/alglib-3.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"/cpp
 
 LICENSE="GPL-2+"
 SLOT="0/3.8"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 61d518fda92d..bffb017287ec 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -4,8 +4,8 @@ DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d
 DIST armadillo-10.8.2.tar.xz 6262832 BLAKE2B f8a5a66464614661bcccffb8138434d117ad07dcea5f89ddde45df293df5dd4f10def2085b85d37386337fd8bd0152914a957e0b1b7919a47ec8b1a79e92b90b SHA512 720fadad491dfeeb894544b0305cd64a0e0402e66fc788949ecd54c0b1a3b9c3ede9f75b081f832931d59d2bd59529cebb9d5b57b8582df869765cac01c2979b
 DIST armadillo-11.4.0.tar.xz 6804388 BLAKE2B cb44d248cf817f66cc0b6aa968535e266282775b20035f46f3158687100c0f49c6cf4fad8d1f2ec1741f9bceb06c5a841f20f3b7e59146f2fe57c86d00741434 SHA512 21d58b383229f55bf6a3b217c04901982b484b6d806dd3c4a72ebe5a9614f63f9429ca31ea7cfc26672b70e01a0b9263a9d4edf69a0080706ade87852f94970c
 DIST armadillo-12.0.1.tar.xz 6802568 BLAKE2B c6025fe3bcabfa6d08efd864c4b9b129c84e8941b7cb237b76ed83f74062c06cdbb98bdf09796f3340fbdbb37a36f82826a53e778dbc589af9e868a2348bd7f3 SHA512 b1b9fbce6bdacc3340ab190605aba77e821629e0a51e0c6277840eaf803d037a778b9243c02c5b55d67976c203808a5fc34894f3928b707685f6d8695ef0bc0d
-EBUILD armadillo-10.2.0-r1.ebuild 3485 BLAKE2B e1a181c2e739faeef970e959d17450a6ab4d0755ef61da1ace1eac3cd1e295003ae60c90b2918b6d1df929f0e0a682645d676a922801218849309d05dfd1044a SHA512 27ce46b12b04a19923e3bc2c0523fb3b4abd4a70be5c072c654502604e9555b58ec54a9bd60c5e0452f5f2c6b262e72c538c804c46229ea32657f6caba75dd91
-EBUILD armadillo-10.8.2.ebuild 3497 BLAKE2B a126ddefbc2f42ac48118a8f7193a1d64982f9f3784366b6c9246b34aeddb5c21c4041918da311f5acedb2912a9712ffc8f19d12e58a35091e1ab1bfae783fae SHA512 f958cd7c822a327b1c88afe4010bef5071a573e71324fce392f137726c56078ffa10c1fbdffb9c1bca4d5912b3ba58c75242aefd66e8751efa804e3f19bce730
+EBUILD armadillo-10.2.0-r1.ebuild 3486 BLAKE2B 1e0881133134ee033ee0a853687d57faa8dfd4ad487f73253d6f1565e9756fc4ab0c08036d7c973c499a76762413e05cd782e051fad11608b75012940d86947e SHA512 56f72e40cf88c609f40b68e2ba51b29c669f7a81844348b5fa664c985e115874c8fff4949c1345f876bbe49a83225a0ffd8f56428a74971a6e2c804f26ddea95
+EBUILD armadillo-10.8.2.ebuild 3498 BLAKE2B 592ca8f284e12eb260363a66d2b5ed5e5cfeca6545a4235c08a7e77393c47cbc803e98123d1d80a57e3db789e4d023923ab9a02e9a3f822f77e7d5a73fd260ec SHA512 66870c2c6e892f89edc5c07ba7d2d9a04698948a057e58f14f50d641b04b98922c63c16a569b24f22cce8324a790d1a1876a033edb51a9a20d05e5c948aed3ce
 EBUILD armadillo-11.4.0.ebuild 3583 BLAKE2B 14ebbb0d13a2e739ff18bfda2b6b46fce4bf934c860b8881c3e869ec771aea5727780eac33488d5dc9066edfd6fb0deaa80c80bf97b08cec237569fe4ed7cc62 SHA512 a3049b2052fdd340891db090bb3234d1cb1611b49ecc4f13336d174ee9fe5f6315fc2c2219f5ca966231a80b678edec71dbaa6dc87290abcb4dbc0ef48ed8b29
 EBUILD armadillo-12.0.1.ebuild 3583 BLAKE2B 4ebac0def757818a94be154546afd2987e78cfaa7fc1b016c74a52dd23323a3c49e1fd6b8f2afa0d8304f5c7164f8f434ee054ba69863412de076d87a0d433d4 SHA512 8fc47ab9a6aec9a504c5d512f102c915995c58daa192fbbef50b514ddde4660bc1a820277d598f7f996cf9e271928ff684f2dbbb4dc8a62953d8ff3f0a36c0c9
 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0
diff --git a/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild b/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild
index bf6e45bd7854..916e16e01584 100644
--- a/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-10.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/10"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( lapack )"
diff --git a/sci-libs/armadillo/armadillo-10.8.2.ebuild b/sci-libs/armadillo/armadillo-10.8.2.ebuild
index 637bacec3260..5f6bd3b57605 100644
--- a/sci-libs/armadillo/armadillo-10.8.2.ebuild
+++ b/sci-libs/armadillo/armadillo-10.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( lapack )"
diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index 9b201575bb8b..3dfaa83adcac 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -2,5 +2,5 @@ AUX atlas-3.10.2-format-security.patch 8872 BLAKE2B 146136803b7c62f40847e6dbc3ac
 AUX atlas-3.10.2-x32-support.patch 3410 BLAKE2B ba2f45ef71805d51aef7280876a825f522ac7eaa6210d1283be3a8a62cf2a0511003c9127393360a43010d29e86467f1c8bbf3be2bebaa37123313a77268e113 SHA512 ba30f795031457a4416978fadd76870aa09fa7af93f10bc5f0258a44d98151fa37c72813a999048927fc9a521e52d2eb9f01b4f7423baa4d0bad099eb0ee06cb
 DIST atlas3.10.2.tar.bz2 4904923 BLAKE2B e2fb0d307907549644cb678c32c4befce7ce6809c348a11fa6084e17d696da8681b3388dd63d8bdee6040999d9ab38a75f1788b42640121a536eb5f13e6f8939 SHA512 9fe04cfa1f89449db047d1a4659a656964d13117c783cbbe43344eb32555736f037d9cd30c5ae1514c08ad5b8949a3982d7fe102d707ddb62288e76b2607fbb1
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
-EBUILD atlas-3.10.2.ebuild 5614 BLAKE2B f9b6b2c19658de372e17ab5cd83111dd750c777b8c09a239db24cfdbc37dea9899335e3230aefeaa6bbb097840692fce024f6f8e62230e9e418a4b5625d1ab2a SHA512 b60ccfc081f69641974e064cb630fa3740385c2b278686124467adf9de12a440cc0c7b864c974f0f03152dc54e8f28097055a7946d1f91f6ca5d64a1add14275
+EBUILD atlas-3.10.2.ebuild 5615 BLAKE2B 323d7699f938f1ce4b0c6a573190f60ca3389ee58f2851449388bfae4a399da78b7db127e10c7bfc0a5a99c416b183d4d8858ca48faae1a939f084486ac2d5dc SHA512 4a0e25154aca593d09f01493c0b5b38d8bacb0a5ab9bb10d6feaabc70dda1364f4249adb80207d38c420789472f318f3c3661903597e75438cd938ced7afd688
 MISC metadata.xml 935 BLAKE2B cf5e711f899988c36d4ffc63997c963a4ee30e7ac57de0415424e32699379d6595ac9e52cca8760f2b49af527d01b6a4e28bccdb762e5f9c220ae4da99899879 SHA512 5cb05a261bedbd08274d72ea3a4c2843fc39c0ca27d2b8e144310035feab40ec3abfd07438db062bc4c5fc7306be27ceb0fe97d1d24c68bea56683ceb55e7b9b
diff --git a/sci-libs/atlas/atlas-3.10.2.ebuild b/sci-libs/atlas/atlas-3.10.2.ebuild
index b763f1f14b3f..6bddbb7be902 100644
--- a/sci-libs/atlas/atlas-3.10.2.ebuild
+++ b/sci-libs/atlas/atlas-3.10.2.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=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran generic lapack static-libs threads"
 
 RDEPEND=""
diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest
index 31ced8d6bf11..edbfe4486250 100644
--- a/sci-libs/bliss/Manifest
+++ b/sci-libs/bliss/Manifest
@@ -7,5 +7,5 @@ AUX bliss-0.77-install.patch 822 BLAKE2B df619f62b9de4d7bcf988c47b938586a4d5f2c6
 DIST bliss-0.73.zip 94108 BLAKE2B 836184b31fa28db3328c21e7563366a93cf1645b02b96e185838e3c2513393b1d0a54783ca14c6d7f1a1d5055800bc3d7acde3c584e61e66c9ab93936824353b SHA512 30f505945c577d8bcb265a349f5bc9d4dcd96555fa3add285199cdd95ea2710f04409008ff06432daffab62c132e884845eae7f823191407906202862509e05d
 DIST bliss-0.77.zip 117888 BLAKE2B ce4b2fa568c5520fe41748bf59a493af1c33ec9cc0732aca5e5ba657ca726e118e26763355778e3def5716d62e7d3aceceb592ef67e5e148c250d3ffffab67d7 SHA512 d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17
 EBUILD bliss-0.73-r2.ebuild 1072 BLAKE2B 33e191a48064d3a02b3626f004e2a803d998dfa21d0e1fd699d71b70756f85e1d7d43a0f4425bab89820b24657f5fee0f2fd703bcf782ead4c9fd281444cdb60 SHA512 5c059e2681445fc77f9828c508ef832d0072410c984c9962b391501744c70df8b9e4ce8c31d820071aa4279d1a45c781463a7322add743d955235bcffd0a42a0
-EBUILD bliss-0.77.ebuild 650 BLAKE2B 0c23a65e3c029b58119afc7e549726dc3f691332485428349859b35588081fd57789bca9720d0368d5d6ac86b0c875ea7028b13b9f41f35d0cd01d5b8ef2b785 SHA512 48de687b86250db1100c0e21d290791d55f3a71473eb9122e46a576996730d9ee0398ed5bca4ff5bd2ff112724028c5bc0aba1f53c65a8a02216995b92fd9dc5
+EBUILD bliss-0.77.ebuild 651 BLAKE2B 88b49033455c58285f292c9f78077ec9d34c32a86dbc7cbbf58399e49db2261f965e6aa51ff3941ef79df1a732613315b89bcd45a5876ca2907fb1ffb6be4873 SHA512 71ff000764b75d580faa1da44caeba1338ca32253e4e930c37014a9229eced2e827048303bc7b1269a3e2de4e9f06caca8b69e09a467b4aa60ab48ea7ea5cbf1
 MISC metadata.xml 258 BLAKE2B 860964b9257d6437e63725fa62b938b40a4b80018b8bcfa3386f53c1c6c1f5821ae70c7e88646036c5f4994ea6db89dee0242f61d1d360f139a419c54786ffd8 SHA512 74b70b0b8db56c49badc858fa51b04c9839a10381bb8d13480509467f9729df1c7bc199b06398c872e10d29d6d8bea8e7b10ded491f7f1c149c7a9193d6cfa9b
diff --git a/sci-libs/bliss/bliss-0.77.ebuild b/sci-libs/bliss/bliss-0.77.ebuild
index cd1ab52001da..1d14bb380cb3 100644
--- a/sci-libs/bliss/bliss-0.77.ebuild
+++ b/sci-libs/bliss/bliss-0.77.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html"
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="gmp"
 
 RDEPEND="gmp? ( dev-libs/gmp:0= )"
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 39d77440850b..dfc1dad56d9b 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,3 +1,3 @@
 DIST brial-1.2.12.tar.bz2 1259569 BLAKE2B bf9415b2980d76d00239eceea113d6dbb916f5dcec3bdecb05db0ad1988761e4d25ab9a0419c68a3b2501f1f9dc6e2d31418aea7c727cfd01f4ae76eea8f81e2 SHA512 c44902f0f935d614b8c2d437d6c895f650ff4b77501ac3ba035e21671719f4080c88a173819f8db8e8b7dda121736146d8388b70ad7cda75207a1b22b93f5af6
-EBUILD brial-1.2.12.ebuild 910 BLAKE2B d11a0086b58a446329334e59d22519035062536e7681813a5bd5e8df4b6e920cab34ecf084730d336c476683b083aeed6fbc44f5ec72e0baccddaf6868b5352a SHA512 29a712c26e60daa202a6ea7dfc19c119906ac39d2bfab6ce3b03e8e2252fd90ce5a8ad4ca2e0f4c9e299229ca92c37b7f3e76ef587babf0b7509b1c0d0081f86
+EBUILD brial-1.2.12.ebuild 911 BLAKE2B cfa42eb00c51032dbd81e0e7dffb91f1013caedb99daf9984067a6dfaeb04184caa9b6716600e90598f1cc193c77c70e2b34db3a5d8ecf00a8707bc44547d599 SHA512 a3c4c8ec29bd58f5de7dc822e84288d881e882aa0d71cdac2d0b77b2c69f3ade0eb2623d4d8364cbc7899b6e8be530561c94474b9f3e6d9c856538a7588b03a6
 MISC metadata.xml 1077 BLAKE2B 516f3390d40d27d4d1934be2eea344e888112ae8912985134bc288fe4d9414f49100874ddf94f7b0d517e60b7a37801464a6f64108df0465a015e6e9f3c3702e SHA512 284c49e862464bf2d825598a9ef6aa6dbf40c6f42f02f1dcb53f7d3baf8c728771dec129a63fcadb711c40ff623e5c4036cfdc54afc4dbaf07c73b75329aefe0
diff --git a/sci-libs/brial/brial-1.2.12.ebuild b/sci-libs/brial/brial-1.2.12.ebuild
index 633498a65896..1a4d4a95fd64 100644
--- a/sci-libs/brial/brial-1.2.12.ebuild
+++ b/sci-libs/brial/brial-1.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2+, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="png"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index 78def004e138..5650047c82d9 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,3 +1,3 @@
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
-EBUILD btf-1.2.6.ebuild 637 BLAKE2B 9275cb798753f7653266eee125b42e91cf18573413053ec00fafdc1a8e0f102a2a8246f4653c07c3e19c963be587c2b0c7b027019361e813ff5314dff1b09fa9 SHA512 06805475abb3313f507628c94b9f9293bc8a8e1a6bef822061138e5d68429939b49e9fe9b1a72a5654632a3f887903b637bf5fa733d39c0086e088d8643ea283
+EBUILD btf-1.2.6.ebuild 638 BLAKE2B d99d80ee837705935bef24771b0ed186b6e37d5ef8b892a343dd93041f9fe7867ed0234888c106fc1f9d59a98a218f0ffade030c275e5be6b8507006c3d2b32b SHA512 10ee257e5080cd41a967405295e946f8613bab6ae9c017247a0a235b26d3b31babe018f332e5c0a5e12cd15e8664f4b7917da5523a2bbbbc09b9a00f0a2c7b7a
 MISC metadata.xml 535 BLAKE2B c5ac79d8f5907d406ba3c9f9f40bf3956305fb20296a1712debba36b65353076247b1c6e9f5b8f7992865b562d7475b9fcbc8a20c649572075940e7527e7219b SHA512 a6d8266b06a85f3645bb4e3b3ba20ff2c91a4f0b10916eab355b7e60ebf01d3b38b9fdd906df9801da9846171162d24cf7b5b4b06621edad8dc6b56ab6c22270
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 5c9805f97501..8ba08b047dd7 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sci-libs/suitesparseconfig"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 5fa7acab51d3..651bb73eab2c 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,4 +1,4 @@
 AUX camd-2.4.6-dash_doc.patch 498 BLAKE2B 93871bfdc9fbe1bc77f7cdc66d18d7517e318edcdbc09e1efa63a9400de5a3e91fa1febdc24394743b710090d7a78fc9e864732c4979db73f679cbd008fea670 SHA512 61a38299792ade16a067e7960d5922ffeb6be838eab73f8be493b999c9256875a07b28066e1965b59f9d9e5f63f616a1674f8987ff847e49ac4ff2a8fe05c73f
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6-r1.ebuild 853 BLAKE2B fa2f3e9374a9d9877eb60389f468bb09bb1eb0a6b7d2752f308bf685911d0485d3cbb30fd2bb92aa9f3621c3fdde50d7f7fd069afeba67d339b5b20c92b17b8c SHA512 0e178ba7083fd7cc6e83bd85f3a2e4fb17208c7c7d222f60a77d92c55419e09319796c7e4beb6b12f58006e5112adcb962816b595936f58242e25dc5343d2a64
+EBUILD camd-2.4.6-r1.ebuild 854 BLAKE2B ac037d0a9265069fa287d0d59b8d49fee9ef8a49401bd1fb1ed9480fd1bed5abea9507330e616ffb62be6aa90888009ee38aa138affd1bef62cb5d9227dd3fbf SHA512 61c2064335736fe3b8089ade2cc6ed223568e739fb7e0963c7f72952fc88f1df3caf064a3555b96c17e9e0e5c7768136c68106b14ca3dc7945db3d1db4e451b1
 MISC metadata.xml 497 BLAKE2B 5be8b59c7fdd2cb3fdd512ea5605461e9346ef642988ed7f14a65c192faa14ecb5ae1840f27f66ef9b9246fcb8ce91649eb9e972afcfddbd3d1ec27658ae786f SHA512 c4ed84a2dc9ed99a524fa303b35ee71d8b0e96fe7d33831e35393eba54090a8af4b00f291410fb0db9671079f8d4b4592d8b7a6fa0e6d0ca31210de83cb18011
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
index 49f955bddb71..ec2f29270a50 100644
--- a/sci-libs/camd/camd-2.4.6-r1.ebuild
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/ccfits/Manifest b/sci-libs/ccfits/Manifest
index 1d3a97fca192..6d13d9668799 100644
--- a/sci-libs/ccfits/Manifest
+++ b/sci-libs/ccfits/Manifest
@@ -1,4 +1,4 @@
 AUX ccfits-2.2-makefile.patch 710 BLAKE2B 8368c98ecc0b9c7e2d56ab43473a8b3d83d16e6683e5f58da6e3a25ccaa5353404ae6b8e3c457aee99ca5b6af3ee228973ea2d0aa9d990aa8853032e204ea63c SHA512 ea4553b9a794131fe1b90172d49623bb97c6d78c52a3cdbdd43c8bb3ec23ae535081a981f83c61d425fc9fe1b6258e7ef78cea580f7df302893840ab3a35e7e5
 DIST CCfits-2.5.tar.gz 1416358 BLAKE2B 4c525761f98bdb133f8d0c5fd582db5326dda84dc103a7c816cdf8d1a1fa02ac5b8e9c9431629304e3eaf21b4ec9767796c8b2cc8d22dd877a2e043084cae683 SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
-EBUILD ccfits-2.5.ebuild 857 BLAKE2B 79284aa94e87dea6da937cc40a1d5df881c7a9e3580e45589df5a01465832e1bdfde735645882ca18ff76f0c967b407b3a274db1b72eb4559d0a174e4a830ccf SHA512 1f54a64b7aba19bc36be0dfe7e36b3526950ef8ddd6c33860514108194e347021480ecb710befb7f1d2c8bd3c3ede2b0b477640064c3dff2d6dd8ca807f2df34
+EBUILD ccfits-2.5.ebuild 858 BLAKE2B 92dd7888a155792fffbeec795421304388ddaf3078663971ce058037b36475157064ba093d938ece8b20655480b2dd19735cfa6d7d0633d3980704745fa8845a SHA512 67d2ca50ff7c7be482562c9fb050668822b6f5de0e3aea7974b9138ef9de15c7bef1c6245008ee60afd8246be6ad4d2e78dbf578498f43c0e8bcd5072581a916
 MISC metadata.xml 640 BLAKE2B 572cdf9154dc544d50498dc8293d5277bee6c3a0bed11e3f21ec4b20075fd0ddbb49e6f5186f8bd86d4d120afa3a25eb53b6b11052647dda6675798054c2c59a SHA512 c9ce8aedcf9fbce4d616757408cf965b4e6ac2e74cd8e587ca1e540045d79cea2d86fcb830b7d0e1ea00b9d2006218ab8631f304263247c0a1da3f762f4f0c62
diff --git a/sci-libs/ccfits/ccfits-2.5.ebuild b/sci-libs/ccfits/ccfits-2.5.ebuild
index 4dcbba0d8ac3..3ea175a98181 100644
--- a/sci-libs/ccfits/ccfits-2.5.ebuild
+++ b/sci-libs/ccfits/ccfits-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/fitsio/CCfits/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=sci-libs/cfitsio-3.080"
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index 116e42ea08e2..3dfa3b82f5c8 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,3 @@
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.9.6.ebuild 667 BLAKE2B 056ce4be8c93b209dad76e9b710f129106b7eec4dfb3a9b082bf9ced3c06d6174126add36d5c146dd2ea866e62aceea1ad017cd9384afb60e6366e101d8fe4ac SHA512 81ab88a00c505283c7795857fa7bf1289a5458bed7792c579cfff59232a92c82ec10849b54ef15cf1f44e65e70162757db8959b01a3def47235771c42f3d2404
+EBUILD ccolamd-2.9.6.ebuild 668 BLAKE2B c6896bb58d48e25208ff70abb75e43987dcb0642e1484c2ae1652c141c65d50a0c3e43294ed3ed0f3b215bfc18baccb01234020a9e740d040afc311a807bd390 SHA512 76b30d1702c9c4b1af08f7f68c6d03daaefe8287fae24b2b8f5d85d0a29a1079926c152ed6c63aa435ea11d5829744fb906e7e8907d2f2d9ec8893e151c6c432
 MISC metadata.xml 473 BLAKE2B 92cd065e76780f675bf6fad90be6a6e7716470967311a44f53fd53386d904a31831ba63aecf37e2d4c6a0f0f35ba24b930300caeba094f6c5689d051047eaf97 SHA512 d8ef080f457b756ea12a610f0dbb70fd6b58c019807beabe6efeb673f8303ac1c61d0ff36390c7bcf8e1305395f452729b08823ecbcd63fb39b4b4b8399e0e2b
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index 1a62e530a1f0..4788aeab19aa 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cdd+/Manifest b/sci-libs/cdd+/Manifest
index edbd6cd3a991..5dbeeec3b017 100644
--- a/sci-libs/cdd+/Manifest
+++ b/sci-libs/cdd+/Manifest
@@ -4,5 +4,5 @@ AUX cdd+-077a-gentoo.patch 1068 BLAKE2B adb0a66750309896dd58309e39b42cf982d3864c
 AUX cdd+-077a-headers.patch 1066 BLAKE2B 4d63d96fddb9e265d28e66371dd3a8656cbfb0b4d13338912f88220e29bc90488d4b50afca581d192559c36c134bc0755ab1e02fb6b900eed0734aad5eac395d SHA512 462f6a11a2cc27df264d93432088fb5abb998c759e08b6bf12121336ae77a9a33702f7169971926bf9feed8fc3bf6f5b526c7ffcfa9f1e12b72a238d9aac8d4c
 AUX cdd+-077a-qa-const-char.patch 1437 BLAKE2B 5d6a347f6c8c2ee7c03612849454aa4134bb4ae41272bc6cbf1420ebebadb6dd68c5ba19973e5252d0b9badd9d90275dca78fa8cc56631395688f93e85d27754 SHA512 5ab7d38beceb21527e2c3daf889a5bcb93eb537b2a5b39f6a1d9781ddb36e3366600ce97717558c7dbf548b075c7280c474388809d37c9ab7391069e7b3839a7
 DIST cdd+-077a.tar.gz 186771 BLAKE2B 1bc1ae864c83da4f2c2d421c783f484933ee9625bf16d299a65ae738cb218e670453b661e9914776d6fc0766503a44f345c4cdfaea834120c79e677bb5686b46 SHA512 cb151274adec502420e5e931d2f248d62b26d5797f7d55f6db9c947f8e9d715a864c88ad08ad2cd74ada237789de5ca3c49dc04dc55e63d4101f07cc1685ab12
-EBUILD cdd+-077a.ebuild 854 BLAKE2B f7189d0b866de1eac79af31782f71a86bb6c76bdfff026e3e9e5adcb2440627dab925e2bd2536a31acd6e07490959b8c5055e403a32bcd0f2845416753d9ce5c SHA512 4d22b9838d6c4809f32e864bb4119849eec35572bf109857e12df5e2d6f2a4ad5fd04f5d6eb71ec2864037ce27963dd214e5e3aeea36cb6bb155057c405095c8
+EBUILD cdd+-077a.ebuild 855 BLAKE2B 017ecdb6b8309f59effa481ad686e42946e683871588cb60c8048d0ed85138eb0ee112a274f4c29cf2d057e3dff9c95b7d48523ed9867f6d94cdc8459483af09 SHA512 6ec75cb54226d9bca6e2e0c3aff5a10b30b8495bd159507486af7c4a7507d678471ca9477b72f8691569d23905858860b30733465d4fa60ee882452e50e146da
 MISC metadata.xml 724 BLAKE2B 03a61c9b15fae2bf444c54962089bc38805379cc6a12e567032902763a1526cd7915f3e1690a1e4d1ebe07e2f41ca4fb010133db45f94d997f18ef33d2ecd308 SHA512 3e2d8905529931d8306c01f4cbfeb7a2a485b4c9f83037fea1b8923b0b8e1fa6ed1f4918200d2d4eaa586a70bd1d694d644317552fecc4b1453df50d7caf86b5
diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild
index 12930c685aba..85957bc5070c 100644
--- a/sci-libs/cdd+/cdd+-077a.ebuild
+++ b/sci-libs/cdd+/cdd+-077a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 DEPEND="dev-libs/gmp:0="
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index 8db2721e69ba..53008be2f539 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -1,3 +1,3 @@
 DIST cddlib-0.94m.tar.gz 1351298 BLAKE2B 0e1931ba94771f0dcae0ee10b003940ca331839eb8ce001ab02c4f1b382dde74d7dfcf74f4c62e1ae7214a3139547c09f56ef0cba5df74fc03a63ab741b64690 SHA512 50997bda38c36990456345881dc1eac65b1880aa510ea3812ae46a122ba7696bf3577f2b6976ff16811ee00f0a920c8ed6f1e7de0a4060bfaa96def11bab816e
-EBUILD cddlib-094m-r1.ebuild 1446 BLAKE2B e0dc047e66b1f226340682f67d8c863f7aef6883b0fd39ee642baaff7e2738385bf620694f082d95a7feaa9a80cf3fa46b1e8a6f5f65b11ffb9d11bb80eabb1e SHA512 767ce2030bc7f55387ab8495b40e99cb7a3043ce8c9f3f89d2d5cb34172bddd61e862cc4301374f59fd49737784b9b2a1bec35b6b183f889eb9eeab9bf34be08
+EBUILD cddlib-094m-r1.ebuild 1447 BLAKE2B 4a295e634092531a352245220fd3839ef589bd7e3050df1f401ee1099c24e069507053ca129ec6913ee41ff4c110945ed01136180f00be3a17f256b493823262 SHA512 3a9dd72a02e9f04f0ab86c476bfa0370889531e6b9067a062e0c30b4b1d8cee36901169e96a6014473e77cb8ffb0536700c42ac7a8c55fd2e9d9791620ab5cfb
 MISC metadata.xml 1848 BLAKE2B 98d72e3809807ac701b575e31068012b568893cc4db0cb8b12c0a0ec6c83862e3e132981192026a279c1bf516fda829e20fb9e314ddd3fa0bcd5613f2e074f33 SHA512 d4b7eccde619f6be50621dba566a186b46c62537dfb26c3d34157ddad7179040ea9ddfaa7b63e363053c935d101581bdeb3a4350db955665d4d163b322e43367
diff --git a/sci-libs/cddlib/cddlib-094m-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild
index 6aa6754453b0..5cb23824058f 100644
--- a/sci-libs/cddlib/cddlib-094m-r1.ebuild
+++ b/sci-libs/cddlib/cddlib-094m-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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs tools"
 
 DEPEND="dev-libs/gmp:0"
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index a8c0d7f9463e..7354e1f6425e 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -9,5 +9,5 @@ DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a
 DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce
 DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be
 DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c
-EBUILD cdf-3.8.0-r1.ebuild 3250 BLAKE2B e32ebdc3724fd5c4d2d324f0e1d52a64108bf5a3d3e50e4419f51c7e8636c495b8c30ba7ebc7ac8ccb70b0978a5057720183f2382ab34aee7d773d30db53090d SHA512 20a92faeced804bff80a5540723a0e0e18742bf0df144b6708ab88c5033e6ff2c2489d4ce3325987011741bb793d9b5dffc1349edd989fba35b8d98c7818d836
+EBUILD cdf-3.8.0-r1.ebuild 3251 BLAKE2B 9b758381574ab0c5afe1411b2574374628437b4eb3070f45e868724ae1e37f9451a3b9a79f722e69b6bc679cd39733f9d754e3a90dd7ee3d075dbfe7ada8148b SHA512 e7c63628bdca9d8f1bc422ef944016346932eded0c99dd88b8e3cc32652897ccba01d78410005eafe5f1243be75a62d8c73df33f74b8a677c8da9b8e1eb63b6e
 MISC metadata.xml 1050 BLAKE2B fb46e44a9381f11bbb49a6d0429b7906026f68812064c2f6bf57d1445ed98c640659563cd323e5a6d22897a0a07af3ab60e23082d080111094ba607c97049e8b SHA512 e4e6c6a12b6fb7f12c165726c8238276e14b5873b6d476ae84935e6ba5c903b4214190ad778918d538825ff04280c174e2629e8e5b8424413085431eb7d449d0
diff --git a/sci-libs/cdf/cdf-3.8.0-r1.ebuild b/sci-libs/cdf/cdf-3.8.0-r1.ebuild
index a721b39072fc..7d3f32ecb62b 100644
--- a/sci-libs/cdf/cdf-3.8.0-r1.ebuild
+++ b/sci-libs/cdf/cdf-3.8.0-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
 
 LICENSE="CDF"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples java ncurses static-libs"
 RESTRICT="bindist"
 
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index b3f326a627b0..099118183796 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -11,8 +11,8 @@ DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0ee
 DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c2fafcbde42504670e73757a41ebd91e42d086529df8139ce920446332f827b1abf027f8932ee73dd025103cd8e SHA512 a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa
 DIST cfitsio-4.1.0.tar.gz 4305184 BLAKE2B 1edfce2b44ab990ed834b22dfc734af632f8f1401b6616f0c4322a3c40117123e52ba191610a3393c077f4a5fccd7462bcb4749e715cf2e9abae08edb1f1f8eb SHA512 bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813
 DIST cfitsio-4.2.0.tar.gz 4356372 BLAKE2B 7f5e695a56105866b2457e0f1c2d74bfb2aa86bc53e4eeb39aa9b8e79b278e1184a610422bf43c341a9f3159a93b980bab1ec9084475189b08dfa080b59ec2af SHA512 41b51653370874f50a7a9fe7d5f61577a979ab9d146b8249afa407d3858cb4dce0581eba23093972b66f7d1042b9693b98ad9130ec67b3b44e94005e72d60853
-EBUILD cfitsio-3.490.ebuild 1687 BLAKE2B 41becad2df276eb16d4e3098943b6fb70bac75f0f4efb1eb4cf70e2d96db5852d16dff5d7521fd158f92ecee0d543d69693900d9e261d8490cf046dfb024367f SHA512 62247452eb123a741e28417952053457cbf7c815312cc721d96273b35571079954c8d8da7df82f16bc15f7a5804167b127fdaf89a0d15569322af1c9d3be699d
-EBUILD cfitsio-4.0.0.ebuild 1646 BLAKE2B 0c4c0da1f2a255cbf8b5d37d5a8abb5a1900f5c6923b8a97e360e69df35b6d1a1636c8911972e07c19222614c341a23a3691d3870eb3a8cd77b1764a760546ec SHA512 877cf2c7cd7ba5958d00d22c6bd1dba2589ab21bc2b1c129866cea738551bda5ba7504bcf162f4808f5d0459508400a134b9e974f140cfb2fcc594b3885b27b4
+EBUILD cfitsio-3.490.ebuild 1688 BLAKE2B f5943ac1dd6f85d679a25d747c538768f7f84ca040c6b40d94a7c537507c7cf70e8ac1cb2a5bef87ddba177c6415ef80359bf559aa5fdae61fd659c8d29f3dd3 SHA512 18d34a21674df3cd56d9658b8419085b14be145a62a3b207aea41d0d1359e6a030174bb351d65e160679ef544675eb885827185c6a1153d2ecfe2c7b5467b191
+EBUILD cfitsio-4.0.0.ebuild 1647 BLAKE2B 3242b59fcd993a167f63e86913e2e8a0924f322379be8a52f2557ad5357aed3b2e6fedbc7ed3d0f16064a8a3a63690b7bf9a083810ddd248ba7658e81b758971 SHA512 2530615cd5b64bac59a9792a3199283b61cc5deabc9567607d74064b2a4908e3da7ad07e7c6d2fdcf71268d079c879c0b93501af03d1bd34b50396310a34dcda
 EBUILD cfitsio-4.1.0-r1.ebuild 1867 BLAKE2B a1048cf514b864afe1f90fbc6b30eef79f544980b9609f97f5bdb423a4f96885c00e4817bf20c9842d570a5b8c3538794b79a494660583aab611e0a32b8682b5 SHA512 899c9770a926aa659051dbe275243778538b18c0b9cacf759bd31a8f3ac6335bdce044298c6120733e334d7bc85ad2ccdd31495e657986e609cb8a706069ccb3
 EBUILD cfitsio-4.1.0.ebuild 1802 BLAKE2B 0fd06ddd8d4e7913882c48f0dba05c1ad359d5891acbd36a0d5a1412eaa723e2c9ac77b7a5b74b4f90c1bd3cebccac75a5f429efb39f2ec3f5274285ae3094b3 SHA512 f5eabb4b42e9d5d8b77b604b424f4ed5216ab1d64d1a3dc43e24587c2a7e630845276dc5736d739818231d2ef18902854cc8f3adb516fe3ce43efdfe5a1f5477
 EBUILD cfitsio-4.2.0.ebuild 1868 BLAKE2B 9bb9e98a875c0b51ec79c065d9135c0fb6948ad38f4954e86ce2a535e672484f2006c7c5f9c30d9ed3acf028da34038d20f2bfd41e47bd443b89cedb7f909caa SHA512 dea720b04a137c9e9648ccd1b97694c3a3cf77d9c2a0661ee986d2abe59c72aefdb4ff8ec5e2047cdf879cdf4adc9c6c3e8bd064fc1a09446885630c3b48339d
diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild
index 0a9b4394783a..5f12eb26940e 100644
--- a/sci-libs/cfitsio/cfitsio-3.490.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0/9"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 BDEPEND="
diff --git a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
index 0555a82a8299..9d0e3cc3f56e 100644
--- a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/9"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 BDEPEND="
diff --git a/sci-libs/cgcode/Manifest b/sci-libs/cgcode/Manifest
index 124671daf4a3..dcc05d1a47a5 100644
--- a/sci-libs/cgcode/Manifest
+++ b/sci-libs/cgcode/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0-gentoo.patch 2156 BLAKE2B f4ee517b96feb5ff5e69a97e4508751622edcc2a187283f53c5a0c0e25aed46799d6bcccbcad9d26a709aa76746bf9912224c2bb11550375bba238c565db0194 SHA512 70dbefb641750142c71d8c1d4b0b85740af8a1bcf2dd9c39db3aa7cbf99bc163352832c445e6bfc674c37919da8e91b952dd6fe257742b297c96ac59b52da6ab
 DIST cgcode-1.0.tar.gz 77941 BLAKE2B bb062991d4bca842225b357a4bfd24edd2293ace224de141dc5782da82b3fb357d79cc8e06d90b948a8016fd726559469ab032b87cd8a678f10188079804295c SHA512 df76a2f8a0c00924af3d6933487a363fe23ded8281b392d40f240074c8643219f99dda9b6b6d515a281827d657a27ab06416ce152e65c5fead7549bb96be9621
-EBUILD cgcode-1.0-r2.ebuild 893 BLAKE2B 471caf9e01a5d0480f4cb6faaad522efb0ac0c492c2ceddbac3b96256ed39f69a5aa2cb5aa84a4a0f6797ccb4e8e1aa4321ec3f7213fdddcb6765f0eef577e3f SHA512 015ebaa8eefdfc325293edd94a2595f319e35ab9cea34e856b966a3700af3f7b07d4455521cdb0bb09d2aa03727f2128eab1c92cbe667b27e72bfc803c8d52b0
+EBUILD cgcode-1.0-r2.ebuild 894 BLAKE2B cf0ac1669b31752d9b3e5d1e4ca22848b06cd5a53f71ff86d8c8f78769bf5ebbd4aef131220ee71433af6a53807fe32de38f0ebbfe59ba1a725eeedbce55ee7f SHA512 c9e28692103643d7e6ac8b7aeb9920f11c76a527518ba803bed0de3319df38acac7fc18131672e7a9e2025c6d94b92f80ed26deac7c275142a5b7d2457aecc1b
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/sci-libs/cgcode/cgcode-1.0-r2.ebuild b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
index 6fe1ddee3b21..6945d82b5a92 100644
--- a/sci-libs/cgcode/cgcode-1.0-r2.ebuild
+++ b/sci-libs/cgcode/cgcode-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/blas"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest
index d03d01d2ee36..c7b53f379ba4 100644
--- a/sci-libs/cifparse-obj/Manifest
+++ b/sci-libs/cifparse-obj/Manifest
@@ -1,5 +1,5 @@
 AUX cifparse-obj-7.025-gcc5_6.patch 524 BLAKE2B 5cf4ce9f5c0615636b5701cd64613e01f0ac130ba4166fd12a8b92d7ffffc368fd5666ebdd8ac9cd983359a97ed4294e6f66e0984b3c826c56ecfa8b130cadef SHA512 f2469b15eb74192b61b78c165249e8b953c58d0f7478d38f1bebf8c2c884e95ad42ba18af23b1ea7e4915979b5d4f70c2637e083a14a2c40e20f83a09acf616e
 AUX cifparse-obj-7.105-makefile.patch 3790 BLAKE2B 11372dceab4e570e420bf639020769a1b1fb6f956a4ff75befcbb0016053d616cf271946ae0e6bb5667dffef863baa246f75fc34d36e80ddeb7e7c17a5befae7 SHA512 310f13e88f7dfb19ac2bdc003a2ab2f095583a90694d27232c1ab15a298bc88313e89590e062274da10d5eaba53f6bfcb3341d1d4f7d1c388520c75643364d61
 DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9 SHA512 d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4
-EBUILD cifparse-obj-7.105.ebuild 1117 BLAKE2B 7149dca4b0123b02b612c3edd3368ec07166d6f32393baba309e1bd8b8213dff1804f74ba6d958db50349d8a2f04b0a4482097306088ed9ecae28cd6c80885a0 SHA512 57c2d7ea69aae1bcda908d08f1a2b390ca7185685390d39105f0b5ffcadffcb064b51a46d19cfbdc218243954896434c7d50249e92ef4d57c898487b7f5e0306
+EBUILD cifparse-obj-7.105.ebuild 1118 BLAKE2B bffa51f1e96d201b3ee0893b1d080c757ef1f3740a446d2aed2b553b6c1de9a311598965ccd8c6dd2b580e0b37fede1140f276b7b4ad11c8896c890fd1fe25fa SHA512 507d56b0edaf407a973a22f5fed90271a4e3ae4a1c4c3551cb3e5ea2d589271603a5446e2462f7371de5de76fb7732dcebf86cf95c2d2dd00e4b2c8d57e87e67
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
index 98ce8d0e6f95..49706b8cea37 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
 
 LICENSE="PDB"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index e511d8f8a088..5e175514cf90 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -3,5 +3,5 @@ AUX clapack-3.2.1-fix_include_file.patch 689 BLAKE2B 8cae0c5d8262ccf0dae3bf52481
 AUX clapack-3.2.1-hang.patch 641 BLAKE2B 01925c41db9017cafcb0a042bfa445b1b3d8ea0991586975870d73ad5e0d15ae53c1f88b613e14ea005dbbaf7fbcf73802a634e7cccb5d8c3a239d7db8655cac SHA512 a6e7461bfe7bddd2120c46e3629a899cc12c23669b22b562675922bf11d2fb69793e8093d24773d688e0d7e1f24c08b16ccd2b01631b23f55fbb7a10c29ed036
 AUX clapack-3.2.1-noblasf2c.patch 5841 BLAKE2B 12a7024af8a82437d15a6ebee66212e305495d65f8874dffff5d8191859e79feb42080b769ec1c7c4c4ae9bd6573037b45939230e8146f237478136297b9c0b8 SHA512 68571f682e7015c75104494f8d156cd0c1f758aa03d9c2614f93db418c8d4f9c9c2e7b5d965022060f776a9baa8d48c15bbfa30dbcada03bccffa4ebb3c4deef
 DIST clapack-3.2.1-CMAKE.tgz 6017667 BLAKE2B 9c4648697ac757bf93a2529f9a2af545d6e34a95b37a14a15bb2bea25b1ffa213a6f17a4ca8ec8119ac2f8bfd883feb5399181fc50ffa73be39ceeae5492e9d2 SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49
-EBUILD clapack-3.2.1-r8.ebuild 922 BLAKE2B 10b3f3fe744ecbea30c0257b35793f2e0c5f72ec8b01245c9eb64da8bc9597aaa58b65de6ef5745ed98d20999c413ada21fede016dfbd7e20adf34689138e2b2 SHA512 cb5850eda0a37e79aa21789e292296cdc249ac5d3332fe89941de3f085102a2efc959b0bb900f98e32e39be78e88ed4788d49f2fd3a93f99532c36d280b8df7e
+EBUILD clapack-3.2.1-r8.ebuild 923 BLAKE2B 12499a297a819be11964ec0090fb0627443b66bfeb2d4bff2a3b0b3a2f04f6e6fe1f58a9f10c5a7e69feb2754d1aa53fc3e15c19c9b2799a3a51c19cdbc5d2eb SHA512 2ea41c489184b8dfe47bca50ce299fd152d71861f02e563c9af2783a38443fca3fe837678abd0bb0c8f0d496289da4e44edc626c7b6c768fbb6be20f44f5f485
 MISC metadata.xml 728 BLAKE2B bfe9f669f67cfa4dc7c151727c0a6d2784f3271ff70870535a862181c0b8fe52a652ee5b710354d3754be48a64e8eb59bf3acc2c0fdca3f6e5ba75a4fc8e37e1 SHA512 a101432c38768e470fb9436ea36bad26bb026ce4fa7238f78a7549b8ed88a92d13fbb471a39f6530e4fcc56b375783979fdc1495868924c9a990cfed21a2419b
diff --git a/sci-libs/clapack/clapack-3.2.1-r8.ebuild b/sci-libs/clapack/clapack-3.2.1-r8.ebuild
index 30384df4db47..0d070b205532 100644
--- a/sci-libs/clapack/clapack-3.2.1-r8.ebuild
+++ b/sci-libs/clapack/clapack-3.2.1-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.netlib.org/${PN}/${P}-CMAKE.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # bug 433806
diff --git a/sci-libs/clashscore-db/Manifest b/sci-libs/clashscore-db/Manifest
index a8472f093dd4..f4afd2415438 100644
--- a/sci-libs/clashscore-db/Manifest
+++ b/sci-libs/clashscore-db/Manifest
@@ -1,3 +1,3 @@
 DIST molprobity-3.17.tgz 26429898 BLAKE2B f2ed8f71c4f71c19aac6278eed40cba0db53e88dc1be7ccb6e3e831d4202456822efe93ded2cc8ca3226efb9ef10999895b191e8b5d5188d577b78c9fa5a8c66 SHA512 a6e986f285ff7e8d167e2d1c935a55b080446c9809d352c95e2ffa32265892b59cd1611730e75ca88aa28387495d3ebd84226e1a9cdd33f0b27b1a8a1b6a469f
-EBUILD clashscore-db-3.17-r1.ebuild 457 BLAKE2B 5e287990f37f03573196aa1779270910680c0219516de7b62d0a20eb24af2d7a5273720cece7c6fc0e1ad76310d429b7f8c6474748d1d31a665583afa9e27794 SHA512 9776f51bf83729928f07a73a60221102fb5a5961785408177976a86e1f51a91d0e5113d56a3dda0b8fad425c8b49a7ce1165c6ff07c2d9f5b35b3928f9d78dd0
+EBUILD clashscore-db-3.17-r1.ebuild 458 BLAKE2B 8e901bf76205e8d11f1a1e3e7276e9b16a4db9ce1c3ac845e00c41d44b30e0d1643e70cb1ba341e27e6915a700cd687fa2dc8018212d5008f2c74dca76030b3f SHA512 2a8cd44e3995a8e6da2fd2193ad278e79096e0e06457e65eac5ed16171901c81de968ac4dd81803dd7af29979e705bf673574b824ee763ed18dd000fbd560920
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
index 41bea4a55af2..92712ac85a99 100644
--- a/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
+++ b/sci-libs/clashscore-db/clashscore-db-3.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="richardson"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="binchecks strip"
 
diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index 26a345a1df01..96ee33438d9e 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,3 +1,3 @@
 DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808
-EBUILD colpack-1.0.10.ebuild 963 BLAKE2B 343a3a30dd5f6ced587cacac3ed3ed3d08232084438d46865c2e24ec02a0c3f906097097111a098ad4588ea9e4c38ffc5bc05e0746771eb3eab66af0d218f5ae SHA512 230f969b70d49b5e846750e3b9c19e6c49328672de14cb0dde87846921ddd27ffb25566814859d10bd232422b8f53111bd55bc70448505aa1de14c7ddf6b8ae4
+EBUILD colpack-1.0.10.ebuild 964 BLAKE2B 099da1a0513c6e4bc86c8a9216d4d13ccd4d27723fba3dbf385e32e4ae89b816324ba5a5fe5b0f5390d1af10d859769fe0c5cc6ee6fd934c9bf6daba535bda09 SHA512 84cf7da74a0da1381960dde5e7fd37e1cb13a2711c3f576c9a8f0dd866f3a6aedddbe350f57d702b838a168e6ff81bfd8b365b357d103c6ba4d0897c5c3258a8
 MISC metadata.xml 606 BLAKE2B 6d62ec670ced7058bee94be97ad61fd6e12b6e51e76e1e2e35e8e0928958bb9c77f0d99c3d881b0e63bc4e55a677888813ff7f277da39d891aed8cdb37a8be24 SHA512 cddb0eddbbdbc91ee7e2c39911cdebe572fdf2985131fa0e8dc5705f1722747283b0bcef141e57559a9ad0f5f9629a8bdb76644900bab3d025ee5ca3867549b2
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index bdf2c4505685..c28bec5db9b9 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 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="openmp"
 
 S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/cqrlib/Manifest b/sci-libs/cqrlib/Manifest
index b96a50a5c1fa..7b93e151cc30 100644
--- a/sci-libs/cqrlib/Manifest
+++ b/sci-libs/cqrlib/Manifest
@@ -1,5 +1,5 @@
 AUX 1.1.4-build.patch 14479 BLAKE2B 79cee0cc380ee3e9f703a9da8cf307e92093f56fd0f951a95b764276ac5e6e732622b31f72e7f1711fce0a94222684bd3fefab4b94cc04b41730511f58badb1b SHA512 c55e53f13884660f499841c6c658b3c1ea3a88a5a78a409af92e753568748dfad8d36261a092dfa1b2511b5b991d440155a17a3de45dd2688f0f199dbfe30078
 AUX 1.1.4-libtool.patch 2256 BLAKE2B a70f6288a6f0343b725f2231c3aaa89e0b72c204f3463724478771d4b4143f2c2b7671a2a8e1c99d6790f5eba51f08a2e5b991c52279e2468f72d2789d7e5296 SHA512 d03c094be631f67346cc3d0409d25173b76a979622f52913055f55501fb5050e1c686a862819cb28bb20467867af770af858e0a7e9b8706f391792714d12147c
 DIST cqrlib-1.1.4.tar.gz 41521 BLAKE2B 2b69dbf401de9908886798425ec33c28c55ef4b892d35883ffe3c715ddff03fb81b32222b6c755c3c690a016b2ded72e965d83408f14b316913e6f8c7ebb5a41 SHA512 14f49ebc5f562b31081cd53c738aa1571cbefb369ebfe4ca8c27af07a691e4eae288fcf374527453b8d6e36a114a97be26204909be478bd67fb8d94934b1bec7
-EBUILD cqrlib-1.1.4.ebuild 894 BLAKE2B 32e0b0885337fd8796f73d72d5db5db14cd45ad2fa5b3ccf4cba3ee45694d1dbff0ab97225b3da48d8fefa4a82047770df0173227f5ad4bdcd11d6ce16d53d8e SHA512 fb373ee1cb599d41bb01f02c9e19feed1cf2bd47ee43414b4c1a267619859959ce1a35ea366b836bdbc834e41ae8a62385971fbc8d56ac49418123273cc0bc58
+EBUILD cqrlib-1.1.4.ebuild 895 BLAKE2B 189ec0ccba1c0757d89e2b73ef8bbc6e70ff61ba7d9cc6d849955a6248dc16c38787a8b6ca0b69eacd2e87646c09f2963a7ceb4145d9c9062c4cb2909fbc4775 SHA512 3373cf5620464b8ece153fb93b8ff91c55755e823502d7bf70294483d3b3516aca555174cf1d5aad446f757f87ff4fc51d4a9621162a852bbff81eac050d2190
 MISC metadata.xml 396 BLAKE2B 0426ec41f80319a5d8791686185e2e64e33c519626b0ba0129b302476798ff667ae3ce840d0395a2ed67cb822fb7f3281dad2dcd08b4ebe57e8f3d08e29a010e SHA512 b9c8fc0431ab8d8921cb169869f5368a989e3870d214ef8e278318d10550cbf89cfd77721e0da83a9ef727cd22d5e82a6ede3b24a4f0278216b585a2a78bf09d
diff --git a/sci-libs/cqrlib/cqrlib-1.1.4.ebuild b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
index 185fb0f5fbd5..86556f4e6198 100644
--- a/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
+++ b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/yayahjb/${PN}/archive/${MY_P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/cvector"
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 8da93a66b618..998a76a02f46 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.2.0.ebuild 761 BLAKE2B 8820b14ef11f1861db18a7a80a566620036b834cb26001df6cd3353118f0c7c2969f343af2509bb0788bc72eef260a2a93e1ac5cde492171638de7e3adfc24ec SHA512 34940e7365a579d8b4b211d47df2d40ec6b851714e00b5fd5c50e9fdd6d6ce4c0eb4c88a82a2fe3bd4dbd33c79f84443f27600bee4bc1848c42c45a02249a91d
+EBUILD cxsparse-3.2.0.ebuild 762 BLAKE2B 98860b77754debbfab54d454f26c7a8d4e9911b36428d4a05c7ce23886dc3aa3ba1148756fabf26f8dadef13046f3cf0354804e7f11020f85ca1ef21bb722b01 SHA512 4425f57939ca17a06644de84878f5f7217d523d413e3fda8a3b14f845e942bd4bfa137329cc2f181a81c5d9b5dcf1bbae61f86526394c197814d5e8b06139c21
 MISC metadata.xml 450 BLAKE2B 06f645dd4abefdc2442fd56a7b4ba79ad4251e39e58938b53f848c68736e7cad82f7d1ca268106034e66ceb900dcd1fb91ba110a19ee08eca5409e19e37e104a SHA512 ba5b18e97e038f65590e260a0a5fbf3e933736a316b2ad764e07d2b6acb0bc2a010cfdd7f132e303f3abef5f853f9f62cd8653d5114e6e7dd159b0aff05a37f5
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 09469aab194f..a9f3846b1709 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 2c5d260d120a..5469e48352c7 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,3 +1,3 @@
 DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45
-EBUILD dcmtk-3.6.7-r1.ebuild 1902 BLAKE2B c15b9a8a1344169b8336025b2d74afb81f6f44cd1e7c3c5188ebd55ca2ceb728b6fe2174b5f4c0487697374bdbf470f3b2159c840de0e8fc5b05f38a3b1f3ccc SHA512 4481690bfb48d1706fc7c02e070dfa95916a09e3405745dbdf919ae324b260fb36ec6dc6aa56f7bed58e9a9a72add7cc505ef40769e74b7d97ddc18164dcd9a8
+EBUILD dcmtk-3.6.7-r1.ebuild 1903 BLAKE2B 8d305c9c087d1b16b92f7cc9cdcd2888f0a3321cb9f0efd53a0b00cb68dcadc048ea2201075f8fa97f9a6fd639d5a634197fb79b15fd28948c132e5f05bf751a SHA512 c8e472cfb43c299ebe233d1bdd56cff550a1e5037a9c66fee87cfeb153ae7323bac4696a9f379a4a62164971969a431851bd349ce2409bf2397d8108310ce46f
 MISC metadata.xml 228 BLAKE2B aed5dcff29c27f92a26fb6756bc7ac8951564825a29dd244c02f697ddc0cc72a3171a360dc67db9d2fb3dcf51bcfe4078bb085c5ca0e343856819732a1aaa410 SHA512 34ff32136442a7884b3bacd8d838f962357f15cbbb4e172bbfe2f042e716313d5dfd29d29d38c4acab816a85803e2c94f98f1933c688cc76c2866454891257ad
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
index 4a85f26eadb1..88c510729a28 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
 SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
 
 LICENSE="OFFIS"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 SLOT="0"
 IUSE="doc png ssl tcpd tiff +threads xml zlib"
 
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index f9680174f403..1ad64bee6bf0 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -3,5 +3,5 @@ AUX djbfft-0.76-headers.patch 627 BLAKE2B 297b8211ec302d127501d5bcdd27f6c08b04cf
 AUX djbfft-0.76-shared.patch 3722 BLAKE2B 4b0367156c0904dad032ea218679355ab4b2d6fd7bbf2a6a8cb17778e959c40db689e9c7fe36e90d344cf9d49d53d70a7cdb481b5d409ec208d46ede6c51f7e1 SHA512 58bc4d65553a6642a1b9a25a5b57974325f201dcec5758c7bf4c86da6b0a9fa018f1099af98234e7fbcbe29b398ac22d40c25069b9b987b41f547630f2799c1a
 AUX djbfft-0.76-tc-directly.patch 654 BLAKE2B 1e564386a6601e2459b0a9c06ccb35c2d13ce64e979badce90bc34cc0a5dcee531691e8bd73bfcdac50884a5f8d2b40b21d61b81f666cc383463fe6575a2a2c6 SHA512 52a37e7c8afc04fd2e3557caff78f9df985ce57dcc9c28e9741e8d8fefe0ce5e57cb731d3f48f52a83c57315ba656cc4e9cd13eabf659b341a5a0206dbc63918
 DIST djbfft-0.76.tar.gz 80092 BLAKE2B de87fe1e2b0af64fa631b9b72e418bdd464f30b5680bc903a241d0525a48180f55d1cbc99e54dd81d3133a0f6dbba99cf55771304b4b1b62d8388aa15fa9c7e2 SHA512 f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530
-EBUILD djbfft-0.76-r3.ebuild 1858 BLAKE2B 021c786b385916044bf27d95aaca5fcba1869248ef23928844fa1d96e28e0104431f31da05757e5a573c702e2d1bbfdadfa01063e52536f911a75d56e96e4712 SHA512 fbd842b318262c65e4128896906f279c89c2e9b3b94df7da608f6770c3b3e1e5d80cce8091bafb482cf271b6aca54038727edfa7da9981e7d9c4d457e9b30499
+EBUILD djbfft-0.76-r3.ebuild 1859 BLAKE2B dff9a0c3c4c75eea34e672bd70651915d592771f4acaa99795fc03ede8126bcd128b6c21d8d705e394143b11cfff48a7238b2d7c5490452ae4a360e527cab411 SHA512 adc7521c993daac84ed2821ea91662694f059607dc5bd5d9cb25204b99a30ea8ec5b76bc0d94bf646be80748bd1ab11ed36ec84d15f5d50d50fa49ef5535f679
 MISC metadata.xml 843 BLAKE2B 407ed9874bd0211a780e994fe9f956d21f7f566e558007013c5478d1630c682a9e0b672859f7f5b5a3829ddfc83965f67bcae2f7589bf938eb74a0d0a3e2a232 SHA512 7c9b48f6be898332393a6193e82b3e740a8d48ad958d71dd80853ce258bf8a90df3db778a30e4da470dcba2c43694d1a387ceb03f6fd01f198455b8f34edc5f9
diff --git a/sci-libs/djbfft/djbfft-0.76-r3.ebuild b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
index fbf5f94fea7f..8a929cef3b0c 100644
--- a/sci-libs/djbfft/djbfft-0.76-r3.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc3.patch
diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index cac7cd38d7a2..05956e429d54 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1,4 +1,4 @@
 AUX exodusii-6.09-multilib.patch 2891 BLAKE2B 0bca9f2e768b409f1683c3d1925add553f86a9fca393551b98fefac1d4cc9913d50be4660bd4c62474a95f2aae129480533d2a51aaa2083cb5461b91c8655f7f SHA512 189047d12455c539308b8eeb81334d980f847d68b96df7cef442f8d552404e5c70f42a3e3649d62cc7db395ae2ca2f6988ee0638eebf52b3cab9c3bf964d5fc2
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD exodusii-6.09-r1.ebuild 1254 BLAKE2B 3d60b3d61f60479db0b0af3e0a9f33fa0971802fe043b57d88701829106fcf903acf0602c8a24baf420d45e9f8b78c02f3c1dc53c1303972fa89a3e3af32d712 SHA512 e0933902b2f2cc88d1759112a640e81f925c490d86ce6f4e60ba5aec36f44db482b4e8866eb5852576116552564182a95b8d6882024757041dad2a67e04d541b
+EBUILD exodusii-6.09-r1.ebuild 1255 BLAKE2B 769297459d4cb710e1a1f28a38244850e89a5534f2fea813b81d028472b89dac1fb043307d0917cc9090223d508ccddb697a3f8b90b64ac4bddce4655c20ab26 SHA512 908e97dd830c9ecb21204fda82260a267264d4c2765845419cf3089fa250b3b8a5da851adb937ba071795bcf7f16460d8283e111c85f0aae826e27a7587e3125
 MISC metadata.xml 610 BLAKE2B f5b23173a5d0468c9468a805b7f173f68bb2bd7706b73a3722051e0017deb41a3498c376168a4eeb0a6ea3944bee2ff33a53df0c240719fd660311c910bb9171 SHA512 e70934d9882935c9c599e45ad1ae2b014910d004cb9cd8b3c4691473764d8ad4c11526c9f532a377a64fb513869b191c3c3db08959c142b3160c863db9a7a4df
diff --git a/sci-libs/exodusii/exodusii-6.09-r1.ebuild b/sci-libs/exodusii/exodusii-6.09-r1.ebuild
index 5feb74cae06e..c3f4f0f4edf6 100644
--- a/sci-libs/exodusii/exodusii-6.09-r1.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/${MY_PN}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/fetk/Manifest b/sci-libs/fetk/Manifest
index 498d5afa642d..114d9d4dadad 100644
--- a/sci-libs/fetk/Manifest
+++ b/sci-libs/fetk/Manifest
@@ -1,2 +1,2 @@
-EBUILD fetk-1.5.ebuild 391 BLAKE2B 76eeb228d4ef13181e481a122de8b48d80db354f53b7ec3a743ed1f6e2d4b536f5908361ab9adb4e777f0189b93dcc67fbf0375e7139fd6e56302515d48c7711 SHA512 c2afc567e61128d249fdfe9aec40c358138559e72ef088c386e50f03bc2bbca15aae7f1186d529494143e25cfc36929db6759f74614a23565dc2be7d21821218
+EBUILD fetk-1.5.ebuild 392 BLAKE2B 7f6a3661fc0c9de884747844666d537f535e834686ef5134e5571f58a9103e51a0beccf5bdb81d78b2d3f97aaf7196a50e7d3d9d000aba2755b6d5d8e946d157 SHA512 3807a8d5c59607b4a22ea906c5392ed01790eac8703a0a9804c42fc648a512c41ae352a2fa9818a26f61bcea598ec27b30510411725dda8278ce7e0cd487b313
 MISC metadata.xml 1219 BLAKE2B d2bb6e1793e6ba154bdcc134c70ccb8f903748d66f0d613daa89a913eab9e6ead660a7dd26933848c04d25ad76d4c59e20059c4404f84d006f72b41887137e5e SHA512 74e973dcc07d81b6bb04b25beb856ed66f1c08175a47ebaccd02137917e40726fe4f951ecce7330fcfeb74c21a0a5c73696cb1c236e2b70d7b6a6737a87c30cd
diff --git a/sci-libs/fetk/fetk-1.5.ebuild b/sci-libs/fetk/fetk-1.5.ebuild
index 0f930c60495b..63f07a95b4fa 100644
--- a/sci-libs/fetk/fetk-1.5.ebuild
+++ b/sci-libs/fetk/fetk-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ HOMEPAGE="http://fetk.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	~dev-libs/maloc-${PV}
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index caaaa931223f..6eba0c7fe712 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -5,5 +5,5 @@ AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f3
 AUX flann-1.9.1-system-lz4-pkgconfig.patch 1168 BLAKE2B 9fadff93a2d603aee3eadd72d28f5af4f41b63803aa7d878d9b23e30a9c2384d48f85d2c8be8cfcd47542b35e929b8f35afc70caf6dc6c676b6521ebc6f829d7 SHA512 ba1c6307f2504814adfc872f1cbcd4fdaab23c56d84427c11c20e3ff75263ac97be0813cf9c5e9acd1a945d0c5dbb2b7660ada3290ffc7332ea0c90b1bc26ffa
 AUX flann-1.9.1-system-lz4.patch 4934 BLAKE2B eea32abae8b13d5d0e5149c58b2639c1b6f3bbbedfa8aa91f5fb83afca4726571eb4e01eb440eb913b54f8a03124bc0266c8b039b6448bcdc0bc5e87a9512c6f SHA512 acb67eb59b400b82722f064e529fc86f43c4e16ba097a3742b5717b33fcd35a619c73ec6ea6391b23f906d4bc40a5167b56cffd0267bc2c8259b7298ad414e65
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-EBUILD flann-1.9.1-r5.ebuild 2278 BLAKE2B 053172cbb1e76fe263efa976e878c4bd3aa7eab6739cc92a5d0d2fb448d0c27483d37a8c51a668e2e708bdff5e1a9aa9770031aaeb363aaf2fdc7ab819b490b8 SHA512 ce846229845592355b012691c9c17b0243ee6e7fa0b6376999b2e8bb5a84709f1856ef1cfdb467ecc601e13326d52fcfeccf7bbe76ce8549579c53728a9f9ac5
+EBUILD flann-1.9.1-r5.ebuild 2279 BLAKE2B e20bc610fd352ab6385f888ccbe9d45b2eca568ce8dddbf1eea1893cf186cddd841f84811562a4ceb6f7a91272c7605279adc40a791256ba4e38441525381ebf SHA512 16e323afbd67b9dab2b2aa9d6b713d4bcd346291e2ba6d64d628424083ad42a321f9f50dc6936b32242e61b806f17095746b9cd6c030ecb747ef12071dd062ae
 MISC metadata.xml 972 BLAKE2B b192aee4ab043f8c3f69526727aad60e2613a6b94c5b686404593ab40213afeacde74009d305fee83c6d670d50af59207ad95189a03c53fb8193abcfdfd69c97 SHA512 77b1bf0f269cd7bd63c06442cf2cd9d1405f2a40925da469a23827a1e2461e89b8ab1b80d202ead404e7fe25f9d24a91cc4b36d775349ddd9dd50168097d3db4
diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild
index e680f8def6ba..6f4b7099f0e9 100644
--- a/sci-libs/flann/flann-1.9.1-r5.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r5.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc examples mpi octave openmp"
 
 BDEPEND="
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 94e3beaf7748..016b3b2c76af 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,3 +1,3 @@
 DIST fplll-5.4.4.tar.gz 2630101 BLAKE2B b990c9346acd2c506b4697f27ff21d8453bb97473b2e988beb2ab9da34b3edd8a64d7558bca5f66a888fb4397c1e5340cf50f543ec580f0ec6980bc8c73a9390 SHA512 32a6515a3ab2677739a60a4ef0938e4284b5d3119a396104a7af22a6291ef669b42a4fb6e59f5c6daf97ff2402e7d035ea84fd1c76bfe7c0e17402bd03ae7166
-EBUILD fplll-5.4.4.ebuild 607 BLAKE2B 05aa0814aa12a6c93042ff5e6069c25c8cf1e8774e5abdb9153865653feb94211e35feb0fcca0f3c4afcdd078d42aba0b6654c1676849df05a298cf5fc5028ec SHA512 ce3d8709a0f9c4c51dc5ddac41771b6f5d6c3ba6039181985233fa23429190adf07205548ad0af93ca72af1a8f036d6a18185e3ee78069af6fe71b04b71e85f1
+EBUILD fplll-5.4.4.ebuild 608 BLAKE2B 0edc23808a661bd009ae7b4e737e2e6ff3331b66f90effd4e6e8ed58f7e49e81590280a84334163f07ca6544d66b00e4cd30598ef1c42e2178cd2502a3314bb6 SHA512 cf4cc0a7d6bdd3b7c04f5f575212f5b9c2c775ffabe30db35e50f71c39780ffb8ca163bfb90f950023254eaebe1442a242b608628117cec9f7c567b56019f672
 MISC metadata.xml 858 BLAKE2B e27b47f6a8d0bb3c17eb023c24f95472c5f791e8a9bf86c1805d1c832b0973a665fe2231f82a289c37afd5318deb89717029ae6694005ade8e112a2769a56170 SHA512 49b6fd4968670fb0da92a883b81420e4739a893a6866ae500106181df5182324e616ccee8e0f290a7cda20f3f4d850fbf9a9462d03f0057da9ced4ba1d835ba7
diff --git a/sci-libs/fplll/fplll-5.4.4.ebuild b/sci-libs/fplll/fplll-5.4.4.ebuild
index 7f1d367f8294..f947f1eaf1d1 100644
--- a/sci-libs/fplll/fplll-5.4.4.ebuild
+++ b/sci-libs/fplll/fplll-5.4.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="qd"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/galib/Manifest b/sci-libs/galib/Manifest
index 42d385803688..d042e138f835 100644
--- a/sci-libs/galib/Manifest
+++ b/sci-libs/galib/Manifest
@@ -2,5 +2,5 @@ AUX galib-2.4.7-Wformat-security.patch 1804 BLAKE2B 555615507fd4d2f644d5de8a4e32
 AUX galib-2.4.7-fix-buildsystem.patch 1576 BLAKE2B 4e26b48f6c8d9ef40dfaa1f9df7060569ebd96619fc026e0235a45d568da22658650a9f97ceb3cb87c4c78c5512c67acb280344633e349869e839b245e61b1b9 SHA512 26c8634664b75ef94028dfbf51dce5417256290703f3717ce2fcf660b166012622db97447a7272781c44d02b3d1728470a0f64d4b1a089ad5e4d44eaebcf3004
 AUX galib-2.4.7-fix-c++14.patch 3951 BLAKE2B ce6ac176bce07bda353458b9c817ff55efb174334902cdd9d861763be083990d8a21d5aba2eb7966c73af87d040b0204c14d293e1c088cebf0b227d2ff6a7292 SHA512 2f843b121c06ee124f13cac106a492f495c2043a54030ebc7d67ccf386ea1eacd72dc14e5a4f925d0c1f345038d8d04ed6de96b0030bcb205714afed1e7103f4
 DIST galib247.tgz 374912 BLAKE2B d6f0d757cee9a1c26eb4525862dc2e9761449492edb323ba30ea70cde95b72da2a90fad4a931ab1d07d8bc0fca2b62672357ee790b1e67f3e9b480d5aff26106 SHA512 9c2aca29f24d3f8401ba65c246a0ca7d1fa67e4f756a5258cdb0da111842ea2903c2d70cfd9d60823c9703bcb3415ca670a731924e99878d5536c2f7eb0faba4
-EBUILD galib-2.4.7-r1.ebuild 1147 BLAKE2B 2899e98752f6c22ac4642bce2758b715320c682723b128e2f6fb2039c9d116295e82035189a0ed71bfa79027c0223caa6b3db91be5bc25a1086e43b35bc8c8fc SHA512 746a8c18f69f76f64696831bda7bb1759312b541885d0e982db54107ea4d9f6567f7b22cb0b5d3e3a32c7c203371282332656e70492c107f8d18b68b4337c0e6
+EBUILD galib-2.4.7-r1.ebuild 1145 BLAKE2B 309fc528f2f2db82f7a63937c3ac91cb44370ae3afdff8fde4a441fcc4056a8f5d8baab9f6e5f4ef57508eb417a27091b3506fdbebd90d908e3f7bd8d2ea6b46 SHA512 b60bbfa8f4f6d5a2d9beba8e1c9cfc3386bf5cff7616b138ff183d55c0bcdad539854e0ae42455150536ab96157fb870e4f9819acad79fe3154236c94613d608
 MISC metadata.xml 506 BLAKE2B 84aac684f9ab79a2def8adde1112a3daaad74e87fc917cfe9a2aed8ddbe6d4daf662135258f54037317c8731de1ece30f4c074c0812bc76d545b07987916f2d7 SHA512 8761f36de9332f13124bb83972a2135f4172fc9a60aef28e730de84d23742a243871758313c0139a45fd7aeaeec673be3878cb0778c27f9c19932a9ba6ce14c0
diff --git a/sci-libs/galib/galib-2.4.7-r1.ebuild b/sci-libs/galib/galib-2.4.7-r1.ebuild
index 5209af1c4c9d..cb0d9e5d4d9a 100644
--- a/sci-libs/galib/galib-2.4.7-r1.ebuild
+++ b/sci-libs/galib/galib-2.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://lancet.mit.edu/ga/dist/galib${MY_PV}.tgz"
 
 LICENSE="BSD examples? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 S="${WORKDIR}/${PN}${MY_PV}"
diff --git a/sci-libs/gamer/Manifest b/sci-libs/gamer/Manifest
index 61425eebc22d..6ed481ccb2aa 100644
--- a/sci-libs/gamer/Manifest
+++ b/sci-libs/gamer/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4-doc.patch 535 BLAKE2B efbd055c70928d01a9ba68943231aeb490dbe4ff412b205d8ef80dbae7a64f1bc6536adce9421f15848adae0c4af020c8b3feef9aa2bc7b09738de299d91c0c2 SHA512 639f0e80eb116c77d723f707488cd66124f1eaefa2f74c2fff80152ce0cf7f17b9c334f33500eeb0f78f11b0574bb20945dcd9718b1ef5e9a149ccce07981228
 AUX 1.4-multilib.patch 872 BLAKE2B 49618dbcb651bc9e307decdb778a3ea5c9345d09c58b1a407a28e821eea419411cbbd79e2357d1f93f4f0b9d927747d31464f83286b96cd70f4e93f229482dd1 SHA512 44ac7731277c47b822bbcac11b62d62e397c539d7a9dd32c805ee656ecc2cc4cad2878082212abded212419bf609823c21f9d351ad828a07357c9b2900c112e9
 DIST gamer-1.5.tar.gz 4232061 BLAKE2B d2cc861a3529678cd2c17bc6e333c99d2e155697ea935d91e1d2be65fa392e0a27b491eb102f5fb623c90a611d927482d8064a134124c1ecb20d7aa41060d64c SHA512 4911b208ae5cd7be7ef165bac8fc9680ff03c0936881ae3d162205df9ef4f3fb176455e27b2f4ca202c3129352156cf5166b1d7d99fde7b281b404e383f72a44
-EBUILD gamer-1.5-r2.ebuild 1001 BLAKE2B c6b37f1c70c4f18247256b07d10430081b0ce0219b3c6735e52b470547fb88adbb761cca84908617ececce9eee092f84bc0292c963d3df3fbda0d124f08c1a61 SHA512 e9f153886cd4d5594b0c9406eb08569247ed2fc7f88979f5c71119e88ef8815123d9a27a882aa8933a7ece9e4e5c33b70bf95dba7c1fa1966b4b67b4653ac7e8
+EBUILD gamer-1.5-r2.ebuild 1002 BLAKE2B a04703131e62cb40d0875991392b17a8b5134b68b628af4dced229670d2d8a18dc05dd562226eb889e3de35a747c3cdd28554b418912289f2e863ab84774e6fe SHA512 2035cf4b5f7ad513a20a35f66dea7f3e249ab2eb1da6f2845724c50332313f5d94ecbee63682d0a65288f893419f01f4ac7e035bac5f90d9713f7d46ad8dcb03
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/sci-libs/gamer/gamer-1.5-r2.ebuild b/sci-libs/gamer/gamer-1.5-r2.ebuild
index e8fc10d94826..1a48e31ad7e5 100644
--- a/sci-libs/gamer/gamer-1.5-r2.ebuild
+++ b/sci-libs/gamer/gamer-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/maloc-1.4"
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index 830c4009195e..cefda44ddebf 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,5 +1,5 @@
 AUX givaro-4.1.1-fix-pc-libdir.patch 549 BLAKE2B f564256b81f1e2ef42bca171fce581e603887905dcf7fe8c881e59aae82d062767efdb096598f92bca09e9127c98fe023e9c034b5b38ef4ca575da9e877ca334 SHA512 927b1a15c834ba2c1cab37e1fdac1ab1c347cba7aba98be652e2ed4468d2a0627cc7f4820561655d1a223c02f8eaba7cc2911acb9998fc853dc20590fb1c74ef
 AUX givaro-4.1.1-gcc-10.patch 1035 BLAKE2B 460371ff8e628e1945a29d9c6d2b718c7d98b07b023540bc49a439cd941a19191db44536a1514495014084a85028debfb4e714d6d9efd9ae7c7c12687d5f8400 SHA512 3e154b3cf6c11a106f78778eeaaf0c2cfe81e25d18f623b5b071b306f1221c8513f27f87ab3e3684a8b3f18138dfbb516c33691dbb854072a35a0be21ac0bc48
 DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
-EBUILD givaro-4.1.1-r3.ebuild 1899 BLAKE2B c42080f053e1b18a25de706f235d03ad149036df6c9c49f60978b78abfffd7f6744c761a189500fa7ab4603a89ff92ada55302d65dfde934c20ce58b2954cb35 SHA512 125bc7f4d684242f3f26d7851aa1b849727e1f43fec44edbfa173e14997b14fc45f25da320579665ac05e8cff885c5b81f856487e30fa0fd5d725e622a704181
+EBUILD givaro-4.1.1-r3.ebuild 1900 BLAKE2B 8cbdeb653e6b381b48e18cf671e595feaaf2b43dd818d8fff3f4870e4ab530dd11a7abfe6b234ecb4df5df8c35e58372eb80c1e74e49b7d9ed3274337898e145 SHA512 69a160fb4b74cc6f93542a4daf85507cad29d649a3523b3e9856b7e88700f2a291de682963696477dca0371f4dc0827fe14ab41a6a92b84c4542c46c551a378f
 MISC metadata.xml 769 BLAKE2B b407b31de2f554fdf554b2d77c2dd0b1bbf39f36b29fdf565f50362153798c60bcfecf0411247eec556ff6ddc92af0c49e11a9b242b5e3e7b7dcc1066527d08c SHA512 063ccc3fcd55f3d7033fd23efe5095d83784d0e60cca2e1092e534fe06d0e69d5d340a0a25547bddc2962d2906c14a2c996852e2c198124ed007ecdfde4fff2e
diff --git a/sci-libs/givaro/givaro-4.1.1-r3.ebuild b/sci-libs/givaro/givaro-4.1.1-r3.ebuild
index 9a656f56f2a1..86922d8736ca 100644
--- a/sci-libs/givaro/givaro-4.1.1-r3.ebuild
+++ b/sci-libs/givaro/givaro-4.1.1-r3.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar
 
 LICENSE="CeCILL-B"
 SLOT="0/9"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest
index dec066410898..fa32e52a2c7d 100644
--- a/sci-libs/gts/Manifest
+++ b/sci-libs/gts/Manifest
@@ -1,4 +1,4 @@
 AUX gts-20121130-autotools.patch 612 BLAKE2B 1dd5e897db2453d704554918c4473ec60f0371994e05964ac11c561cfda55980ce7fc12611fb3d5588ab346cc4a78f280371b5c0db633ba052dcc0cbf4d12d55 SHA512 dc80e024813c045f3379552f2ad3ed63b048462622149e33ab97c74ab0c75cfb09f928f6ba975b4e94ac201f3d04a4bec1016cce014c134e4baee4480ec38158
 DIST gts-snapshot-121130.tar.gz 880569 BLAKE2B ffd35083122ec40b9ab3c301965e2f40f35f81cbb51947fee01d851f545d5314cdce6c24eee2cbcdf08fe492a63eadb3720535d3f4ed913f3309561d0d382c80 SHA512 84c38dc345830eea75755d9d55235b6d76786a84c3b9c3b7e057437bf395a9f2687596bbf037afd601b9f31a485d425a371ca5e60680265f10cb414400db4142
-EBUILD gts-20121130.ebuild 1179 BLAKE2B f6d0431ab6733a467b1f84d4a39c39282146b834e0f9c14be2cb255efa7a347cde2a6192580a3f7da13d8b2b3717b9b5bbc0508279f5a5ea9a9edc9aea34d0b5 SHA512 66ed3c0c54130356f39898a17e2867f67b5e0b882ceb8fa0c1ca5e15d551eea624ef2bca2a6d72f2039bd03cdf2882e3eac5b4817c4c7e434702b2042deda823
+EBUILD gts-20121130.ebuild 1180 BLAKE2B ea074f4318c606662be751f0af9e6589ba64c2dedcb70711380bf7caf5a06906ae8592782dc7cfa8ae9be18d785a73de8cec0fe5e5c2a971449212215ec06a90 SHA512 68fdea17afbfa2a427289b6a023e83a8343835fd726035debe705757cda8645cb3cc695ae80a69e408e0bf0f589142978ac1b1349e85e6378b3fe80ceac36dfb
 MISC metadata.xml 511 BLAKE2B 7d84726e3807de09c17f463a9b03e993592cfdffc9c8a6e6604f4fd8707366302057cd298f294aba2f84f05114587e6b4ac9bc9f70393c2cda2ee5ca2f121c7c SHA512 80ab76a08373dd78b3de544b8cb1c1c185c55cd6bc86baabd932bc6ddaaf6737f2a6add2406d9c40816c6124d6bcfbab203fa33303300f4428d075532610354a
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index b1691a17cff3..f020d7942f5c 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="test" # bug #277165
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index e5bb924aad06..1e8b7f35c405 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -13,5 +13,5 @@ EBUILD hdf5-1.10.5-r1.ebuild 2940 BLAKE2B 45e4cf6004cb70667829844ddf37f2c4f96d6b
 EBUILD hdf5-1.12.2-r4.ebuild 3209 BLAKE2B eb7b30bee62cbad778b07f089026395d70046e3845b636bdb526e0960e4ae3789f2e5d1c9eac6fc213b755809c42946cf332446582d032d04900cfd80b57b06a SHA512 e6c2c24f9558c381b8ae5da8f0967635c64b02ad5f8288d5a08841c7637f8de7b72229f89d8be2cff5cd0c8c4482b404db3a7d41aeeaa927157c257f91fb62a3
 EBUILD hdf5-1.12.2-r6.ebuild 3341 BLAKE2B c574efa933f240fae23049007c320138ea43354ddd78194d74e6b27f630a6ad0fa2a1bc083b563006eb7dd7e36ee00a77a6f684ad42bee383372a79750726d9a SHA512 0385774ab2be1abeec7467886f8900b514d8c1410c531dac7753570cb9e47d35750cd8ddfe92a0df524ecae8889602cc27caa15a52d8e94aa10455e50cf18df3
 EBUILD hdf5-1.14.0-r1.ebuild 3111 BLAKE2B dd454e38ca53ae164ae9666f04bae8e26a6cde15e1b677db621b804d5e2d01d4679a8cdc1fa99a3171f1b9bfa777d3f80a9780d9930f91a6c3dfa113e6a1d737 SHA512 540f9f5e24c1ab13943296bbb0a6c4d2fcd6693d600c42bf21458782622cfa308bc182a23a1e12a9881c35e40604f736b5c14eda0194fefe2e6e97ccfd3de025
-EBUILD hdf5-1.14.1.ebuild 3060 BLAKE2B e340b0b90c9b37f5c1e67e0c28be6ed1935b8c3c94582204e27acd11e1b30b1586f6bbe565610b35f996a18cea0af6bc459a0a324d115a0954b3ebeeebc0776c SHA512 b40ab1c8218e75109689d873f149463d7e27de37f9df4eb2e068f7d556d4b649cb4fd5120577f7376d3d1d69c02f31267afec40784185064f45f68fca2fa4b01
+EBUILD hdf5-1.14.1.ebuild 3055 BLAKE2B 5f46acf0b436703be378c054dc816d9e4754688dbb270e591facee86efe74d21df770a4bc96a70c78e139d45c99d558e09987a462326633b544b6feec7333fdd SHA512 b731f19c0814f8de8e9e7fd5488ac05c2474c3630b09095e920335b0a0bd2fafe7c8d935b4340f86269363574390aa7355ce33ae89377575baa4c1514efccc24
 MISC metadata.xml 826 BLAKE2B fd131bb207e4ab863ef7c05ab95e5c0254fa08230139a2508ab5f0c363809b0735532498ad26cc39621495a063de86ab5bd97447514ff561a63302e8b1d7d26d SHA512 290883ed9bf3de60bf04e2474c4db50e095b1b87974867e58601a5c5c2f98d6b839ed22d9ce2798bc44f484f1a38ee4b6df99aaea7d134629bd441d34b5a29b5
diff --git a/sci-libs/hdf5/hdf5-1.14.1.ebuild b/sci-libs/hdf5/hdf5-1.14.1.ebuild
index a71ecaa91a84..1961ce8631e0 100644
--- a/sci-libs/hdf5/hdf5-1.14.1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.14.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 85b4beed0c6c..addb814b0991 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -3,5 +3,5 @@ DIST hypre-2.21.0.tar.gz 6017038 BLAKE2B 500885cbd9f2b79c8740d1031a3dd9e5fd141dc
 DIST hypre-2.24.0.tar.gz 6116863 BLAKE2B fade61df0dcef3a93c8f4ff32eb72adbef56d572b8ef18202d8cdbbbd4c53a46a21f3478cf10720c64b1eaf0731e5a6f2236736ec9631f8500ce966f55d03cfe SHA512 4f27e99ba2923c6394ccc3705930897430becef840415004d6fae2fa311fef5b2399265ec1211364f883b35d00933523e65888419890902bcd4e1e6942b66560
 EBUILD hypre-2.20.0.ebuild 2601 BLAKE2B 8369a62a5984128a6c16241afd3e888634176bed2ca65e1bae0bbd98c32a09b42ddd8e01ac72a392d5fd693ec4105b9ee65b8c7ca83945f9a972ce964c357447 SHA512 b72eb3ad60e1f2640cbdff6ae85025794d49cba2d7813cef8719c9667bec9aa37e14230c495799de2728280d7bf2909458165694ff8a4908048d77b15288d207
 EBUILD hypre-2.21.0.ebuild 2594 BLAKE2B 5f2114028d0b4e79be150d198f5e1dcb09c54384d4dd3e19da7d2886d3d3e101e1f8b3696fad65ae3c9bd4c0dd0a646aa9d3b0571bd605e36657aa10af67f046 SHA512 00f80fc4a1a3fe80fcfa0b3c37aa99721f29a3e7efcbb11d1c73d6807d8599d30eed5bc3d33fb1f28d1225a96debf0aab6fdbe07c19d0f06912e282a7e48c5b4
-EBUILD hypre-2.24.0.ebuild 2594 BLAKE2B 5f2114028d0b4e79be150d198f5e1dcb09c54384d4dd3e19da7d2886d3d3e101e1f8b3696fad65ae3c9bd4c0dd0a646aa9d3b0571bd605e36657aa10af67f046 SHA512 00f80fc4a1a3fe80fcfa0b3c37aa99721f29a3e7efcbb11d1c73d6807d8599d30eed5bc3d33fb1f28d1225a96debf0aab6fdbe07c19d0f06912e282a7e48c5b4
+EBUILD hypre-2.24.0.ebuild 2593 BLAKE2B feee0cacabab27db678b7a4e92241b0635b685f623f5212ee085b1b1cc2f1305a12b4d98cc28d0c1ce83b3c8df4ecf12e30eb108752c3658755bc6a2212febd6 SHA512 139c6a863f289c9b72759758738c86a57cff5b653e5a9bfafe2ac2022619d7cbaf71a0804d1d70cc751ad42be5d2c090e1acdd920db58585f4bd86710a954727
 MISC metadata.xml 616 BLAKE2B e048d1098bac6c90fe41d2971044618675902957e8b2e1acbc6b4a0b1ad045d33d43f7fecea667848e533796ce05cd5735fecbea9b84bd8950f3bf38d84e11fc SHA512 c24906c2f269b820f3d926b805e5debac9d2fa864f15e800da698a93f517f6b6d2c14987d8edac0691627e892d3c2a2b8e58075feb8db2c701200861fdb05195
diff --git a/sci-libs/hypre/hypre-2.24.0.ebuild b/sci-libs/hypre/hypre-2.24.0.ebuild
index 8c9d5ab220f1..c05c8fa99193 100644
--- a/sci-libs/hypre/hypre-2.24.0.ebuild
+++ b/sci-libs/hypre/hypre-2.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples fortran int64 openmp mpi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/iml/Manifest b/sci-libs/iml/Manifest
index a4cd9ae0f582..2dd5286c1003 100644
--- a/sci-libs/iml/Manifest
+++ b/sci-libs/iml/Manifest
@@ -1,4 +1,4 @@
 AUX iml-1.0.4-use-any-cblas-implementation.patch 865 BLAKE2B 5167ab1a5f82e5fce596dd3f7cdb3a711f0fd5c86fefc6a36574bcbc63e464115895e43d81eba3d4d04bd016266817440098eed18fab04b30bc45dee37497ffd SHA512 36181f90032b6f4d786d50b327cb342d5c8f4431dd556e4267e99b02e92161adbb9c23d7815e1764d8f237b1f008b2abebc27bdc422ba7296144999f0cde3c19
 DIST iml-1.0.5.tar.bz2 391757 BLAKE2B 5895b353269ce19e17e2522f78eb705c89a47ed3c6cce54d1b7ab3003f59d0a13050b30ce9cedbf38392c737c169740b6c2433f1a74856b0f9d4e6e007ebf804 SHA512 b5a85982636035cc50acba7dcff5478c6271be3669313f01915b2761302d4c77617c0dd7932daf74433098670d3ffdb2ef19eb24450b40709750a0b7c8f797f1
-EBUILD iml-1.0.5.ebuild 694 BLAKE2B 3e0329fc29f93d0538b87ad0f90b596428b8f829b2440b611612345e416c011c9962e34a298555538b76ad4809cc604b2ddab0947201add33faf0e50288d47ad SHA512 96f492c55e946e361006df7c4a224976d46603a4cc1accdf7bbc925460ff1d893e9ff8be6c33134319660d80ac112f119914efd2cd64d8a1bf4f4b665c47bb0b
+EBUILD iml-1.0.5.ebuild 695 BLAKE2B 5fc5e952dec3aad3f73f8bd3c36ce99c97abac403094202c3462e63a2a9a722bd6bd4aa453b1cfa25a52e639de0f8c52663ec381f9ee559cdbeebb34d99b4370 SHA512 764cdfd70cc9142e47be6ca6800c6285de95c81e7ea1851f5c29b2bbdad0afd9bcf1456857f376556361284d516420b000932c5052006aa0b4eb5f2437d2ea89
 MISC metadata.xml 435 BLAKE2B 2dcbbbbeab2b53ad1407e3e52e4a0067853099061866f8a1f20eabd82ef7eeafc34fc806701a0b496ea874d5c47ed46c3963d5f0996e623eaf5172bd99141ce0 SHA512 f3ed1aacb63866ab9e5df4d62d8c5dd50a264d32fa1c52f1b960822904c185cbdc0ae708b391e321378b1bdf1de29bb4073752c43bb82609877ff607d65d2c16
diff --git a/sci-libs/iml/iml-1.0.5.ebuild b/sci-libs/iml/iml-1.0.5.ebuild
index 29bfa917676e..e87b1e50a002 100644
--- a/sci-libs/iml/iml-1.0.5.ebuild
+++ b/sci-libs/iml/iml-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cs.uwaterloo.ca/~astorjoh/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="virtual/cblas"
diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest
index 70ba8080d547..e95359294a3a 100644
--- a/sci-libs/inchi/Manifest
+++ b/sci-libs/inchi/Manifest
@@ -3,6 +3,6 @@ DIST inchi-1.04-doc.zip 2128303 BLAKE2B 041ee948e8a852b66e64c8b04a52a4b4972a750e
 DIST inchi-1.04.zip 2701930 BLAKE2B 12e5153fdefffdd97794b3942936f93742729cd195a1be0687762263e1d8aa9b0130a79cc1c8a652d2cad67b14a175b8f5ad968c83094f9ebf250f43bcebc18c SHA512 c5a1c2f08d472fcde603acbd898a9a8880407474869eadf0089444503693ae89ff805c579161cb3ee9d7f18e891289a21c4b8a65cc7ece69ee730f7f4e283be4
 DIST inchi-1.06-doc.zip 4143516 BLAKE2B 10daaffe40c1ce523ec1f51e090d4cb0080f17ee103859a872eb2a5606b06e84b25459c3ed0492e5009d4898caef36ce251c34bea8148ee773e4c9bff7f0ba3d SHA512 df31014d21d46498e3bcde85d8c782a23193225e8d3b6ba7f6e31816c935c8ea1a60b2472fb0cd81733a47ae71918de973324ccd20a49fea3808bdfed92e6850
 DIST inchi-1.06.zip 2931129 BLAKE2B 9ae317b359e886c5e16f6c5f2ef6037c1b9f46b4928b1cb372d7dc4ec9f50e695bd58424eb30c75b823f8c12d392a4aa0070161c43a448e6a078d2427df8c956 SHA512 56248030f30b0fa065cb783353cc9eab0da0e39b580a54120e9fca0a2ad8a0cfc85da1ea81b6231e48cfd59a3a5d81e1c6310778d913c21ec3f2e72d6a7fad8a
-EBUILD inchi-1.04-r1.ebuild 1624 BLAKE2B d618fc05911b99c7e5503d23dfc7e0fdabaa873d69e170dd4d370d43349fc40b910214318ca8c4f8aa3d7e89c8e8c26ffeecbed70e9f4c21e2643d37210db2c5 SHA512 6827af53782c5b1018ef670c0048533d5bc8a905cf05d82af672b2334cc64f3980756869527ddad3507917dabd4d3efd5a1a391a704461c5cbe583d289358ca1
-EBUILD inchi-1.06-r1.ebuild 2013 BLAKE2B 2874d82ccf05dfa279a0a283d19ce73baf9bc770a60a9ef8e9979bac660d9944ce6e1747f3f329f14ed4b62cb6553c5943d435e5b7577bae2eb5b7b01d468d7a SHA512 aea2ffd9558c5c9274882d29220cd48861971599dd2f74f841453d20e392fb2a5d4b817827717fa94ceb925369da225dc8627e62d777c295475d369fa9898293
+EBUILD inchi-1.04-r1.ebuild 1625 BLAKE2B f8e64efb6af03253f98fc65832fa9f68ad9d8b6b23563c05f3c1d9a67d7506467956369a13d3072689c8914175caddbebbc8a2d8056079c1b585c45fd518bb01 SHA512 88b121926b706b09fb39e20197849bde74f4742d0b71df410a20e1fbf76111f628f7fdd1f44449c978a278f5d38921cd5b80e6e4b79bb42d29f90161bb8424cd
+EBUILD inchi-1.06-r1.ebuild 2014 BLAKE2B dd328570aafb3b8a198b3d5e8ab33a41b6faca6215e7d98821252593325a531cd5f4cef47c1d5291a41c8bcb31c86a7a1458bb2e0c19548173dd37f07c493127 SHA512 6f572e73c350d9e6c614b8295c8923424c5add71ad09eaadd2f11c5d5a1406627e53454d7e662437cad46f7563d34459f69879056fcae4430556b78e15d15213
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-libs/inchi/inchi-1.04-r1.ebuild b/sci-libs/inchi/inchi-1.04-r1.ebuild
index 8880af5f9093..47eba9dec162 100644
--- a/sci-libs/inchi/inchi-1.04-r1.ebuild
+++ b/sci-libs/inchi/inchi-1.04-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/INCHI-1-API
 
 LICENSE="IUPAC-InChi"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/sci-libs/inchi/inchi-1.06-r1.ebuild b/sci-libs/inchi/inchi-1.06-r1.ebuild
index 3536521f9a9a..8b8040286b7a 100644
--- a/sci-libs/inchi/inchi-1.06-r1.ebuild
+++ b/sci-libs/inchi/inchi-1.06-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/INCHI-1-SRC"
 
 LICENSE="IUPAC-InChi"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="app-arch/unzip"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index a0a28eaaa8c5..6ce47b7aa212 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1,3 @@
 DIST indilib-1.9.8.tar.gz 2633085 BLAKE2B 045d38fc565546528fddfa83cfd78650d30e41769923d7ec8f462a617fdd298228913a075a9f0b511867aa9174143da010bbb4c015d8b5a1d51f2b80090e50d5 SHA512 b9551547de277fe311e4779e65915351850a25fb049ddcfad634ef385014b521416f2366cf50cda80cdfa4a754c18face21cfd59f7f45c4018ca733ddf981ab2
-EBUILD indilib-1.9.8.ebuild 1843 BLAKE2B d055e6b6e9cffe9ec476af0dcf567abf8f5123f295ebd80368a013e5410f6077c622c0a262bfe0088e027b1745ddddd99f1dcd08d5a0ea360c8b6425f08112db SHA512 7f35e5f597e52b399c4c31ddfda8c5add547199fcab48d1b12d8be646a16cd4ec0bc59c95ef59b99e36e10e53c21063944e07b0b416ae4dad80aaf11d27d6d5e
+EBUILD indilib-1.9.8.ebuild 1844 BLAKE2B 15476b47c941e4ec9994c5c01d082dc12d318d87ae96fa68fd268c9e8a63d96025c1982afb9afa12b28ef5ed4bea50ba28d2ddd1acda8f439f4e70cfaf0db867 SHA512 75a37db288c52c2fae71b7e3f9b0a48bd5b9799c816faf625df33ca03161ef3de580fe67ccfa7b37d15a27ac4ea5895f42af039de7135c182aede1b48edde976
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-1.9.8.ebuild b/sci-libs/indilib/indilib-1.9.8.ebuild
index 7fc71d680158..d7ef0939608e 100644
--- a/sci-libs/indilib/indilib-1.9.8.ebuild
+++ b/sci-libs/indilib/indilib-1.9.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/itpp/Manifest b/sci-libs/itpp/Manifest
index 2cc3ae918a87..80e5933d0ab8 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,4 +1,4 @@
 AUX itpp-4.3.1-use-GNUInstallDirs.patch 4717 BLAKE2B 2f1ba3119fc88d4a1fbf4d37c56dfd2e83877c71908f90b2ac8f9751c7714556dff8ccf7a04598b62517f5330684d79ad0acb9ab366e07be76678cbb1c6e9f86 SHA512 2743077344955bdc47b0ec5a763f04fdbecdb86edb00f1661e0b94f878324dff54e7feb8de4e157ae9b9e7c6c853789dd24faa1bced65a5ebab9179d59531d8e
 DIST itpp-4.3.1.tar.bz2 1289687 BLAKE2B e14b88e6e37185525bda0d85dd13b3ef9ec8fa68f1757f56dce6436f7b9492a40aa256872186058d8fc090be656e977e0ce3bdbdf7346d2a940b481865e6d02c SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd
-EBUILD itpp-4.3.1-r2.ebuild 770 BLAKE2B 980174858a2479021aae9f5aec037e80e20030df0cb681538862c4f864f15d24fb4dcd680d056b26c4b18d8bd5ab8429ac45de08d7e0f21d24380b52e0dc74bb SHA512 2f9f6df0cbebb07726743556d4f75fc17fed01fa677f17880a59d0edf89cf61baecb64d38d69e0d487c72f2142000fad52d857bbd356ea827c538d12a8d8ce7e
+EBUILD itpp-4.3.1-r2.ebuild 771 BLAKE2B e9db31fa55015ad01f800a5c3a631ebbdccac29293cdade4184845d9e1d99a0c9c0fa9692c849194d580513d852f28edbf92347891d2cc4f9de428f6376f1f6b SHA512 46a5a83aa6d69b2927eeadb13edf87f03d1b14c1ccf12a0343c1c9c94c105b1874d772a36ea470820ab483b39928497866d77e2c8e87173565cb83d496174ec9
 MISC metadata.xml 781 BLAKE2B cbd4fb57f5549bd816031f8fb348943c4ce298cf000591198a89a0ad4d92d1fd7f6714e075750322fb04897faa9c8108ad6a9042865166a1af51b1f162dd4331 SHA512 58f20ad324a80e01ed8bd122768e167c667d6838eaeba6f12762ef417913e60fd58dda5e05fb25559a8a81281fedfa9b26d5c0560ef0eccef298a6e0d7eb872f
diff --git a/sci-libs/itpp/itpp-4.3.1-r2.ebuild b/sci-libs/itpp/itpp-4.3.1-r2.ebuild
index 694554f3b582..6bb89700ac6d 100644
--- a/sci-libs/itpp/itpp-4.3.1-r2.ebuild
+++ b/sci-libs/itpp/itpp-4.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="sci-libs/fftw:3.0=
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index b3c9dee3d42a..3c2f81e69e92 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,3 +1,3 @@
 DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6
-EBUILD keras-applications-1.0.8-r2.ebuild 515 BLAKE2B f24e0859090ad43697932da2c2efc7123d19c138fb9f7693a5a7b190d62a778669ff673f4290c7cbf606ea8bc7ef589663b46e5b91906e7fda58d3ec4bab5647 SHA512 3cdac9e6f08a1e4abe1690fa7123df2ee7d775bc38cf9421fd492f31fb9c7be7d0b9c9bf474e231ddf4b2756993e3834c26898721f6f431f55a914b06767bfc3
+EBUILD keras-applications-1.0.8-r2.ebuild 516 BLAKE2B 62be29c596d05c8a443b2da151e02854c5ac1bee12692b28ed35599612ae3d7be8b8f3632c7aa380f037d80727e79c730e1ccc6603bddbc4892e911c0a651b51 SHA512 1fa4ce1692b184104431e5c0c06cfeaeb567048636f555578264bcce47cc3871a2f2971b8e5519ebae6e2704fdc97ff86c6b4625bc8d179a34a462e7db00e0fa
 MISC metadata.xml 622 BLAKE2B 284cb36e61afaf60b1a8f59ba55f52d5dd4489709e927df4c5e62afdbc7c604b38a6959578498adb1014ccfd0cd725d1a6b06966976acd6ad50efb38195ffc32 SHA512 b2137434d3919e17e79fdd2884502c8b082565e9462e159f38f3b7ac873e0c1266124afc2ffc57ea94f0f4bc987d692968b998f2089215f1b68665ea9b44b33c
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild
index 75f506838541..16e901fdb80a 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.8-r2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index 4e6f728c8464..9b400d34a64f 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,3 +1,3 @@
 DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec
-EBUILD keras-preprocessing-1.1.2-r1.ebuild 541 BLAKE2B 7b8b65331a9d53f28c9751f900987caa6cd572932c0620378b2b2ba3bbcbd6c67c12a63f21d28810db3a89c1aca4d35807c47680d4c857600f5411b29151f55e SHA512 e6cb68f937bcf0cd6b68e51abcb0fea1c1a213e629d5b9c6da5d083019e3eec9fcfc966bf9b0134a085c15cd46995d83a5ade04bddf5318d376d5f25cf499b60
+EBUILD keras-preprocessing-1.1.2-r1.ebuild 542 BLAKE2B 71896c823a3cc8ac048ae17414f0cfd4658e2d4c64951690d7c7964b16f3329bf7c62a7532a8280fcc77b03bff6530c0e7405722cc42d5535725cf633ccebbf8 SHA512 317fd31cc7c716312bc4725b9ef0ab8a7d1d202930c22cffbb33c24c095fce5fcaa7ad8d95b484a3943cc7615d73a3ce97fa99f2cc45057c22f6f4e4dd8b25eb
 MISC metadata.xml 586 BLAKE2B ad53f0cfe824544995fe03a0b13af89ca96e443d140751b6ca9f8fe566a50f4a1492a5ba767635dafd4a47ab7470524b31bd592439f369e9f9f2ece8a643d05e SHA512 ccc05fd9545e6a56af7685d560c16ce9237a45dc1a78b4f04e23729603f5f1c77c22c528916087a9a6d44e19087b7ccb6e4126751004eb0d72e956fa3c35afc5
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild
index 713ceb444748..120e85768ffc 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://keras.io/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 92cf22de66b1..0135200fa3d3 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,4 +1,4 @@
 AUX klu-1.3.9-dash_doc.patch 931 BLAKE2B ebd1f339401151fcfe4ab05a23d8818ac288567c8baa4a2e0428399d03f5bf75001dba373fdd820bd3f6d69d45e42d1a36e347a27ed34e7077b7e0231a21f15d SHA512 31f859dd56d429d2399fb7b2065dcd9630e4b30bb84d6f24ba63b5a10d3f1c608b3b6dd148eeb463ea08e09025d5784a8534ae4624654ed332e89856a6d8c8fd
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
-EBUILD klu-1.3.9-r2.ebuild 840 BLAKE2B a59e1a4047d7f808567b799380623667580dadc7f949a69255efad50baa7e1a7c6df80f6b0fa01545c0b927de71104a3eaa44d1efb44ff31d7ba6c5d3b3b7d42 SHA512 d95a692da3ec8d28927749cb6dd89df00b95686a59e7ac9808d8aacb53141e87f44c83cf121d3ca5dbd969bafd96dcb07361a51adc48f691f3f03cdf58c360db
+EBUILD klu-1.3.9-r2.ebuild 841 BLAKE2B eece89450a0b627a6f68650ac00391e69ce441af0f3aa302ab3edf8e5f196b07de2a7d69a629500f60ee56e0a58c170d5b5b0019cd5d7d415426c45fae60e50c SHA512 b5b94852a03bbfacf3690d949d0c6900e70eca8deb057ca2aceda33f9c2591ba29076d218e98d5abc7b9bc8d9cbbdf772e2bf4209c6d7cdc4725b6ebea07733e
 MISC metadata.xml 461 BLAKE2B 12b2781a0636a67e56330afdaf8a736c490cfa388f786af46eab161523822884f272e829d88105da5220d05f2b37a0da955b20857896420e59fe0decd3fabb16 SHA512 9a12022b1e6205984851551be463f1f499f3c52e1fe008a820693434e26eea243b7ab56252bd0aaea0d748a8eba990fe0f6ad13c405266d09543df57e6f18c1e
diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild
index 63e040f084c3..d4400810d297 100644
--- a/sci-libs/klu/klu-1.3.9-r2.ebuild
+++ b/sci-libs/klu/klu-1.3.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 525b7fb02fe6..ffbc86051cf2 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,3 +1,3 @@
 DIST ldl-2.2.6.tar.bz2 342923 BLAKE2B 7acf1a82824de013fe9a7742fb2d5c44c86de96e95d1d7408106d4af420dc3655ab7533eb80592b52523245c7545bc246bf129712547ff6eba856a807c78b6ad SHA512 266c9e62c474a6a9b2d7f74aa580e313fbe4b322197236ba6fbbab6d1756348cf146c1d807ea6d8d0e5941cedc48298e8437aaf386dd6c433dcaf41a9d0b7371
-EBUILD ldl-2.2.6.ebuild 629 BLAKE2B 373cbe35811d3dfe525211e578ba5f82c34ca905aea63983d903b24126aea6e4075e562f0766d41fa039decc24ecb7f29ff635132439909b7b982a9c562c4400 SHA512 ea3d4b82262a597762e12e1602dbe876b1f081542c631dfad07db464d0c5fbddb6ac9a31f7e6d92e8b7b2849b09e1ce14eb941b798fa25868acc6b0f5df1fb75
+EBUILD ldl-2.2.6.ebuild 630 BLAKE2B aff0e66113bbd9b3263546478f9d203195bf466b808f16e8666b16f58b531e0c1d125128e70fcbb08f67fff9e1c175d35384a5347c4159b63146ed2c0be1fbe1 SHA512 875dc208fd53e328cb26d7a9ef4f6049363d528f6bd23eb9b85e2b4541ff95597a2bd599a4801f67faf81b5c999ca7d6e7ff4a8ff7fc03095e7976ba55d56bd8
 MISC metadata.xml 892 BLAKE2B 20338f1ef6872e6318a2ee0bb3365c07e1fb5dd06289f7aeac32c3412626580075735ef97aff5f3ec9ce92ec82f6d1c155cc01fe49552349879164aaddd59d45 SHA512 c8a9418875ab2b71be0f6fa5023641b650ac6a897e1c04b6facc97e16eb5c83433908cd2e9e56aecc8a67712c150e6af1d8273d56ead415ffd45e76f83f71f90
diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index e5e74f6e7d0d..6cb4ceafd590 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index 431e2a04cfb8..11bfe2a9a590 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -1,3 +1,3 @@
 DIST libaec-1.0.6.tar.gz 2777547 BLAKE2B 20da3fdf659c9d47ffde442ceaa9f9a831aab70330e27683ed4b62a28fdad02ec9c100413580f04d5a2bbbe86f3fe54b065230393bfb5e7746c522cce71513bc SHA512 f5d118c48225f97b229ac11425b94adff4d3698733bf18767b427e49047f8e08768464bc9cd9f5e6a66ceb44c8ebd9904c4f6f46566e2e66fcaa1049b2ebfcc1
-EBUILD libaec-1.0.6.ebuild 1086 BLAKE2B 31e5921cea388b4c3392be61b8a75e34404f8adbdf05c0fcbbb1865c1310dda3da866da03e5e3dbb722736234df574990ac32827a3259341efd24f45e313dac5 SHA512 b5eb08b826a0c7203ae312300fc648aae74412f79efecd35946788d674c072b1ffb19f940312d59f06fdd510c6515dcbb301fec759ffc7087d7de804afd16296
+EBUILD libaec-1.0.6.ebuild 1087 BLAKE2B 824e5bef5c2a965751059b14457e6c390f40411196068b472d6a025433259d7963a43e87cfb753ce36d0b03768e4cf430bbc60cb140cc862e3357ef16b2f5fbb SHA512 a9d5bf0124e49b345260745d45352b7d12b55f138ac64748fdd055cef45368c4829e5ea238f1c2d5eb38873856e0c096e631edbe2a2157b0aca1b16e28138fe9
 MISC metadata.xml 720 BLAKE2B 08fdb1266842d4855449e2b444beea95e1bddac8b4501a85ec79b1aa40d4838d3d0140b48a0fd366ce588a55873a986483c0ba3216eb5609fb4c4c13da205eb3 SHA512 ffae51194154bcd13ef917b2e16fd9a49725ed163f742d67715a2b1c350bcc3a2bbb9e9ef788fa9e776ae4361911a8954fd56e03adcd59c54e83a64d5b41a0fe
diff --git a/sci-libs/libaec/libaec-1.0.6.ebuild b/sci-libs/libaec/libaec-1.0.6.ebuild
index d413db1b4c29..0304f18d144d 100644
--- a/sci-libs/libaec/libaec-1.0.6.ebuild
+++ b/sci-libs/libaec/libaec-1.0.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+szip"
 
 RDEPEND="szip? ( !sci-libs/szip )"
diff --git a/sci-libs/libdap/Manifest b/sci-libs/libdap/Manifest
index a1ac0e5e170f..5d4906bfe7df 100644
--- a/sci-libs/libdap/Manifest
+++ b/sci-libs/libdap/Manifest
@@ -1,4 +1,4 @@
 AUX libdap-3.20.9-disable-net-tests.patch 1279 BLAKE2B cc9e813074d590f7fe9c15f4854ad7d721694bff6cea0376e2b8f7c701ad05a7b602b86959b7d0b260df55bd6f7e8fd5424fc221a18535c2a6b3695c86c4305f SHA512 a2c7d1b1591c41dea792a3805208d39e850ce794d02717c327203b2d0a1856c28bb7f1a830c4b8c504c619b2a3557893fcc066a0327b375ea2330f115b2fe0b1
 DIST libdap-3.20.9.tar.gz 2838651 BLAKE2B 84186a73455d8756d0dccaf11554861d48f55a358cc3f70d899d7f24b0b676b0bacdfff47b63c956619717c7fb7f7e3678669599724a2170221a4bc74d8388c2 SHA512 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c
-EBUILD libdap-3.20.9.ebuild 958 BLAKE2B 02e6cf77258761fb34c7e9d10474c95dd290459c403c05c065e3d1cdbf46aaeb1ab1c605637607213d82b4f66174e8474b279e02a810494410b1063024502e4f SHA512 49de2e5d7f508033161d8c210e01f4953aaa6b151b6de830ab1cd56d1291fee0b36289533b09cb0d2a8286978a92661eea4c92acf1a76c6ae1397cfe3b3fbf1a
+EBUILD libdap-3.20.9.ebuild 959 BLAKE2B c03ab60ff95b7b61bd9c61584570d1aff13315fa9fcbd33ce9eaa15b16155d3633b49e9eff69fc66eb805294495b4753c5defb4527c6e508222c61412a90417c SHA512 01184e5e9c317c8296859ca31ef0376d837bff4d26bee36605c9106ca78d01a630dc82dc5288224acf7b68a0164c3b2c097896a0fc77593fc1a091478e508367
 MISC metadata.xml 773 BLAKE2B f1334411aab7288075c7683ec32c35ed82e5eafb48e87a0b1d320d3e29d514f20934ff65ab214add8f8fd9df7e2c54491f6804314f5d7abb06e855476f898662 SHA512 48fbdada76f39eaf72cf385d9f73f029ce166919e1d80a57ec98ddf257955faa6de18673b94388526a41f2f126c9a313d55f016fed63243848251fe0ead4c27c
diff --git a/sci-libs/libdap/libdap-3.20.9.ebuild b/sci-libs/libdap/libdap-3.20.9.ebuild
index 65d7d122dae2..94352c46f41f 100644
--- a/sci-libs/libdap/libdap-3.20.9.ebuild
+++ b/sci-libs/libdap/libdap-3.20.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.opendap.org/pub/source/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 URI )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 5c8258bf9b39..e019cfdd3207 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,6 +1,6 @@
 AUX libint-1.1.6-as-needed.patch 1982 BLAKE2B ee6fdcd80c2ba8e9b40b3a25aecdd3dced861b2b0a0b6abd535266cce23a35b41e7a6bb65e35cf994b9cf37e2e94ad5910e5f3730e7147250eece28c536c9ced SHA512 6677550cae8aca9cd7905594e1c229e16057e3efa4c1b96e4f03586d694189bc5c8121884397b9d618300f05dc9c86fad3c0c82bb701bf82f6e07613ac9e8c5b
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
-EBUILD libint-1.1.6.ebuild 859 BLAKE2B 1ae8519c75d42b6f37037aa89a34868816938098108cf001006ea2bd292d465b79d74980bb461bfb9308e2526f052748ed2697c0a52efdca811857aa1c6ebd56 SHA512 dc2d05872d9d2ec68d4d1321d794711cc135267ea78ad6aba08f8dd5b6dae08166384b1e46e8f5ed2138bcf1b0e269db149a64ac205574a91da8ffde82f8b6b6
-EBUILD libint-2.6.0-r5.ebuild 1607 BLAKE2B 048dc68c48380c1296280f261f02034a9b511f84f7e19e1765a9d4b34eeebf116e4fd7ac158e687b26696620795b2b21a8fad473eb53653543339a89cfbdce6f SHA512 580ae810781261eead898292054fd0410891527446c812dd99f24f369ff7f11418b2feffdb0b2089e95b2b2db0bb3ad3b5aecc1f022c65eb7132020c7f2616dc
+EBUILD libint-1.1.6.ebuild 860 BLAKE2B 8754e49c481bdee95245ddfb5206aa9ee58fd00a763bc123cc9b220dd4cb801b35f3805b90921a9c3d2594bb9fe60e55722353d2e95c66fe451967aeec21682e SHA512 43eee72c4e9f5ecd4156cb92d991e3e5fe3f1f4721b71a54b39d881546cca325371e45538eec21444b483f01faec993dcc3eda5d7fb9be0884c0b34503d93c11
+EBUILD libint-2.6.0-r5.ebuild 1608 BLAKE2B ad6e06af583349f46660718d2a18a5f91555b8af15db62a761d3bb19345a27c49696a7ec8a1a1d28aaf1ba9689c388153bbf97d4b5211f3a91439b15cf904c47 SHA512 15f40345c43d02dbf66819a440cb22e9e613ec7d0e893ef7ab9cd847efb4249cbddee2feca0d525669ddca8549a29fd58f5914103597715800ba6c6006d123c8
 MISC metadata.xml 615 BLAKE2B f5cbda5191fed47e8990efc5790990aec42c5e6fdad17e70b8c191d8e67eeb7e090aaeca83e5026a9ac88f6158e5dfb1339aa0975c5913a0b3840597c5be8b19 SHA512 56962705b3529b26d665a3d144ea7b4da7b54c119ee547e7e38f9d48597288d62a3ecaccdcf27f799c0ce3390adb52a0fc5c6b0321d9037837f220da7fb35386
diff --git a/sci-libs/libint/libint-1.1.6.ebuild b/sci-libs/libint/libint-1.1.6.ebuild
index 28a3672a85ef..46357d7c10ee 100644
--- a/sci-libs/libint/libint-1.1.6.ebuild
+++ b/sci-libs/libint/libint-1.1.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=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-release-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
diff --git a/sci-libs/libint/libint-2.6.0-r5.ebuild b/sci-libs/libint/libint-2.6.0-r5.ebuild
index 4acff533f4c6..dcbf1716c8ed 100644
--- a/sci-libs/libint/libint-2.6.0-r5.ebuild
+++ b/sci-libs/libint/libint-2.6.0-r5.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index aa369d5e615d..8a92cf94f4df 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -1,4 +1,4 @@
 AUX libnova-0.16.0-slibtool.patch 577 BLAKE2B 333476b9d79c82a62e3387f15658ac522a2747b71727372a4dae3d0fdc307897c78aa5309026a9ee773cfe00364aaf4c056e2cf121717d37c495eace03fd8839 SHA512 1057249337cee731109835744424f88b99a9357342e3c2023a156d543eb2568048a0db23c4e86d51cb0d416a2dc94954b2bfa7fc4a3bcc0ae64629249a971f70
 DIST libnova-0.16.0.tar.xz 909212 BLAKE2B ae7efef8295dafd3715c37506d7403fc38a951c9a7c43e41e3c6ca3c922243a396052bbb71f07901bbd3aae2b2bee183efbd9e3e9c50dce72379f6ced80d5701 SHA512 f1c33421b7f09097223afe1bd5c31fa9a4591e4c965ba8a5ae1f164367717aa03986970ffe9c01e400b27aea43843fbb67cfbfe6ef44ec2c519f524aab9ea86f
-EBUILD libnova-0.16.0.ebuild 910 BLAKE2B 26c93fee992ca686fcdf29240e1c4a5b6c480714aa796d6898ecaa93a1b9353958a2c0240d97b2f1f17a9cfe403c798f90c21d0e97d5dd77c5311cd9d67ce9ad SHA512 fd77726c30b2249abc2265412206580e32291614215d9dbe90fba67392009a6d1e25a378cc8c162afdf6bba2da6b2a7c9178a66d0434cb2ee75088be4edc1589
+EBUILD libnova-0.16.0.ebuild 911 BLAKE2B b8246f567699936f2c635963cdd305555ee29a81aad064eaa0dcf40cd2088f0b801626a3e087189312bf235b4092d0186f785f00f70967ed954547937eaf3e60 SHA512 605e06cf27caa619e83522d65f372a8542e263c9d98c2e37354d9e7969e89ac6a249b38ee1376707691bff843da1a8435d042aa4bb55659b600e7b3efac99384
 MISC metadata.xml 640 BLAKE2B d8db8975700f5d7c96c3844120efc66ba262a2d121f62479b7552e31f46358036cfd4e8a7b91decc899036c4719b5d3c2f8c0aa0427f0252481a635daec5b215 SHA512 3193ac9e5621ea1b142ceea70cc9192d77ba694a217fa734d2521549acde8149fdaf231f1cf5befd72a203893d36ed707b88a664b054bbdf2c47a3fd82bd64fa
diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild
index 56dd441e0cc3..4c8ecb9f5f81 100644
--- a/sci-libs/libnova/libnova-0.16.0.ebuild
+++ b/sci-libs/libnova/libnova-0.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0/0.16"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 268a6c0ea74f..715809f1df15 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -2,5 +2,5 @@ AUX libqalculate-4.5.0-tests.patch 2864 BLAKE2B a48001da7ac2def7d7f82d5878d078f6
 DIST libqalculate-4.5.0.tar.gz 2603599 BLAKE2B 142790cf89e97c601b08d553b1f9cd6c1bf184a43c2614a07fa91560a875ea3e3124cf29d7652640b1f2fb4fada1519d48e4cb0ebcfb844c26369d3031aee230 SHA512 a123eaa725c6c6badce0eceecd6ef7e37ca281e7de18085d6a28aa6043bb3f1069f9ebba82b29989c9958455aa093ee183fd8013a86b39bd34e56454bdb35770
 DIST libqalculate-4.6.1.tar.gz 2610769 BLAKE2B 02ad7371c537bf40d98bb1b32877f0a39394b0723c45e53b00381df2d0d326b79ab39c66238a8e3a89f10aa093f6c12bcc5ae0457f6d65503fb3712a78bb0dfc SHA512 7f03e0f8cc87918b8ec962ce8c85840b644aad02cdd53037d41602198cdcb6567099d175771ff3752fc99fccbc4b180527da5fef68b0059bd1b259c34c57620e
 EBUILD libqalculate-4.5.0.ebuild 1868 BLAKE2B be2f2f91a02aef7173c8bee825b3bc3f72c182d4226e08112d38af02a60cc34aa33bb5fad5123dec7216cf0f186e743df778aeea1f20936d9c210a7bf9179ada SHA512 337ce33d7e7be2d5a7fb01deeaf30a1f2568cb32e5c4eb17927c1d3be031b94de91c2180def7bd431063dc4fefab601234c7e27346e013941d2a871b5cd0cb1c
-EBUILD libqalculate-4.6.1.ebuild 1828 BLAKE2B 7bae5fd9d112e633c90eaf935eed82611f9f63fef7cd9aceae641e70869b665b74bdfca475ebb32259fb6eeb0caa0982eac0ef92ad686f0a9ae7e6f4e1f9897c SHA512 4ba41a2696cc1696f48d4dc7ff712438b3799700f19126f444f24a33c7d8df0c01ed7ed1adf9aceaafd8f36d669287029789416f58cfe41f510f60d5f88e84fb
+EBUILD libqalculate-4.6.1.ebuild 1823 BLAKE2B 5b24dd124635d4e34d01fa0ba24ba1ebe44561205ed96852e0218cb4b5451795a4720338a84dcdb21e94988ad294eaf9e41f5288b7d5df7a1b1b6d3ce898b8f3 SHA512 4b057ad5c605fd94d56b849f1875bfd020137969789bd0ac6009c29facc8e33c1967f15ae6ace8ee2afdf05cef892f446a6c8d0cc6e76d1a80f04552afd7ddc1
 MISC metadata.xml 544 BLAKE2B 063781dc01d5fdfd9d4d23c10b475bb4afa03cb788cb170d0cdfcdbdfedef24924452384eb5caed4a92020b449de9cc32ce12e17ab77d835b8986836bbce101c SHA512 916f4be9424b01991e8c6322d62126fb2ea67b10e4632cd3d9bac6bdd547121c1806c7257fc086751d49d02bf70959a7604f99446c9fefb3598cf9a92489a6ad
diff --git a/sci-libs/libqalculate/libqalculate-4.6.1.ebuild b/sci-libs/libqalculate/libqalculate-4.6.1.ebuild
index 6bdf2d129d50..f367366c2910 100644
--- a/sci-libs/libqalculate/libqalculate-4.6.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-4.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot +hardened readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 0bbc9c6ca05d..93821420f842 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,6 +1,6 @@
 AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a30621967294ed8198b00ca9e7a21caf7ee77f07e3f6d1e27c3a4d2629539835ec1b4e7bc3fdfe2ce1e98d7e97b4a897131ce SHA512 1729653f153ebdec08c0b987a0cf15a50ed6ce8948805b2a9ddf122ba591426e830329bfb47527ef253c19f9b8e98693ab0258e9ac19906473d3605d61c8983d
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.5.2-r3.ebuild 3397 BLAKE2B ece29201900dd28c9ca6dc90b3203a4fc7f0a9a8ee17dd9ac8ae9669cef74b3d98f41c1bea015b78485171d3d558a323c2ccaf609ad79c08dd22c83fb4438b0a SHA512 173484a330c20aabf3807b76d95479a87660746f0e9eb10cd75a3c265f98d2035c97d67d6d13942bf3df41be168d41f4c1717bb36cc3b22e6f8aee9f02514894
+EBUILD libsigrok-0.5.2-r3.ebuild 3398 BLAKE2B b5b98b69ebaed5cfd798b817da5d707d91133c802a0b2689d5cb72b487a7438e779e8157c5ce7862b410fe0a93d79e684367111f30b5d0f93950eab45e540e37 SHA512 c7490bef89a1474f539d9e243f90370edad1e8e8b1519a1110290ed3ad83b03b42cb2e83949ea3e3fade5d8ad1cb3c2f5c8831a01046a23ad9838560d45a637c
 EBUILD libsigrok-9999.ebuild 3315 BLAKE2B 9545f2fe112cf738746ca97ac6ff2d7d6fcf3607cf1fb700173230e9e0ff23a0c78b510c67063cbbcf30e0699fb8f4d0f4a3b2c26aeb7ae734f6be9251f88d02 SHA512 ef0d1c82b5e108ee023d2acb5f10399161989d5be18bacddaee753c505c9769c11958fc45f2db967ad8b1453adc7f9941a739e207b614624571e805558f79bf3
 MISC metadata.xml 886 BLAKE2B cb7cece1f79a4affb612e55f147eb93895a805e43aed6bbabfed2e3b925b0714d64651c00294da2742f8c09ce9984a58888b89025d73712400c8bd026296b2cb SHA512 79c9697b3fe6954108cb60ae79c06cee280ef6d73bcd9e35ab148750a4fa55c8e5118c21cdb4e3ae009d4c160a26c98132448476ef90ac6d7a19a79138c3b2f6
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 8a010fd267af..96bc45edf8d2 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index b4a56121390d..7646b39444d1 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,5 +1,5 @@
 AUX libspatialindex-1.9.3-respect-compiler-flags.patch 526 BLAKE2B 25ab85c15666fce87c42513c22eab503f2e6617fb45484a7beef69690e4affac2607506f3ffad87878e6791004717aefc43468d50263dfd21a16a176ad008045 SHA512 bbc71df1e53f35415ce8e88c3003a88920f526f96113da2dfa99eda3a3a49b0913d839aae3d95cf7a51d2e93332e49410b214494d7467f3d07025c7fb5551b87
 AUX libspatialindex-1.9.3-use-system-gtest.patch 382 BLAKE2B 113e93e5d5f1524929c07f483f9df53d7b2b7b44bb104ae10564da0a9570be28b0da50ba12c8ed8879be782ff1df9124c85ff3884a4a683f098ebf7db83490dc SHA512 2eeb7f48e7adda39da8338d370d7278b9294f402ccd5506db22c94a5ab561e09429ef0f14df0d1befe9423d18413223814f86122810deb23b7b5e06459841e60
 DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
-EBUILD libspatialindex-1.9.3-r2.ebuild 945 BLAKE2B dcb77eafabd1f083e1927d4e44fc5e22ba22c58a9e16f64ee4b7dacef08442ff962877e465518a1904bc10770f499691215ebe8480b951344726a7378c0abd6a SHA512 5b6fe6d6a58ee0ba968ab4d291f6ffbca85fcdd58b1c73d7fec778b52b6e7b0e0855ff0ece05eb6ce84f7cc31cb4850147608e117e8926cc65fe37cc7dad170c
+EBUILD libspatialindex-1.9.3-r2.ebuild 946 BLAKE2B c5b2754d227403af8f866bce8fda345aec4872dd2e6dd4accbebe9306938557d4a74dbb1eafc5191f30e88bc78acf379f2b8d512837e36d02fade02a8e507bb0 SHA512 e39bd9510ac03b5e5c5742bad4cd10a8f8aac0b70513c8b7c4351071c66c89bb470eb1abf61bda20a1e9e0adbdf6bb1514cd0169cb87e5dae88631aaf4799925
 MISC metadata.xml 509 BLAKE2B 8ceda1e32220335480bb2f700a73e2a12457a77e9bdeefd0c67e7859569e54879a238735f0dddc673739c2affed542e9bef67c498a4ac3af1c09cd287af94bf6 SHA512 80e5b87ca4c0ede5e48381b4f51e9a8ae150f77bc5eaceff5fda645c3f8d3eb482825ab8a7cd5701f8a1f889b7c5fa68bbe1a3ceeac6e03df79944da3016942c
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild
index 0b81b51c3059..7911fe92a05f 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P
 
 LICENSE="MIT"
 SLOT="0/6"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index b990dd932633..fe535a9505ea 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -3,6 +3,6 @@ AUX libsvm-3.25-openmp.patch 864 BLAKE2B ef67a094c7cd3cafa3c998caa78bd226d83e462
 AUX libsvm-3.30-makefile.patch 1443 BLAKE2B 3b8009da6985170045b0d5d319869d89126c9577fa92aaf97bba76b94f4210bb6a40c1629354f30bbc93984a408e121341f9c00a37f824ea367475b2a86849b2 SHA512 a28ac993ea9746a5eb569161d8974108b5b758b4f181f5ce9891a15dd3e1b67dc8f57f934852d8c6660f4ca5be875e70e7064bf0e449e78c6a79cc0e72a75485
 DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
 DIST libsvm-3.3.tar.gz 910001 BLAKE2B 69364210998e496e333c6a87a66ad3f1515f2b3e98fe7bc579e8aee6d4df0473a4282f979d4f7d1729ce7080fd8b009ce830caab0ac37b57fafff0d2686e86e0 SHA512 705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d
-EBUILD libsvm-3.25-r1.ebuild 2506 BLAKE2B 7ae538788c22721105926f9a0d9a40e08cdb90666dc8247bebd0917e61259e1d3d5b334191a6f96d70ef911cbe3d65c5b1d31dada02271e52e16bc47baf846b8 SHA512 d2cff526ce1c98430d5dab6291575b73d9cfcf88b2607f6f4127f248e245d6e4ad3121816bb79199578d2c13021bae8e2a73634267b7c27d3a38a092d10ee93f
-EBUILD libsvm-3.30.ebuild 2532 BLAKE2B bda8fb71bed31afbb7eb3424c16b1031916b2e38965d21495212685316eef790ff69af19db3455cc48953e63a89f7a92f770bc1b4dc37e76764a089518a50fe9 SHA512 3034dc9fd7dc69a6a3d55ecb9db0c36847f9c267bd97e7ff2c8e2235a4f40c4ea59cc4b8124de0171af01eec51a23cd0f74384e9e0200c03789bf95b7c2a639b
+EBUILD libsvm-3.25-r1.ebuild 2507 BLAKE2B 71108ec61dee425d3b6cd863cf908567f2946283e2437dcfb921e9a451bccacc409e93a028505fbec0aec4a623a6d5ffd05eef281d7ce7e9cb08c0c47ef8045c SHA512 83f3ca9e203a31bcaa73dc11483197e121e9b1974e7c3f4f37e5ce917c1535547605c91917b3a413d56d6ade0ba07a02e1c495c1b55464273c59a1c5a4c24f8a
+EBUILD libsvm-3.30.ebuild 2533 BLAKE2B da60a97837ffa44a59cb0ba428afedb4885e3d48a46631e123ecfd2ea5b2cd177701e42480ff851f1685e7c36368ada948546480c8194c0684267cf20bb3633a SHA512 3bbc1d7dc94cec88f7853200a055947d900eeb6bfbeb65d197d0bf93be471ea9684d629d3779e5daf9e788786d9028e1d6411025475794ec35ff0bdfbcca5c18
 MISC metadata.xml 816 BLAKE2B 59108eaf569019b5adde56aa0197503346d53d3ab07285c65768e4663f8aec41d441c1c8b894ddd4cf86f16d40784800918345a15cd48b8bc6f3fcf1da8dc08b SHA512 8a6fe72c2ad1f017e36bef14eed3d61909395bd2aaa13c561d7818942099f3b20fe020b5548053758c30ec7ba09c0e4f7238c6906452ad6c3f049a857cf8eac6
diff --git a/sci-libs/libsvm/libsvm-3.25-r1.ebuild b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
index 7466227e694b..43c67613dec8 100644
--- a/sci-libs/libsvm/libsvm-3.25-r1.ebuild
+++ b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="java openmp python tools"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/libsvm/libsvm-3.30.ebuild b/sci-libs/libsvm/libsvm-3.30.ebuild
index 3d8e66cc62b5..e94e47acd243 100644
--- a/sci-libs/libsvm/libsvm-3.30.ebuild
+++ b/sci-libs/libsvm/libsvm-3.30.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV/0}"
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="java openmp python tools"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 3f8a63d7390a..18c8a136eb39 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,3 +1,3 @@
 DIST libxc-5.1.7.tar.gz 46172191 BLAKE2B e18acd864a5de7c93ce5499b79f60db473851ac6df35461bf0f13d16321fd2f68949a21b060aeed9c220a546c9aae614357f9815379356c9c9356555f4acc10a SHA512 ccb535e9d9427bdc9b2d05fae21995c92ae08efb64d51adaae44efc018bd9e5f7807d3a8ab073bb279968284e67bde80bba8a90d95145a484b396784ae072974
-EBUILD libxc-5.1.7.ebuild 733 BLAKE2B d48f4c20c8ed27dac3573dffd8d9729c2b5d362fb7908aa1308207d01d4c68218c0632c87ebe2db7e2c3f88fb70629ba2c1e63d2f1f7e6e936f64191a32bbf47 SHA512 727198ca4c2ac9c4ab84797277adb3f061a483d190581f301aef09149dbef3dd563c06e3f74808becfeeba3e2eece9432fee08aeb7cd06d1b1ea20aee1e699f0
+EBUILD libxc-5.1.7.ebuild 734 BLAKE2B 162f99371dd5d6967b945733e461b54ec7025e6c0bf80a2537b10cbb806451e07d6601b723652f5b1a7e5a78c0bd343d56ee7b24a7e12c4e7ad41f2ebbdb13fb SHA512 ab7516eb2719722993dd9deaf4e3c096a02c7adc69bda9da13ba53f442bf5780fd903ef32df6aede3912a11d132d0ed55b6697db63ffe69fa0a3f11f2e0b8893
 MISC metadata.xml 1365 BLAKE2B ec4c78e57729cbafae0a846d7ce660a005d434f1cce05c9806da3571285b8e51019514d6839c23925f2052a5bd901fd6568942cd3fc1176982b8e99c1bca4e01 SHA512 0d166ef5625240cc52d9f8fbf1e9c2194b7b9ed6ea53dfd919e4356ccf1f96f45abc99998d1cc388351f47e8996a46a301cb6146dc1f03e99bf6508c5773b886
diff --git a/sci-libs/libxc/libxc-5.1.7.ebuild b/sci-libs/libxc/libxc-5.1.7.ebuild
index 9506ce207c0b..883a843a3e26 100644
--- a/sci-libs/libxc/libxc-5.1.7.ebuild
+++ b/sci-libs/libxc/libxc-5.1.7.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
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE="fortran test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index 3cca3a6d105c..1df6430e93b3 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,4 +1,4 @@
 AUX lmfit-9.0-cmake.patch 1599 BLAKE2B e0f4783b64436845a12f8ca0a45f93d4964dba3855adeb73cb466c1bc0b8652610f8fa610e816db33c0f027db0b86233c01358245cd42a2284e718b76c964b18 SHA512 7256873a0620a429c231cdd296a6dcf6dffd4caa2468f7a91ca0d3943488753155aeb32bdc5813e1404c52ca2ea9bdf48b7ecf736e1348a1b36c0fd8d555f0c3
 DIST lmfit-9.0.tar.gz 36686 BLAKE2B 34d77a9101dcea1387df09e58cf8b69e51b1961ba8f1f73ac070abcc4c6ddbf1a1cd1f4bf2568942442f0c4c3815288959259c16e505ad1a91a4db2a2753bed6 SHA512 523d18c75498f5586c55e6dfcab8d1005aaef61d60e8d482814ced4f90bcd14d72c53ee71ed1991651d38845cce67e3da756fab9500431d6f435fa5ad998c2b1
-EBUILD lmfit-9.0-r1.ebuild 511 BLAKE2B 2e7e9f2c2c03312bab8bc69ee39d364bdc98bd775d78f6a6f36d82d76aa77f74415f01e9a23734fc32511ea24c247f393ae8347dd94d60e4cfe040f33e876d31 SHA512 e57dca400bb03808f915b35292b77d329a41f4271c45aa19120ada275adf96af13d98950b005eb26ac17202e6b654ef88d6c85341f53434c5307f10bfffbfcfd
+EBUILD lmfit-9.0-r1.ebuild 512 BLAKE2B 80e9a07f802d4ef710e3443c9f16be1137eaf890a76c73c4c941597a46e494e6b47df14748999a2ac19f0d2f480d614e918e2502def64c857ab3a250e1cc8f27 SHA512 810e65deef938750e26e02d97016fe1699ffa3cce36d848b3bac47708ebffea36f713e40266d553b86069ba4eb76a272e60bf4f5195af980a1351e3f798da57a
 MISC metadata.xml 329 BLAKE2B e14c94d390f181a254eddb7c0ae891c9b736ac30346be5caeba754b9439f17391b5dd1bcabfb58a486d53c9ab4403afaa1b86ecda1c9378b99859a8a01f000d4 SHA512 adcd5f27f011b23bed7d73d3aa88a43d6ed85760e47c0cd8bf89aaf3ab0e7524e52203ea0bba95c6c44d1146998f7e3adcf5430220866c7da9880c0008a9e7d7
diff --git a/sci-libs/lmfit/lmfit-9.0-r1.ebuild b/sci-libs/lmfit/lmfit-9.0-r1.ebuild
index f3a316505f1e..1c7f7fcdd3bf 100644
--- a/sci-libs/lmfit/lmfit-9.0-r1.ebuild
+++ b/sci-libs/lmfit/lmfit-9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0/9"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
index 5fdac4fe8540..b8a53b47913c 100644
--- a/sci-libs/m4ri/Manifest
+++ b/sci-libs/m4ri/Manifest
@@ -1,3 +1,3 @@
 DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a
-EBUILD m4ri-20200125.ebuild 1270 BLAKE2B 0bfd62cfa0c6eb44e8d168a45fa27823263f47a6258e80029b268a1297f8b5eea705808f954b338fa79124b150a6862ed0a40c63951880ed065dab8d608a18ec SHA512 75136a2e4943fc4f20ea601218e4649ccb082aab18f28b9cf2bcc624c18adcd313504eb4b2f4f3fc7db15009e26765fb8d0d2aa275a19dbf93c56924468c72cb
+EBUILD m4ri-20200125.ebuild 1271 BLAKE2B bce89bfd944cbf457222e13ed2d5b726a0ad12e23704b2cd0b4d4b00671b33693d4bf5756e4f6b760decc59050b8fe1c12984fb2365827bb0407dcd12d4af77b SHA512 6a48cfbf4e8b6e944d3881d09921eaf32963dbfa1ad52d09e243a8079af3820cf5042292ffd785fbef691a981dea0b4bf42aebec5db4027ba4bded632dc33148
 MISC metadata.xml 1190 BLAKE2B 57ec862b1b1d29fedbdb9f75fd560e24fa0494afc168ae9894219aeccc890fc77f6909a2f9b241122b51bb438bf6774b8d1b77444051095d18e1dbe62a5a5f0e SHA512 f756e8d2a9c5bf44763933eb09c00a058b88d88120553809618f5c927e39a7fe8c19fd7342206eea97474a6d596959493a8390bff39ad032890dfa2d4a49a7e5
diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild
index ae6db04b9138..3b265a53a4ce 100644
--- a/sci-libs/m4ri/m4ri-20200125.ebuild
+++ b/sci-libs/m4ri/m4ri-20200125.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
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/mc/Manifest b/sci-libs/mc/Manifest
index 73c4d06d40af..0b25dbcaba73 100644
--- a/sci-libs/mc/Manifest
+++ b/sci-libs/mc/Manifest
@@ -4,5 +4,5 @@ AUX 1.4-overflow.patch 426 BLAKE2B 36d988eb5eab0160983cd9120ec390371b6905aca6b1a
 AUX 1.4-superlu.patch 695 BLAKE2B a3cacc3a95a690d79c69885e69157cf8cf43550082971c5f454ea9d0c614b091645eb0010ea0491647ac59475f6788cdfa65732520f51345a8a5d4f2b276a43b SHA512 9ada97571a91a8b4d832c61e373c2f64267ed4f0730a4e8543f388167daafe8800ed95e74e143d1644019f934b1e5b6b658b5ee639e97a01ad0a78bfe653296b
 AUX mc-1.5-unbundle.patch 1825 BLAKE2B f77f91126b87e2430d1ed12b8f5f08229327fa26de52eeadb67a9bb6f0a791e7f64c612bc31dbc7fd9d2c973163630a4944529a46818f43d02912ddc0c3b7a22 SHA512 45565bd8ffd7525798f21f878c9d4f34c46dd198d40fa475d00bdf1461a2ae6372e836bef59f2686a9af52d31a3b061e43868fdc6a7da17838316294ba689d92
 DIST mc-1.5.tar.gz 18140539 BLAKE2B a58277b6755a43c0f9a9d67789c2fe28858580babfd4251d5d9223fffec43ead47d3dab9cda3c739309b9f18bc7bf558d7974a5189194a4bc92f72e857d81f1a SHA512 6db79c677b1a326ea50c78a07b8cc088eb5e23e9d8821a3a3802017e9e8d4011307ba024d3354dc24cb31d822da2023a150787a137b7806f6344b0834e7f194b
-EBUILD mc-1.5.ebuild 1873 BLAKE2B e41832415319ba09da0d32c0f879467f56d38f16564bdda9eda9649ec05e1981bd5d919c33085f9feb786d4132812f2f836dfc136a6aa0ae48cbc29a554d5433 SHA512 3c843373fdea84085116d8d63e015ab8107a49ec83f00e37acf2ab7fa027ab57c61660616709dfd21ef1f0d9175cd3d84ae2c95b437556b2cd03b7c27334547f
+EBUILD mc-1.5.ebuild 1874 BLAKE2B c9be7612364106c52ab12549ae32f75c373353b2c0b5760e2e28b15c793418dac1a870786d2f78c0e71ce80964d5fa5eb22d5dd5562d3517972d64893a934395 SHA512 fe12723276209d1cd7770db2eaacb03b17f6ae3d29df16537f2bb4b61fad763d5795207485512a9c00edffa9ddf25bbefa806c662e319da229918197f055e840
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild
index faecf71d6cfb..3c0019e332ed 100644
--- a/sci-libs/mc/mc-1.5.ebuild
+++ b/sci-libs/mc/mc-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc"
 
 RDEPEND="
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index e41612941281..f7a2932d311f 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -6,6 +6,6 @@ AUX metis-5.2.1-multilib.patch 603 BLAKE2B aa988f804f6dfdba9ccff7a8b6929c2551273
 AUX metis-5.2.1-respect-user-flags.patch 1258 BLAKE2B aadf0612d276228bc0fc116534a523337f0e6330195ab5b66dc0954ee8ceb98e3c9e5f849dbd234fa6b1a5d8ca0f284b1099711bbc8bd53f8be41ee347f362e9 SHA512 c7b6f6e7db0c0a2bccdfa9fef8addcab67f79fd05609375defe432ac05d54a8d4da50b4ee35d873dd04d05e2d251cfcc7a6b1e0fbbdb8d39af2385833d86a778
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST metis-5.2.1.tar.gz 4838377 BLAKE2B 7f2bb3b4dce71cd05e25d042095c311f814d5d197b1a6ae19994b6bcbb7d948d3a96210cbce5633f39d7bb8ad7cc3f8f4977c6465ec8591934aac00ea9637c94 SHA512 69127b7a777f9ba14cf399a7122000af9d6094a5f44be600a28384cfc0495c024fb0c6eab37c4473a5763ec1077cd9f30d9bcbb3c952462f6c9ead31c6b9e790
-EBUILD metis-5.1.0-r5.ebuild 1828 BLAKE2B 9242cfe725ba1e958ac8847df8fb11b5db8fd68b0bd9d5d8f1f1332fba161d0ff425db0791ef065a83d745f449a9814b5c7859f6965baa4990ceeae9c7eaf99a SHA512 77ad064d408dc0485b9e174177fe567bea6e6a171684bf9f5810242d7dc1574177fc63e474400718ad9d7b0beeaedd24d74c7a249de0ed4ab29f9635014fa4ff
+EBUILD metis-5.1.0-r5.ebuild 1829 BLAKE2B 34c689ef43ee52bb0c13d654daf6f44d436c4edf845f6b02d57f21e200dbee5444a4ba788c41a9b937703b9f8532f70d4b56fc9ed9c0cede37825695c51f0a5e SHA512 aad2f154fc7ef7ebe6f0061b7c74c422ec588a6a7df5cdd5ce207930c211a27bfc533e2083130642110a3164b41097bd8a0aa32d8a130b6e5b6f3f28a756cc9f
 EBUILD metis-5.2.1-r2.ebuild 2141 BLAKE2B 5107c394ea01f1b735538cc51f2d5a9a4a6ab7eef4f8e7e753c5a1f5431d76aaa95c16f1fb220aa20e0cc89af8c2da5181cb06ba750ec3daf3e35ff636709730 SHA512 2d8a7ec81640671d444735e1f19d9e4a50f240509645cf568fbd5d032e0c79e37db55d2e60aa8af479483e468f6701e25b9353cea1ec4b3e967adc4340ab3f3e
 MISC metadata.xml 947 BLAKE2B 9687c616dd1c8684be3fc1022671560ac5ff752514cbced0a3bb1bfc70348ecdb72c4913e65720a70f03609a1277c5a697e5985fb0cb8032d60e5c24f9b16674 SHA512 efa12e77a7af2803d0626eefc85aaaa5b2594fdfc748c8ad870590f65ae40ec7e557fa923707f327b8bb04036b57a67a036fed52ff9159af1fe65c062165408f
diff --git a/sci-libs/metis/metis-5.1.0-r5.ebuild b/sci-libs/metis/metis-5.1.0-r5.ebuild
index d62101a729b4..71b30fa92596 100644
--- a/sci-libs/metis/metis-5.1.0-r5.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples int64 openmp"
 
 RDEPEND="!<sci-libs/parmetis-4.0.3-r2"
diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index ca6dd5bf64b7..c0a13c208df9 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1,3 +1,3 @@
 DIST mpfi-1.5.4.tgz 261696 BLAKE2B 264453870fbf18afc0876eef72a3fc9690e9eee1da5179831a24409159abe75b88dc373e2d20b8171c846e870ded876715b2c9034ab4f0d0f0ff10e34abd099d SHA512 72ba7d8c950f4d4e2c7a3da8570cdcec08f75b73580cdf64c4cc3b24f8add23c46ccf78a6de2158e81bd77e6efabceebbae418988d536e7484356b8102e10ce1
-EBUILD mpfi-1.5.4.ebuild 643 BLAKE2B 949702150a43f3c1ddb264350451558cb7014715b17f8ea3ef723ac7626b14ae609acc71fb7bb293e34b2a51c8be2ca4f114b47691b76fba313d73d922df0112 SHA512 d19ed765a9ef8de7defcd18be5c59c4136ae9e7e5eb191ae2958b761c631be99184a77ce484d545bc07173deb968f929e5f7979bba7d91ddac3ff3b04c307415
+EBUILD mpfi-1.5.4.ebuild 644 BLAKE2B 43a6ed646b063b99155bed73ad7ac63c2d49705e86c70824949169fffd5a1a3950d0a18a2eeeb4a8bdb752e1197ba3431db2f32662ee0c70321c5e581f2395bf SHA512 481f831e6ef248e4a00c3a5f29b48ee003b29a9311adade6fb48b40fbe0da7f5e8375a687da6b6c146b48aa1914fee7101c1bb5f69c8cacb8abb607e480f5461
 MISC metadata.xml 1032 BLAKE2B b5bb021e154acd0fa8bbb286e3229ac2b1e6ad19dccb8712f80e6d2507b27dc5ea2967dc286229fe146537140bfa5f4b2c75b1acbd707b63292632da42975a19 SHA512 75e9bca1c492cc7967e2fbd6c4e5f82f731c163777bb4a5639669b4511467b78f5d84224be11985e5e0286e038661b748aba70e55655bf434b5fd8f573b8751e
diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild
index b689664fa587..80f3bc6e283a 100644
--- a/sci-libs/mpfi/mpfi-1.5.4.ebuild
+++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index ac3c1e273c63..48c69b131f21 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,4 +1,4 @@
 AUX mpir-2.7.2-ABI-multilib.patch 3830 BLAKE2B e1f39b6f8d21546680cda9f82307af4601ba3e3cb16f5b9039fcf43a8d9ff28261bc2f4ff204f03d794254c4edc906b9babd0a51ee70cf0f5a6d89a3a245fbe3 SHA512 d55ef6f1b3a41755623a64d8873317887c4e5b630d52a5bd8d139e70bb746817899e3983f4f1178e7b1efc21ac0864debaa752e70369b5e071b4012e6cc965eb
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-3.0.0-r1.ebuild 1803 BLAKE2B 776ebdce5d909e000463ec3dfd9ecd5de63676e5c664c152f8605d7dfa558bbece01d406421d6684348b7989f7016ee45edba0e517ac84d4ff240510420f2950 SHA512 9048da80c4fe4065899b535171e896dab02372c8d90aa104198f6db18dc271b4ee282dc539d4a20e8fcae36123e112faa962372c8ef666f3b46abac792506cb3
+EBUILD mpir-3.0.0-r1.ebuild 1804 BLAKE2B 02670b237150ea9d9f997222d3518341a363c72f65c453882d74ce37f3d2357eb20148ca2b6f36c3140a87fe6cd1c8f868cc6d4866c8066375d3070e8483f902 SHA512 daf6a16043d8e9ac4d97d89b7ba6bef361530da4f108faff1d0d2a3f07a0b00aaba2da4aab595ddf6110b8ca6ff614e63a62d7b5f0b714702e641f97c7ca7880
 MISC metadata.xml 859 BLAKE2B daa9dd3f1bae0f85a5dc4418416efa8ab6a98dd268792db8dcf6e4b376c34c9c5339ea7a16348b465b9bf37e7630bf1a74bcb78e979a3cd2e2f62fdecffe7c95 SHA512 fdb600446c5438e31506832a847e6ef3b2a4c7436ace89a23e2e78c1e14e92dd9ac8c2523eded60752d621e754b742986660b1357d79f2fe0b3f3d5f2f774d44
diff --git a/sci-libs/mpir/mpir-3.0.0-r1.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
index a7412c34ed3e..1c8e843d6950 100644
--- a/sci-libs/mpir/mpir-3.0.0-r1.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection"
 
 BDEPEND="
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index f634a02da9a6..2ed482ff1547 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -1,4 +1,4 @@
 AUX CMakeLists.txt 746 BLAKE2B 9c85308c3aa59cdc38c057dadf9c2af01fd35c0941192d6c17f1db98f2abae6491695956f7d550377f62519cc1b14b089a72b4a77ceea2a1ca32c0792b79871f SHA512 254bad915a43babe87e5c9d0c88ce9dce15c5e876f1b18628be356114ba13735af80c7dd00d7661e15589bf4485c58eb80cb09cf318ed212594169b19dba9826
 DIST neartree-5.1.1.tar.gz 167695 BLAKE2B 238f9d4f6c900938b53d692b9694044685cd2d906776c95c33f4f3619a35ed33ef2b85ddc7c2876219c7faa3930c234a3854266f539cd0a4b48d15b4a5e96040 SHA512 36f2ab878319153440914325bed67d111dafcac724cbef73d439285f4ad82979b05d2987fa3802c440aa4a037499bf7961ef9b09fa3658364731b5a405854b00
-EBUILD neartree-5.1.1.ebuild 601 BLAKE2B e3c6990a5ef56b0ae5f95ecf7cdfb9ca700f6c578a977428bcf29d319562e0c8dba08390888d0179c31cfd510af23b5dc091db28be6196eff63305823eb59f18 SHA512 c4c1211243825d221f59f694157891d03f251c9b615bf2ee81b8d0cbc24a43c72d0808d91ba7c2137754e99fcb44c6605e4bcfc137e93c035898911f7cf977a2
+EBUILD neartree-5.1.1.ebuild 602 BLAKE2B 1a1a04dae47662daa1c5a68c492bcffb9596aed4d00d0a27a7b8512d4ebcd159d2a3d22f874124b9f22ed7fbb8ef10de90f5af237efa8be2762250effccd1ffe SHA512 52f110b3b762420ca03b9bc1c3e1f562c8594c39931eff0fb1d6573ac0eccd0d5674791c13c62c60cbad10ca5a9b82b3e15d65e41a5f0176f52a973261f5ee56
 MISC metadata.xml 332 BLAKE2B bd3cd2e76e884d4c87c44ca3ce575f4154a318b3d2e03eac4f20f160ae11edc21714b75da3d36c068eb24334ac507c5fdd253a9820cf74f9aeb25ffa7321757c SHA512 e68379d5d440c60660a2e76167e1a6594883cea07eaac03905baedae38523fda89b01c7d0f9bed67bdea0be2f38abd80fb40b4c9bae5a0471df8151c246fc7f1
diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild b/sci-libs/neartree/neartree-5.1.1.ebuild
index 0dcd44743f73..89ccf3f61888 100644
--- a/sci-libs/neartree/neartree-5.1.1.ebuild
+++ b/sci-libs/neartree/neartree-5.1.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/cvector"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index 7c4955ed7d3a..d37cb76b4849 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -2,7 +2,7 @@ AUX netcdf-cxx-4.3.1-slibtool.patch 1500 BLAKE2B 6cd24e0a48c27c4c5a474acb671f98c
 DIST netcdf-cxx-4.2.tar.gz 703482 BLAKE2B a6727b7305204d2b53e6ee951c8165b03cd07f14e5d59a306445481272d0e10eb077e4bc62a2586c57652cb8273b9098ed77836f9023817d8a9e6ef51ac2cfe8 SHA512 347ddbc518ac2186868d69417342e5146e285fc3a88f7c55edc33063f5c9a6647af7e512a03b9b6a8f67a448b85a1edcdde5df707b893f6a1527821cfd78e643
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
 DIST netcdf-cxx4-4.3.1.tar.gz 598335 BLAKE2B e8272d9bd74cf9b814303a5b208be20228149533a9cc78cc1ef460f2cfb0086c7187afba325ab9a7b3d071e0fb9160d3b057e3bee68b679d9f504ccfecb016d8 SHA512 f5d9d26fb9f57430d0d681a9c7396bb0f03ed6446ac6fed51058dcc43690c02565da3f729f98b268b0bd923ca8b5b3cfa8340aca6a4f18f512c0c320ea20703f
-EBUILD netcdf-cxx-4.2-r301.ebuild 582 BLAKE2B 8fb2ea518e66a6d8f5fa3e9d5c7a08fc53a3f7f6a8e6674fd5c1313000329bec5ab8f35a943754c82535f1f85e407e1d734da10568e97807cb4bfd4ba729a128 SHA512 d4e87659df4e06846f20a86d7df6d24f54f6c923f966b9ca188daa7907bf96f504423d97c88a3f185b747ff112c521bf972b6374acd6614407aff7607c0d2e28
+EBUILD netcdf-cxx-4.2-r301.ebuild 583 BLAKE2B 30732360da6ae15649b283dcc974192fd4e490c878a38378380863f3369f6395b05629eee54292089c3f904f5e2e40afc630752509e9d60000546892a7b309ca SHA512 11dcbbafeaa004707e0034da82b225062d0fb2095c24b5d187ca4338453e45d30cc5c91fb64f6635311dbf75e351ba9af6c7c16b3e4dd2dd14c42ae4bf9c849c
 EBUILD netcdf-cxx-4.3.1-r1.ebuild 707 BLAKE2B 7eb126a243a7e422dfcf898ae8a84cf3bb4564b1e9ac31de04c789def36f51742181cc85f34466ced76ae503852c5d59bec375ee2dd932dc40f09f1a74e35e8a SHA512 ef0384e16a50952cadbfc3ef581399767cd11019fb1950c4cbde4bdbbab3a9d0125a43b27044770de233a171b7ca8627c5aa730f9f448a015bbaf1f31c0fac52
-EBUILD netcdf-cxx-4.3.1.ebuild 753 BLAKE2B cc55b7c87f0f19a021fe90c3cbeeb8602d509691b3c2d7c1c88a525df215a4471ae8be26f4cf0c73f561f77fe77bedce118a47054caaae26c8bc5564bc6e408e SHA512 55020de4aacde4db532e654d875d1d29cb3e7d915819929b46f267ed9d289f6d86d111bcc5f8270fd5151b281ca71196ce704c0cf9d72332ce437c6429a082eb
+EBUILD netcdf-cxx-4.3.1.ebuild 754 BLAKE2B 40d41f6d8d7ec3f89dfbfd619d524a1d7b389ffe6efa15d27fb3c7ea7439da05d495a3fb54170c27d09c08863378c721bc24ae51fe75c2e055dc950e4ecbd970 SHA512 4b1b0037d03ac71a4033e8e6a724bb3c1ae196f0f6247cedbc4371c59dce7df72f1a3297376f0997600cb17fde70655bcd39378b6a60d06cb1b0f386d1274921
 MISC metadata.xml 839 BLAKE2B 2cda1c652d7d7e83ebb67f70db48dc7b9a11908813739a646cb5798dd232f8eff5754c10adb0fbd206be6280fd599aacd6f63181b658623d55e17d6e73b0f4f0 SHA512 7e8f0b88ef5ad2cba94369ad26f2b27a648831b6433e05d127e4bc72ccfe6afc5eba7695f5c3cabc426a9913e599ce9b0455a087f9d606471cd351c8be5190d6
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild
index 1d7f1644788e..897094334974 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2-r301.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
@@ -9,7 +9,7 @@ SRC_URI="https://www.unidata.ucar.edu/downloads/netcdf/ftp/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND=">=sci-libs/netcdf-4.2:0="
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 47e1c0f9bb27..243ba75a2e3a 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 # 6 out of 9 fail, reported upstream
 RESTRICT="test"
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 6ec42e477117..c53f923d8d54 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -2,7 +2,7 @@ AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec
 AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e
 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 1811 BLAKE2B 9d9c2906206dcaa7c40fd697f8abd6b463142dc180fd21ee108f966b4aafa25dbbbe7cd3690d66a4ee207b9a31a80044059eeb41dd16ac00d8972d2785a83348 SHA512 acffdf300282d8b96aac992d4d28f512bc20ca2fec0fbf309514e798ae5ed6f884ebed801227d165e48eefd91fe4ca65c0e276dfb1b485620e11f878eaee6f78
+EBUILD netcdf-4.8.1-r1.ebuild 1812 BLAKE2B a7237f15cae06791b447a84e6c30d24594df1b73ed035c94e2d8ca7cd60c2757688da0253fc007ea20b4f0aa47c03d8c1a40e00857fa2c32cd524f6222ba0980 SHA512 8616293c70ae60bfd64cda75459fc9f6ff6b09aece9ff06c0bf6113e44e683c0d85d9b3d40ed49ca5fea8eec718be36430798e57cccbaa6e68067e0697ad61aa
 EBUILD netcdf-4.8.1-r2.ebuild 2005 BLAKE2B 27ddd0dfc01e7ba32d889efb9085c9b16f4cdd076e860c2734ad78397d562c3eb2e1a231449983b5817968efe211ced789f0624d621d257c565ca362a02b1a3d SHA512 3672c96fca8d1d60f1757192d4d39cb0d0a5f57fe8e102de1a4bfc16449c478ae9c7fb2aeb42b669241c269d9dbd1cdba6712cfbcd52d595cc7bbdf733b0eedd
-EBUILD netcdf-4.9.2.ebuild 1652 BLAKE2B 5e4a4bf8f46a696821c7be6db3bb3f4265ea1fc7f28dd5b05a125eac9fb05317fa2b254059aeb771aaa0e70b343f67db2cd9b8c8046355a09bd169c0512b8b59 SHA512 378c21ea96d503364b61e733a961fb42cb7d6d95293ec2c95a6f4f50b709c9ac5ad13a600e684638c73189db081bfc7c48fd2782ab10c891655aeef9bec0bbfa
+EBUILD netcdf-4.9.2.ebuild 1653 BLAKE2B 655ad723ceafa31b0fef856fe1f697cbbde9d677bc6be38a12629f94fbdf6eadedfb3f7703db7cd7398b27d500707d43f5777216620d64b87866b322d6685866 SHA512 016c81f6780b93a7622950699ce3a7f5a5e93f0411e65cdac83a6a25cc0b8232e7eb354fdc99c79c18828a3f7d146c4c215c4ffa4c227e19d20ade87361cf266
 MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
diff --git a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
index 6cd26bbb1078..003e1303571f 100644
--- a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-c-${PV}"
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/netcdf/netcdf-4.9.2.ebuild b/sci-libs/netcdf/netcdf-4.9.2.ebuild
index 2456299c863b..186210a47b95 100644
--- a/sci-libs/netcdf/netcdf-4.9.2.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV}
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="+dap doc examples hdf +hdf5 mpi szip test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index d65d2268a6dc..27c964bd7a26 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,4 +1,4 @@
 DIST nlopt-2.7.1.tar.gz 2044180 BLAKE2B 6d459f94a26ee6dd7f72c73c48992bd047150aa525bc4ad088c8516127afc5c7843f6fbb6726c2f845271b87934c13e0892a063362ab50df51f92e81979111fb SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2
-EBUILD nlopt-2.7.1-r1.ebuild 2157 BLAKE2B 99c6b62f7bfa138b22c77a4b6437ca9b3928729d422b1c5d35c23ed5401a3fb0b3b476a33f5a6b7c14a35b0d0e0a10c1af5636f4ec06026be78f0ca36d58e769 SHA512 02053f76a40a07e7b00c74ff41a6023e271b05b9632c67adacd571a4e59ad29d184430da74b629ccc5e4ddbca7a51823ade8812ad7e01b29769d3b83bf1e81e9
-EBUILD nlopt-2.7.1-r2.ebuild 2159 BLAKE2B cdfac44d5ed514b0e656e6665c3ad2e9137a35e2a1752f3b96a0b95887069e2c05895db99bf4ffa3962973cca31bbba7a44cd3280f87504346df72c4a74037aa SHA512 b8e72d3dc540735844ac83a56ba62018c5be3481238463b5b8df4606a802a35393d2d701ac1c3f05c6d6632d068225cb492fa1d3f65af261f0a0e2860b702571
+EBUILD nlopt-2.7.1-r1.ebuild 2158 BLAKE2B 88b1e4398b00988e964a7c5278a23eae12325464a8f8b89ad35b7bf69649d426b86ea14911a478ef96fd7f253cc09a90c080749e272f47a92a87443705edd084 SHA512 cdc065b3160bd91c75c5ebd90a34d6e8664ee615b275345935fe55ab217afdc4f3d1dc6953af8a202a19a560e0dadf692d8fff3dddcf1cd85953d503b511df18
+EBUILD nlopt-2.7.1-r2.ebuild 2160 BLAKE2B 147b6091339a56ab53bc42c0199a441c59782144d1d7e8ae09e4dae63be7fee369d2eaaecec64e33b6d85130b95002cae889274ea95822083cf0b53ce677940b SHA512 b38d3873bbca86f6eb62c6638f4ce6762529db4917a9d3d9cb7bfd34aa6ccc041f404d9c5d16d5b2b29661352c0a0b954909150be5c1da46bcaa737b87056ba4
 MISC metadata.xml 1098 BLAKE2B b6b28ce454a68e6d4658ba5719de2f5d1e3c0a48ebc44df3145785fd7de6859f0abc9159de83835b90cc5180078c7ed332765c4f58d13c08d30f94fe8cad8ea7 SHA512 a205d614fd70c150dd9024034ea3d92aabc36ba87c4612008e082954734f5aa339214c3d237b36e41114a9690f14167251ac787dd15328522c27eae3613ff13e
diff --git a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
index 538051367347..926fa896d4f4 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt"
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
index 8c7936051193..634c1c5947bf 100644
--- a/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
+++ b/sci-libs/nlopt/nlopt-2.7.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/stevengj/nlopt"
 SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="cxx guile octave python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index f6124abc6cc4..4d3737477a89 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -3,5 +3,5 @@ AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe435
 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
 AUX ogdi-4.1.0-subdirs.patch 600 BLAKE2B b42bfc9fbd88e729a604d53d72464af1e91c47f765c29ea18001118b63b14ac35e2e2ad4afef5da8e03a97f5703aaec4c435451b5012c6a16d8e1db48aeab572 SHA512 b3557d0b2e1b55231988401474d0242296c66199731998487301e39849410a4c55f4c50de8ee70c2a44619198d9049a23207c2046989a210915c742172897b87
 DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859
-EBUILD ogdi-4.1.0-r1.ebuild 1379 BLAKE2B 00ee0e7558a0f18e6b10ef9d7054e26ec99e56f0bc0ba880737e5bb8c94198bb3032d1621148def512ca9984ab8cf8aa1ce76374bf36fd82f22dcf1248dd04f2 SHA512 248c79af5c8fe07149a828f2614aff4bbc9def15d13af37086379ab4b7202cba59849e06f47ece5f74c010cda5bb4f1edca53106f76ae1d1d196ed156eec0160
+EBUILD ogdi-4.1.0-r1.ebuild 1380 BLAKE2B 5642da092b9070f2747b7d61cc46aad695f696c634888893a7d5e544a80d4a90dd10b459a574f14777fc894fa470c057800ba11d526abcc18eb3b3588dc22c65 SHA512 986e005814516d7d1fb41c9674fc24d3a617f36a8f9397280c9a9cfdff713a408d4ae2d6e0af8269e9d53f3c35c094b4b1d53e8e88456c70d990ef4aad8355f9
 MISC metadata.xml 338 BLAKE2B ebaad9e5a8ca2e2e604eab4fcf9c65774a5ee60eb5d937bd1b7e2f95f60f9d41f528ff8688cf85399cc9220b65fbeaaa8977937425733193dd57bf64c3880c00 SHA512 8408f1fdfa99c7ed449e0f14129ec260f9c166e16db9e775cc245735f733da3968a4ada840f2409d6fa8e7121e99e91dbe02fcf9ac28c5f8598e93db3298d551
diff --git a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
index 20cc1b5b3fdf..e449cbd2f7e3 100644
--- a/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
+++ b/sci-libs/ogdi/ogdi-4.1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index 6e86ef32fc38..4eb1cd32dd8f 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -4,6 +4,6 @@ AUX parmetis-4.0.3_p20230326-multilib.patch 1091 BLAKE2B 3f380afb3593f7402e193a9
 AUX parmetis-4.0.3_p20230326-respect-user-flags.patch 1394 BLAKE2B c688028d352356fc5e5b9b0637ad0eb0650e1551d22557ed206fe9094373c2647b5e1b69ec73325764828599e40a5f699d4d680bf07f4a9c4185fda977ca044b SHA512 f91978522d13d90e638862f1045f792db25917b3302ca307170b78a120929f8b528cdd6e281c43343367ef648ac6917b73b79f94ff5751345feab3176145ede1
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
 DIST parmetis-4.0.3_p20230326.tar.gz 5312266 BLAKE2B 52f34982cff0aa3dbc26dde1bab72ff1a8f5fa20feba72deedc600fcb0d73c9d05f3a43bf5713f9a7db74695affaedd5ea5f691396f5d02c58ad26dc5a779592 SHA512 a71d212a1c8682eb662ef6bb8bdcb124bc13c353e76ac236b01e544bddb975740c36be54c05305e1114e4daf20fec56642ffa319a6426c87c5538ea2225c156b
-EBUILD parmetis-4.0.3-r2.ebuild 1690 BLAKE2B 6aac6160b20b60e2f57f286c5ec1574b77d0ab8330c9ee18c60f97199c99ed779d619787a05eccf9e49c9cbb32e4d8829ef719b505fa6bccff3271729c9e8566 SHA512 27699872f747004b29f5460160a367dee4769e7be3b09bd80cae02c4f20bdee046819088ed9e3466355ab7f678459c878d5f862b19875efe6683e531e8e1707f
+EBUILD parmetis-4.0.3-r2.ebuild 1691 BLAKE2B e98b150bcc070c23b5dd922354ff49c1bf45b000ba9bcee08a97d0825e7c22bb64fb95f2be47d59cb2a80551af7d5a58fa85c277d58c54fdc6f17a4c5d25ef50 SHA512 1759d4972aef4974695b013710da8c35b65cc6c49aff665371ab16b6ab919c324d151d85a27501ba2d115ee4a36f2dc19d1353eacd75a0b96322da5a43a398d3
 EBUILD parmetis-4.0.3_p20230326-r1.ebuild 1697 BLAKE2B 1d66798a8ed4c4f4ad41837e58570e6104c16c01cfedb6df4ec13c1122d9b364f27ae09dd66ba3794330bace675478fe184a178728ace2e84f496b7cdb63b214 SHA512 a38b37c2d3d18213fb1dd4e5b48469fbd7d7334446d3b9b57ca4a0a24b95904f506d45acd59c80448928e34b417f92595bee0d9677eb2d59e74451baafb74816
 MISC metadata.xml 745 BLAKE2B be3f5f93243ec90f867d88af721f18f6ab0d4ef43faf2739eedbc4a0f1bef6180d17254fbbff1d0c0c6912b21d249ca145037ca17634382dfe6111c875c8e8eb SHA512 c1a78d446d63b6939396f698fa188b7acea2e50615d079e62bcfc17a0d96327dea376f5714fda34bf6223c2b9a8c87f14bfd87ddde0fae28909f8a4e4419e8d4
diff --git a/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
index c2563edf4869..3c2f019818b2 100644
--- a/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples openmp pcre"
 RESTRICT="mirror bindist"
 
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 0fd739fb6373..f8ae116d5da8 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -6,6 +6,6 @@ AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c
 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.3.ebuild 3460 BLAKE2B 5ca6715abd56cbe085d3ccfe3eebac451207c3b915aaae96045e0637cef727b23c800b1967cc6ac67b20618977162903e69f356e3cf0faa92b01d9d1a61b6fa0 SHA512 dcb086a2e5938aa522bd3d551fe20bb38bc0ecf03042a5acbb2993d3e2257cf3e6e383ea1bfe1b2b38593e8336b3fec67e5a48f93b019e2dac05ca569e7aeba0
+EBUILD pastix-5.2.3.ebuild 3461 BLAKE2B f34acff0fb9a82eff42d32f409062b28fb714f2641e778dce5c1b6db73233dbd492c65139b2eaee197612d627889188b63470e9b12ccc16940f8f2a30b8daf83 SHA512 5d87adf2780dc18fd6fde4c2a9cae1cf0ec2553cd5f070da06b69a9ee1c6d37d69dafdcaef692f32e60dce2efefd58130bd95844d64fcb7a9e5bf4f674c99d1d
 EBUILD pastix-6.0.3.ebuild 2453 BLAKE2B 8ab236555460a157b247d93dad98fd8e225807a28cd1f045dc6d433d929a24576950d232a52324ef74f7b66edbc67ee9a20ac2ce9377f6793c1d223d6c3a02df SHA512 c330980983da67fed249735bce6437bb8e976c485b17db9370fe2a3413cc162343a39af40cf412eef1228aa0941783b70ec67f7cb0d0892070c2a6e0a949b041
 MISC metadata.xml 1385 BLAKE2B 9045d18e4db81973c0f7fe5089e5c8134e3707a3bdf256d462bb07c7c4caa17e501ecec7600a293cdc595c422ab138a2ea3ffa155b38c5cc5be43962de9e0c5d SHA512 42f649f76c49c9d3fe605fd65b2d4ba1a1174c817282380735bcb4b410285256cc6029e8d74341b9e604ffc9e6d1cc43fcce056933c1432f60ea00fa959cf0a7
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 0295bf5d62d6..e1b6ae05a5e4 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${PN}_${PV}/src"
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index 81e666ee53df..0b1b4c9ebabe 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -4,7 +4,7 @@ AUX pdal-2.4.3-fix-test.patch 1168 BLAKE2B a5b532ac015408c60d7f16d9aa325a36f85cd
 DIST PDAL-2.4.3-src.tar.gz 100758279 BLAKE2B 7c157bb51416b24bd8896a62e71a186bc9a45b34d5ab58fadbe691cb1abc9595f598fcf92ec528c9103f646c21f940b26fbf199a998e707d17f1527eb2957a85 SHA512 ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386
 DIST PDAL-2.5.3-src.tar.bz2 102669314 BLAKE2B 1c6c8406f8de65a04364cc1141be809c00ea716fcfd5578833883357258855b3f7e70ea03c86f487dff0bc98072c29bed45a613c14ace05aef6ae49627b40374 SHA512 f67a303711b7d9e9dc14260afb96d299bcd5327ba0cc947143a583f55bd532a248b131e4602fd37d711ad0084e8601420828dacac40c414b95b8e9f9e8175e1b
 EBUILD pdal-2.4.3-r1.ebuild 1288 BLAKE2B d12899fc99caf59862b4d2de4a9f8f2331a870d30cbf514899365b7f86c09456d8ec87e104f5d1c3fac323640d2df487a5154728a55479f7a984b1d21029408d SHA512 3586c455e3de041a73b7735a775acf36d9e77224f52557f69858195ac9940c046ba8322639a5cfb1fca77e8d6870cc1a5eb13976c02e53d65af6ca7e1e780f42
-EBUILD pdal-2.4.3.ebuild 1213 BLAKE2B 8c51699183dabfa41c580c864cc463b400daca4ec77b5dd478752f27c2f3a52067e3a9cd024691ec022b34d58ae55ec8e49bb0137c79ad0d0621cf157d05acb6 SHA512 5c5e6d6ad2b1281185a2cb3b222d9c42a0e27d7eb52df42a4f50c86ff874d95914753a0c6a002481e8d05d78d6ee3433368306084af141c4b078785a3dba2bc6
+EBUILD pdal-2.4.3.ebuild 1214 BLAKE2B ebc2a5fe5fabf6f0f21311c8b2acffe2035a5096be9248395188b0c5b0d75c8fa4eb7db51ebfc53c133cd60ec5da10de5acb848e0d2fbf4656812f9eb0ef48f8 SHA512 c4136c06aafdf634912ffeaa17ea071552666b7f18f883d149bf563323d9510ff437eeed2ff03e098d22dd870dba9d46c4e2c2db49ea9108470b0e985dc70596
 EBUILD pdal-2.5.3-r1.ebuild 1250 BLAKE2B a9688937cc11422115dcc92d000e1351d98c48c26376275300692e40a0293368a94f8386f4e05c23e50e1f8100deaf38a5421494f6e5f6a741a370e538596e02 SHA512 588f59d9be15bab42f029a6f6008d1c687c4d4340a4b0c719ff1bbf80e87d94e676cdc51c0e2fa1da787724f6c8c0ed9e8f6faa5ef695931a1004f376a778b7f
 EBUILD pdal-2.5.3.ebuild 1193 BLAKE2B ce04cb145d337379459bb2892a37c4008fc5688167b520bf983771d92cf64965c3e4d105d5e4c550f8218b63cd7be17f8bd9570ae13d08de19689bc204a0e5f8 SHA512 4baa1a5d153efbf8f8009f2727e74149b9552520b0472320f67461b96954270e73f96b40a54987258df40acd5cb05a53ad1e0f4b557b8d3acfb19e497af9ad8c
 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2
diff --git a/sci-libs/pdal/pdal-2.4.3.ebuild b/sci-libs/pdal/pdal-2.4.3.ebuild
index ba9b27888418..cd19216c8dd2 100644
--- a/sci-libs/pdal/pdal-2.4.3.ebuild
+++ b/sci-libs/pdal/pdal-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar
 
 LICENSE="BSD"
 SLOT="0/14"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="postgres test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index ddd715b43538..617d0c136607 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -5,5 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd
 AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a
 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468
 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f
-EBUILD pgplot-5.2.2-r7.ebuild 4036 BLAKE2B fa122a7773906b33b9b1495612edef185d458e399e15c5b8c874c781c61fea60a7ee27c5fac9c1ec76a65beadbfa2aa0571314b8ffbf54be5bb3f2dcdb414d3f SHA512 9dca103d228714df225a33795110d776a8ca62ab9f533b84d314a0473366437514467c1788b6e39670b60e1dab22bed8d38e163c832c11fa073968534e8951ec
+EBUILD pgplot-5.2.2-r7.ebuild 4037 BLAKE2B e2b70aa410feae2b55d8c70f51f1f591f724e253f24a520ae4cf904b96346be37cbff8af9741d049a58c6197f902bd16b6cb3c46cb854701c390e431a2b9d5c1 SHA512 c63e0074ab1a8394303869301ba20cb5f18026a88dffc9e2cc7927bdc556a1dd1cfab18fbb6414011d09d413392d652849558fbd1a120471e470c7f2173e3950
 MISC metadata.xml 625 BLAKE2B bbd521da84f7e10f6f09957ba02f4d731705784b7958951f9b508642e17ecb8840bb4ff33d81cfbd21b19723416f3a4e44bbe22a568f79731fefd2c25ce1cb8a SHA512 52ee7b04c1294da75229ca6c7ad407e7b278c78998962a818519c5312ed4babdbb9a62c31ecfba12aa39b439aa0477a7170f6f644d90097d149ad3a5839f766f
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index f0722506dc29..07e406e2d678 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.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=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="free-noncomm"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc motif static-libs tk"
 
 RDEPEND="
diff --git a/sci-libs/primegen/Manifest b/sci-libs/primegen/Manifest
index fb91fb0a1cc9..ec2e511989b1 100644
--- a/sci-libs/primegen/Manifest
+++ b/sci-libs/primegen/Manifest
@@ -2,5 +2,5 @@ AUX primegen-0.97-man.patch 714 BLAKE2B 3fc121138c95e14b0c418dce18d96843ec337a8f
 AUX primegen-0.97-missing-headers.patch 777 BLAKE2B 613d33c795e70e66cb198e64dd77dfda439ef44db50994cb9888ac9d2bee10705ac14b59ed5454f606ea7195fb4a4f4552b96695d252f2873eea1da8fa1be63c SHA512 561dad1e31bb229367955e719040ae77b50b56f37a4232815d31173468faa9cd31257774005e1f986e340b72db16666cfd4557bf88b8af0914d271955728d8f6
 AUX primegen-0.97-respect-ar-ranlib.patch 315 BLAKE2B fc6bdb8292a2d15f409b762828293ed1efb03706d8994090b50353fbc271a7f5ddd132361f0dc2d0f698d43c30ba3ef403f84f5707da2740c3e387f633d059ea SHA512 c9b68905b6073711fe8e13f8684108cbc06986da2f266355dba2a0f4bc7c6c8b6e7d4cdabf6776549481cac346e8bf223fcc95f3e6d7031f20f163203f543de5
 DIST primegen-0.97.tar.gz 31491 BLAKE2B d9e48075a38456da30a23aa95dcf98143f5ad59e8ec56469ea06b6f33b8b2376261fd254fdb9c40ca55f76fae58b89c82329194dd99be3a6bbb356416f294337 SHA512 d6d8de4d9866dbbec20afd4d4b563e3383528138cd3ec849f706211045d735c28bbf7aa6931b8aa54163664e87c2e7ad028c68f407040ac88efce7856bc8b6f4
-EBUILD primegen-0.97-r2.ebuild 1445 BLAKE2B c8a911a8e519b4e1b0cf6779da60bce3075fb131faf02f6113a180e222e6c2acc976acab7fc8f455a8b169dc8c1b0e4d4557a1d0af1c5449d8ba7335813e0561 SHA512 d559b3913f372e25dec264eefa039870cfe9c91d687fe2216c9870366d365ebb6f3697903dbe1f26bb7d168452d85b4ba633ae031cfb7411afc00105f0081faa
+EBUILD primegen-0.97-r2.ebuild 1446 BLAKE2B 36b52f422b643af74f88622e77bd691ee8a6483e835251bd3fd8a94320ad94fd46ebf3d742ae92139dad57f4ef5d88d6acd35db26ae0fe3ecff0dc12ab242726 SHA512 3916596b8c9c81ea7c486e7f4767ca321f97c7724b4157b2a62717087ed5fa91efcea0be870d317eb59788b5b3518976cb3c315fa50654f721821d6234a67648
 MISC metadata.xml 723 BLAKE2B 8fc21f26c55b232c88771380451cfb0b5aa179587d57f49c56c9dd3b33a65f89527b8f306e434713487c455fc8b2d452f9071ed4ff2fb8d38d4f31e886132d4a SHA512 e2dc892db1fc31d86eec69b2d2d81907dff143f343929971380e784d778a1be659d160b41dd7eeb0e4f5e41f6f55e3544cf50abf664f15f56b9cebe8c2bf7c65
diff --git a/sci-libs/primegen/primegen-0.97-r2.ebuild b/sci-libs/primegen/primegen-0.97-r2.ebuild
index 0f2528bcf5d3..3394131d63df 100644
--- a/sci-libs/primegen/primegen-0.97-r2.ebuild
+++ b/sci-libs/primegen/primegen-0.97-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/primegen/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-man.patch
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index 70708c60182a..6b36d71565a4 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -1,5 +1,5 @@
 AUX 1.4-doc.patch 534 BLAKE2B b4b41b83913efb5e92eeb6c92d4db04129e795a17c5749d8b031452a4808d72c66f90b7499e13a795e386c315e9f717f88540987b262c22efac52318261a83ec SHA512 388855f15bd17f5bc42ea3dc1d76d338a5586ed6cdb005442d46d158d36a1ffd32c2b08f10f992de30c44c1f160c005ef7499b6c2a629a0e7fab93f59d15bf65
 AUX 1.5-linking.patch 6247 BLAKE2B a50a4bc8a7c28f3e140ba8d241fcc9d9bf02becf13dd3ef50fbf6e06af3444c5135309d9f4026826b228a62fb531d4f62bb9b8ebddd4df43233b56f41bfd3a53 SHA512 d7b8f8f99a2d26cb3e0cace7f31c72eff997786fcdca4a80e81493f7e255df0975743870543881348814d777507a96f328bacb1115fdc118c848a3a0be4c833f
 DIST punc-1.5.tar.gz 7036275 BLAKE2B aa87b824c3426b5573cf1c40575901cea079e4c244565015b39b52adff74424e49086146cd518acb54594545650340a32a0c8438c9add28c5737253d49091093 SHA512 8b454f5de9cd01e87a30083f975ce8901c5d5a2cac7256cb535c8698221ce6d1ddb93a3663b2e903e5cae93ef76b48932ff7f13a816ba7da6bb07ea25490503b
-EBUILD punc-1.5.ebuild 2090 BLAKE2B c8e9ea8ec9f2e9d2c123bb8e2981028b567dbc409cdae50f5d7c142809ff1018777f016355e8e65509805f2475846c37e003e3ba20cd4f95767ff7d4fff5c966 SHA512 9bdbdc1d6530c7adb7537d11d14e4113d7b052e3b0af476df1e5b1ef91ef0862ab6b31f62d9cad04d5fedaffc5784426348d034bae730c4159a4769d3f37f50d
+EBUILD punc-1.5.ebuild 2091 BLAKE2B 86cee3bb1b3c9055937b2c7b974474781eee0064c7b917c2317e1c9535cc404572688b664544e66eff77581161d78808755ce819eb33c990973340362c547d56 SHA512 305966c69a2b6dca31c8a9173338bd39cace6b8258ef5d605d8d4abfb5a76a327573380bb6321dcb7c9cee94bb3c02518112eb55d0b06fe8e01cc87a7110f4e7
 MISC metadata.xml 1313 BLAKE2B c805f8af184fd77b98dfd0c6339cd89cb59e29e6f0e75fac6a5c48300a557d614882584fef379f5a8c03661b43df69329fc9c34b8a862b4b8cd884327de66716 SHA512 25ce2843f1c6f8f11a38fb2b6060bdc51e2eae7f7a577dcea24e5f2f2aa11332e7ae6fa16a00ada33ac72e1ac7f630574cc825d4d0a981a05f88c4486aea8d6a
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
index 2bb21a1e7e5a..e22230669491 100644
--- a/sci-libs/punc/punc-1.5.ebuild
+++ b/sci-libs/punc/punc-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc mpi"
 
 RDEPEND="
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 2c0e343664b6..e27de8539920 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,3 +1,3 @@
 DIST qd-2.3.23.tar.gz 781558 BLAKE2B bbda1ede1e93c100ca831b3eddc34ad6092007f9674c83803e5a5e140f80cc6b4b41fa71857beb9ef255d77265470537e43ef81886d6a013958a429b1c641c55 SHA512 ab311883db7708cee1c307eead5d02dac3b9809389b8d29e2fda5207decb752ca360a9aab234dd8a70228e0e004a6b6d6cdf92fd098536e96a2fa01c5b2ced2c
-EBUILD qd-2.3.23.ebuild 915 BLAKE2B ceffd243a0c3547131db09182e6b92b6151a6df320540ff5a878e1c8bcf96df98b03fabc503d5ae8928b87b4a8399e93b7a5ec74cd6618899a083e3a81b371c1 SHA512 6c7e0e8eafb8607d17dcb87424febb4bd1b92d7c930705e55b3f4923eef313d46d19396fa9d00c8196317986456ca645be1944d534474782306388246bd84835
+EBUILD qd-2.3.23.ebuild 916 BLAKE2B c9220a83d46916dda3d308d480b84078f8af02515c13db7ba4303a999cb8b9aa5837ac3b19271942646a46397d600c674cdad17b729834669a056535771efe75 SHA512 8ee98f3f5bceac44362d9f148084585a1996bc019774fe2b7daad55e9ead316415652ee0ee1ff4fcfbe474f3a8b86336a9d686fdf8bc86d40824b2ddea422bc4
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/sci-libs/qd/qd-2.3.23.ebuild b/sci-libs/qd/qd-2.3.23.ebuild
index 4517c4163f9f..2f8569afa28c 100644
--- a/sci-libs/qd/qd-2.3.23.ebuild
+++ b/sci-libs/qd/qd-2.3.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran"
 
 src_configure() {
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index ddba1b40cc11..010a264d8968 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2134 BLAKE2B 36e3a94684bcbf7c6738f7af5a990102a56ee5250255c809b2f59bd4c1e96dd48476c9814fb8d33f914dbef5e4d3b70c455e015bd4fd323cd8c7ab6693a63216 SHA512 66b86960f90bce81839ef85a27ad0815b3f8417a0fd44b8027a02bce536aa6db4c250c665566d269150b504afdfb2fbad44b3344497947a193f961c33e63db8e
 AUX qrupdate-1.1.2-install.patch 1210 BLAKE2B 311a21fd3c99b875aca96d9bbb2c0432abb1867a47d58c32d33a423c91bc8460460bacf99fea97230fd3456830fef93c80539a6aca4315d73d949f61a7a0bf97 SHA512 3f53b1b0bbf04415a5f14f18f28a8264725296b4dcdc28c4d3e13852a4f12f3f2466df7ba58233b1e7279ec9d8075b0dd01fcf2d00bc9c13cf5d21f40f98f0f4
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r2.ebuild 1276 BLAKE2B 969defcd42bb9bc36f180fcb9f6dfbb7649108203b2727627ca6b68d463710802fbb4996eeed57932245528278a2314b15ad4573d4c3ab26557cde5c6b230d86 SHA512 f0320540fd65263e5a447e6822e28689bf4401f94ab581c9b6689d3c921f48c3ab5981e802147c1bac83d452de2310a78a40c17468cec0963aff922f04077623
+EBUILD qrupdate-1.1.2-r2.ebuild 1277 BLAKE2B 102ab64719af9e35eaa6b2197483d2af42d504b3c5100e96758a3c7d58651426c8daf778915bd34e1521b0eaacb1e1cf65e1faa3b054a5a07d4622b32bae9ded SHA512 f335530e854be89a1cb8b7ee06735bbc920c238c3931495b19c5f92716a2907bd989cc96ec1f39d390e48d8dfbb16106319ac0e1a7877549cdc16fea6924253c
 MISC metadata.xml 332 BLAKE2B dda33ed8f8a63591e183723ca80d1550d104a4996cba185dbef3bbd2f57e287b1f0c1776296e324e3648f39378cc8fd17225cdb04962c99adda59bb0024f09e7 SHA512 5f787098bc13a29f7905d07e27464a966766fdd65e19ee07fa2ea96517b38da6cb77187fb4b60ed40c81a962a405ad4dcd472f114c7849c5aee730c405062f2e
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
index 4776ebf427ca..5efab6e07eaf 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos"
 
 RDEPEND="virtual/lapack"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index df7f9d0fa250..039ac33a409f 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -1,3 +1,3 @@
 DIST scikit-learn-1.1.2.gh.tar.gz 7104556 BLAKE2B e67e1deddf5a1134b57a146e8271a406cb257ffc92c9719e90f5b9d98e711b68bc67e3367660ecaad61aaec1794bb8999b4dd00b7d56e21eca8fcb2ee72cc9aa SHA512 58789c1e607d7de3339fa3b8928553ca96cef93e8da8fd13612aa78e5ebde8e6a55e3bf7845f9a45b78ed77da6a219d08d2c26318b602f937e0e3debd239293e
-EBUILD scikit-learn-1.1.2.ebuild 1544 BLAKE2B dc079564a6af225e7856937dafabf9215305f267841af12876e1dce93f0892de1874b749472a1a94a827d1aa45ef0f6634e5ca2951f9ab3b97776995ab3ce9f6 SHA512 2badc71299d2cf023ecb27eae9d0414a21b5cebf69cd74b2a82dfcbe367301c60ef14f948ec6452ea6ca2ffc2133dad592aaa945ccd30cd2a1c809cb05af6488
+EBUILD scikit-learn-1.1.2.ebuild 1545 BLAKE2B e5975167e1f7f98f302759f0921ed1555027a9b55e75a2aa93ab04cfd8df9a3c4445b2f67bd3d40f7d1b4cd12486009dc1ff4a09bab67e5030cde1bb51485241 SHA512 f560d112929f35bca2980dee96ac0d074bde76d2beab9d0c3a10e56aec7abd8fa5dc42d66bdc94566752e4e889711c0917dc305c41cd5a595299d4f804884877
 MISC metadata.xml 614 BLAKE2B b5425c2d022592581647c9b97c0ab22bfc2afe347b2e5ea22f141245238f145322f39406c62318ba1e6af1462b2691267b39976bfde38faaf1d28b1d29c4e015 SHA512 74ac79123848bc385c29fcfdc4a1e780529dda685c1deb5eb722f5d4919ee6ac9d80798d52c4af0be0cc8dbbaea3784963dd97e2b7c1258cc2f5605b0bc8907a
diff --git a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild b/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild
index faa181004634..e498e32de5a9 100644
--- a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="examples"
 
 # Fatal Python error: Segmentation fault
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index d44c7d54d504..4b238b4712bb 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,5 +1,5 @@
 DIST scotch-v6.1.2.tar.gz 6395320 BLAKE2B 07aa4f56c097cf364d7d63613f3c5d5d3f2a8419ce27da95a4a20d5ea48fcf2f036acaa62ab1f591b5d1dc672151562bc0721a66f203c60d5ee26a501cf90352 SHA512 dcf63c65bf8155590a70483f80ad21b4a303debf50d47a3c154983935dc056f3df93a61c3d88304f3d1a4517ab3a355e176d72b3835382cd65c1556fbbd21702
 DIST scotch-v7.0.1.tar.gz 6838403 BLAKE2B 48cb928bf8586bbbe206dcb4f685e6c392ae078f5493e0384776cf6788137361286adbebceb7ad5c171eced34f5dda3f4852092413e79cbb791bd3ced204784c SHA512 c3267d5c8785a2258af3baf999d2c1eb75ef361062e74962b6e985a75cc4f5ef1f79919759ba1b7cf028f94d06a5ddf3818108a97eca4123a11d7750b5d7093d
-EBUILD scotch-6.1.2.ebuild 4952 BLAKE2B 07cac56acd0663f1df7bc89998f60bae5aa5e467a0c2e43988728a1d298f7343a23d150ab29172b2bf2c0e0b8f18a35a79ffed49a88ea97a943bd7b9605a389c SHA512 baffa7547e22f5ad4444032b9221e3bd875f2bddc1cfe85217e3be573c68950df729f434f5e25059ac10d5aae5210f5d5b19d4df1552d9dac5a704a330f4dfda
-EBUILD scotch-7.0.1-r1.ebuild 4957 BLAKE2B ee8faa284b48cb77f220d1492af2d6a74ebb98be3f831d265159905d95f979c546cb66294cd3cdf6099513ba43de6c498c70f93ab5762441312b267fa5f302ca SHA512 99d07250564b2c9a9bf8e33cbce6c827d2476924b9a17b66fa9dd2c57a5d21d846d78f2a5e0d71b76dfc67308194ac73d9f8705518c8431106f1fb6f8b6ff8c8
+EBUILD scotch-6.1.2.ebuild 4953 BLAKE2B 4711523f6d250c5fb55d9b02f89b9849f8086511cd60d7b1a000917f7c49fb65634d11eecfd0de5ea8e2fccf98a2630a9a4d3feff0dac1eddac65adad11536ac SHA512 e16da47cde1c22f9c2e2060211e7ad86b6f01d499d6dc91c0139902b3b4859c4e6fa171d2c2ebc0a09abf7491ccf3c0adbb63eacfd28442cd0087fdc4f1b6c6a
+EBUILD scotch-7.0.1-r1.ebuild 4958 BLAKE2B e7f60bc3bd300bd1794ac6b6b1d53a862d08a1b72ce89506bee50d5b1464d0a2fc749cb9db6b0a1ff33e4cdce2830167ca8c9f8b0e0ff04dd7ff4df6607ba032 SHA512 849f7f5c5990653fe5e570d211fe957951fc2ef29c8e86f0eded3d63975ab90abfe8dbfc42f90e8fd887edf4ce1585746eac57e43b6c035f260f64ce15715a4d
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-6.1.2.ebuild b/sci-libs/scotch/scotch-6.1.2.ebuild
index 0d4023655353..70616bcc0aaa 100644
--- a/sci-libs/scotch/scotch-6.1.2.ebuild
+++ b/sci-libs/scotch/scotch-6.1.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-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="doc int64 mpi static-libs test tools +threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/scotch/scotch-7.0.1-r1.ebuild b/sci-libs/scotch/scotch-7.0.1-r1.ebuild
index 3ee6ee308e01..39afc59e85ee 100644
--- a/sci-libs/scotch/scotch-7.0.1-r1.ebuild
+++ b/sci-libs/scotch/scotch-7.0.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools +threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index bf6dbd3dcf4c..7801bd6825cd 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,3 +1,3 @@
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-2.0.9-r2.ebuild 1113 BLAKE2B 25abe45383bafd4f98b98045b5c0167a3c03ab2186998de3f7d578b900d97cb62ae673d7ad3dc1914c94a602ea42c67aaeb85d8a4630afdfda6a619bb6c4855f SHA512 a07e3fb0b3b694f390cb5277eadaadb09be0a4c857889588c77ab3ad181c3226f74ad19ca38942eefc660e13120708f49be9ab25c120776ccc3652b1193b5024
+EBUILD spqr-2.0.9-r2.ebuild 1114 BLAKE2B 91ab25af3d46aefa0b384121b3a3632e1988f7dee1ed2df2fbb4fd677142f1a0d6a39e95c70f6b20aea638da5d4132677d62e8766fb8c79cd3b5a5b965fb4271 SHA512 6a413073ac9e96a2a2e4731c92ae5e8c3391c9487f065abfb61630d45259dc8b3aa3da8caf1afbe01d50fa321fb72a61dcc635640c274fd04ba47642116047ca
 MISC metadata.xml 852 BLAKE2B 9480a2097af529f47896d300d8654b791ef1ea3989b97d8aef287dbe5b322167ef7a425016894b14c975205ebdc35cc5a1f187026688e0cbd7497b51657d0181 SHA512 51150e01477f24a382731c273f83aeb8fa646a7f897e4f6e8ffff4d4050fbf9ff589b7036134d9faf4da2c07a16654b01d1923003bc1e30c380b6fc46a3207f9
diff --git a/sci-libs/spqr/spqr-2.0.9-r2.ebuild b/sci-libs/spqr/spqr-2.0.9-r2.ebuild
index 09281bf3d570..725a9490aa41 100644
--- a/sci-libs/spqr/spqr-2.0.9-r2.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc partition tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index c1aa64b84070..dce68c99b8d7 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -1,3 +1,3 @@
 DIST stellarsolver-2.4.tar.gz 23402982 BLAKE2B 6eb9dafdf2a209afba10c09f7e7c0f6832a4399cd67c6ed3e4eb87ba98f2163ee8cbb342490314246c77d13581d1c0547817b6ab3c292685f3c496fa305f320d SHA512 f397ddafd3bb4774ac89e95673f67c4fef40ea0be842555608d95978ee26949b21b16cc984e00e936eda2ceca316f604b784b44844cf37ad1e44a5ef8d7e75f8
-EBUILD stellarsolver-2.4.ebuild 604 BLAKE2B c0fbc8549a28b289eba9965f3c968c0517861d2f4868342112cf7168eb1a971da50d060f54e5e64323eae041e71ba63b49e0e709ae305d13710c07d08390fa80 SHA512 53064dad8130d864372c5c73fc5c9995090313c3e9b08ba3cd87c4efd4c0539fc06c24ba54b1d1c5a593e5dd9a2c75297d30f9f8242075538d519371ea24a37c
+EBUILD stellarsolver-2.4.ebuild 605 BLAKE2B f9d13f32673edad663f2e0669cb59ccf35fb88e8a428fe4c5f279ea86fcaa4d98a95b4ea29416ca85b3a6ca5f7de2acef07ff3bdb36de12cc75c75a80f2408bc SHA512 62ae6af06e623cb86e269dcaa841f43c5c671844e0940464c712fe2ec917f147f42350e254c282093cdb96eae33e87ed291b11c3bb2aca93fa6f7b73d16b30dc
 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77
diff --git a/sci-libs/stellarsolver/stellarsolver-2.4.ebuild b/sci-libs/stellarsolver/stellarsolver-2.4.ebuild
index 745064e47d62..1473c730ee95 100644
--- a/sci-libs/stellarsolver/stellarsolver-2.4.ebuild
+++ b/sci-libs/stellarsolver/stellarsolver-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index 3cb1b4081137..26f84b489687 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,2 +1,2 @@
-EBUILD suitesparse-5.4.0.ebuild 783 BLAKE2B e7344be6db82d2636467c17b496ca4f2cc53857b2196dc464327616be0d59391d1e15125554bad2655526f83838b844316ead40db42fdb3dfaae5314c9eab88f SHA512 53b580f8fb9847fef6a12d471270c8cac4723023c347140e4374d22e2febe24dea5284de1e40ca5710e286ad38e4c08362b158c05db2a7cf8cabeed82060a8bd
+EBUILD suitesparse-5.4.0.ebuild 784 BLAKE2B 9fc0c328c6887eb798fc810ee004eb526ebb50eb231dddce6e7ab0e87d1d671bfb861ad2324fa7b09cf5e1db349bec2f9c832207c185509306c4aad5d0727b93 SHA512 3af2811f00b65eed71acfc563b221696172a739b66632f776a0cc1c6049be4e018ff75379248f6b4b6a642b184283b504801bc9ea584d292397136a58e3451f9
 MISC metadata.xml 1889 BLAKE2B 5676b53cbbd3083abb1cef3d3cf9658b735d61ec9ff3e17452f5cdd5f8b67aea10dc3add553012c5f22d52bff9bb891a74d66df0d519b5ccbef8babaa9dcafd0 SHA512 dc03b9a5c17a77ccd5265ec7db4fa32977f7df264e17e9cf9f3a42bcc2a325c105db9535a1c56deffc74b31b1a806f31b0cccd773970365982057a0c18d2ae58
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index 57f3529c89cc..3996e95fe79c 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 59fd8e392972..6a28d1e72d17 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -4,7 +4,7 @@ AUX superlu-5.2.2-no-internal-blas.patch 658 BLAKE2B 63c782d994b8caded0b707c2a26
 DIST superlu-5.3.0.tar.gz 2483070 BLAKE2B 2e877c12b698fae6649d3146d4a22a8c701df813d1fa037b7707081229de09e102660e75dd32138264ad9e01e5b3e820012106cd2b0d46cc2a1c37dc5eaafec2 SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83
 DIST superlu_4.3.new.tar.gz 2875951 BLAKE2B 4208edb7df0babc0bb7e21077c6e0a00a10766a2d01b2da47f05ecdb232ca3309a2bce00f2cd1b709a8c01b7de2276e4f7d63856ace2e93c3598f1cdcdc12712 SHA512 57799051c5cd394e4cb1b89481a4706ee0a21159f06941bab4a39dfe30f4b6ccdf67042c6ec2c479a12deee0ed26c3707069a5b53281fb26b6c752ca77102aad
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
-EBUILD superlu-4.3-r2.ebuild 1911 BLAKE2B 3353ee57bc07ae84bf924c8f4e0b423acec324499f057fdc7471bc186f0bdb523ebefbcb007f705559276ccb3bdb41f81d98530b6b9aa695668001c2e135e002 SHA512 29690907135db292397b8c54f030dea043b1b977fac73f80af6959d7a5a8d87818d59a8639e29d0469faf81f4c95192c9a9430ad26cca51488f3be7431741fcd
+EBUILD superlu-4.3-r2.ebuild 1912 BLAKE2B b523fdeec625e5aef64b1c99236bb43b917317750d7cfa8eff0f4a74b0cb2b706e6680b0f703bd345814e55a6d9e2fbf9d720b0ff5a75b2c660db1756efd79ef SHA512 cc77568098aef343bd1497c8a2bc7d8e96dc5c195be597621a3e68b961cb6fbdb0fe393e0206dc22c374386072aafa4d53c8c145826cb61ab3e0ba25206ca5ec
 EBUILD superlu-4.3-r3.ebuild 1727 BLAKE2B 3ed7e5656ba7ab422121df6e38c631e05e3f717b05c4b9b8414699304ffbefad0ec1940ce071b9a2fe7080c3032adba985cad8a5b5b503e574eed35dda55742f SHA512 57674e8175b17f5cbf7f1df09a07c7df13b0742aacaf92f002109d62451f0feb337a2dda973f44d40e98477c24b4314608a51bc5b8a55f0b20509fc5daa33045
-EBUILD superlu-5.3.0.ebuild 1211 BLAKE2B b51ec3b78c7d6b2b9503e6924deed20d80d5fc0d0b905dfb9dfdc7151527bca3603d2a50e1c52901761da4bb754bf6ffaaeef4808a2f61e7842b0b3bf2e9940a SHA512 f169374c39f6d72cf50475b1ad16659524f2264360d4364ea8fa686d8eb2cc717d7b99b683c08aad186a146ac8faf5681dda7b49680c22ecfd96b30fb4f3bda4
+EBUILD superlu-5.3.0.ebuild 1212 BLAKE2B a9d001df4c52240b3d02a3421b6364de54c5501b51c4f9ef0bcd6e9465c04ea755e2068f0cd25d6aa26158a6e5beae16464cc80f1a302a05c5bd8778eae6f0bb SHA512 b7b622d271d189b1243421914ce1fdf3e07decca91740e3d07f647be1c675b060a05d871a9c9c3ea200ca2945d698fe9e2d48caf8deeb056689f0cc0148e4826
 MISC metadata.xml 1405 BLAKE2B 37c946ec0b73a5bdbd2b856cf571475ed8e85e220f200bde8028278dafb8ace158c21d42c9a4a2e7c3373ac4c5bdd4e39cef7947113d99baea5bd86992912dd0 SHA512 6e07a544afc19f7704a7babf09441a223b24f7772bbf856e06889ffac2ac09f20ef9e8a03003407e0ce372db42850cd075560c4b006082f4fcc569786bf868ad
diff --git a/sci-libs/superlu/superlu-4.3-r2.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index 9f2d995880c7..e8887bb82b09 100644
--- a/sci-libs/superlu/superlu-4.3-r2.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/superlu/superlu-5.3.0.ebuild b/sci-libs/superlu/superlu-5.3.0.ebuild
index c70f4c5c9ef5..9fd9d87b809b 100644
--- a/sci-libs/superlu/superlu-5.3.0.ebuild
+++ b/sci-libs/superlu/superlu-5.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiaoyeli/superlu/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index f7fb91c913b0..b31877ce627c 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -4,5 +4,5 @@ AUX symengine-0.9.0-pthread-cmake.patch 1973 BLAKE2B c66e3b3eb8895ac27e1a294632a
 DIST symengine-0.10.1.tar.gz 898206 BLAKE2B 88182a7facaf0d9ac90de8acaf549a3fd3cb65f0ae12e0ba3d9a1ae477d193b312cebfca99e626815789d8746822f0d1e256db6836a1ce265f65951880f486f3 SHA512 e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934
 DIST symengine-0.9.0.tar.gz 878574 BLAKE2B 32c37ca6575b3f7e37184c80c2df74ebf7bb7846537e951be6c888994b8dc049c1ed2a6f51da1c1cfb038e0a47393b18acff60cfef665c5a5e714beb9b0ecb12 SHA512 dceca49ddb6e2ac7c4f8ecb73ce19824cbaa3eff41ad0f50008e403498121184b4e9dc660628dbd8e4db979f8c16b83a709a40540f7834954ab01f9854e12caa
 EBUILD symengine-0.10.1.ebuild 2621 BLAKE2B a912de0fe1b8005ef9f15af29ab27f0942f5e27ec086cd270a602352903bc538140cd0cfee817fa29ec11157b0fad293409273be59ef9aa461fb92850d1a09a7 SHA512 3ccebdedb1214a648b413ca22e0b1858e8bcdca96f29776d8d15a5a97b0e165df8ad5df9a58ab28c090d3ecd32467ebed4cacbd7281b3c1123bb3b7af069797c
-EBUILD symengine-0.9.0-r3.ebuild 2626 BLAKE2B 0b235ae116b954d2fcd3924626307c712111f40bbfcbfbcb72e65804f1248b3b68c7ffc33aadedffda5e78231f45deb18efaea933ee48fe74704c61071a49020 SHA512 02b3761f800a31dfbd67fa01bf8365c8a2cd33df47be094d08bfd2712aebf043cfb41a45ab2b1171e142b9f261f5e446e17fcd13184ecee7c883c52ad8c47fc2
+EBUILD symengine-0.9.0-r3.ebuild 2627 BLAKE2B 5aad085edc09fc29aa5bd99b1bafa7f7163546787848e4a42afeb7f2c1bb167cf795a795b695ca858c496a2b457aa18be2f0b99e26d61a3dd570416c1f46c8fd SHA512 4a63a85155997c5ccdc0051d461075e0062cc4799e026501c07221a33897eb484c3d04a875d7f0a2d4f1c66ca77cb295b81c3c4463d3bf5a8b9c92210338b143
 MISC metadata.xml 1270 BLAKE2B e52ff12980457252a05195ef47bd90e52816794948169473a597e263d744d163cbe42d35e995243daf6b8664f1ed7d41879b63927606187277cdf503fc7bf846 SHA512 4fd6f340d1d4952774eb0fcd47d9ed6e9f145bd83ba7bd04fe428faa96ec63b6cd62173b6ead116a649471fe9b6466be7bbb48c8e534b3203f232f9a7bae12b9
diff --git a/sci-libs/symengine/symengine-0.9.0-r3.ebuild b/sci-libs/symengine/symengine-0.9.0-r3.ebuild
index ae4af472a02d..4613603523e6 100644
--- a/sci-libs/symengine/symengine-0.9.0-r3.ebuild
+++ b/sci-libs/symengine/symengine-0.9.0-r3.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 @@ SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 # BUILD_FOR_DISTRIBUTION enables threads by default so do it here
 IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index ad9f114c1f07..dbf0b29afcac 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,3 +1,3 @@
 DIST szip-2.1.1.tar.gz 415774 BLAKE2B e0f8d1f6528801c422a4db0f0cad43dd2c17f913dfff85962f4b4d448176903bcb385f631d32c5328cfb114527220baa9fb7d560364f700a61d4930ce799a7a4 SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
-EBUILD szip-2.1.1.ebuild 729 BLAKE2B 1a9da6cdb52916308db53f7ebdcc1c762ce98bcbf6911fc417e479390055153f6dacd52196393720fb65acf755f660a4b13764b6146a01372b0e7250cec53e97 SHA512 9653b3110282114cc948340b2993db254ad75532074f1f421ff015347b1c608a3a3ce3afa3797326cc1448ad265e89728044ad962272e23800fd75c09b7a1ad2
+EBUILD szip-2.1.1.ebuild 730 BLAKE2B a37f8e596625f7aaaaaaa3b5ec6308cbea7a6ea4487c7c0f1f547d74663f1455e34cdfcc7ee6c2e3ec7bfda2ee1c093a2a612e1663ad7a39706e12b2aa21cbab SHA512 82fdf243e5893844257628f750493f18ad3097210fc98e4d2813d888b769f5b80c79dd17b239017faee109e1a8763831e924fe37f8e6b30b0c51821c62ae7953
 MISC metadata.xml 766 BLAKE2B bd0e35e752baadb4deefad410c7e1d554cd412744af4a91acbeae68c04491b248d51f8169b81e529dfcc76b33ff8c2534f4b2dfadbda747309d3537de6ce5df2 SHA512 69ffab49952e563f8697a906f810ef7f8ae96bff70287b0f0a1f4c2b01212e6a3ba4fd89068948648979e53fd6efe1cc3c80e18584c54fdb6a8dc61cee21e14e
diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild
index 9a8a24773291..81f94ddca7bf 100644
--- a/sci-libs/szip/szip-2.1.1.ebuild
+++ b/sci-libs/szip/szip-2.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar.
 
 LICENSE="szip"
 SLOT="0/2"
-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="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index e196d33d2100..5d980c20a422 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,3 +1,3 @@
 DIST udunits-2.2.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
-EBUILD udunits-2.2.28.ebuild 818 BLAKE2B fb33795834e1249a7708e443f19d0aabcaadd2fa1f56da93e29f844e88e39a916716c414e8b0b3a7843e039bf9de8fc55cb68b85fcb67089fe8caafa7306f73c SHA512 67af5517fb55cbcdd0fc0af7483a5e404f596e202de1559d19edd65b7586506d01a0127853aeb4edf2a0a0b4f3042c7b6f52938059d2af79473920c7f9c44993
+EBUILD udunits-2.2.28.ebuild 819 BLAKE2B 44b939b187cf6f6513dbd6d156c660f27578a5b7da723aa5c8651fc8ddb6c23814fceda0b7b3536b797ec0bebd428e7fffbcf44b81c79797c447340d65381729 SHA512 7ea731df0eab5e7a7267721e07f1d577fe7eddd8d6b003c782684bdf2a00d87a74fdc89a73d7c3db9b484957df9576caecef246942aa58e6659d09e360e559fc
 MISC metadata.xml 536 BLAKE2B 89c4b4591b117a63e6d2e627b36d861605fc01693b26b11dd1a931d04beb000ee3e90974d7b4b74fff5435c9b9829d26b551500512139b1083d377214a4116d9 SHA512 7b2e3a330e624496803b31584636c95178e4ff810b075c338173bd2552a6a0c44fcb0304987b03cdae75bb49fde3306a8356b77f9ff8b8b77c2386bb7be512da
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
index 6282665fc0d4..3dbebc08a08f 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
 
 LICENSE="UCAR-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/expat"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/ufconfig/Manifest b/sci-libs/ufconfig/Manifest
index a502c5dada6e..2d20949a3015 100644
--- a/sci-libs/ufconfig/Manifest
+++ b/sci-libs/ufconfig/Manifest
@@ -1,3 +1,3 @@
 DIST UFconfig-3.7.1.tar.gz 8523 BLAKE2B fee3520b4c1305c4684ef4d0fd6cbcc27cd6db957b838642241f75cd6de4468fb5dd61282a0c1484318e56c5b06b8354a78eed2e6df6a5d21e4250883ad1c42a SHA512 a9d562205b6d047d8064d6f61e4f9fdb782774637f0522abef6031e8633c7372db108c69b48098e8b41ffdf786ce7bda0d8df9a3dee634dfb11b5e6073996a22
-EBUILD ufconfig-3.7.1.ebuild 1616 BLAKE2B 182ac3182a47ceb68dbd936c1ece09ab796b86ea7587b554971a11c141a0177fc5cd2280822e1c6239aa7b8231cd6cbdc552c71d37f25484c7f654a75edb2dda SHA512 93b4409e385f86be146adb5ff40e12df6ecc56e597491d6e6aa45542b65d0e898ca6c85800acd1c2f0845a111086df5e77b43458e89b093cfd747cbaa05c32b9
+EBUILD ufconfig-3.7.1.ebuild 1617 BLAKE2B ddbb296c791fc2ecbb314e793714e4b15b1e5bc6537d419169426696a0f4edb0d23b1335651e6b61736dfcbbe13e7e442e095673b5ca88820d20e618d48eb51c SHA512 e5680b2b024ed92bdaa2bacff7e52df352ac03a736629ca98f279cddab23894bc9390387cc79b960c443ef14af91c68ef0a4dd3ddb1a3d4487c4ebf824354496
 MISC metadata.xml 460 BLAKE2B 1e82a704578346f1700140b7d2c506cbc3e593a829fe6750041b9784b050e288eb27b8694926d1f7820c4f5d990a211fef622cb31123e8ffd2a48a31d70522e5 SHA512 e89d9bc1c96eb771b477d361e7f4cc953928764833c255b932345f0043688479d61d6aef7aac7c1a7f8f4811e0431caedcc7f686cabb23e99d02d3468dd3994e
diff --git a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
index b9e5fe8b5a45..635e21b8ae0c 100644
--- a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
+++ b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="static-libs"
 
 src_compile() {
diff --git a/sci-libs/voro++/Manifest b/sci-libs/voro++/Manifest
index bbc7ed9078c9..99da0f28b49b 100644
--- a/sci-libs/voro++/Manifest
+++ b/sci-libs/voro++/Manifest
@@ -1,4 +1,4 @@
 AUX voro++-0.4.6-cmake.patch 4197 BLAKE2B 294957cc8879e996af0a7cc205eabd501114fdec41380620b8162f1a63a4c88c9e042ac832b33c1ee7e3805321ae1396f3aa93cb2cbf0fb44cdf70878201aa58 SHA512 87c92d3e899242467c2df9a08f863d34255b0e14e080a07d9eaecbf111bb0ca181f68bde899373c8e6bbf1d2d730a547d880d14d2bb988b66a741ebd0f76c09a
 DIST voro++-0.4.6.tar.gz 809124 BLAKE2B 0b12f68fe2400d850353171a79aa41dd0a7780dd38d8b7d5fcda6621ba43e5bad60d72a1dd24c3ef9e30d4b63c0be9467062ef33f27138a838f7a984dd3321a2 SHA512 aa8c73d7634bb4ec4c0a7d4d18c0df07511ef975338f2517e6f0ec65de56bac10397adccf1c0e13439d29d096b7cb9b4540d7cfc191a1662f15dc0c3c1ff77c1
-EBUILD voro++-0.4.6-r1.ebuild 373 BLAKE2B 12fe8c3fd2a466637d61549453581a302152d7d1a56c80befdf690edc6e4063e56ec2e042ba949b7a1273b62d96bb6c1316059c9336f6631e632f3725c82e681 SHA512 56e0a01a0303d69421e21fbfc8de58efe16b8cbbf7caa12873244070d552177782f62fb4c6ed15dc973897eab1bffd793f87ce6e9fc35ec502cb808abcc5f9c6
+EBUILD voro++-0.4.6-r1.ebuild 374 BLAKE2B 986de064bdbd47fa1faf1c9f4794dc025b79182698e0290ca550c9fb515ce5517c83b35f839cc449a25cc15fb784cd7d748624ae4be9dd195d91eb89ad3bf2cc SHA512 ef504d04613aa93e5dfa6462f314835842a835e60f27dd3b23076d39203fe23512eb887fed927d04ee61a955623f890ab7199d44f271671a20f346ced7f0eacf
 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045
diff --git a/sci-libs/voro++/voro++-0.4.6-r1.ebuild b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
index a2ab69b03aa5..4bddb96ea028 100644
--- a/sci-libs/voro++/voro++-0.4.6-r1.ebuild
+++ b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://math.lbl.gov/voro++/download/dir/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
index fa3572550200..826246629ec6 100644
--- a/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
+++ b/sci-mathematics/4ti2/4ti2-1.6.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sci-mathematics/glpk:=[gmp]
diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index ddca2d793b34..2261eaaf09e0 100644
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,5 +1,5 @@
 AUX 4ti2-1.3.2-gold.patch 434 BLAKE2B 38162dea9fa7e7072966fc7c5fc72c05e2d122dbfbb25aa0027f992f0fe23bd1232245c670b8f3d3a2b75e67319a217aead99850ec6d1a025c6c4a890605b2c3 SHA512 109f89dcf1f66fae079d9ba4c265b0a9ad0a60b88848ae38175d98c51b8b8fce3e92b0f862191340f4a8dd8c60a768c77b1504d0a797553b5cd1fe5bc95189ff
 AUX 4ti2-1.6.7-gcc13.patch 895 BLAKE2B 2827da0a04f2871af174ffda828aca91141d18f379e30c27c10e3807b369b502ef7ebf781a4137e0c6651e5e7922912857bbf5cd3d24b12c1571828983ba3f63 SHA512 0de85310fd9680ed1f3adc5b4990283d4d6ee2ebf8a8c82e195ad323fcf1cbd16fa3727dc428f26b945edf660285332354a102c19eb37737beabbc5d9cfe9444
 DIST 4ti2-1.6.7.tar.gz 5649869 BLAKE2B ab0e7da1de88e5e99ead0b8fa7f7a72773b84ae903a31dc3134e83364ea45069889f8ce9812bb471cf72b824fe013756d557489b4d2ab31216141d5b6347acfc SHA512 38d638fe01ff3cef1aebae1eefd276cf02f808978851b4465e132f77d3ab34ea51d512e2ea28a42ac65263b458c43cf420dc5f8ac930f959dd0c14916cef9841
-EBUILD 4ti2-1.6.7-r1.ebuild 881 BLAKE2B bf0c9a708fe2bd389d3e8e5d7e8c0732914d3aeb495d5e4051753aa35a2bdee0b6de7b5796a332f30862c5228c7d447348d6316a8dc965d2cd625691fdb313d9 SHA512 923016a557780b6d208a1167ae1f73f18429d15bf3dcc1b284cf6187cd4a439ab4c3f11b65dbec154e087a5b93b2155b386d1c82b8f15cb578b5401edca660a0
+EBUILD 4ti2-1.6.7-r1.ebuild 882 BLAKE2B 53225de86083c1f5f65a65138979c59eef5d460b0b7e5443d25a5e07957d7df61c4f0bb87621cea0a0e0cea754abcad61da66da0418f9b42354ae0b301d3fb5b SHA512 44966dc8c9f8aa40c02bb542dec561b7c658264ec29845933ff92caea50b9a4dd016b57f1c724f22bfde8a0a81a54b9c29485b82bdf369512b687c9f5982169d
 MISC metadata.xml 531 BLAKE2B b06d3faf7ccbde8dfc9012e3d4060a703639873b4ebbda9c2fb07ef1fd4e6ad6b97d09e7ed12d8adfd35492c2cdc93ae9290987129e7f0aa34d6b0df6f8513ae SHA512 3564979bae9192cadb2351ec2a401d71de987d78e320701676f8e356a3352b75e921dd807a33e4963687489cd4b9f1dab7112c7d631cb74fef39d3b66943970e
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index c824e0243a27..655559311b08 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/arb/Manifest b/sci-mathematics/arb/Manifest
index 917a0c355ea3..fc57405e0797 100644
--- a/sci-mathematics/arb/Manifest
+++ b/sci-mathematics/arb/Manifest
@@ -1,3 +1,3 @@
 DIST arb-2.23.0.tar.gz 1989841 BLAKE2B cab9892b903a1f61ac7b37e0a0ee6c78ff78a4ad442ae12f42ad741cf6e251c1ab74b370dc6b912f75d2558a5baa248567e79d4ae90f8d98e16551d6ea90601f SHA512 cd15c1adc1c8a6b7cd7b98f5d32afec3b04f6849998cd8586924a6ebb5fe1a1a6efc250fa7fc1d346b2331daa02a4d07133ee58edeae3cc6684d306c8b78c4ae
-EBUILD arb-2.23.0.ebuild 715 BLAKE2B af49453068d33d19509eef4e08f4f1c14b42056e4b14ad2409a987df6ad87f0522cac5f42585c95b5b2697db2a57a15345bc39f425bff6c8f4453be2946d1284 SHA512 3b40cfa963e881f40d02420055ce1faf954a05a20d24de741c0b4a88b0ea4efa100d051ef2d86615bc1d58378dbbd38c91785cf8d4ef0a994fd40565f96b24e1
+EBUILD arb-2.23.0.ebuild 716 BLAKE2B 5f5812e12f1275576f00fe105831f894f896250ae607a1997d55ca4462715195f42320bdf40ad979a1df1239b85dcc01ad14ac98b7ce9725e3ad67f182f2743b SHA512 4079f8e969eff33a221b0965cda2dd604cdafd4622e627c1dccb9628b3dce8e9b2961482bfe63a31c4e6bde4d6840bcd52394d23138bceb5511e049e7a4843b6
 MISC metadata.xml 1108 BLAKE2B a2e3c1cf3f6c710c9b3e6fbf629101c3dccc9ae60c80da0d08853669019d7a2a03bb276dbe078cb6cb5ce6060ef7139a3658481d61a6d5e6d25f0cc1593be344 SHA512 2865a818ec7ffb77afc1c849fc960c2c39ec3bf6586b5f67e5c5037c6b6836fff0390224f27b1251a613d07107cf164ca11e05ec2f6988b629bd7e3a476e4854
diff --git a/sci-mathematics/arb/arb-2.23.0.ebuild b/sci-mathematics/arb/arb-2.23.0.ebuild
index d8fa371b1010..4b4adc3eb076 100644
--- a/sci-mathematics/arb/arb-2.23.0.ebuild
+++ b/sci-mathematics/arb/arb-2.23.0.ebuild
@@ -15,7 +15,7 @@ RESTRICT="!test? ( test )"
 
 LICENSE="GPL-2+"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 8c4906d84cd5..77ce84262219 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,5 +1,5 @@
 AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
 DIST CGAL-5.5-doc_html.tar.xz 53145672 BLAKE2B 7a575f09eed2fd97f3e68f37428d4ab41c267a6e4c158e653a8c2b5a17f2c56a31b64937fa161d3f256b473a1e617acbce2f3bfb71c2e810b8b0335b57a8b54c SHA512 41e16b44b93664ddd5185358165cce99f149fa33bdb308ce7230550ee79e3603c24df5b8d4f67de324ebf7e8a8c1e343e6d76341464cedd9d9af50f5d512af3b
 DIST CGAL-5.5.tar.xz 24156768 BLAKE2B e5f02cd082abfa8443e65430ed366cfdc3736c6a7af37284969ddd558ede1aa6c881d6928c65708504fd58f68ea01f56aa0749267d6dc83fd54f0b28e8c01374 SHA512 7fa6bf6c046727a9e0bce7cbde34cbe85979127a1ad0904f2865be83a80e89fa9af5118e5647572414f8096d29ecc808ee471d4bd3e7ecd41338be649b549290
-EBUILD cgal-5.5.ebuild 1229 BLAKE2B 5c810e807f9d28c9f7fb27c2724ae6af784a7d18ac910ff24773868252b7bbe9a7cf05fb9f6dc5cdb24088349657aacc33f8116d7e7ef04323f334aa2fe7d70e SHA512 35e0cd4f6baf57f8d4b02d8bdc19490cc7c5844bdb0575158d30ef43b4faa5123d64ce8047adef4805b77d83bd43885259aae237300e181ad2e028a09d39697e
+EBUILD cgal-5.5.ebuild 1230 BLAKE2B bab66db74651bc5798716ce9c0e3f3c8b46d53e446e2d6aa10ca1d45d0d008fd7be07363374c103c9e9a913712d02495fa9324b70ca101a81867b6718f29a411 SHA512 4eacfc73204574fb5e4cf72716e45419476f29be99020c69ba2bcb5a40bf9ce5aed1383ff23fe4e5351d29c8268634e3f31c1d687858658bc396903bc2879150
 MISC metadata.xml 1118 BLAKE2B ed180a3128a37bc151ce89a0edcc076b09449a43e9ce7633ac0c0343b20cdd585cf6b68dc92262730d8379b4eb0d4b26feba90327384f2e4546fba27336d96ca SHA512 c407490521df2908343dbc870684938dfe71e5f4a072f016361db9f08ebb598540c69a704ce97cf803b4e23846a18c259fc208f286f0d11d8acbadd32182142c
diff --git a/sci-mathematics/cgal/cgal-5.5.ebuild b/sci-mathematics/cgal/cgal-5.5.ebuild
index a20801ec0461..745af51f2473 100644
--- a/sci-mathematics/cgal/cgal-5.5.ebuild
+++ b/sci-mathematics/cgal/cgal-5.5.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
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0/14"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/sci-mathematics/cliquer/Manifest b/sci-mathematics/cliquer/Manifest
index f2d45b05fa2c..ab32059afd68 100644
--- a/sci-mathematics/cliquer/Manifest
+++ b/sci-mathematics/cliquer/Manifest
@@ -1,3 +1,3 @@
 DIST cliquer-1.22.tar.gz 416433 BLAKE2B 3f43d443b1ecfef599213da99ffa15b5077392dd8d1bebdd0f5db73898d1fe997d6eabe6dbdb29852d40355228f082cfa7e3198be90dc9166965b90f062cae69 SHA512 3285cb0a3987ff730d9f9b25419a98201f399daf28444179ba8902211ddda87adcc7189f5b94f062d0648039a1b6217b80c8db482887d7dc8552b20459eff861
-EBUILD cliquer-1.22.ebuild 796 BLAKE2B 7e26d90188092ccb638e6b18c990dcbed6240ad63c787f49c9e8b93ebcda699cacda67369d092bf81ab47b86f70797b8b3113f3aa9c2f4250bc696dfca216d7c SHA512 ca753e57ab29076e9bbe03ad317e0f9110accab6be50435c1ccb053e8df0cad8a32ff68ccdbe2ef6f5b8538b56b614326f10e8aa7bdfae7f6c23501bb261346c
+EBUILD cliquer-1.22.ebuild 797 BLAKE2B 0b7dd55ccb0077a41762a424a3d40081035ff9d1e07c4087e8623d70a748a680891f20aa6b346981aeab25fabc8f7717d31ddf8b558ba35afc9d6260a59c2d83 SHA512 c6bc799b3d70a2062ec3db3f8fc6c80d24a5aed0f4fe0ff0fdb5589901908873eb38cf49067c497baf3aa3ffa443a13b8a34106c74648d0f71cb4a42b5068421
 MISC metadata.xml 770 BLAKE2B 0de00517dccf6991a64d76ea25b7f1cfedd615d09c9f9a4842cc678bf1b23ec45af444a7ff6829e8908fb2936f6b4a959504b8c26ef89c8246bc0e0663e5f68b SHA512 06646ea6cf94717e6d98b81f2b6ca833d9beaf4e01ac012331e94794132648786c84d6177a32778c86a69ae7cfbe21c9b37690b6ef0d93227fc9bc67c350e1a3
diff --git a/sci-mathematics/cliquer/cliquer-1.22.ebuild b/sci-mathematics/cliquer/cliquer-1.22.ebuild
index 427fd6eb269c..bbe8fb416f02 100644
--- a/sci-mathematics/cliquer/cliquer-1.22.ebuild
+++ b/sci-mathematics/cliquer/cliquer-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 89e136d56242..4f1dc626dcff 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -3,9 +3,9 @@ DIST coq-8.13.0.tar.gz 7010242 BLAKE2B bf9ec96b6698a2371be3164f65424a8ffb273252a
 DIST coq-8.15.2.tar.gz 7222794 BLAKE2B 2f187982a56cb0a512af838ee321b245f9a44b0c32f5413aafcef8e5b7f933e9b05ba521c3e681a6c6973ca2b7ec5965a8b69b2febb978ce7cf246755187f656 SHA512 6a5487912dedb6e54145bf3f177a091cffe13429ba2f73db7c1cc241fe10e86340c968e19cefba7d680facce55f4e914cbd16a317264b109a6f9a01ec822a8c5
 DIST coq-8.16.1.tar.gz 7401345 BLAKE2B fa6bbcd6b4ee29feaf7475f58193209afeae0bf8b6e3640f2f1cf40dfcee7d7f1fb3f371e8790b8d11c993b5f234e9175f1f5036a7286b7c6569720ddd3985f7 SHA512 e9c82f1a180c2e3946628e8e039999a1841397a5b4cd77f158de69876fa43b5c0f61ce76c510cc2b2f646a489110aea59da452b88ddd7850d1eab4105f1382f5
 DIST coq-8.17.0.tar.gz 7504612 BLAKE2B 90ff0e187e13a6501580733f0e92dbaba0ddc520b418246c743f0c282e74cee3e1d69ad0249cddfd5b8f3ba363bc58cb91aad33d0936ae38afde0f4c97d47a72 SHA512 2f77bcb5211018b5d46320fd39fd34450eeb654aca44551b28bb50a2364398c4b34587630b6558db867ecfb63b246fd3e29dc2375f99967ff62bc002db9c3250
-EBUILD coq-8.12.0-r2.ebuild 1853 BLAKE2B 2a34013702abba1c9e1116397822684fcfd09065b0cf254d4fb495ed8b222b6c900a4d73d529ed07020b001c215abc1cc686dc06b2c199591e6b7cb27ecf388e SHA512 36c78c06dd77e1935c843b66d73ffc85d00bf0c6a72d3167145352f526e44913bcbf220bbaf7e42771251d4041d98a82cef567d965c15a39b0f24083625b6b27
+EBUILD coq-8.12.0-r2.ebuild 1854 BLAKE2B 96a5bc026d7cef8218fa0f10401c697df908487a2a510f349a57d080e2c59c6fc6237223fbe82f5114c6ee70ebdfd9fffc9812bc2e8981febac635efd94b3035 SHA512 3936eafb537044833b310fafc9ba4595bb6deba71679177fbb807c59e3bfcd44f8a98c26077fda791619479b5efdefd64f6235ce2ae7c599489c4f0e8f8e003b
 EBUILD coq-8.13.0-r1.ebuild 1827 BLAKE2B c14222f64269417e09c02f581a281a5328cb71e203d365019a939846bd2c2d61c8a059e64f3df0027472927b8e36aea6b2b998de86799cd1c425481a3d98e3d3 SHA512 faad0043cabc4f2d2fa129878a233ba11d0ced13fbd2c0f947c6ee380a5a1efceb65bcc0ee8e84f4116a9c3b78beb940865c07aafd22816911a39a69f9b23138
 EBUILD coq-8.15.2.ebuild 2402 BLAKE2B a1f9f44c17ea51c1a0536d02eaddbeba7eb5e441ec8562da3b9776dbafafbd30c50beb821d248e0a51dc56b3a5bec7feb36811d92277609d405b01229bdda17f SHA512 45c64aa13323c97c29dd4eeccc5b4e228b6abf51a3717bf62dee0c102df13c9a809073150d82be8ae7a07d43f62f52b4b7d2a69908f0ffed646b64a44d46c7e3
 EBUILD coq-8.16.1.ebuild 2418 BLAKE2B 09538efce3b1ba1b96141fe56b4328ed5fdd9a2c3aeeabb94ab35af59027748e4e75f456edd6ea81d97f8a7cd2ace7c6a89af1c815139168bd2728ad8ceafc7e SHA512 37dd16c4b7d7ebb9c380f47e24c25bbdf361db401d593f1a0d21cd0842dc4a1c6ebfd1bafd1d6c661885811f2b00c3d1665e78efcc385c478216b832e7889a51
-EBUILD coq-8.17.0.ebuild 2317 BLAKE2B 6f6d95472af219858da6f5e10840b4023eb9ee3208ef5466743b1f1001dfa7557a6842236900e4f865f1571de1a12efe79d2f05e5e931b88120e2867506283a7 SHA512 353d4c840833d3339a541fc54535670a8ffc5a75c8ba043fe883139515d5282a42ab04f2d4d8c91e9b7830b45e00a7b50cf4e46dd3735d1f30e517d5288f05bd
+EBUILD coq-8.17.0.ebuild 2318 BLAKE2B 43895300c1c9b754f5c1d1cfc2140318f8ef32014bcfa59e47e21931efe8d9d115637791b0ddad99c6ecea9fefc172bfddaaef048cffe99ae769fdb807cef8eb SHA512 6f9149a727109283ec4f4ca883016478f0e77464542ca3798e068d3eea2d682eba1b226b37bdc1bc9e4c35c8c19997e1720f3abf2d42c6fc790d148137e0f8a4
 MISC metadata.xml 1047 BLAKE2B 9f6defdf213139ee6549bc8f3b36ce5e8f53ea73bd5aad9262932cbaea7e90bd97c9ffc9dbbd03ac50097c5a6f19f5ddf00dd2b74cc6a5349faf1b597244fb67 SHA512 0f5bfbdd9ffd6f64379e697ed7cf90c2d9257cd1815e520aa14235f1cb399d20fc863221a0cae803cc88e5975be964b9debc3d750a6378ea157146f2e567c5dc
diff --git a/sci-mathematics/coq/coq-8.12.0-r2.ebuild b/sci-mathematics/coq/coq-8.12.0-r2.ebuild
index 8ccc4c7a73ef..2781f3840db2 100644
--- a/sci-mathematics/coq/coq-8.12.0-r2.ebuild
+++ b/sci-mathematics/coq/coq-8.12.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gtk debug +ocamlopt doc"
 
 RESTRICT=test
diff --git a/sci-mathematics/coq/coq-8.17.0.ebuild b/sci-mathematics/coq/coq-8.17.0.ebuild
index 6e20f85ae93c..f634026e1cda 100644
--- a/sci-mathematics/coq/coq-8.17.0.ebuild
+++ b/sci-mathematics/coq/coq-8.17.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc gui +ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/eclib/Manifest b/sci-mathematics/eclib/Manifest
index d55795328726..ea99577d76dd 100644
--- a/sci-mathematics/eclib/Manifest
+++ b/sci-mathematics/eclib/Manifest
@@ -1,5 +1,5 @@
 DIST eclib-20221012.tar.bz2 922112 BLAKE2B 2a6e5dccdef7c3c3b8bb1a121706bbfbcaafa9fb50882e4e88f8fa826c3b1bcbec11dc55462cbd51da3ab263991ae357b151ff3bdbf453abfc30e82d2abdeac8 SHA512 9d04aefe9e35fbc1b18dd92b5ba872cf71f5ce1c94c9a0f1ff326c763bf144112d7d950ac80e2bd8d3780a303edeeac903754b4eb5fb241e87be7ef3f2738c19
 DIST eclib-20230424.tar.bz2 923074 BLAKE2B 00c314e54ff2ce37f3aa83b757c0f880aef563093ab33db5241dfeb1e78cfd21be4f6a5097965697d5b87aa1987da17bd47007a599717ebf39456717efa6ad2c SHA512 4c248c48fa563e53b9354f3822c4e95308320a809f2dcc3e116cba8a6f903b333e27b527da9a10dc8252052201c4fcf50d9747a75cf8438a98b9d3828eb3d9d9
-EBUILD eclib-20221012.ebuild 1027 BLAKE2B 8d6b0aebf0558475eb1190d37c545977b67f22c5c781d8b2c291eca25b65f63f4c14e0d23632028c70257285e210932d8540cd837c4ab56f9ff5a93376a69f42 SHA512 d91fb3677e456480e6b02f8ec643007bbbbc3a339ba03d4ee6a952f1187e743ea13379a671cb26dc5e7d3e3fa244657cc89d366193f829589dbe35bbd785e901
+EBUILD eclib-20221012.ebuild 1028 BLAKE2B ca4175b062e00cc11004c69745e4ff08a0fc5e9643398c41f286e4267ac790032b309d3db2ddcdc7579ff44b56e339c59857f9df860365163fcf44545db72945 SHA512 db5459d2422aff4cde08387a65a33b616f1a1938f713ad8b1429b980f5aa089e0c845597df4cf60b419f3b64331dc762385140b155413ec7ec32667904160251
 EBUILD eclib-20230424.ebuild 1114 BLAKE2B ee9bface000314df476aeb6f3b272b680cff0712b3998f1891cd400c2d7e7bfa9076ed892957617ea605f02eeae9504776c20b001e0b4640e625c3236beba4c1 SHA512 4ffa8c82f1a255ccaa7f81d793f55ba03c87e58d9625f4ff4c12a9799d75d97aaff6d896c3fbabb4d8d02dae320ffa1c395d441e339b2492c99c409cc79909d0
 MISC metadata.xml 1089 BLAKE2B d10f9af5634478f0f13595abd10d9eefc437c27955cd3f504165beb4219e55c3997f16271148c1c2fbb5c9ae71e08665000836658bb954b83db06aeffa2b4098 SHA512 7111f3231464624d356611372934d0604fdd7a05c3531342a372979292a068dfa2edf49c4de5840cbf07b6f4819c22b8d87d54d7cacefb28ce0f53576d4620fd
diff --git a/sci-mathematics/eclib/eclib-20221012.ebuild b/sci-mathematics/eclib/eclib-20221012.ebuild
index f37e55f7be21..654058540279 100644
--- a/sci-mathematics/eclib/eclib-20221012.ebuild
+++ b/sci-mathematics/eclib/eclib-20221012.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # but it's actually still at 10, probably due to a forgotten autoreconf
 # or something.
 SLOT="0/11"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="boost flint minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/ent/Manifest b/sci-mathematics/ent/Manifest
index db2bf64525e9..d4b8e283aa1a 100644
--- a/sci-mathematics/ent/Manifest
+++ b/sci-mathematics/ent/Manifest
@@ -1,4 +1,4 @@
 AUX 101202-gentoo.patch 385 BLAKE2B 50ff9cb07e240b83db5610960cf0c6419d36cfbfb932dec421ba9144c8bfd1ccee01a100caa913dccde099725916e93fc8f5178d444217d0a553cf584dcb7a4d SHA512 5148ab2c222ce7e87d5240750a54abb4d79e414ef392fec4d8f955509ffebbcfa0216841ad18a20c2f84b00b5105739e8aca737df5cd08f4567b276f16de4755
 DIST ent-101202.zip 76200 BLAKE2B fec032543e2b5721f558c641f9668544579db022e018ad025fad16b7402f9279a0b66c70465a6cae1cae81afecc04fccd02edc80f213d167cd513c18c876eda3 SHA512 f74cfae8cd8b9f405b7459a350571d3ef438bdba42508da59ca214f6e7f6372d253a4c1a30685aa7dfc1cf14dde9796ea54bf42aa103a63bae09a5bb3fd3d3d8
-EBUILD ent-101202.ebuild 631 BLAKE2B 7d95fc678c9ce9aacc77952faa09ed7f717b9d275d1f4329332d088670c331494b59fe2c1e60be1ca91a80206904acd6129b621337b267e4b3f7da1fdbad5660 SHA512 eb8b6d76abc42dd8c63ce7d5a8d0fec6ed20ab2d3fd4eca710d65d3bf5ea4148f86406d45bf7a37a9f5772ed96a14aa919b507ae25855d4d9a67781d2439c9d4
+EBUILD ent-101202.ebuild 632 BLAKE2B 0f3707675a82adf67b1bd9bfafe803d2e873cad9997437cd8a0d6d4c190acb4bd48eb9429e0efeee4b6334fb9ba51ed0adad18929b49852951e3853adad15f2d SHA512 6e1fe0b84b4ace3063e8159f7f2fd5b6954011e8008dcf49a717b54d33ddd3e503cdd7b379340a82247d7d002a048357cfc6bafb6e2df4f85a742d2914ed66b5
 MISC metadata.xml 276 BLAKE2B ebfb8324de9ffc201d51a89c5c48054dad71e7ed3d0c012d20b4e24bdc18aef948acb61b87b4540808e7eeb07e99dca7e2d9b43123b8735e559427d5afc7a28f SHA512 615bf33cd754550bca58862b133795b54792f3253d1e80cf933a4094717e4a46acbd872d9373e0f25005843ff296ce3529d55acf38db43e9921220bdf0a3c2d1
diff --git a/sci-mathematics/ent/ent-101202.ebuild b/sci-mathematics/ent/ent-101202.ebuild
index 276a9a29fe86..d69dd0083f7f 100644
--- a/sci-mathematics/ent/ent-101202.ebuild
+++ b/sci-mathematics/ent/ent-101202.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/sci-mathematics/euler/Manifest b/sci-mathematics/euler/Manifest
index cacf272aa6e6..cbba7ad8ce3e 100644
--- a/sci-mathematics/euler/Manifest
+++ b/sci-mathematics/euler/Manifest
@@ -4,5 +4,5 @@ AUX euler-fortify.patch 658 BLAKE2B 4674ab1f332464315c81ffe01cb5d0f58fcebdb5c508
 AUX euler-glibc-2.4-gentoo.patch 280 BLAKE2B 1f668caf8685d97bd88f542fafe75d8632d75736438cbb3e58e60b66874b55ff5cab4ed4cfabb28a3d54e087e2808b45c467990a53691fdf497ec148d7e7a931 SHA512 714f03c3d249d9a0d001d905f68d0b48306b99f7ad1438418356101c2c87a59c6f628dab0d4626f564e657234f10903a0160cb2a00f8fbaefb532d0393bc14c9
 AUX euler-xdg.patch 772 BLAKE2B 382625847e68c23d5bac02b744caea00eb61a637eef1a7465dcb58ca81623ab3edccc90c67fab50328b2711dc6e6b3be86669f858aec8035b8e4b9ff3d82e39d SHA512 725f3243b92d7c7d5064e227eb0b6d15c39fa5a23586cd4ccd62977dd334a943108ee29e7cf06c7591b7af9f1322a6d27ac72016ce951b5e0bb7552021af069f
 DIST euler-1.61.0.tgz 1202485 BLAKE2B b886d483f5bcb8e1a953b7eda43c1f4d4b5dc2ad1606be48da60f9e4fdbdf02a42e30c862f14f4d2d182ac93c29fc7e234f7132500c695cd8d5b693ca48e599b SHA512 f8b9b0c6aa5aea4bd42bd33fff986a52c624c268ede11b83c2c53293a5acbda45317ecc719c12f377b236460c7ff0dba1d110ee8e90b526fc70af03ed0327b27
-EBUILD euler-1.61.0-r1.ebuild 946 BLAKE2B b4e3cf7010303f36dbdbe21d63a0c52fc60332744ddc863a69aee1279638ea6a8e51e854e62f31c0bd68ab367bc3af4394d712075a1fe02ae51b96b8730fbb96 SHA512 d7efa0be5a582f91da373205df261a8330ca1051c95ccaa2fcbf732eed58fdaf6af83a079fe408c21bf081f40fa33469114046baa20496a6f878689d8fc8bfb0
+EBUILD euler-1.61.0-r1.ebuild 947 BLAKE2B b1b7e881e14bba9dafd97e77942c2ab3de0bf520313b1baad323ed28a7e8d70935d330ba5b0ff63bc00cc6c2b377b6a4803cb9e42e8a7eb5460bc3f1c79c045f SHA512 c7976cb22f612d0356c498d45d74139aaa71856fe7a9e5c7b67ef6231c36eb13c92b0da85981592a304293f1d2345d1605852c66eb97bb5ae1060cd94435392d
 MISC metadata.xml 345 BLAKE2B a084671da4686c4e3f1cd5bc008bb43d9ca1948609ecd8d05c77edb79fc1fe4316d5987206014bf254381e303e8eef117936cd7c86063ab4e01047be672f5687 SHA512 1dab2658c910bf3ff1c7df3d0a903128035a5898cd94289eb0be5d7e3f9babf82582f5732a29875c53be153c24e7c01833ed201e42cd27ce1bdcc714a09bf1fb
diff --git a/sci-mathematics/euler/euler-1.61.0-r1.ebuild b/sci-mathematics/euler/euler-1.61.0-r1.ebuild
index b7ce622ec035..3345e94d0e80 100644
--- a/sci-mathematics/euler/euler-1.61.0-r1.ebuild
+++ b/sci-mathematics/euler/euler-1.61.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://euler.sourceforge.net/"
 SRC_URI="mirror://sourceforge/euler/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="x11-libs/gtk+:2"
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index e8c22de76322..4858e8729079 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,7 +1,7 @@
 DIST flint-2.8.4.tar.gz 5212964 BLAKE2B ddd3b9dca76ddac2070d3e12dfc4c5ea1a3b505c7bf28e41489798798d65ed2a5db12e01059816d42e5d1209166d17ee6035dcf0a94d991f78df59c6ad06b271 SHA512 1f66574a5f2f27e1f3cd0a334712c0e64f4a4b8dd57179a71f9adba4c4faff23ba8da3993f51c4f44f52a588d0d1678b1e1a272e8fe3367f2abc88e9d86ad804
 DIST flint-2.8.5.tar.gz 5212805 BLAKE2B 8922a2925b68d93fd35aa5b78eb0b8cbc6aa609498b8846ce4ff036c2fece3932a0eabb0f04a5c152147d8df3eccd6570832f55dafe4f7a35de135246454a83d SHA512 849fb61612f3becfde0d8afc019a9312a7ea07d3000a6bc558eb82babecd737e3af894d3084e4a57d52f7db0403d7298cbfa277b08e2b1f5497897637ed4825f
 DIST flint-2.9.0.tar.gz 5283894 BLAKE2B a790437ee142d8acb5cec1e6c7d21812f8d83f5d30d1e8c07e799713e96791d87792f25fbd4ce2d0d68f6a8ee2f0cde2b8d9f8db8ab26922a48485e0e90394aa SHA512 4494cba6a4e215e817d7c74ef6834c4e05a832488f4808bbd7bea8b02a4a35d47ef3c63a4f213230c712b32842f5588c503fc1cf23e5e2ddc4a4a5a1627a02ba
-EBUILD flint-2.8.4.ebuild 1527 BLAKE2B bc41b0e9b4fb9d9cad64c442610bf2ed805777a98b9ea9b98b00ae0f6df58648cdf3e5aa43c9a07767f10ae1e8a498d5bf9f291159f9f222e67b9f968be85c0b SHA512 31f6d64f14f1d8754ce6c0bfca8e5b83fc4fba2804f2dee07cb948b3c4a73e1806a497d5baa1485687270491cc7a2dcccb02a2d991d1db0a0407fc6001d37e0c
+EBUILD flint-2.8.4.ebuild 1528 BLAKE2B 349b7cdc5033da4096b18ff8066fcd036a5f88a8f037f4bdea02128954f03885ee70b1ae71dd3cf027c7b7aecdffb72cbbfa0196c6eb2ac0df63dea0d8ab1756 SHA512 56b3b39d5508f5ca577d8b56a89977a3f7487cc3c6e6d6f94ee236c1b4457e5c46896eeb24b39c40603a639837817cb15c46218fbabee0cd81dd3d3584fa41b3
 EBUILD flint-2.8.5.ebuild 1646 BLAKE2B bd2043190463fab0c3e6618d7910630a582f4ba0df984b6555efa28816ed9994ef4d9bd574bea6a00b29a071ff3a21443e83f46224cc8a87c2d7d710a9553260 SHA512 8dbbe5d46cd1167cd524cd231a952b137a324881e397c60fe02d057b4bfc680e7e729888c45b0457ae9b685c629e92b1591aa345f82ac7f6d2b94110db77c197
-EBUILD flint-2.9.0.ebuild 1658 BLAKE2B 65a9d48a8f9f04568c5216de5ed266889cde68329d9069232bd99ee38fae827935483e480466a091c86b32f8aeb906aec12d72b85a6122bbe4765cbec5c1a677 SHA512 f762ea39e0d85e97bdf95602fe40cd520117971101142093dcd2147cd88e1c9042dd1b23f7146b7e11f5843672a930c012aeea43ff312604d4edaf940e457728
+EBUILD flint-2.9.0.ebuild 1659 BLAKE2B 31dbe52bf90087158ab0c429305e463d34d6a3e7c05d41bfd68aa7c1b666a71d7a067d7584fcedf6fc6e18b9d7e4f466c0f3205f0897528cbe864b7a0ddefc61 SHA512 1f4b21e9fedbb1cb3488f792179275613983a73db47e4b6bd084d0c8b65646e145caa5e00becb44b4555d2087ad762fe6db3ea25259a993c15eab2e616786e60
 MISC metadata.xml 640 BLAKE2B b95d6f493564025e43604bffa340fffd88fcedf29c282fcc3c18e08ac089cdf1e10837787af664dd250a77a62237bf3665ff0a3045ca52680dd67aa0b39eeba7 SHA512 a9a64076e7f0df29e6a05a9d349c530a4ee4285b6a444425681eddf6ae1e8b41f610fda0bd7cc86b5177b36f34bc3072b67c7edac2cc8c0709a032b000576a14
diff --git a/sci-mathematics/flint/flint-2.8.4.ebuild b/sci-mathematics/flint/flint-2.8.4.ebuild
index a9e0256cfbec..3e3f1fd68fe8 100644
--- a/sci-mathematics/flint/flint-2.8.4.ebuild
+++ b/sci-mathematics/flint/flint-2.8.4.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 # Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
 SLOT="0/16"
 
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 IUSE="doc ntl test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/flint/flint-2.9.0.ebuild b/sci-mathematics/flint/flint-2.9.0.ebuild
index 5a8694e18bfc..5a1fb677b0b8 100644
--- a/sci-mathematics/flint/flint-2.9.0.ebuild
+++ b/sci-mathematics/flint/flint-2.9.0.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 # Based off the soname, e.g. /usr/lib64/libflint.so -> libflint.so.15
 SLOT="0/17"
 
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc ntl test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-mathematics/flintqs/Manifest b/sci-mathematics/flintqs/Manifest
index 31ec557b0354..9625f6bad08f 100644
--- a/sci-mathematics/flintqs/Manifest
+++ b/sci-mathematics/flintqs/Manifest
@@ -1,3 +1,3 @@
 DIST flintqs-1.0.tar.gz 151535 BLAKE2B c05761767af65ed5e5c42e75640c0736a26de76126907a91914083791ce0fa3659fb6f9fcdddb0b7aaaf2200010d826a18e7fcbdad0ffc6f861d4bcd941caabb SHA512 8391bb13bcc91f4ea68c972f0f6eaf9aa37bedc4c8694d039a21fd5153b203d561364ae545478d34013001354c4e8a013b2e5a5cb947b6e7f453c6f0f392f8be
-EBUILD flintqs-1.0.ebuild 1007 BLAKE2B 75c14059653e39e414e401bba190c21a2fc9753ac5df5a7607ec8d3b3128fde11b1cf7e8b6548fcf1415281c2061cd6e255a76dc09915f7988323639049fc38d SHA512 d52bad62cee3d11afdc12ede64a478bc94e7c6341b4912f5cfe86ae91f3d03055bc53c3ccc9662f846ac2a12be45630e75155104279b69f3b5e73113a1bfe7d7
+EBUILD flintqs-1.0.ebuild 1008 BLAKE2B 1d61e63eaa0dc26ce97bb948f916e7d867be60eac097a1881d0a834c0753dd91f0f94d94aed72f99397c3ec8ce3782ceb12682d72df834c2fa8b1da0dd98fd1a SHA512 cb603e8c5c1cee600b353c9f68c60ac1fdcdc28f78d7d0812e3de6b9a61b935178a8e55d4715406ce5413da4be989412fa9f72df9c55901dfce63901bf45843a
 MISC metadata.xml 767 BLAKE2B 4bcf27523db786620e6f15729d3459f1061e1520addf64d480949b2bcd47ba8a21ecb29db56cf98c60e173334c0cba88642b7639481cf60b756b20bb1cb4fcc2 SHA512 7ca6294e62d2b84d35f777ac0185f8952981180479a884ff0a810b78af5b39e1df26324f5943657fb227cffe02a207dd7dd0de1d86550eb24c8c01922d43fec1
diff --git a/sci-mathematics/flintqs/flintqs-1.0.ebuild b/sci-mathematics/flintqs/flintqs-1.0.ebuild
index 97d6af6c68b9..c03f6b1227a3 100644
--- a/sci-mathematics/flintqs/flintqs-1.0.ebuild
+++ b/sci-mathematics/flintqs/flintqs-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-libs/gmp:="
diff --git a/sci-mathematics/frobby/Manifest b/sci-mathematics/frobby/Manifest
index 7cbe9ab87e9b..a5ff7299f9b0 100644
--- a/sci-mathematics/frobby/Manifest
+++ b/sci-mathematics/frobby/Manifest
@@ -2,5 +2,5 @@ AUX frobby-cflags-no-strip-soname.patch 1273 BLAKE2B 42eadf37029f1ecd679e7591fa9
 AUX frobby-gcc-4.7.patch 974 BLAKE2B 1d8b6194866fd865858dfde063b5cc454c9b1a33106b5f49b9d3e595a0742039c434b287da9a000bace6dbf3f376fa2805ea9748a4a92a997b7ea05053262333 SHA512 2e1895b16064cd7121145202f865b0b9ca1cdb3e5088d82f9f80c8a2fdc8ef4a76f734e326d8685465b06218eea1a502d48ee0e6dd51fe92965bc3f8830fc13f
 AUX frobby-gmp-5.1.patch 482 BLAKE2B b807633ea98da37c51207276cfcc991db411cbb049dec30313013bfc2cbb1c1aaf1df60ed0136348fe52769b0f56295550302aabbf9360dcf2ad298363e6dff8 SHA512 a0e113c8a7c25c442a13425baf3fd3259ef48dfa67db25dcc1c87c9a2b1d2453d7daf9778a7c46ce9298db4f59177b63b7811eb4085f206c5a73e538488d174b
 DIST frobby_v0.9.0.tar.gz 852524 BLAKE2B 7cb2a617e85dee8c39c94973520e6dd42118145f1fbf09e7d16c3712a190407f216affd5bcea2ce4b6124b984b18c462118700c161168ae29bf4eebdb9bd1e53 SHA512 b1f64d7a8630ba7f5464e36f66a06a7a7909bc42f2e52898b2967b8ad6288da8ce11a5d79ebfbbfe2f3933930ad26444173f721465ae9a42b6dcf3eef7ecc59e
-EBUILD frobby-0.9.0-r4.ebuild 1201 BLAKE2B 7f7ca68edd2d6de46a53956cec856beba3b9f2c2bb6d00f59ede031428fd00d22e5c470886a66d5add4f000d9693c0193bf664e5f34a1f9914b2ce6dd53ac5b5 SHA512 091eb493fa614a7f60d6789b9401ad868fe0af8f5c922c391b51147acd2dfdcc3d42741d1976304b3718d877d6312191c17fe517a66a6c9061c9b4d374b508c6
+EBUILD frobby-0.9.0-r4.ebuild 1202 BLAKE2B 0f781d5172aa99672c4a4e01b1205d6f937d80b229a52cccce66470a03153e7356845e85ef7913a12d5b8776b096a8dbf453666f2fe2e87caf02cf469ca3e6d9 SHA512 ef900524094457955c219564ba68e1dd71f7ef18467bcccf54fa314e23265c4c3b222c4dc69d8ec4e2948d4754a9e12acfe7421a778ea60c0cefef4da7cb01fa
 MISC metadata.xml 270 BLAKE2B 4a5eb6dd2d9b902f13d543c859532c69cadc4595acd36675d25ff9ff204757f274327f87aa1bd7ddb1f040d5b028f52f614828b6794c19f60cc08dca04185af6 SHA512 cff77e4b0c454fc9c32b427b012585f4b1ab12dc2ca19ef669b43b0c64eb0ad6ffdc07a04c0c3e4eef8ce621f3a90c701bdd824cbc6e828aa62f6450f40ac1c6
diff --git a/sci-mathematics/frobby/frobby-0.9.0-r4.ebuild b/sci-mathematics/frobby/frobby-0.9.0-r4.ebuild
index 14a17f5470f5..e96db47903df 100644
--- a/sci-mathematics/frobby/frobby-0.9.0-r4.ebuild
+++ b/sci-mathematics/frobby/frobby-0.9.0-r4.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}/frobby_v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/gmp:0=[cxx(+)]"
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index a805a9a4f759..78594d429f2b 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -2,5 +2,5 @@ AUX gfan-0.6.2-Makefile.patch 6603 BLAKE2B 48f9b4280418aef41d502d770c070ec1dcef9
 AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
 AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
-EBUILD gfan-0.6.2-r4.ebuild 1867 BLAKE2B 771c2d6b4e656b5461f19c56afed397995da74dc984542adc590bbfa6b79012b37d6572abeac711cc7b43defba925198ab9c98a2e3d5b7565007a1bacc631ea0 SHA512 4811847a4e24efa6f6844ac32c6c473c8076e4871880fe1c26f9112303a435cf68dee16900dc2278dde2f691404a197c59e39476a3114e043bb4f91f52103138
+EBUILD gfan-0.6.2-r4.ebuild 1868 BLAKE2B 72f25bb20ca594ae03a9026db435708f1394b00ca751e5324e377c5d73a85eec1f053e8a0ea68f2dc70685a280524ec40bff342cfa8aac2fbd0644ae85802999 SHA512 8a66091eec812182870403be15667501a4624ae638e0be312751bbc0dc5b1508d4bacee32fb4815344f52e65d5ff138ade0ee1023075365cea3982ee25d26203
 MISC metadata.xml 1344 BLAKE2B 1a1d24099e2338877b068dee2b9e17feb4063de3a681a3b8d6a707c863708d6f380bb4864eb2fd5fef8ed49d6b1a770a8d1b4c12ce722b4f7fe113876de0b792 SHA512 8d5c93337a82b132c66c8d7e64c97deedcfdc724e9874bf308e6d817f71e663bc2b281ea133ae15e30096f5c801f88116b11e4d36dd8dd8eec526b5bc16d5f54
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index 1ec0a87690e9..e4c81181dbaf 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.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
@@ -11,7 +11,7 @@ SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 984357158e3c..dec089992643 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -8,7 +8,7 @@ DIST gimps-30.7.9.linux64.tar.gz 7100830 BLAKE2B 8ebae083d26309f7c624e38c943e3bb
 DIST gimps-30.8.15.linux32.tar.gz 6029035 BLAKE2B 4b84ebd89d45d5f0d0de28539ea8bc5bfb0f7383f39bb02ac00d51ba46897bba222db6215578e38fb939f541dae2569f431547caa51825dcdc6845e7e62f028b SHA512 b0a30d2d629d0f08dd2838be9dbe669c7f8f3d9f50ccfedc94c453a994cba9972440182e05d8e3b74b258e6e60cff53f6521e73a7ebdb34a45701a81d8b3f671
 DIST gimps-30.8.15.linux64.tar.gz 7211031 BLAKE2B 1d0291adb255099b9c8b44e2f650831755822ab850c2ebaa86dbe9728da619a4f9c22e3e5736a70ca3657818e2748caf32a23243347c048b9d57ecc8f7b3cf42 SHA512 6034dca7644bab85da3fdb194755a076778b37dfaa0a944ee5e64915e1196b61bd5f0a291a40118648c3a81faef3ac3026230709312d2de154260c3cf736a166
 DIST gimps-30.8.17.linux64.tar.gz 7222132 BLAKE2B 14e0e75fbb4784fdfe27e29535eb162071f04d63456f09bb98beb2a03af2b7d9eeac8357dc8d53e9591f9035351bedde40825b7eb8f6d85035e87b317a7aa50b SHA512 988c7a387b4d39af55bd04793bdc1c64acf67b13ab905bcc19fbd17575a7ef65d3a33ac06c2290f0457a6ebe4bf92451b43bc47d0b6d913bb03eb5f67ab823d1
-EBUILD gimps-30.7.9.ebuild 1928 BLAKE2B 8dabf8f54eb82e875380668b6ebe6f971db1cd3443d80ed9bd668204b5a19c91e997b68cfcc86ab6e9339bc24a696b6015a21bcdb83c7bea09893902596b31d5 SHA512 f22996f1a27b8941881a0fcbb2b09219f73967bf80708e6c9a55a1407ed57a180b26a53878989ec70ee05d604d29980616988e0ff1aab4323444d62b638f8e65
-EBUILD gimps-30.8.15.ebuild 1928 BLAKE2B 67fc2d3abae78ac9cb98f3b62f7b2e6fafd9c33961b3fc0f2a4d3705bc5aa346ffbee666e8711308881e2358f17fab82c19eefc444885e91f963b3b2a0cc4d67 SHA512 5e66f019374f926851d4a7b7ef41a4aeb4045fee23844a1254dc6ba71d8f2f89376d68cf9e79fe83a76cdce2307eda02416303001f1bb72e2d2a6656a83c1be5
+EBUILD gimps-30.7.9.ebuild 1929 BLAKE2B 479b10f49498aadbef7838114a64036d31a62aff4f893691902f0e27c34a8863441c98c301a85b83f78ded220741d06b3b1172881c5ab682f62cdc803c456beb SHA512 2bb5deb4692b78eda0ca75515599d42325d9b72b37dbfe22962ef0cad33107e0084e33f4765da54d36ac8a3afb5d00c46b598ac911588ca535d1469ca45c40b6
+EBUILD gimps-30.8.15.ebuild 1929 BLAKE2B c975f7a77545fc614da23cf2482189b4c9b1a5f0f2f9cd950c1cb7edafc29572ccc5458289a0b2e065188e25686f13e9fa57a51a95aad4261b5d89639135e1fa SHA512 fbf3c88184a6fa23872365e84906b9d01dd089e9a8b28caad37cd34cdade00f6d0981fed9b05561178a8a48c0643111fbf98d2a0826307b1e6578249393fe90a
 EBUILD gimps-30.8.17.ebuild 1805 BLAKE2B 934a32857e42f983a84ecd0051233f2b379bd5fc80ffb67fba2e08cbf507ee99937c33e941ac77014c60c7e8a374561e488e705a96f91af70fe23052388506a1 SHA512 8e4a9d57dee3e849fd99e150bd87de2a9216f16efdaf1ba0e195afdbb5c73e7e217933f3f05376933c38fabb24791e12870c1648f8417d3cf65c34f6a6deb0db
 MISC metadata.xml 560 BLAKE2B 01b265f54acd4ad1c9e1d23043d4ce2020fd41843a0efb09003046ea835989393df9935edcc3320eff43d552e47c2bb5afc688ddb96e9e6088c1e1c3a38fca64 SHA512 ba744b0b86d81acf54ed31c70e19be7ee315b6976b29cf0a40e79a7a227b8f68f4262ac2eecd696ddf051dd13de2019dae5df43706ca629bceca738e0e501175
diff --git a/sci-mathematics/gimps/gimps-30.7.9.ebuild b/sci-mathematics/gimps/gimps-30.7.9.ebuild
index 028722863590..5c9eb912b335 100644
--- a/sci-mathematics/gimps/gimps-30.7.9.ebuild
+++ b/sci-mathematics/gimps/gimps-30.7.9.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
@@ -22,7 +22,7 @@ SRC_URI="
 SLOT="0"
 LICENSE="GIMPS"
 RESTRICT="mirror bindist"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* amd64 ~x86"
 
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked
diff --git a/sci-mathematics/gimps/gimps-30.8.15.ebuild b/sci-mathematics/gimps/gimps-30.8.15.ebuild
index e929fcbd49b7..d456056e7649 100644
--- a/sci-mathematics/gimps/gimps-30.8.15.ebuild
+++ b/sci-mathematics/gimps/gimps-30.8.15.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 SLOT="0"
 LICENSE="GIMPS"
 RESTRICT="mirror bindist"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* amd64 ~x86"
 
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 7041f7c2a88f..18a5ba247de5 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,5 +1,5 @@
 AUX ginac-1.8.2-pkgconfig.patch 340 BLAKE2B 1f405dea9cc0a68fec86a65765247e93959a4b7ab4b962855259dd4205d139deb11e52366760a3ade6200ef53938d56dc08e5eb132724dc840291d4be37d74f0 SHA512 6629df1b961d8697e6ec1080ba13caa81eaf7596f103862e35f80fa13ad552e0cfe6d53733dd2ea8b4ac83075cd60d9e3f93b5f01886933bcfe97e919b6caef9
 AUX ginac-1.8.6-unicode.patch 755 BLAKE2B e51170a710a0bffca47da33183c32730938e2b52cfe7091adec18e159f8fb94164626cebab516af014f36a2bd8362cca0bf2622a06a2e1e717a2656cdbc69bea SHA512 33a7e74803a0c134b21bcdd44a6fea7236d2c1cd322bdd0ea709d36d12ed0dddb5849452bc837a3d29340f84a4d9d7bae3b328e435142cebbef9fa722a490585
 DIST ginac-1.8.6.tar.bz2 1152914 BLAKE2B 3d3d655cde0f5444fa01b0dde62a48d3c42b5a3b27e00d9608c56677fd031e639b7e4e6ac7c6cf68f807033cbe81432148d5525d76ad176b8dcd0d80aece07a1 SHA512 b10402d722e8216374dabdee9eba9e6de3b6afebd291a368697eb8efcd0eb8148237628bfb74713771c99977ccc46d972bacccaead3fcf35a1ab328744a7fb48
-EBUILD ginac-1.8.6.ebuild 1548 BLAKE2B 5d53ef75239c80d68bc52c1915000844ea2364952142d4606e80c123a4a3d47d5a41ffbe4689e3da331178aa54eb46649f738431a3b715c34d90b2be76cf10cf SHA512 ebb10a2f6908fc8343270c6ff89513dc1ccc391711a0b600a2568ecdb099491d0c74c5c426a070d6c1a40361b3ef7164b33d7fcb66c581849571974a07f0c532
+EBUILD ginac-1.8.6.ebuild 1549 BLAKE2B 4fd2459adf3059a074d48ae808d091959ea2e43b9bf32fd14630eeef3cc5182dc9371ef341517733278df4795564089f7ae439a1978d474e465277c3aded53e9 SHA512 f54c433be88328bd7fe6c93e1e8ad977b6babb6d26368ab05f6bbce60d173dfb9eb67627bf595be732d2d3caa4962bc133ce3f33ead349d85a32ef811c11aa75
 MISC metadata.xml 793 BLAKE2B e657f7bb74f228c2a4be58dc2fee5dced4002195d0a33d153a354a962552a8c49395cfb92a9b0de0b5090d8009de29e13c001301b041dce149dbb9fec9799b95 SHA512 c8da993984bc0313f9586aad8899ce1fd43c304da66486aa68a1c33bb1c75aac63e129eddeda925081f624c38064634187fc24ce39c5c337b64f2889443befad
diff --git a/sci-mathematics/ginac/ginac-1.8.6.ebuild b/sci-mathematics/ginac/ginac-1.8.6.ebuild
index 0bd93e779910..00b6750a13df 100644
--- a/sci-mathematics/ginac/ginac-1.8.6.ebuild
+++ b/sci-mathematics/ginac/ginac-1.8.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.ginac.de/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
diff --git a/sci-mathematics/gmm/Manifest b/sci-mathematics/gmm/Manifest
index 04a23c2f878d..9d31b08e32ee 100644
--- a/sci-mathematics/gmm/Manifest
+++ b/sci-mathematics/gmm/Manifest
@@ -1,5 +1,5 @@
 DIST gmm-5.4.2.tar.gz 545222 BLAKE2B 971656610e458f589de4e1d7d28947f501e23a25a018fa15b854047e4e34d11ac7f0729928250a80537859dfc888582285217a595e6168606ca7b54c4045e3ec SHA512 525eead2c9b4dbedbf4d5c315a7f7efa584aa4a2582c260bd304a3b7cc762f8161b4bc825b4853f53e5a766e56eed538d2005c8b1965bdc7efc77a5a0795e934
 DIST gmm-5.4.tar.gz 547563 BLAKE2B 44d4809b84434e50e954d64ddd391ad39a2df8ff77b285b87615f1b7c0ce8dec6b4f002daf7fc6095c075ec60e32d7209ae3abba1899a42f8cc830b6fb33ff4a SHA512 a271755a69395f1fa3813be7fd65ecf123521ab5106acf3b87ecfc00a818ef476b669c65f6c29123f6351f9155ce3b5a02f17c8cff6d1821ad7c17ded0b854f5
 EBUILD gmm-5.4.2.ebuild 427 BLAKE2B 9fb7c04044ff6bcb78394a02bf0cdf6cdca5f85383a4a55ac1d26236e9c08c69f9850f1c8cfbbf59b203d120a2681815a89fed5d3a133e18b3dca559c447f799 SHA512 ed336a4cd1b8bd5bb16659c1249e74612331d714dbbd3e7771fce7d6a1b5739307f36b1112b260981ccb290fbf0549905403a13a84c2e12a8a56e23682a70415
-EBUILD gmm-5.4.ebuild 536 BLAKE2B 11132a49fad6c434f2ebb97e077018552aa2eb3a7152845e4d944de22f458e6181eaefdfd5c975e126e59be3cd344f7f33b8ea3926cd3fbf6ed3b9a1e7d01f64 SHA512 5a34851529784db1af6578818053029f68cf4539f0cd56b194e90a14bd03221888eb8feedab04808e0e43e867a3856436d60418a46469d4451075060a02ee33a
+EBUILD gmm-5.4.ebuild 537 BLAKE2B b56ef5c947af58a86e6b919c358fad0fdab1d167c414a92440ca5632cfbdf3e9da7b1d09ecd1932729d2a7b8f57bde656e29944dabd794734faeae3d2b120aa0 SHA512 20fbf1925dce940581182558a7656a492fbb7602490113aa77e0c5b0bc03275ceebdf98e7cb43dddedfaa0fbd7ebed3708f21fe8a7e1fcfe347f359901a10482
 MISC metadata.xml 748 BLAKE2B b38c10240d8438621865fb03756c8a2812d5377051d7ef6ea21c1f572a313e7ec07c219b682e8501b3d658a23aed216d30394b9640aac1a5438f018af05c8ace SHA512 b1aba97ea7ff9373892c60f9a92c63dc222a79036c7e802dd8d4cb914caafd6fd0403d7b222961d8acfbe5e62dfe10bae3b2ad7660f24adc6ada38d8c3678336
diff --git a/sci-mathematics/gmm/gmm-5.4.ebuild b/sci-mathematics/gmm/gmm-5.4.ebuild
index 8bac1a827bb2..f144d6079b30 100644
--- a/sci-mathematics/gmm/gmm-5.4.ebuild
+++ b/sci-mathematics/gmm/gmm-5.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://getfem.org/gmm.html"
 
 LICENSE="|| ( LGPL-3 LGPL-3-with-linking-exception )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_configure() {
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 78a010c6b22e..2de11726864d 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,3 +1,3 @@
 DIST ecm-7.0.5.tar.gz 1159568 BLAKE2B 7fb8d78a6bc8423c9890b9d6e334f8c4317b68cde7d712c5306775c6f07eacb3cbbbd11d651bbbdd687a87692f4920170557b51f9498881a6c5018a2ce0b1b7f SHA512 f5a482a231339304683adc3334c9b86f21a0d9b42ea871418d4c01005057d560cd418eddfcc1c7be7f8c249960b2ee612a1454ccc5d8e41319b06c6f42e6662e
-EBUILD gmp-ecm-7.0.5-r1.ebuild 1583 BLAKE2B d1df6c2c1d9ff71f5b026204ef750e495189e232686adb9dc2430ead45d8ab058d69b9a46cf455fd032004534d3d94d1fe71166faaa1ee324cf87e5ce7665c06 SHA512 43837805f346653933d962d64a8a885b28db1f27f76c7d41f4d9632127628445c897c88f835d8dc8dfa3c38a004969c884d0abe6d5f2ff362daade904f1951d1
+EBUILD gmp-ecm-7.0.5-r1.ebuild 1584 BLAKE2B 488a2fc64ec683b3cfa833bc67764912f2b81a97e9e5c800f7fdc2e0f207ab699493c2ab4f31c914f7769a9bcf7c78f88e5476abb352b03f4d568d53a28731e3 SHA512 5b846e326edceae9813ad30113e6418531bdb065c50dafde1f040f12a351dcba683b3a88a723df09501ec7ba77f76dd03cd1f0e94d91e0bd737a0a6973c0af5a
 MISC metadata.xml 643 BLAKE2B 90da8b09f30dd8bd8d4df3dcc388663e52d57ea7b2974becede9ed0c592eaacb33958d202cee33988b79364e058ef84676e995b9d8467beb1f7d89ad8b177136 SHA512 e2f0d6f286440543ed15531183671b30f0044c38685e58617d004286b596ba1b898c470dc39e2ebe95db10c83be9430f1a010539ba2b0231883fe6bf4b0b97a8
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
index 4c5cc18e67fa..c627f3f4ee8d 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-7.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc9220
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~ppc-macos ~x64-macos"
 IUSE="+custom-tune openmp cpu_flags_x86_sse2"
 
 DEPEND="dev-libs/gmp:="
diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest
index abacf02a13fc..1f7c1619afac 100644
--- a/sci-mathematics/jags/Manifest
+++ b/sci-mathematics/jags/Manifest
@@ -1,5 +1,5 @@
 DIST JAGS-4.3.0.tar.gz 2057409 BLAKE2B 5820c66dd10cc90343d53b901b7dbc1acf85dca0f5f80280864190882f0af865edad877eb2cfd421ec2035d3ae843373da1facee8a10b6735e2fc0387d452949 SHA512 d0564c73ff45484afad532ed788353f9c0945cd9667030eed5be674492bf97524d05903b22d4995c1de8a331dba7b04425d009e114d98a38b4bfce5214518b36
 DIST JAGS-4.3.1.tar.gz 2019687 BLAKE2B dd464675f1aab59d007ffb29844b50ddcc26320cf8159b5ca108bf0e6db9878499aa40e090250b84ff4c8733100149037b2b3cee00b3ff2ec4fb23769157b944 SHA512 dceb97c92ad3ce3ebf62e1e68e822857f170f797f81a79fe5a56d8a81f8ea619e6e06356335e44def8f50ff82af55b2f9f7a880b84e092262a2d78e46c43acf2
-EBUILD jags-4.3.0.ebuild 917 BLAKE2B d8712dbc00033a29522f7dba81966de2353cc5bc434b36eac6785a4b794be6c15ba08ab63b828ac4a3ed63bea19229b499492d0c4751d1d1e7875fd73cdbb43f SHA512 e3a08da8d7294cb1d4c864f791fc80d76b193519598b9161658f1be07e34a340787bed1ceedf5258bacba54868f3c9d02dd9b38af1f5b3caaa845a4dbd959b39
+EBUILD jags-4.3.0.ebuild 918 BLAKE2B 43ce289502c561c95a7612ae240dbd37e86e5de94ca65188bb8cd32bea57cbe7de732f5dd98ebaf1972d73a2fafaa260cd754887e44fff4e12ca547e6f75a5d0 SHA512 5f8ab7a4666e1e45971cb5a7e44f82e566835e3b716b3ccd348e826ef0d13fece8a2f41c3fc61ad520825cb92fbc42142052cca0b054a1ef4e970f6429cdc651
 EBUILD jags-4.3.1.ebuild 916 BLAKE2B c8d02242a9a876b2ab719ecddeca3ba77bd59d8ea65719f3bfffddaf3b110b58335e19333fb9c6277aa14c7eaf526e745eff237bc06f474dc979d9db66d7c26e SHA512 4509e862431329e4ce99607f5ed6b4b6ce6424f2401083bc7b020697e7f529ac97d0165d5e9d8a4b80deacac8f2eabf0d01f7a77bb9a9f2cfa471214e8cd970e
 MISC metadata.xml 865 BLAKE2B 6a997d33faa0e84c6bacead33c91a63048cca029df407566730b77f615357230154f9a6ff790190a2547b33311a6a7f23135c354ed25f1eff1d7ceba9a146f94 SHA512 7e38978f65eac37716d885e6e5519c45f2c9c6b1f2616225abab4a6f9b4112cc02a47219c2db48458de2c998864023f10487456ae549829a8449a56cf49181c1
diff --git a/sci-mathematics/jags/jags-4.3.0.ebuild b/sci-mathematics/jags/jags-4.3.0.ebuild
index 6c2ad95e6bdc..af3933c65fbc 100644
--- a/sci-mathematics/jags/jags-4.3.0.ebuild
+++ b/sci-mathematics/jags/jags-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-mathematics/lrcalc/Manifest b/sci-mathematics/lrcalc/Manifest
index 80971f7a33e7..868dd8aa8279 100644
--- a/sci-mathematics/lrcalc/Manifest
+++ b/sci-mathematics/lrcalc/Manifest
@@ -1,6 +1,6 @@
 AUX lrcalc-1.2-includes.patch 1939 BLAKE2B 37dc25d9219899cf9cd6268038715b927af294135f1acbebf5651fdfdcb50f7b041e53464c36f572201be411941d889b5ef7c1a20e31eda9915339ec378faf0b SHA512 d5ad549ddf23609870f6b15e389323bf26ea2c981c4af28c93dae7f70b4f7c96e242011213acb7c138ba9acc0ce0bc0c41d51d3fccf4cc5de331a12d965a46a6
 DIST lrcalc-1.2.tar.gz 363120 BLAKE2B d3f652abfe38e81331dcbac7068d087b198445bf02dc5ccb5bcbd76b9bbc329687209e6ccf40ecd09f166e7d2da054edd0e5c2b18503d8e4d961ae4ad91b5152 SHA512 699f4c2ddabe5879542d5c11f3df3979a4e009ad37741711a70fb48b4a0d4a7969e5bb110adb63d4473f3c2b61d1efdb7228a6b74c5dd7e1b5aea8cf1d170fab
 DIST lrcalc-2.1.tar.gz 425484 BLAKE2B 3c9d33942f44f8f6cf29e1da36ad5072b49ea3dd949f8c3e96a2fd55deec566828736ccc1da0ef32e528b8f4967bedbd46ca84f144e022a6916451c02befccc3 SHA512 76db29af51fb97e582d37b92a426cacf85fd61b8e7c2a70dc99dec23b396d62d996f0c66b5bbbd8b6928b46fa1186c9bb3c28aa91646cdccd38bd9b783af44d7
-EBUILD lrcalc-1.2.ebuild 592 BLAKE2B faf95fcf9ad635380d47df7f691346cf7507fa858b4ed608071b9e50007bf271905e2fd7bbbf8dc73e203f0bcb8f0474ad8836268e7fb3f8bd80d7cbb02669dc SHA512 256609e7771b5fa1125d464de13631b6b0244ad1f6a55614f9a436dfe35dfd8344160202db02b4ebb99b299ad4773d8b7c5147097f981cf6728b431cd7d721e8
-EBUILD lrcalc-2.1.ebuild 540 BLAKE2B ef0db280a52c2e4888286691bdc99d1d7fda09e5405e3fe9af1cd4cbf0ecbf7b5586662701b56501f6baa64681574036dce65064824d0fe98060574e082b1257 SHA512 5979723e4d8ba6359356e6c94a5d314cdb323cbef684fc59657ab54d9c909261abe35b4cb1f721070ee92081db8340c3c1a95477085148751d3d8a1443522ec5
+EBUILD lrcalc-1.2.ebuild 593 BLAKE2B 33456aaa57db869fe0cd00927fd0211d92e16fa217c96e3ccd45b44a5d7e46ef7dc60745374a0a121e68d21c0dcca52b5a5106a1d4e6536a8dafb652187ba746 SHA512 e4a3fdee7cad675379290ff92a70ed6eab3b010e152cab96e637592af5d4d2d0af0b3de7984d42c1c870b2205cfad49ecaf81666e077a50e74473f52221b545f
+EBUILD lrcalc-2.1.ebuild 541 BLAKE2B 111b36945f1082eb9ec873d2e808f74dd01bc6825867b13a645782d9cef19fb35d29427e2f672608ab71a6b6b57dd7417d04ed1764be0ab25d21a7cae54b5d92 SHA512 2c85be357925bb4ec8be96f1d57f785a86a9769c6762dc7a3b1050416c3200635bc7224d923f91bb4f4c4e99ecbdf441ff9958a68f31e04fd24857110dce6c3c
 MISC metadata.xml 865 BLAKE2B 59342f149f6ceb01b00073fa2714c268337bffe50d01b81ea8cf10b865d8c51112714932c92ed18373efc18d81ebf4d75446a0ec26b8cf5c6188eeffcdd79aab SHA512 3198cfa61428c86100f0e646f21460600afef73f83343799a903d6d43d1084eae08b135d74c302daf6d37eabb686d2413016c11b0b7c1e15a3907dd2b58f5146
diff --git a/sci-mathematics/lrcalc/lrcalc-1.2.ebuild b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
index eeaba798c92e..684d60dfd68b 100644
--- a/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
+++ b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://sites.math.rutgers.edu/~asbuch/lrcalc/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/1"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/lrcalc/lrcalc-2.1.ebuild b/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
index bbafc77ebb66..b4cdd85c2350 100644
--- a/sci-mathematics/lrcalc/lrcalc-2.1.ebuild
+++ b/sci-mathematics/lrcalc/lrcalc-2.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://sites.math.rutgers.edu/~asbuch/lrcalc/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0/2"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/mathomatic/Manifest b/sci-mathematics/mathomatic/Manifest
index 0277b3e5256a..af5e9c12face 100644
--- a/sci-mathematics/mathomatic/Manifest
+++ b/sci-mathematics/mathomatic/Manifest
@@ -1,3 +1,3 @@
 DIST mathomatic-16.0.5.tar.gz 381466 BLAKE2B 31dde337646d39faad3bcda6b72e316de4febfaf8c825320c70d69fdd55bb377948ec9e8b5ad855dc0a5b9be0f50b19387a595dfee7299e71fbf19c4f2bae979 SHA512 0d98cf7ad707d6536731c98dd253f4cce30243e9eefe9912b8fec3ad4ac4261e324b93b4f0113789ce17fd0b2e3d75f7b258be7905d8e3c7bb4b756627b75950
-EBUILD mathomatic-16.0.5-r1.ebuild 1188 BLAKE2B 9547f127ea1a190428bab49e1b4428d089110afcb82e4748f6ad7e753f7e69567ced38b610c08722174c0e42142b9523d440ef112a38e2641f99e859e75f77a0 SHA512 77f8261d38dafabc230d3a12571e12f904cccc63e21471357e0fefde545f3ec2e01a9c02b1a894b9b2c88a05433a4c1ec1a187c7cf22e0cae8660be674240e8a
+EBUILD mathomatic-16.0.5-r1.ebuild 1189 BLAKE2B 9161f73ee5be1669dc1bb3408bee05bc039f322ee904e5360560311476bbda01f50f0e1a2d77098816c703d23fc6e07eb17e8ddb60deaa2106543df875abb6b0 SHA512 05ba0fc4e83297039fcf1edcd30d202b5bc864c3e0a5cc67d51ad5a18545e4346c0bdf5be102a609b940b5f1ef0df5e0feea19af5bc5b73a0e98ccd7612b930b
 MISC metadata.xml 620 BLAKE2B 6e940ef7cff9245d2c53d222b811dbfb9802599ddf4a057678c0e69389f872052819b4b395c40d38ee7ebb3fc6e156628c95cd1a3466a034fb0febabf1c725b9 SHA512 89d1fce50b1f404956e1174cf63e1db2e66bf9ed42f636ad607c63723707b366a19446429f9f51efe83d7fc4e716d42c5590f1a6ed405dc8c229f10e80247e04
diff --git a/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild b/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
index d16b05048391..e906e8604965 100644
--- a/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
+++ b/sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gnuplot"
 
 DEPEND="
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 8c90e482137d..1635badbfa07 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -10,6 +10,6 @@ AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
 DIST maxima-5.47.0.tar.gz 47939891 BLAKE2B 46f97c81ff8fd227d04759103ac683c034820e29b7ecd78ad76e3a43a8911d29d1a20007fe4ccb37da88eaa3888d71c8b98a55bc4e692cf72b154391e91a4533 SHA512 953b98336eb086069edaa917981372450ce165dedd7a7b39b181d3f2d8b089551eea943e0084148eaa3ded395dcba9135509d3d11d9132ab7a3ad8bb800d3a11
-EBUILD maxima-5.46.0-r1.ebuild 5969 BLAKE2B a7ce5eb8d067bbfc50e32bd141c83c04dd6072b6f3b5b84d9fbf08329efa54a2800a7d6909ad511eb1ba4e029663078ca10c1b3ebf22c3690cefcc8a57e7dc6c SHA512 6ee870eed18dac583cd68efcbcbf710764a3bc28bc3a84e62733416092bf495fa564fa766a3bd087cd97b50c7d72d71ac8362b956d574672f710adf62006ffa9
+EBUILD maxima-5.46.0-r1.ebuild 5970 BLAKE2B c5ba1dd7bed01c671c32e32cb012f5455e47846ed529511b4448d31cb908a814fe595b890546fc655faefde2bcce173fdc7eec53e8839c2499ddef07bd9e6d93 SHA512 3c14fb96c95d1a837c119b0600aeddf47144557e48cb848f23d0fc5858314b9431aa76d9bb907ec7fe6e55aaeaab7f862cb47c8cd92bb1ac8fc183b2c53d721f
 EBUILD maxima-5.47.0.ebuild 5971 BLAKE2B 13ea5cbd3a61c839208a35604c8179666e51e4fb9378dbdbf8a7a1748ff2632e9ec6fb1fd3a68401871ab10989da086f68f2b0facb48e44cb6a963930ea4f0cc SHA512 df5d0612e10d197ccd9155d28be9c36babdbc356672fb766e081faf240119cfc00c3cc4d56564d45aacc5ce65ebc231be8f74f3aa99979ad1a34180da2f3fe27
 MISC metadata.xml 1843 BLAKE2B bdb4437e3ecc08ffeb9a42d816c03866e0ced9ba3b7ca44b6777d57b36e89603a5ed44eda015ddefdc8a87fcbc0c5bb9447cf424d60aee2651a4ae9cebd7edef SHA512 bed22b9442289ef93c17de1529071d1e1a1c6b925ab306c4b3a5aadcfb26f2f3fb792e8d563e726c8d28b3cc8708b692fc9a6e60fe38c280eda37796544acf14
diff --git a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
index e106fab26432..f7a15f268d76 100644
--- a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index d7c81f174f8f..f7cd280ec91a 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -2,5 +2,5 @@ AUX nauty-2.8.6-gentreeg-gentourng.patch 3005 BLAKE2B be0473d69c5be8ed74ed4291fd
 DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2
 DIST nauty2_8_6.tar.gz 1546765 BLAKE2B be8aa8ef816c8833a79876e6bf99b0dc4a23922f48684c8a3272c01b0b4eb64959366cae363fbda4200354a0833942b64e85c009fc35a3d6fa02f9b74c9b9a74 SHA512 9bc597d4341a6a67aece0ad95ecd4a649f675def73e97af1d215cf7399cbd3fb8e39f140cbd6f69740f2083c7a5739d5089e746bb3f831250709e0d2b43548b5
 DIST nauty_2.8.6+ds-1.debian.tar.xz 62852 BLAKE2B fcbbed54b10d9dd4bdf82d8a72ef91866a235c7679266b8f395e2fe6b44a679e98f85462a42037094d856130d5456d9989749c416932f895bc17df8ef32241a2 SHA512 3784e0ec15c64ea6850f9198c61af3924fcedf1ffa4715fbd53a9bd1cd7defd69b543a8d4e6d46ef727918661409e2de77c89c3ca79f36769c1335b30bdd305c
-EBUILD nauty-2.8.6-r1.ebuild 1808 BLAKE2B a4aa891997f84ded11916541cef719def3468efc6773f7e67c4da178daef6a8c7ed07ef5265d2db4a28f53a8177af2c517585ebb7fc1fe5721e394bb57dfa274 SHA512 13359b3bca57a7e59f8646d85b6b4e9c8ded21997022c675b24710b96a5836a0cd29a7e5c7a30c42d79f7b2b740a3fb1fbb185f92aa42de9fcb86f2b3967edb9
+EBUILD nauty-2.8.6-r1.ebuild 1809 BLAKE2B 8d68bbb927ba796d1a366bd0480bf19cba44ffe942dadf25868ce2fd6bf793cd923aaca064260477f53e2f16e53c2b3b68d52afa6e1e7276045347f539849d3c SHA512 31d01361a5c594d085533338297c72b6375409ffb3f78de693bdca8088232de89f3bde12acf0f88f27b6dc5877755286f1356df35b6635c4ddc73a2d2019cce3
 MISC metadata.xml 554 BLAKE2B a6fbface4e867c9299680da9d2fefce4194771220489b4d9a81d295bbf1a8048fe1bf23e3c3225501a18b23af8a7daea3533f8a7c250afc7f9a4bbbf60fc8efd SHA512 c7b67c8516b9bad6cd9f60a54b3b3a4974a72e81071f53cd6562a5bea2e2b8ae990119e4391615dd3b2e30282bf70924c4f2f4b5ccd3dcf1cb7399e7de189387
diff --git a/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild
index b7d960f6657a..680f026d9f50 100644
--- a/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild
+++ b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
 IUSE="cpu_flags_x86_popcnt examples"
 
 BDEPEND="sys-apps/help2man"
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 4c86935b9e03..70271ae77c13 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,5 +1,5 @@
 DIST normaliz-3.10.0.tar.gz 5177794 BLAKE2B ef2ed089da0bf7b286f477837d8793466c1b030ea0f321cd74e910461a6bd28705f971d1b987ef59aa783311dc247e2838d5acf850cb1948e429c98e1ca440f0 SHA512 febc43f846607dcfca8bcf462e8ccf655e2e6e10dcb2741412c08489fc9b2e99410306dc4b078084bfe73e41113849b201e6f7f5a8e2ae07508ebf1c043f95a3
 DIST normaliz-3.9.3.tar.gz 4946498 BLAKE2B 3faff64fda86216ee11b0f55ba1341d70988472f65eedafe5b52bf6b05abd817add2dbab45144de0a43d02c501caf3c4a89d66c2b2d621b81188a2a5100d158f SHA512 5d6866cc35835c196d22d6b4b0d5f0e3e2e00f772553115fbbabd8415b20388cf367cf9a282904a72c03c2ef482b804f7009d67e3334add4fc37f3bab675da6c
 EBUILD normaliz-3.10.0.ebuild 1681 BLAKE2B cb3d172f736136d5706ee0e3b9b8ff162c4e3ec4ad3dede67b2d275dd340ba0d361c47bb4bdda66d7fbfac01372fd4f6e79a029435d75e41a27f52e925216c61 SHA512 91ef2964ace54fdcf9fa9da2c63b11669cf3403dc08678b44ba64f75852fee6186ae95cd3682c8019e6a2b525398a20737140feeb7ebff7a189a0e3915a53ad2
-EBUILD normaliz-3.9.3.ebuild 1599 BLAKE2B 7b87b54a8dc78b220f1bd46945d46165a2f37269d73c7f3ebea5bd43b0f5e74674eb532dd766e678bb3292c98422a47266198fc76fdef4320cb22f8b0ca5cfe8 SHA512 17dae30d1e232055b0e20dca7563978905a9560c978abe9e8a52f1c4498b17a6c5e180c2ca81128a74761b3277afd78744de173a494d62e621fadfbd03cdd88c
+EBUILD normaliz-3.9.3.ebuild 1600 BLAKE2B ecbba2146925c8a4facb6fccc88f40db9ad024f7413f302c61543670ca64706ffdadad5f523e0b7994602f850bfd7698abfda5983ffd5e8fe7af148bb52d10a0 SHA512 187f7b0e4264be7289e0677543001104630449913b264889e3ac8855e87b3f2bc63cfbb4b912b7ecc01ab645a889c2c94d1dfe8feb0d3222a7bdec22a4b657c2
 MISC metadata.xml 823 BLAKE2B e6ac647e395713b5589b2dd6655bdde020fdb4113067f83d503497e0e5ec916b04d2742227ea16f1dda4551c1275b2d0e684e3dab4cb331fc4d42597ea2bc004 SHA512 3f242ea780a29900dfda6b7a0372a87d38ebd11184e1eed976653bc3712e54c2cf5897f07c7f2d0aa50a1af6364fb797c2c4e78cb9c3fa4344370cab4dbe4abb
diff --git a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
index 942b854e1028..987b73b0907e 100644
--- a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Normaliz/Normaliz/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc extras nauty openmp"
 
 RDEPEND="
diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest
index 529f335c2a42..e7e42d06830c 100644
--- a/sci-mathematics/num-utils/Manifest
+++ b/sci-mathematics/num-utils/Manifest
@@ -1,5 +1,5 @@
 AUX num-utils-0.5-r2-Makefile.patch 1498 BLAKE2B dd113fae4449a4d40d5e2c4aba77e4442dd120b3ead0160963910f3b9c6ed9f14578e3795ea6ba5947bc591eeadf04154e5df2482dbae7c76dba0ec2e8699292 SHA512 a59169a419a8ee5529e28f67b67c231f27da10715ed5e876f2ed8c971e8b12870897c3759f12574f1de82e832947336f788e2b1a060cf594439722f98f43fbd5
 DIST num-utils-0.5.tar.gz 31845 BLAKE2B fe6620dd0cc7c0d0dc03447918b525f57e9360c5d2a44a32afe7879cf8000bbce646dc271fc821531642c209bf6b356783b09e969755eb7c7af785a8a07a2462 SHA512 6f5a2a8304a0ac3cdba342ecfd28ccd926778a5fde5eed4655f973a5c921e558f0986061ec11ba6146382f63a46b1503570576370a28a0f975e361d790f03561
 DIST num-utils_0.5-15.debian.tar.xz 17436 BLAKE2B 099e22a67b359072789106581c6d3b4fe006eb0064ad70578c0cf07388d1b9a677eb418d8d79ae59d6a9e0f3bff93e3159448e36c965f314c6bc559f5af70921 SHA512 5cbcf0d984e2c87fc16932bbd3e952a2b38c1272e00b55839d42ffaf28e0a8b0f5e4340ae01124ef34507ec4a144df0a48fa2af087f876cef39fdc5ba20ce0d1
-EBUILD num-utils-0.5-r2.ebuild 1199 BLAKE2B d0cfbbbe8d6e4170b447a83973b2362db7ce4042b3401da5d8e71e2795f65283c89147c02fe28a2df04524bcef133990eb331cf0367b4a01cfcad3b9225fac47 SHA512 46e12f29c76c9b621b5c70d9f2da0c2d2416377f27537c1e02f0c47aefa0db46f59833f7744377a825609d0573ab7f2e709dddfb28914bbfe490afdc5cdf6bb7
+EBUILD num-utils-0.5-r2.ebuild 1200 BLAKE2B e448252097ccd4cfcc56e8604894371febdd8edc627a7cbc7aa0f735be409df9bcefd70224339e2f56817e086aab383b902aaf225054508206a350e4a597a9bf SHA512 b0c0a043d80998a565d3de2671208e445efb1bef1264211fa6102fcd4afec4a6be607aa52086abce4069ca9710ccbd57cf7b448ef577178d12dff00fc104edb0
 MISC metadata.xml 270 BLAKE2B 4a5eb6dd2d9b902f13d543c859532c69cadc4595acd36675d25ff9ff204757f274327f87aa1bd7ddb1f040d5b028f52f614828b6794c19f60cc08dca04185af6 SHA512 cff77e4b0c454fc9c32b427b012585f4b1ab12dc2ca19ef669b43b0c64eb0ad6ffdc07a04c0c3e4eef8ce621f3a90c701bdd824cbc6e828aa62f6450f40ac1c6
diff --git a/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
index 816840466f1c..43f9a593b109 100644
--- a/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
+++ b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
+KEYWORDS="amd64 arm ~ppc ~x86"
 
 # pod2man
 BDEPEND="dev-lang/perl"
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 97a3921d6d2d..f25aded47ffe 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -6,7 +6,7 @@ AUX octave-7.3.0-docs-texinfo-7.0.patch 1623 BLAKE2B 36a6ceda753083171ece9e4045a
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
 DIST octave-8.1.0.tar.xz 26957620 BLAKE2B d1d90a242b1517dd0284af454b9de83238c5f515690c1ffd8bd5d8c43ff6c690ccab590a877e74631394295b97292d71b2dc1c62ea50f0c4ff3e9ac728f67dbf SHA512 7e43e1a272cb51e981d4f534bbed2c2915bb714be3f151f98862ed8ecec1ee3a90600dd22778077b6cdecee4c802a2e4d13a49c339cef683e1356941b9e1cd1d
 DIST octave-8.2.0.tar.xz 26970452 BLAKE2B c5bd03861681a7e194a0fb195433d085fc7d98eb3c6f65929ad53c93afef199062902293082e5aeab7c5e15e0045093efbebcc860052e6081708947483425f2f SHA512 9f56428e990c6aa71a5cfe7698602ba681535c36b140fa9248536c260afebd19f6125c92a0fd6d14fab5a794de49e03ccc98e89ac879108f635b3ffc4ec40514
-EBUILD octave-7.3.0-r2.ebuild 6727 BLAKE2B 2de036fb8ff4ac1786aba15d3a115b61317a6f3262e39758840f07f96063a81b6b0f035439422f7b329ace56f4d63ab4891d7add71e1491d7a749c934054da2e SHA512 f1d39df10bdca389a8a9ca7dd477bd9897ed6ec9a0f36569ec0ce27521721ce67f9dc8abea214d52a9bf58eb1387e97b95d5110112fd5aedc2a88c3ccf8cfa95
-EBUILD octave-8.1.0.ebuild 6594 BLAKE2B 05466ca70998eb8ff86a2d1f12a3092ebdd1f9d8b82232283e89ecb3438683400cf08d8f274d0bef5a1b16eef0274eb4805e2344c681f189f52321ec217bcc6d SHA512 76e49fcd5c751ed4fe24ced673f9c6c60be0468b9cb0fe91004f25428b5292a83111e8f66530d8554f872a4da5c7645a52106204fe2058528e82c74fbcdb3889
+EBUILD octave-7.3.0-r2.ebuild 6728 BLAKE2B 71e9479d926d8309750e7a9fe273cbc974d9c31e25db5a7e7433ee1926bee0aadc90cf40911897816ad178af7464ea21c877f37bb4787bdcf002469a7a0b7e7d SHA512 cbb2754d28e5cf8b2533baa076841b95ed6d18f19f3c0a21a1accff4bb38c073c64552cf6b7afab51a1a9557280b2c14065a525b4c3033380c8d99def27880f8
+EBUILD octave-8.1.0.ebuild 6592 BLAKE2B adfa90ddd89a3b4c4354f62eee8716a274837657d1d38636990b074dc997aa732e291d0fea86520a3654bf580e9e4a1c9ed1d41a3ce05bd475f9d75574595107 SHA512 0dc0e6b020a12af45dd7c16cb45fe8c70557e2c3d7cc1d0b1b0042ccc7f9c693bfd15d3f52a59f9503109c112b816fd50966aa2e1aef10b701aaac2d57074be4
 EBUILD octave-8.2.0.ebuild 6648 BLAKE2B 9311b5befed393215880922e48d80bd189c74fab43dba2d29fc75de341ec20382baa41c7359bce32f27e5cd2429b701db3d31ae5c38638407faf6637dbc8f49c SHA512 b3eae1f150e448d3a30ec6d4fb389852a4d3c797c48c31e16a9bba71842fa55931530faab69c875c3d70330c0c00c2666b2c58a96f0b0d2c1828c075c325c1b7
 MISC metadata.xml 1703 BLAKE2B 0471bc1eeaa2ce86b8eeca5c3e831eb0d9207b5fd1d3c03aba017a257b7b98b313c42a1054471c79dab1b5d2d84df8a8d3b0ee68e772cbe6970ac92f07dc3269 SHA512 3c051ff80c958af4315faa1670cc5e1d6a53397b4182304b760cf4f2e14f716e187dd76879d094e35713ac115c47ea623530c2f4b114f7bf2eae1cdf28bc46b8
diff --git a/sci-mathematics/octave/octave-7.3.0-r2.ebuild b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
index eea6ea2ec301..98af07848357 100644
--- a/sci-mathematics/octave/octave-7.3.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
diff --git a/sci-mathematics/octave/octave-8.1.0.ebuild b/sci-mathematics/octave/octave-8.1.0.ebuild
index 212af2b3d89a..5bb414745372 100644
--- a/sci-mathematics/octave/octave-8.1.0.ebuild
+++ b/sci-mathematics/octave/octave-8.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
diff --git a/sci-mathematics/otter/Manifest b/sci-mathematics/otter/Manifest
index a02f1e64d2eb..ebac068329f9 100644
--- a/sci-mathematics/otter/Manifest
+++ b/sci-mathematics/otter/Manifest
@@ -2,5 +2,5 @@ AUX otter-3.3-build.patch 3072 BLAKE2B 818cced4cea1d1ded0762143c2c3a81a328426b58
 AUX otter-3.3-clang16.patch 510 BLAKE2B 59ceadaf806a1c9e8cfd90558f0cbebf77c19b3d79badb1131fb2b7f7a44793f3578fbe6226738dd0edc606ff77d5cfb3131d40eec6234e6abb2ceef10a96dcd SHA512 6acb56dd75ccf997b5468bc550a39596a14b698abe3a3a844086f24bf03556fb0e3ec328824744611184fa166e11e6ceaa7215bf73a2b1715073ea1ccd8e1245
 AUX otter-3.3-gold.patch 503 BLAKE2B daddf108d12dfec68eb07583697982a62e68413f533ff2c1fc9e27912f3d761704849e7afa776109def5b361b246d1e7a339da496998044695d40607c4dd5dca SHA512 66e4d3f246a1d4efbfdc8b3442bd269990d9c23b90426123ba2ef04b181179fe3a20f39e49bc67c2ad9158946fb0611e4b5700825b27b1af5226ab66fdee16c8
 DIST otter-3.3.tar.gz 2809092 BLAKE2B cd98fa71a43671a4f1346cb98dd677e99bc51fcdf8ea71662ba991b84c17e732438e4e1a2ffad7a564034b735acf829d7ac4446b52d79d6b4e154fcc0baccedf SHA512 c33d0f89cec647567cb84467a0adff2cd6023d7713f207ceca1736567b40be4ed6ab98f2ded151fa8dac7184a653cd00358ef8b18cf407ac8387d200e6dc073f
-EBUILD otter-3.3-r4.ebuild 992 BLAKE2B 410795917d18c01c33afacc50eb5d5f56131d9da71307f276cd26fc38504893b41c9c607cfc11df3f43dd9956647373fbf50bb8c0d728e041e1d3be97ad07b70 SHA512 a3c84d35653d120539dc783c4c66c14b1b28c7820ea092bbd9fe07cdf3af871c29a6f786b550fe950f312faa92a0eb5541cf2a87f0273c22c3c1f772dd5b4464
+EBUILD otter-3.3-r4.ebuild 993 BLAKE2B f9edf10653791e4844960f36a97107e488acb0b9347c6366cfb0625ddcdf99e460c9701426864355971580a00eb83cead3942f8c5d068d6bcfe9dbc0596211c9 SHA512 fa9dc17924e572492b1e37067e82b74c193b3dc51b23a1a4a8f5770625a305042a571f683ac030a5f416523c6ee8af4a8f2d2e32a5b1af7b50852336217c6383
 MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/sci-mathematics/otter/otter-3.3-r4.ebuild b/sci-mathematics/otter/otter-3.3-r4.ebuild
index edf670138134..711bc9eae538 100644
--- a/sci-mathematics/otter/otter-3.3-r4.ebuild
+++ b/sci-mathematics/otter/otter-3.3-r4.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.unm.edu/~mccune/otter/${P}.tar.gz"
 
 LICENSE="otter"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/sci-mathematics/pari-data/Manifest b/sci-mathematics/pari-data/Manifest
index 54ddd361609e..8e6a83c4c33b 100644
--- a/sci-mathematics/pari-data/Manifest
+++ b/sci-mathematics/pari-data/Manifest
@@ -3,5 +3,5 @@ DIST galdata-20191216.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab80
 DIST galpol-20191216.tgz 10049371 BLAKE2B 0b365579823f6f8243269144648302170eb2c2fd8c69ab3cc47e68e08745a909a9c1305080833f99c96c3ac8076ebaa9f680ba25e35eb84859a3aef22ba23c82 SHA512 5109081488ce5cb442b1a5d2f9c3206c48bfe27a743f7a6fdbd34f6d0a1cb5c2a4f5fdc173af25547eea4caefc525b9851fc9bbdb215b606598d4ab44cb60acf
 DIST nftables-20191216.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
 DIST seadata-20191216.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
-EBUILD pari-data-20191216.ebuild 810 BLAKE2B 684e94fb571d22db98b345915ac908769c560a9b2ed0fc9d7566d2ace4a424052770b61b8b26fbf8c878d7f33ce17d30ab190b5de2447fd9b166b45bbad9bfac SHA512 3829ab5a98bbf036d43987f8f9c54d2d49e760b6c9d0021b962fc04ec81666cb91c74bf1e08808b51bc45aa4687c7b4bda2f636bcbe55b202afb300dd231f559
+EBUILD pari-data-20191216.ebuild 811 BLAKE2B 26b0ac3f9868d790616819abdac2aa97f08ff42550bfe35f0f3c354512b07e7e64f7e848742b2bb3513dadeed5f4a414d629af1d97034aa50daefae858ec00bc SHA512 4ebbde8359e8d196701779ee0ad35f8d29e01592dce91a0319d64334bd0b586bc9e8356e4a3454a4f6bd858a39f7e7474627e15f5492bb5a30aa9fa8ae95a62e
 MISC metadata.xml 726 BLAKE2B a4f203b7f7b138fdccefa3213535d99ae7c99030727d48c9390d42076c842d749256631147344c3d89fb0f599ecb0bd54cb66e072f5ea28c6cc8b9debb279af8 SHA512 d7dfd8043266e498ad26eeba8c23f5db24c5d9c060b30d98ed81cb5d7d43456a4aaa124e722465e6bd587e5a00b46038e0101162760b673278bde7624235ae33
diff --git a/sci-mathematics/pari-data/pari-data-20191216.ebuild b/sci-mathematics/pari-data/pari-data-20191216.ebuild
index 83c3b554cc9e..c839066c7fb3 100644
--- a/sci-mathematics/pari-data/pari-data-20191216.ebuild
+++ b/sci-mathematics/pari-data/pari-data-20191216.ebuild
@@ -18,7 +18,7 @@ done
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 S="${WORKDIR}"
 
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index daf226f311b0..e01e7ed9b89a 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -2,5 +2,5 @@ AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eed
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 DIST pari-2.15.3.tar.gz 5178288 BLAKE2B d9cc11526360e9fc7688e0a3195a85302d6bf95039051c9419aa18c5bf91eff837d64d9acabb0a51a6e15a3614a5cab4acbf0a502dba5417982514f27721d47d SHA512 9e127850759bac0c0a9b32c6660a55018ec6c6781aaa14c42667f26655444f55c08e100fe186aec8ad1f574d883d76888b13fbafb65d1f4741e2018b78ff307b
-EBUILD pari-2.15.3.ebuild 4003 BLAKE2B 122fbddd69cfd6b4304acbee6d4ad93394a89cd54b0db6688aa588b95e5b3734d8e27255a5296e1dec0f43151db26f50e1914cbee1ec1fd3f5dc4121fbc3d914 SHA512 e3a12be83119b00aa7124544d0aefdc68da121ab81a4f84b9854871522450b4b662b3d824a3d29b1adc7dce60b0bb3e893eb8f244ddc3db3209d0d310974c4a5
+EBUILD pari-2.15.3.ebuild 4004 BLAKE2B 9a024a99f7059e85f77282fb799f75ae525b7167b982aa2fa1e5f32c4a05a4c7f37b0eb81a24036d4cbaf0e45c8ed6d68b7106b652a53b64330a15368ff8072d SHA512 9aba44c7d0af9b6c6ddca06e5f6336cfeba02ceadc8723a68cc971209ec13802ebb1addf41864505d64a870975a9f404682c71f06e3fc83af91f3a44e0190214
 MISC metadata.xml 1770 BLAKE2B d730330ac80159a9e46a7c892049d00e28bfe9e4d4c61616c033ccaf526cfef6f95a03bac803bf70c59760e1833e35fce5bc535038aadc8db68dca878c7bde78 SHA512 387a8eb845634e8568a3e98f44f9b92bd7819870ebb6cb57b28e96c0df022b4436074fa526771f5e6793ce59c010c0c0437abb63f03ec9890bca3c301afcf9ee
diff --git a/sci-mathematics/pari/pari-2.15.3.ebuild b/sci-mathematics/pari/pari-2.15.3.ebuild
index 664fd8a019f8..2c285bc6c7ab 100644
--- a/sci-mathematics/pari/pari-2.15.3.ebuild
+++ b/sci-mathematics/pari/pari-2.15.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
 SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="data doc examples fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index e98843e9284b..ad39131953dd 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,3 +1,3 @@
 DIST planarity-3.0.2.0.tar.gz 462194 BLAKE2B 7927b04cb7c9839637fe13228da50cee581ef7fd7fdaaa9ff2dc62348ba10c7f42ba88a75801034fedc973cf86fca6396ba2fb0b1f71407d850b73b8a9fc4fd0 SHA512 dbbc97cd9cf0a5497fbca76f3b0741d3bcfca110c7022150750e73179a0a0441428c854479831395b8f6340d0554b1c0e7cf7eaa63f7fe40d2a59365488c7013
-EBUILD planarity-3.0.2.0.ebuild 503 BLAKE2B 1af02f1e899c4b275f7f87c8c14e922768dee30ca062b8f7ec2c5377feec5f0ead2b71fcb3427b673404b844845cf010b0e0a19f5cd3b871f9a7a899183f50dc SHA512 96466aa877988ee4087292c2218a80f3af1128db9f19b03e479287fb834c3e9ea1ab3249bfbe76c7e4bc63c20ae41062582afcd558d209d37a29a1cd027488cc
+EBUILD planarity-3.0.2.0.ebuild 504 BLAKE2B 28b677a802de2ff32e021c8d80272ac47b4c92eb1d7dffe4c3f67bcdc7485a74f8f11fe6aabdb4e724f94c1e129591730edded6f75097271ec2a2a23d7a38d2f SHA512 53d3bea711b5df67a90a8f70859c150c2023c2dcaa19c47e0980dab8a9d334dbd1dbe29df942e9909154f71c1c446834d49d285b050cf56ab3dc96567cb964ac
 MISC metadata.xml 809 BLAKE2B 6c3ad8e9bbbc3cfbd8c18183051153054b2ab7f4dd94e69c8f4f98a955001330d1e51e6b1da7f98a7ce29f7920b7a55a31624828a5aeaf7831ace0b4cf5dbec0 SHA512 5aa885d48f2d4626ed54a67abcc068186189e726ddb68bc889b6dc7d9aa09da30dbf7bb284020503d70bc94a25b5e16c907fe992862c2c2a6c344e2977e57f25
diff --git a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
index 1c8db97eb865..11e65b5d56d1 100644
--- a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
+++ b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/relea
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 
 src_install() {
 	default
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index ad05be938ae9..5b1bc0e6abea 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,6 +1,6 @@
 AUX polymake-4.6-perl-5.36.patch 659 BLAKE2B 4013b45b4edc79654fcfe77ffa17530ddaca8513eaf76fc338dae7fbcd1cf83f07f7b5ccaf2117051ae3f9fc951caa676b36fa06413988c271e0a5f01da28233 SHA512 0bf9f512c6b7439bf1660560d25a502f1fa16b7f0136f04f1c1c8812c1b1c5ab0ab5133e149777243985ca37e159d8a3de355b443441126328565063faa2ba8e
 DIST polymake-4.6-minimal.tar.bz2 5634651 BLAKE2B 6ee24fa6e70fdf746ea298d78e21e17fe38c5837ae2d3153e53656b4b003555b06897f463220b59474eed1111135dfa61c080d08d6363391afca51011f331122 SHA512 90f04c67bf297fb1b9f5a51d1654ff12385860b1fc80278a8b47f65970f11a1e0f33ede8a839b54a12422e772c8b76302ff78cc467712a2486f6e76ce0d5ab20
 DIST polymake-4.9-minimal.tar.bz2 7287220 BLAKE2B 4a40c3177bc146c16ae7924c2911bd96a26e7eec82963dba1293db272e60a6efea59bd27575951ecbe343862c1c28ecf1f2eb5c2bd1b9b09ef475a7ef44a6b95 SHA512 5c762a59b135dbb1bbcff9a0133a17c20529dc14a5af19efc2afbc1ae773ea3834ccc6b97db130ec91d9cd7a3a20988360b1d844f70272724794ac81ab42658f
-EBUILD polymake-4.6-r1.ebuild 4117 BLAKE2B 082513548c437c62044209bb1f75bce4131cd4202e7c49aec776e35d8cbd83fba477c43958d96baecf7d3d2b8a94e2cf1b45ba9aa08e0250153a4ba932c80fbd SHA512 b4639b6d3fbf9d265956dbc3c62cf3262c64502945ef25fd1a8d85402d279182498970909c1a770eccd1e2bf1e71d17151ba521c720f3fae8452b27744858c36
+EBUILD polymake-4.6-r1.ebuild 4118 BLAKE2B ae3372df2a1921627455b2b0710c373852de9669e96649ee14f94a746c89b47cadf4ffa43a88dafb5e4735af6b6a8f113ad6ba7abebaaa9b6bc7ce2e79fe3f42 SHA512 6c09012b23951fa5cc9404c1a15b166ab400feec793f99a5978032d45182d89c314fb7d6a00d85f721b3311527e5e7fd40c46f4131b0ab5dfd2b2a1d6a4e24f6
 EBUILD polymake-4.9.ebuild 4071 BLAKE2B b57f3b18e7d6172fc6c76d7ee08f51d7792008fc1b81b9b50fae1fb3d8447cf370ea1d3042faa2380b57e4b51da5192027d2db3d4692729bd0d7afe114273c5b SHA512 277a3d25b0219cce02ccb15ca22607a5be432d8596bd76fe410ca4985d88f3e22bacc5fa3c6294e8a03058b1bd46fa9ea49ff752455cb503c032fd952e7ae173
 MISC metadata.xml 1762 BLAKE2B 249af503c9e7e99118c87e4cd71c151cc962502972e80c4ba4f66ae3805c9f6c47601ecadef5e6e1b5c67a7e7779155f2524bace8d6f2f4fb260f2f4dce1b257 SHA512 fc887d14710c9529a9738a14ae8f6a41adae80c273354aa5bcd0a14ad695de09ff562e775a5d40582b23e3b6b1fd4e34a277fa9a6ff7131f19ad4f5cc98d6374
diff --git a/sci-mathematics/polymake/polymake-4.6-r1.ebuild b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
index acc8c5d1207b..9034962c61e3 100644
--- a/sci-mathematics/polymake/polymake-4.6-r1.ebuild
+++ b/sci-mathematics/polymake/polymake-4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="https://polymake.org/"
 # closer look at how (or even if) the corresponding code is being used.
 LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular"
 
 REQUIRED_USE="^^ ( bliss nauty )"
diff --git a/sci-mathematics/prng/Manifest b/sci-mathematics/prng/Manifest
index ddc91b4ffdde..07eefbcd98b0 100644
--- a/sci-mathematics/prng/Manifest
+++ b/sci-mathematics/prng/Manifest
@@ -1,5 +1,5 @@
 AUX prng-3.0.2-fix-all-c99-inline-semantics.patch 11925 BLAKE2B a95a1041afe001dc3a8531ae5e273402437e4fb3a377653c2ed42daa81f8c6d24a647c3991bea99c23d82686cd72230e6134087c4c80ce97a0d04f558292f2bc SHA512 4073da901ba7c9ab5b9102f6d19ea4853113badd9d0604967ffd4c8d9ad531b3edc0071380dd96bc917b1bc173c4204522ceb42c9b896f6e0a3b68552b7ab484
 AUX prng-3.0.2-shared.patch 1049 BLAKE2B 7d9abc870911e53168104a31ad9ecaa6f98cb602ca7010698c37d745fe56d11833f147e547fc87533f4894183239cc593fbe6ed5e52f03000c2f630eb8534719 SHA512 bac71da41ab908b6682d3705434d33f37d7cbb240c87a3fc349b6461d5dc86a90010028be3b0331aa58dc3ddad31efe89986ca24966071092d6845f4c6c80864
 DIST prng-3.0.2.tar.gz 497047 BLAKE2B 8df71dbf8cfe5ba384a1700830b41f947198e51262904a04796968287ca54f21f96ba34af2c0bc93393851ff3c153d24744a5d843501e0f29387282a64a03c24 SHA512 16addfedd16f1caf7489356770c15bde17d8ec5c66dca9fbaa52e50f850f2ab81a1af9d522bb6028ba5e279490beaf6c72060494e8a5367a7453a417a619367f
-EBUILD prng-3.0.2-r3.ebuild 855 BLAKE2B 8f57ae8944a7c4b0e795c15296b02820386fa132e11b36a5d653ef299c8664ec9e24a498fb6cf3ad88ad3424832516b2fc26f9b97f670d79a6d4a722761be820 SHA512 d767bf8f86aed846bcc7204b093bb208eed8fcb9c7771886998438b25ed563cb68d328a57306d5dbfbc3a93f44592d6be21a364412456e18a7b76f07f047905a
+EBUILD prng-3.0.2-r3.ebuild 856 BLAKE2B ef6204ffb155bea6c210f9dca507f87e6bf393d08af9363faba6b8ba046bf5b4bd0f5c029faef93937a21e0c5f85d6ae16ab736e2d9db674e932cbff3313a9fd SHA512 059db2309eef04a4ee5254ecdbfb02d920ebd0c5c1546e766a714ab900e49ca1f9ac7542dc51e4f88642fbc003490b80444e7ea902a3f90b3db4bbeba2f8ddea
 MISC metadata.xml 674 BLAKE2B 74a58c63816bbc82fba6973bca258a38fe6b2c2903974da78620c17c5f996c29dc6d66d7eac6ffada1b548eb165cb7bdfd905bd1fc57c7e9bbdf839e9dda2852 SHA512 c2de10dbc4e39393f621e6198f67ddacc3f922c2257e62e2989d23b6ae996a9ef2ad41afe798a83485a7e707a20e0bc5cdf2d19661d8f01b3885cbfcce5ccaab
diff --git a/sci-mathematics/prng/prng-3.0.2-r3.ebuild b/sci-mathematics/prng/prng-3.0.2-r3.ebuild
index 676b10eb389a..e25b96a897a2 100644
--- a/sci-mathematics/prng/prng-3.0.2-r3.ebuild
+++ b/sci-mathematics/prng/prng-3.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://statmath.wu.ac.at/prng/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT=0
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 PATCHES=(
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index f33c226acfbb..5125f7db3418 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,4 +1,4 @@
 AUX pspp-1.6.2-underlinking.patch 980 BLAKE2B 59d7509417526e3428023f2e0f085a9ec806fe4bada8934404e0da3d306860f5826d83b9682151c5c4946bdf914618e3d555c99d60b93e858e56221cbd336c12 SHA512 8773b768dd8336a37c97527ac24311d7006c04c4ea0b71199432dc779b7a16c2b2e6fa786714cb7e359a2e52e806958315644f13199a7f656445d1c17a2b852a
 DIST pspp-1.6.2.tar.gz 9249366 BLAKE2B d1a4fb352615be8d5f3af3125d10760648ab16e8d2b42dbf0632de64a5bb5bbe87b9b56661c7f600ea09c6a359e477376d3efb821280023d1825d6eb7b0a299f SHA512 fd8b6b23ae4e4a1a560bf4d20c35e761d84dcde2e220648303303f11e9c17d56285a3d5b3c26e7dad44d52ecc82fdf93fdc51a3533ff907f2ca1f1474922e31f
-EBUILD pspp-1.6.2-r2.ebuild 1873 BLAKE2B c33909cea8c93c332cbab712c1573077c7f6b490070d4b43873bb995aa3cbae549932671292de91f7d178910460e9060519e47b8f652cc9bd4ad4b38abe292f8 SHA512 76e7c1ed174b5b90d63aee987500d491c807c50f0ccfd0b67fdc4192752d6e2110fb0ff9101efa127803321286db2690a19463c255c0fbbd10541bf8e6da3b62
+EBUILD pspp-1.6.2-r2.ebuild 1874 BLAKE2B c9bdabe3154c2093d439450db76ff528df4c6caf9de3cad41641750a1f8e21c0c93e8080fbed14630b850a09610cc0ded86e2d184a511b37b42b24e470f42606 SHA512 dc5d44d7b32d9be2f4f282b084e2bc835cb2ba39739f3eaf1892e3113d18520c3eaa8cc10b6545b01e878b8c892eb1df107f55655ddbd1bf64289d0fec052a6f
 MISC metadata.xml 789 BLAKE2B 512ff8155a10ed8c1be37ec63067c73c196c5bfe48d9722feaba5305e95703e0cccd247d5d55dd123275f3543632020d3cacedb0416953a547e5e7015d1f759f SHA512 011cf3d266b6d1385791930ce84850e99d5d0b506d9ffb632807a8e825217e94ba02c3cb55b56a6be40fc1e84bfed28b7db7131ce58fe958468d5a44b6734305
diff --git a/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
index e12dc7530437..997eac8a4074 100644
--- a/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
+++ b/sci-mathematics/pspp/pspp-1.6.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gtk ncurses nls perl postgres"
 
 RDEPEND="
diff --git a/sci-mathematics/rngstreams/Manifest b/sci-mathematics/rngstreams/Manifest
index 9cc497fd6937..2d7185241d2a 100644
--- a/sci-mathematics/rngstreams/Manifest
+++ b/sci-mathematics/rngstreams/Manifest
@@ -1,3 +1,3 @@
 DIST rngstreams-1.0.1.tar.gz 502458 BLAKE2B 119f4bc9ceb34487176c2ad02b6be16b50c6300c0512b05fb2376d02ddd59f17d62fa9e3e190093534614a90daace84701c628962284228be787950a534ec24e SHA512 665c27e72a4e1bdc59864f340208d42fc899c1c9429aafe1c7c3f8778dee0bb87ec9da26976a925197e07931bc1c2864dde0cb3fc08996155f775b7e44f9d7f4
-EBUILD rngstreams-1.0.1.ebuild 853 BLAKE2B 80eaf7d1091b8b645c3f7a80f1acaa2108af3cb1a400a71213648abfbca6875b90e84211de6fd3c0db557d08d7151d78417b4736d6ec58721d12c852f1113646 SHA512 7bd04222b8fb454964c5ee42b09fe76e44646a8d4514f6f811c10f5541c3c2a95a062e5af523511219aface3869458734e7b9252d461403ae3e27aaed6c6ad25
+EBUILD rngstreams-1.0.1.ebuild 854 BLAKE2B f11bf02f6034bca319144052c982c7e8ed7e546ea3d3da2c283c794c05d402f5e992349e41ca951a3d8c926a77cb38bd02e2a9ec474f79672e94f5e370c1321e SHA512 ce4aec7c799b035a89c4686c278c3a86c6d760f656997810772cb0c96cd446e94c2cf974df8d9210dda12d63e59d84b9eb9f95abe6550453e37268b6dd53a32a
 MISC metadata.xml 602 BLAKE2B a98c1ed3c7db964d68e38f4b60ea48389acd6ec394da3534e8955cd742172a709439253f9f6a8cb7e71f195311a9cc75ae38e1a49f97eed3d75769f671068f71 SHA512 d07899c328ef84ac484a4583c0bcc60350554a2cd0a8e5dce5fc3e154b389c243e904f525a6a48fc52e49046b98987e1a22560ddf97f929b845e55dbaaa6805c
diff --git a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild b/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
index 6d38a1954b32..918e8fcca42d 100644
--- a/sci-mathematics/rngstreams/rngstreams-1.0.1.ebuild
+++ b/sci-mathematics/rngstreams/rngstreams-1.0.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://statmath.wu.ac.at/software/RngStreams/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 my_src_configure() {
diff --git a/sci-mathematics/rw/Manifest b/sci-mathematics/rw/Manifest
index 781b61bb7de5..5d02d7dbd97c 100644
--- a/sci-mathematics/rw/Manifest
+++ b/sci-mathematics/rw/Manifest
@@ -1,3 +1,3 @@
 DIST rw-0.9.tar.gz 340385 BLAKE2B 2eba540146094eea7adb26874ed6f7982e46a863c786bf6f4a55af2d1d3167641e10c324f2b0e0e366bb8f83503b5da5fb02447abf46ae955da78ac8fe6149b6 SHA512 f4f1910506cbdb557ca50bac6f63cfca3271a5df8d13c67d2d9bba79b9cdb03196a679e6091554175decbee0871888de71bed5746662c9a75418f0f5dd9bd609
-EBUILD rw-0.9.ebuild 808 BLAKE2B ee05a2cdf52369f428d1c7b05d3f2ce546f551b39da05c5811d1d20378061d06845dcdde01999bcc3aabd81edde9c6feb79ea3bc6cf85f0cfdbef5ba73c79b04 SHA512 6b750e656db891a847b66d13b4be5e61c17076443b51cd486db31e09be2cc1cbab2cd60a62ba3ae09dc8fbe103afd94f15d2226dee8b7355f1b1dc64dfd86ee1
+EBUILD rw-0.9.ebuild 809 BLAKE2B f9749375aea40ef13f9195e81a3d1931980ca6ef07f4eb7a192b18c60652eaeeebcb9ffe6b7dfcb355c48417771934cea7615cf7ca8479b5c6378fee6eab196d SHA512 c4b4adafda7b0072bc7ad73db412ba84440aef6836986d3ec13b2480fa17793b35c2251f5a8e64c22f3e27532f093a614e23bb49f0e21c28d5c29de06657a53a
 MISC metadata.xml 1159 BLAKE2B b465be32d21f14659aac703a5080baa3c39f23e5610a15a5e9b29a9902888aec980c27e3281e395296140d00a73720cd213983f98562dff03bbb340aac18779b SHA512 6c476c17c8e42dec4b308c0deb4834a474cdd0ed3b663bdb2f257f23d9297ca721fccfd03697d4cbbacc1a3a78318c0639c333e078fc759b3e364d6703defbdb
diff --git a/sci-mathematics/rw/rw-0.9.ebuild b/sci-mathematics/rw/rw-0.9.ebuild
index 66b44f3cc23e..da2e390db2ad 100644
--- a/sci-mathematics/rw/rw-0.9.ebuild
+++ b/sci-mathematics/rw/rw-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/project/rankwidth/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 # We have a file collision (librw.so) with xpaint, bug 560210.
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 592b29172725..c3f8e0bbe472 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,6 +1,6 @@
 AUX 60singular-gentoo.el 298 BLAKE2B 5b42e2083037e2ff2ace5597ddebfb079920e09ed91d1a359e058fc654c6778456174d6cee9242f7fcaf81bf1464f47f43604b9e4eb298f051c6a4daba4630ca SHA512 4c17a25d91c085e12f26441fcde858e61bf191bd7d9dcf63ff5b5a1dce1d63e3f7c4f78ce8afa4f2359ad4ba6eb51f3e224ae6c502b18f5f7a76738534337431
 DIST singular-4.3.1p3.tar.gz 14991986 BLAKE2B 0ae2585a362839914d3a134bfe637f6faa34d95f58937f2adcca0c5a35e3218eb36554bae8187f5bb3a423dcac445c836e9bfff2d0d1a19d4e14a4452b84d839 SHA512 f092683f4a92158d82a2e694f284662c6285bac5faaa7d5e5695a84a220012fb8a733b4bbc52820def3037e1596ea4c2ab3846f58a3a3fb19e01bf7595790462
 DIST singular-4.3.2p1.tar.gz 15013729 BLAKE2B 00276f2417cd9e2b71afcae66c2aeb7f9d4f434f5a90deeee56dded66e6d5e0020ab0b06b6561e41f5b196262993732ffeb9196f59315f1b6a081b0029fc99a1 SHA512 451054a0bf33b9d1c94a63f0946e1eb7b3e7b92bc025b6aa4f64e65183aeebd6354bac5f87f6e8b35cb713b30e97af5c66f92f02683144bb426f5e3a828db616
-EBUILD singular-4.3.1_p3.ebuild 2298 BLAKE2B 1e13e21929c3a358aac835d33c927d9859fe8404364a8282db55f5ced8e58422ca5d3570b2df0ccb7ce8adb3cb87c376650d85d007ad88deed13f7a0ee3414ee SHA512 960efd7f67cbe0d9ff275c35ea2ce737f52b162a27db9adb96001313319784ae6999ef0d248bb2620681a7b36bb6d37f2181fe4b55ff22c76748247bfd3a15b7
-EBUILD singular-4.3.2_p1.ebuild 2376 BLAKE2B 720c51a9a7958b48627f917a7b2eeef12cf6c6b30fd2d3e06ed68178f1872c856cd9d148b55192dc9ee7077864b21315c9f071d17323dc091f631399a7000ed8 SHA512 b996be342bca09aa4019e36b3c2d4f7c2732944f55597464f94d4980fa2cc10727b9c43b47dc2f0ddc9e4d1ef57c782735e5949cd02ba0653e8db33b3dab3fc7
+EBUILD singular-4.3.1_p3.ebuild 2299 BLAKE2B e0a759150b1b90984d6ad694bac432a7790aee00756fcb932284ed2ce01046949bfd8fbfb4cbde9ffb1194c2326b9fc7d0697b9ecb1decc0f6d232cdf388a599 SHA512 325672260a966c22be4bba06531e50ee6f1866789439e9a1ee17eefea2c48956eac2821447957dbf79a6b95d0f9268dbdf900f60ab783f9727863ed4a9a1a9a4
+EBUILD singular-4.3.2_p1.ebuild 2375 BLAKE2B 7d0dcc306784361e9bf61236de6863db463de429fde5f954abf4223352409b6da3c32d6f800a197c2e84d0ba5698fdd10d805bd40daece0db701babb5c41b237 SHA512 95a143214cf28dbcf041bd1fd74d8770bd1452ff01bf5f19ddc912de00c6a2fba51f177ac05e8ae9c71d4203a32490ff75c568bd5af6b6c1610093c8d128c29e
 MISC metadata.xml 862 BLAKE2B a6e991149cb925158806177b1b4a76da2b747b3273b395c14455993a99f4cf83de141980303a068b9068983b8adf4da884b81e80546a3d2dd162f188dc759385 SHA512 9e40cf7b3841bcf8289f24903e392df2a812b6d815f71da41d95a81bb89f493ab1afcef749ef47960ba683dc3433d2c4488015990806dde0b560ffe3bb6ca545
diff --git a/sci-mathematics/singular/singular-4.3.1_p3.ebuild b/sci-mathematics/singular/singular-4.3.1_p3.ebuild
index ad7f220f5d21..5bb8ebd002a2 100644
--- a/sci-mathematics/singular/singular-4.3.1_p3.ebuild
+++ b/sci-mathematics/singular/singular-4.3.1_p3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE="emacs examples polymake +readline static-libs"
 
 RDEPEND="
diff --git a/sci-mathematics/singular/singular-4.3.2_p1.ebuild b/sci-mathematics/singular/singular-4.3.2_p1.ebuild
index 82abd43c1f8e..d280e933c94f 100644
--- a/sci-mathematics/singular/singular-4.3.2_p1.ebuild
+++ b/sci-mathematics/singular/singular-4.3.2_p1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc ~riscv ~x86 ~x86-linux"
 IUSE="emacs examples polymake +readline static-libs"
 
 # The interactive help uses "info" from sys-apps/texinfo.
diff --git a/sci-mathematics/unuran/Manifest b/sci-mathematics/unuran/Manifest
index 30895e08fd17..677f424b3a29 100644
--- a/sci-mathematics/unuran/Manifest
+++ b/sci-mathematics/unuran/Manifest
@@ -1,6 +1,6 @@
 AUX unuran-1.9.0-configure-clang16.patch 835 BLAKE2B b52c40054360babbc0f72ba6e4f0836471ae253c906915cb428a4400ba9b5d4214f863dd630e83825cbc8857d37b04b17e2701e3b8112db622ef32c49cf77ad0 SHA512 df0f1e5c674ebd50dc1ccb5b76be330a71c559feb73e69f1277a3dde17ef77c31e9eac6c4b15fe50f10edb6403f8d9191bde2fa4613e87fb5e9c4fd4101fb83e
 DIST unuran-1.8.1.tar.gz 4409911 BLAKE2B 2b036032deaeae70aa6ef58124fc88e9c167ae7952d04cba4b50181fff4249eff88c20bbb667c5702899bc863745b6991ae842da86f6bc592b6635dc310ec544 SHA512 4d98861914afe39065ec31ee837c0e21e0fb4f4667f559dee38a7a5c4e06f0d09bd550b20d06321d1f5fcd4799d482a9eebc66ac35f8cd7fff834f536d24854c
 DIST unuran-1.9.0.tar.gz 3803126 BLAKE2B 20a88e9004d284983770364f35941f8ea66e1c68ef8c0ea210e1b12d9027947fbf723032f22f88b87c8f649ab52c904b460673cee8d78a52ff5196a6f4212d9c SHA512 8fe389f2fc569265e7bac2a5de3d12e4a6238076bff2a7e19842a57da314dfdca19ff5c398e24732883a19de794a65bab7d0663b4551c664562a3c93f2d87170
-EBUILD unuran-1.8.1.ebuild 1077 BLAKE2B c6c6125e68735d92cb83640cdac1944de65ecfcd9d1d4d5bfc36184b17cc4c60898a6bac7bc8c7073c6deb970fed41468623c64f3b1354ca09f82a479b6aa6c7 SHA512 bbf41de5e3b22fc9decc023a386862d5ad07a4ed5d2660de1f57e8d3f46a8e940cc21248f7b97cb8a61e10d8f2d9ac9f9f319f8e3e34557982368bdddb7bc32e
-EBUILD unuran-1.9.0.ebuild 1241 BLAKE2B c943cac8fa66d08a3a8f22c3ac10b317b86614a3cbf7ea837b119f2dc3d38fa223d53c51085172ee27cc4bc4eae78b6e955c04a5b677c55ad09da6fde5da4f09 SHA512 abd1d4889a695670408aede080e948941ef1ff4196bba49c7383e15a02a611d4f632841cba0addebc03b6902b1d09225102db1323b314fe5b0a585291fcad57d
+EBUILD unuran-1.8.1.ebuild 1078 BLAKE2B b28c5044d255a67e3235b29b5714d55cc4d87c15c2e38059d1d0230ee0b7f965c54ae73f645643228b320ab9facbf3ebe9af6cc3623c0d1b85a06abe5cebb02d SHA512 576dff36b81fcd79262601b81efe764e38cdddb0b252bc81ebdf21062e43f424d2d8cf390abf43682893c9532fbf41cfbfe891c651797fa3620d53f09df0d119
+EBUILD unuran-1.9.0.ebuild 1240 BLAKE2B b1f7a5c6dc084eadeb6d7d667690b9d48b4c24eb51c6f9ba4e9c2ccb5f118ac549a616e504a902f5c95850b2f61805d6ba3f38e752ee93180f4c60ac745e0039 SHA512 3f1619d95c2bdcee729836dbdd93a9b9d1c5295b9ff62980b7b2d9f081243a33031b7e3f3c251ac463c6b3e49db50b9287b6e54646a6bea48ad0a2520ba6b940
 MISC metadata.xml 765 BLAKE2B 5bbfff9ee5301a498947abee56c8f2de1dd4e365507e448318c2a0f19279f939a861e6ed3c5421792c4041c6cda79d37b00b345d3014223ce64d9026021de717 SHA512 afc845034ac9d87a5397de9aee88b2d089ebdf7e47f57d803b70893aa4a09127057b349f21f3276e7aaf67136412de667cc0efc3aa1036dca414f18ea0c4efdd
diff --git a/sci-mathematics/unuran/unuran-1.8.1.ebuild b/sci-mathematics/unuran/unuran-1.8.1.ebuild
index 7dfbd8eacfeb..d53ac22a555e 100644
--- a/sci-mathematics/unuran/unuran-1.8.1.ebuild
+++ b/sci-mathematics/unuran/unuran-1.8.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://statmath.wu.ac.at/unuran/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gsl prng +rngstreams"
 
 DEPEND="
diff --git a/sci-mathematics/unuran/unuran-1.9.0.ebuild b/sci-mathematics/unuran/unuran-1.9.0.ebuild
index 971d2638952a..3cc0fe7faa9f 100644
--- a/sci-mathematics/unuran/unuran-1.9.0.ebuild
+++ b/sci-mathematics/unuran/unuran-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://statmath.wu.ac.at/unuran/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gsl prng +rngstreams"
 
 DEPEND="
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index f3cfbdddd44f..bcb5dcccea65 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,5 +1,5 @@
 DIST wxmaxima-23.04.1.tar.gz 22060726 BLAKE2B 77583c2461f7c32ac53ad2890d1e7d07a9fc2dd0caa07a1fcdd7c62d39ec63c50173542c74ce2d21093ce724d1777b76e7789f8a5363ff20406d52177c86a016 SHA512 9846c11cbeec8411170e0d55916187cc77274e2758726784bcb5540d55f712b5a557562de0c37dac0c7ef119d43570bd33efc33252fc5359627e527d668580a4
 DIST wxmaxima-23.05.1.tar.gz 16220058 BLAKE2B a680a562c92ac400c2e3e377e9f6aa387a259b3bfc9d533bba2f2fcc4c5abfca78c578935273932cbb4be6aa04c29c0316582472f212b0868cba2bfb0081234f SHA512 a36cf3207058065dbe68b8a75b7a97ab0ab827c9097f90a67af1c436703a22bff6978fbf173e0806e40d01270d97def1137de9af7d2501e96faca475d474c5af
-EBUILD wxmaxima-23.04.1.ebuild 1899 BLAKE2B b2b7d01831efdcac24c97f7a5bc565e20b7c1405e2f14bb1d245de076d5d6a4a4955176215c45a8adf1d603cd305a699d0f7ea743c4de4398f661fa1aaa3ef42 SHA512 adcb57dfd7011fad7b0b263b871066262c6c32bf9bc0e70213950e319be6428516f62db3b741828c37e6aed87445f93cbfb84fbbb7d238f4e279cd16fc61f56f
+EBUILD wxmaxima-23.04.1.ebuild 1900 BLAKE2B 2064073e386527c7a5625179577dd2ddadd9f121bb20a9d1c1c6ac1302d4dd190d512cea6db3ae3dab9a3779870538bdcc1f22002c21947ffe90614e967e265b SHA512 05c9c852bb12efc110953b75787ec6e0807f494283cb5dbdc1e246dd0ce6631fa56b825c2c8354a40c0e1c7dcfa667709fa042227118ad6a70b0feeac8ba50f0
 EBUILD wxmaxima-23.05.1.ebuild 1901 BLAKE2B 33ccd0d0c93571d76bfee6727b62a826388cbe39d1b757ba81f9ab77bb2d05994b675e22f6d73829837e2fedf3396ad4cc2ad28c0bdc85c6221f7825c0bb008c SHA512 c33a36b8cde439d4a760d3ba328c8a52c51fb7b29f79e67009e5bb25acc535983c6d3738ed1f09fc9d2398396522f9abacdee98598e2e510d3d1ffcf66c83838
 MISC metadata.xml 849 BLAKE2B 6c18b0b74354faa0b9cd8922433cf3eca1a39dc0a19eb6112284561bd33b217d1be5e1f6b1813de01c52705442c51c8e7a806d8866a29f717306a260d9230296 SHA512 f626764b52b8a4068f954698b48a304340f34255297b25597786db8992227e354a3503bdcb900e578b1b39c9936faf3d09ea27ff2c26740f10aef00ee442c4a4
diff --git a/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild
index d12d936a2b8a..0da4df8637af 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-23.04.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN}-Version-${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 1dfd6dca44da..eb559ababbee 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index a8b7f0fb5c41..dd6339deb5ab 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -4,7 +4,7 @@ AUX boinc.init 4366 BLAKE2B 1323f79c31d02c544601633590a4cebd8d77c15cb78d7ef612a1
 DIST boinc-7.20.2.tar.gz 46555666 BLAKE2B 4d11217739d341c5b61d86afa02eebdad80809f42caa3f6dea1d86ed53d79004d60fa362fd04d53060060472e108e0ee0aa0428e4799eb70f2e98f07dc1f39cd SHA512 0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb
 DIST boinc-7.22.0.tar.gz 46675766 BLAKE2B 97083fa482fadcbd38c3e207fe8c41bfe380e37f181b7d32969b8ef44b0186bc4e117bac59ab1f557b12598352ff9206a9ba12dd748781342545d661e1386a67 SHA512 f8c87338750605f59f5265fd0bfe2956acfca0c42ef58402df860f0eb9953467ee34286308a916e1d4ee12cbf85c05422558ccdf241ab8f26b86c966f66aec4a
 DIST boinc.tif 288208 BLAKE2B 156a99f08dcabc62a46874830600b9d237e64b650b8edf35db67b82006a67039a3965707194e8f0b25cfd65138b8700c0bfb877507418393b9cd3df32e94d260 SHA512 548e19b87fd70dbeb05687320b86aad39981c161b5b5b7e02fc3ce886d4c464c9bb763d5652d9895dd505ce247c7ff4490caa3d407e28f54ce889ffbab22d046
-EBUILD boinc-7.20.2-r3.ebuild 5787 BLAKE2B 6f0bf025a26d2e64188778c530134f5109b48ed43ee587a3b02488f7282d7518f7f9a17a5b33975e344e1f0e9adafe98cb34bb6247e9bcae60abd19b5801427e SHA512 4b19c4e3ab87e634cc742651d3ae840e4591498aabd10ee9175947fe1b6722640ec98fb7f907a58debd295a9dc863e08dfb1f71604afb71e251cc589b80a8df6
-EBUILD boinc-7.22.0.ebuild 5787 BLAKE2B 32b7ebda25408be15457d89fa64d7d3c155828ac93ce2202736137ca16f695ecbf87e29b278a889453093f27543a7e45422bf3ea71258ce8b59463bca60d1107 SHA512 53ad51ce2fad06ba9ec8d86deb2155acbcc0fa0ab2beded8c9a2c1cc9b49ebfac427319fcbc96f66a66a9c8683463e614565011a79d8f705075b5bc69506bdd9
+EBUILD boinc-7.20.2-r3.ebuild 5788 BLAKE2B c5038c55aab199bd0960a97f33f497f1576e3b17d6991a13f024813a8133baa0af5fa7bf371ede3adbf4f2aa4839a26195fdac78578f5d698c914698a2c700e3 SHA512 21bc4ca4b445c466b8f80e95af4d9e92c35eee34f9d13a2e611b202275663f6467cca34397bdbd87300a129ca785429d69b6ba1c24894fd09f2ddba6abd3a024
+EBUILD boinc-7.22.0.ebuild 5784 BLAKE2B 01ffe554d0348256d981d640730a2921789aad862c4d0af829d4698bc230d37e214a47c2f1ca3123714c0a6a2f9ac346a4865a87798f354106fbcbd483efbbd3 SHA512 194f307ed0f4d4797978249dc3c678164c347795ef3bc367d24b519ef77ef3ce32d3b12d2786d8745a6911ea0bfdfe70d2e768d624802f2ff6907df09c82b184
 EBUILD boinc-9999.ebuild 5995 BLAKE2B c793d08ef51d3bfa433817a75f96805216210539c462878442cb496729a444a82a2fc7ed49c46c461a1bb59d22ee7eba207864d05dbcd74b5dfb3b5f26fbfe29 SHA512 ca334d9c510cfba804cc81f65252eea2023fc2df7be320fac0b59bf7e5ecf0d7e2744ac215c44bb49f818d17687e20c300eed3465471538be897458616525670
 MISC metadata.xml 1092 BLAKE2B dd67235d65da71d4c9a8d1bb7a47a420afcebda050cd87e181c34465d4004e2c86c1c5f3eb027d99ab50d7019321618d2940432e34aa7f0caee7e800800cb548 SHA512 d26df4a70225e2fac7d6c32a28141bbd5b70d7d4afa9c22a767b641a7964bedabe01615278f7a739b17ee57d4bbda9f1a091c8a8883da51f453b75d84aa1688f
diff --git a/sci-misc/boinc/boinc-7.20.2-r3.ebuild b/sci-misc/boinc/boinc-7.20.2-r3.ebuild
index 9afaa8e7a874..769f1e61a2ff 100644
--- a/sci-misc/boinc/boinc-7.20.2-r3.ebuild
+++ b/sci-misc/boinc/boinc-7.20.2-r3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI+=" https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ia64 ~ppc ppc64 sparc x86"
+	KEYWORDS="amd64 arm64 ~ia64 ~ppc ppc64 sparc ~x86"
 	S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 fi
 
diff --git a/sci-misc/boinc/boinc-7.22.0.ebuild b/sci-misc/boinc/boinc-7.22.0.ebuild
index 395eba6c25b3..cfd8ad6f9de4 100644
--- a/sci-misc/boinc/boinc-7.22.0.ebuild
+++ b/sci-misc/boinc/boinc-7.22.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI+=" https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm64 ~ia64 ~ppc ppc64 sparc ~x86"
 	S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
 fi
 
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index 1bda8aa2373e..0b24761e186d 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1,4 +1,4 @@
 AUX h5utils-1.13.1-automagic.patch 2261 BLAKE2B c9aed879b096c95cf6c17c15d13d6a4a2f0f47afb96e00d382971676cfd34fc53ed802c8070f4d6a19f18165f828746a87efbe845ef89ddeaeee35bcff2eeb87 SHA512 c13621ada5c4f2e2e247bff5d4bd94d19ec888c6fd4b5dde1591ce06a96d346942392c1c3e33bcbd17d30e3d13d4799a7d54a456aa6b52a7123bcad05754d6d9
 DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4
-EBUILD h5utils-1.13.1.ebuild 736 BLAKE2B 1e204a6784904f72eb45f43aa88d606b0642e6fdce395b8507235e1a74905780255458f7d228d1cca16a032e0b2e8f6f7900a324fafe805b5c83b0715f9894fc SHA512 bf6f724dfd1134c75310819597ef21d6cafbe67c919636ed427f08ec42f43d86590f1e25d1965e6123c5e35847d206c6b2ddb4f67850b36bd8cc55968ccb25be
+EBUILD h5utils-1.13.1.ebuild 737 BLAKE2B 77e21a82f90b7b40abd681afabd7acd05ca0d68cc83b68a80fb55d10edd0300dff503826ce271f3eb163029c9fd4f1ddd9326728cc1ee79874335016cd0a6a18 SHA512 b1a8a0a65d72785bdb20160f1778e883bb4e75f004a903c2d8dc3a76037dda28083c2577a1a4b7246c9cfa4414d65ffee2f38ccd9b904f0cf02633d477b58fc9
 MISC metadata.xml 777 BLAKE2B 4b76c9102efe700a4edd2f58cd1139527b134f3f00fd00a1d5e3a354bde85076be8d924b6b019f5e005647b3478051e540cf978f9d58387e0d315b5815e64008 SHA512 79cccfe5f1464d98bacea2b149bd7886333ad047f50a0b5cbcdb5e39373d941e768e03cbd9abaec1c86983e897e1ee33557ff155a44be258d275cb84a5169044
diff --git a/sci-misc/h5utils/h5utils-1.13.1.ebuild b/sci-misc/h5utils/h5utils-1.13.1.ebuild
index 11fea5196970..11650891c2ec 100644
--- a/sci-misc/h5utils/h5utils-1.13.1.ebuild
+++ b/sci-misc/h5utils/h5utils-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NanoComp/h5utils/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="hdf octave"
 
 DEPEND="
diff --git a/sci-misc/nco/Manifest b/sci-misc/nco/Manifest
index 26810489a1d9..e7114da7a25a 100644
--- a/sci-misc/nco/Manifest
+++ b/sci-misc/nco/Manifest
@@ -1,5 +1,5 @@
 DIST nco-4.5.1.tar.gz 4406757 BLAKE2B f2e203f1c38f5575fe4affb9122c91c61db8a2c2604cbcf9cd1eec6330e4771b8ff4325fcc19cfa292508e9b7a3107ae20e6230397f1269441e4efb883f8e4e9 SHA512 69c19cc9502272adada329dae669fc1c263a360789963253315e81ce1534647b9172b39a0fd3c0f0f453bf903c8a8a4b0e3f0eb778390e43b64eede3a0478485
 DIST nco-5.1.3.tar.gz 6438534 BLAKE2B 6296d881b0e0b62e18daa40db71ccca79b4cca9fa8f046a0664f53b690d8f85175676900d792a4691090662ed80ce5c4e32e4236c69c6057d292800bd9987f36 SHA512 c4819a0b3a1c431419df73250e6648e5afc55439d260d166fb4e13ca3f4ae34bdc728b921922e075c86f6bf5dbede1565741616b2b9a32bcdcfbe85617a7f8ec
-EBUILD nco-4.5.1-r3.ebuild 1253 BLAKE2B 739f9fe57b70235a9a6cd2182d9d71b90f6c760f16211e333ed9fe0cd182ac25a7048e59dc1e237cea783d5b94fb66f057dab5507f30267c31d6640f1c8faabd SHA512 01f7fe1ccf2a7cf0f782658fa6c27ee6f0fb7dce364218cebb41b65e67921d7c80a93d01bbcb635ed2a7a196275f5348443e5688d385879f3d1a4abcf3de7b15
-EBUILD nco-5.1.3-r1.ebuild 1341 BLAKE2B 60684ff22fff9820a134369fa638cdd940ec04a05b799f0f59c7967a74e7c7d06f840db5adc74c93361e31894030d76fa2b849dc5ad2291772ef2df8c774db75 SHA512 d346349d7a09027401591fdb3f3114b6762d2219ed80d6f947895c5bcf724225a018748afc419509d16a5d5c956b4e76ec105f0c21b0e4ad7502317b0e3de0c4
+EBUILD nco-4.5.1-r3.ebuild 1254 BLAKE2B f03f1db9d70f48419ab351dc5e3635d228ed9b1eac007177194f79c9a90adc773a590d5ff46907902a6d6da45790305637a9ec100d41bc4f63e0f939cf7b3dde SHA512 a6f15a3213d47c4ef5f7220400704259e884b4eeefa5ff29a0dc0242e8a527eaebce27e31c4d34014bd6ad2e64d352549c7c734e8f7a5110d3a9ffe56e37bc3b
+EBUILD nco-5.1.3-r1.ebuild 1342 BLAKE2B 14e1a997c0ecdbd44ff537cc6a47d9786e1730ff502f4f70bab48411e81d114a1cfb2f7da6608c8add045a799d182ed276a7c91b37a2aa4f81cd6bdcae538cae SHA512 90843d8b805f59c8fb78f88e78b1720f017eff78ee23e1553d981b8dcc4786b43fc993d25047b06c7c236fd29ba17bace3adfb35edb7f7227fc06a7eb8c625e4
 MISC metadata.xml 1145 BLAKE2B 4f9165405e77c57feb8de2b4f128d75238039455c55f6290ff6232c7988f5bfd3fa3d420ac37645e893d7b3d47a065513eed454e84ebb007a01e4778e2f88921 SHA512 003ac5b9bddcb83a5adf70e4f1779276aeef6be1a6a1208114547924049fa43df8a71cef4e46f63f87cd2dd0fe3de8a1885457bdc71f5fcc7755a5c1a63afe31
diff --git a/sci-misc/nco/nco-4.5.1-r3.ebuild b/sci-misc/nco/nco-4.5.1-r3.ebuild
index c43eb9c88c09..67c918a6c9ac 100644
--- a/sci-misc/nco/nco-4.5.1-r3.ebuild
+++ b/sci-misc/nco/nco-4.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dap gsl hdf5 ncap2 openmp static-libs test udunits"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-misc/nco/nco-5.1.3-r1.ebuild b/sci-misc/nco/nco-5.1.3-r1.ebuild
index db1cf5ca67af..1350da622372 100644
--- a/sci-misc/nco/nco-5.1.3-r1.ebuild
+++ b/sci-misc/nco/nco-5.1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://nco.sf.net/src/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dap gsl hdf5 ncap2 openmp test udunits"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-misc/netlogo-bin/Manifest b/sci-misc/netlogo-bin/Manifest
index 461355b13e93..5238aa3180c0 100644
--- a/sci-misc/netlogo-bin/Manifest
+++ b/sci-misc/netlogo-bin/Manifest
@@ -3,6 +3,6 @@ DIST NetLogo-6.2.0-64.tgz 224714930 BLAKE2B 5149f9b3ad9e49f50b907223ca554ec9bb01
 DIST NetLogo-6.2.2-32.tgz 232876084 BLAKE2B c32b74d57b9671c6de380b77d78d305582b2dd594b9c6dc4640c6978630c1def5ccf24dd21a25fd9bec868908f3b41c93d40d090b540d1a6dd1840620a0ea5be SHA512 c27c7a73f51dc919e9acebc32b3fcd399d8597b2e0141d0cdf0ffc06e932afbdeb759a5b298aa337af5b846ed6c9f31ca8a0c6441f8f31f29151ea8a96433840
 DIST NetLogo-6.2.2-64.tgz 232588273 BLAKE2B 65d0f5ed9ba4616ac4a9f6df2f0a3f3fec280343233f4d715c7eb96002860b0a2377dc354913bd78527df45c7f93bb97e0979d18f49e3dc987847a73d879ee51 SHA512 0f38e34507897dd36a3053415bf191b8e71a7ef601ac6fe407bff0faa50c2e915e283e3e043379e19fcc4449934e1b7ceaffb68eadab1e529a5494b3a2d0f11f
 DIST netlogo.png 23702 BLAKE2B 60816d1bf1ee265b6d4dfa7f4d4b3df22d03996b551d7056b51ea8fc2703a6037fb7d0fb1fc5d0557255eac569aeb17dc0f32bfc91db2b13411588e5f821bdba SHA512 37945b2739f7f25f5b443c03914c4f6e28ed81efe2a0eca5dd83c7c5961fdeeb681b80b162dc45e1de3f65e013a38999b91b9b0ad1cfd5bf664d5e11029b62dd
-EBUILD netlogo-bin-6.2.0.ebuild 4040 BLAKE2B 01b885a2f0bc99dce31e55d92b27425bd88fc58792a7f1fcc9e922af011e229179fc198a13c159a737fceec0ba6efd996ce7d75a679f186f307c5c44d5c21965 SHA512 4e9c52ced14c09114c0ed7a86b1fafcd18825a7dbf200129d2894809762bd60564a872e5bfcbd8f6d80359cb88eb9cd65a297670f5ff0f6b8682bc8e4a0ba33c
-EBUILD netlogo-bin-6.2.2.ebuild 4042 BLAKE2B 37a498a6b9b85437690678165dd490bb0641bbb47ed49b499876bf1b91543799948ce7e28b7311090258b77159d2fcbd81d652ffa6fd9a1cecc44e92e298c642 SHA512 354b3256a89e7cf9136cbb020e75e7fbe451669fc59f121d4b0c5d1ca65d51b308c12fdad3a08b991f7a50114ee7a52a22482bd02dc65ede2fd3ab8d48ce5005
+EBUILD netlogo-bin-6.2.0.ebuild 4041 BLAKE2B 03a6c64cd55d0600efe2ba5cd5cbc39d61b97072ed2a9de146ba7f938a492f6edd5af7795e9cfbed0d613532a9ad703d66e83fd93327c018ac354c69ea2149b7 SHA512 530a3cfcd5bea0c98960dc8f1fde00121a4075540a6cc2aa3b8e0ad80e355f70163b2178cf6c371530a1ee2b157d4dfbca28cc3f632564513c1a59d7a7113288
+EBUILD netlogo-bin-6.2.2.ebuild 4041 BLAKE2B b7e0761bac84d6148ca0288681277c4e4e27d16a748ed8f8e18424b62d4594e5d240f4dd9b2f98786a382fa42694ed34fd9427a015581d3cb3ed46c8e9cbcfbe SHA512 63811d3dfdddc3420418a0d76e4d857518456b8df9f32b13fcac755d8df95295be2e692f34e68f9176fee8b97a6a9c57db0a7abfe6389ac10d7e87281e19b902
 MISC metadata.xml 761 BLAKE2B af52b31417b1f58f94e33524acea094b043e211ad176598a39e5a47bece3f706969137bc65f01a3bd30c71f0eaa32087a85a4a058d91cdff4cdaa2953059066e SHA512 455c2f05d6e4d8602a55a3f672e4a9403a4630d56a8d34ae454cb7a15b9fd942a47e23621ade6f51e8d0416394dcf0d2af003f1f1d93d211b3979fbff13e509e
diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
index df6e8fb735dd..e4db57bd5879 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="
 	>=virtual/jre-1.8:*
diff --git a/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild b/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild
index 308285791dcb..f3a2be39b675 100644
--- a/sci-misc/netlogo-bin/netlogo-bin-6.2.2.ebuild
+++ b/sci-misc/netlogo-bin/netlogo-bin-6.2.2.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
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_PN} ${PV}"
 
 LICENSE="netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 
 RDEPEND="
 	>=virtual/jre-1.8:*
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 8f4d91bebcda..92a317138cc5 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index fa2459e3a54f..3090acb47c12 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -2,6 +2,6 @@ AUX bullet-2.85-soversion.patch 1094 BLAKE2B 8dc035b80d812b3c2382067796f1626a932
 AUX bullet-3.21-replace_altivec_vector_keyword.patch 1093 BLAKE2B 64bdfd5fe7f6bede79c6c96c0bba59cc1da01d77e845258fc96b896cb441ae41739a4bdd841319f550b088e83fa2d1bf12ecc6eb344951a562ab3994c412133a SHA512 9460db7e8edf77a5f6ffb1bcf920f69285bd2da67bf1cf41109fdd450cbe6fd8e3ca650b8a5e7ca0b3990a708458130f44093e28a3441872e7edb16ae78ac1d5
 DIST bullet-3.21.tar.gz 133046747 BLAKE2B 7bbc51027f19502e4d72bb33ad698817d87d559b60a3eb1067aebc8e25dbf746fd99753cfe6839a2be649318ce7c7563f63409818dc1bdd210a5ed56fe38b5bd SHA512 dfe2e091d2ea42301e131b010769b5a3c5204693f40d46e4f2a8cba94117d19058b8c9873e6a1ce8dff11a249498e65540566ef1a2ff7866546289958965fda4
 DIST bullet-3.22b.tar.gz 139800935 BLAKE2B e7fb35d95b11164fd3184c110581bd73c0a4886087ccccd30b58756ffb97f79d1d2d1ae4a9f51b83c2eac94e5666b7529bf0dbfd7dd8a46ebcaed3f10edf76f5 SHA512 9e2f3eb78b94de6a11d605f4ab87868f19d5aa8df61b35030c3866d47ae9c3e5cfc56ab57b8752d697c17489599de55f4066125f3e1fcbcbc61eed8821ae3f24
-EBUILD bullet-3.21.ebuild 2154 BLAKE2B cdff13f06c67d9a84bf952fcdb11df3e7a7cc3c0beb45bbb95e92cb35669fabfa0f1afcd869d7bf79876705449f715c0cac5010c939ee71859803969fde3d6f9 SHA512 fb24f3a781102fbfa15cbbc8bb825b18b0f6e3e7ae09929846d397d4fd65fdcf39322933c6a9245e7d498fe6bc3c3da75a57e58c1e634ff5cf6c3e5963841532
+EBUILD bullet-3.21.ebuild 2155 BLAKE2B 16d160fe246c8418d367a93e61763252177a5c80baca8c8278dd62cfc63cd32c09fb18b16536c6fbafa6e0c9d6c65e624f6bd5bce0cc6d44c3c9fb8d2773a2a3 SHA512 dc46762d60e212bbb894511fa1aefe38adec8bec8d02cfcdb0498ad959deee3be791f4bd325de5d420b4d726304ba1d7e44afba566748f3a5bd70a0ad271c1bb
 EBUILD bullet-3.22b.ebuild 2052 BLAKE2B e595345cf8964a6c5868570f38468254ec16fdde8ec744567706cff97b90523f083fd69066ed5a3b58c9b5defcaf68e4aa54b4f800db124d3d2800f610780c29 SHA512 f00875c2cc797a464cc233cecd1972e00c3918c0029469dc80b7b9dc3fa3676e967557c1653d5b3921440c248c22c7590d0e18132984a46cf52eb9dfe6d31a46
 MISC metadata.xml 894 BLAKE2B e58b8207b484f560d885c36d36e55aa68ec2b0c1258f594c8ff276b1fb0191a5af6bd8e52fae1e0eccec6c7fbb82228017233d75c9984e4f8f7b6320243731d7 SHA512 e66b3065069dc6770c965dc0c0c339c800e367ce7496f99c7d305a1059fd63ece09e91b0cbf000cee3a1d0b2b4aef8bb4481db708fdb16b8811d87e6ad5d2c3b
diff --git a/sci-physics/bullet/bullet-3.21.ebuild b/sci-physics/bullet/bullet-3.21.ebuild
index bb234e0e4a56..57d64ba833ba 100644
--- a/sci-physics/bullet/bullet-3.21.ebuild
+++ b/sci-physics/bullet/bullet-3.21.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc double-precision examples extras openmp tbb test +threads"
 
 REQUIRED_USE="
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index a3bd9c58296f..c06f0de9f541 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,5 +1,5 @@
 DIST clhep-2.4.5.3.tgz 1552597 BLAKE2B a2edcbe133af98c817982f9d9f787fbbc76a1e8a10a29c890cbdd223670ee2e9d6dec872de80880e5d286790ee0168501cd3270bdbed04f9781554ee35f6eb1a SHA512 f677c93bb53047167fe0f22cbf1f5d97f27476b64566817a799240bfce8e9fe7fd658a168c25fad76a35c6eb92e1e42ec7b88960facb6632279367f0606282c8
 DIST clhep-2.4.6.2.tgz 1550248 BLAKE2B 10da3a7adc295c306d3ad57bff68489852717885eac544fe6858aed3868047cb377565f55a861751a09ea6c88584fe94b685f5dcef84c6e51afdddef8080eeb2 SHA512 cae1295d27b804c3b45c21195d8d45e9403e9449ca12d1e1a031615584f46784a1c6f75fdbc51467b901fa47057aa79077bd224994f0b6261abefc99810c2687
-EBUILD clhep-2.4.5.3.ebuild 1199 BLAKE2B f665541db0eb7c9ee4228e50ffe58377791c4e562904a46f2b48aa83c58a328e5aad2131433b5b19d5ca072c6f635c0ddd9cd57b91c178fc6feb4a7a10482b5d SHA512 c93e9ab497162f6b53fe4220a5cc6adb90aba2a3061126681f88265e2a739b24b5b27381c52fce8ffbd889e8a7d8c483227ed2115c3293ef74f3ecdc37ceea5b
-EBUILD clhep-2.4.6.2.ebuild 1199 BLAKE2B 46d3084f4a74f265b6a75034f7121503c0a5605ad2518e6317b9417e2f1fb9071cedbf3cf684dfd02e96f08667e3669ad9d3e1ba867c7f91108db0ae26dfadcf SHA512 35c8ad32cc319673f03eb59897a727adce6a8b01efaed3f43cf8d28a8754af26649e7a63905e98b01dba6b812d4106856c9ddc005c4af33d36bbace532252256
+EBUILD clhep-2.4.5.3.ebuild 1200 BLAKE2B 11f50b18c145f935c8f5faf246f4ec79a43577be1dbce76d7486e518012435a4d90920fa4f13e90546309743cbcd84d4b28963318061805d4f268f738d186803 SHA512 9d63dff04804e5bc9fe79b214d6ed53f8930a24f2b2c74b8b7760a65389f6cb4d47a0d88db1c9cba08fa4f28af6ae4289a8ee848846f8feacc71553c336c11c6
+EBUILD clhep-2.4.6.2.ebuild 1200 BLAKE2B 11f50b18c145f935c8f5faf246f4ec79a43577be1dbce76d7486e518012435a4d90920fa4f13e90546309743cbcd84d4b28963318061805d4f268f738d186803 SHA512 9d63dff04804e5bc9fe79b214d6ed53f8930a24f2b2c74b8b7760a65389f6cb4d47a0d88db1c9cba08fa4f28af6ae4289a8ee848846f8feacc71553c336c11c6
 MISC metadata.xml 497 BLAKE2B 9f68cecc9a1a96ebbc0f8408a2124a47414e987bf458f979548b458676ad45644d9fa3c690200be93aa01ef1d205e5bc3e7596b18d48a1b8a85455e2fc84fe8a SHA512 9ef1d630cfd0214dc7fb0c8021560d974cebf717c3eecd27f7abc7ee634edcaf2cc128a808b21a8676fc7bed2bf93d927cd682d4b37ef9f9c34041b0c8a06a2d
diff --git a/sci-physics/clhep/clhep-2.4.5.3.ebuild b/sci-physics/clhep/clhep-2.4.5.3.ebuild
index bae7df5849e2..78d5e4cde95d 100644
--- a/sci-physics/clhep/clhep-2.4.5.3.ebuild
+++ b/sci-physics/clhep/clhep-2.4.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
diff --git a/sci-physics/clhep/clhep-2.4.6.2.ebuild b/sci-physics/clhep/clhep-2.4.6.2.ebuild
index d53a9179fe2e..78d5e4cde95d 100644
--- a/sci-physics/clhep/clhep-2.4.6.2.ebuild
+++ b/sci-physics/clhep/clhep-2.4.6.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
 RESTRICT="!test? ( test )"
diff --git a/sci-physics/geant-data/Manifest b/sci-physics/geant-data/Manifest
index 6ab94d32859a..39ff1983b3e2 100644
--- a/sci-physics/geant-data/Manifest
+++ b/sci-physics/geant-data/Manifest
@@ -12,6 +12,6 @@ DIST G4RadioactiveDecay.5.6.tar.gz 1059792 BLAKE2B 610761030c01445ecd3159df01938
 DIST G4RealSurface.2.2.tar.gz 132506346 BLAKE2B 8b725cdd4ed5739692e3c07627661921e8d7e08bd448cb70f1d9cdd7ca8e2e090f4c65ac3b4fc3fbceb96cca22bef3ac9000075df490b3ac520b515a40b2cf6e SHA512 360fc0cd829f9daa21300b4df8da294982d13659a9fe77cbdf1f5c411eace0153d8202c658525d4b82b7925524baf8e138a51ae71bdbd1f91f674fc80958ffed
 DIST G4SAIDDATA.2.0.tar.gz 38502 BLAKE2B 349608f8f8f57b091579b4892f1547c25f0c730fe8b22de3a7355f45ea08232c3ab12af64583cf4d48528b54489d0c71c724066715592766a2a51a1a6d4eb745 SHA512 cb192c10cc9805ab8d57d5f6dca595f85ac628ccac5b975b5d8ff965ed3841b9b01071ffa76469c9a03f9ca564267f5c4a300f13d8df5056b43cd71c669bd35c
 DIST G4TENDL.1.4.tar.gz 912261874 BLAKE2B 9ed05676ed52ca8341007cade3620b655fcf56eea3d3bda01814ae7133ec04bd2ef84b1c34ee5cd76114407bd6977bd4392322decebea1e1ed7e6377a482e1e8 SHA512 6fb1e5fc8daad9ef8391ff04793f10394cfc28cab0967bba0d9c91a69b92a7af7406e543275d9c1d9ff76d3dfec2c9f653bcff40040e17edbb765fb21012cae8
-EBUILD geant-data-4.11.0.0.ebuild 1518 BLAKE2B a1a5ae7191bc4de3d2b7ba7163da2d752afec812e496807e654a69564dfbedfe66c61bcc7eebd25e36820e5caee46077ca2bc15620952a8ec62dcfa92e8e712a SHA512 895c41448c41752f390d4a8a48aa7eb8c55fcd0847845d2dbf92e885679f88acd4575b1032ddb026c399c940b9a300875d9f4822eb95c09d1c9e21c5c5282071
-EBUILD geant-data-4.11.1.0.ebuild 1306 BLAKE2B e159a55f0bd8d7020a374405cffe76633ef39f0c9402f30f9157ad900480cdbe55f46d5ccb9b4e705692cba017b9360657835e8262e7d0c356156f3382f75c67 SHA512 6fd3ba03a9529c8d0d25ae64a2278ba6bb8794ce45f4987538a9f368cb9fb8781d9af4fc44d3544cc094448f29fef1c6ee73c2c99909ed3e0d625a144a263aaa
+EBUILD geant-data-4.11.0.0.ebuild 1519 BLAKE2B bd07ec950d9213a0eab3da1729741a19d6e7c0026fd5a07a455a69ecc7887170d91e0bd03e3395b2b550170cc92a3881c3a6ef843e6031e992fce135abebe037 SHA512 b38428d2a8579483d54ab57706dcef3d0a8a4d52a7094a83469b1dc90c209f29215d9a85070f1e46f818d479c32f9ae7e813a08d034ed26e1dcb7713a912ce54
+EBUILD geant-data-4.11.1.0.ebuild 1307 BLAKE2B bd9ab3071f5a0841ff23a3d42a8ec00c82807ef49299d0d094a3d74d8dd63559ea22f58bcddbb406c612ce9fe024530e9216e9732b5fcbeca8ec2ffc163d3347 SHA512 2af47dd787576fb616050e670b9d4dc09288a6e84390b81e28c5f2639f1781a1a0f7b2fc034c9458760504bfbe9f7c4b24edf668e5b6139242f8facbaf76e512
 MISC metadata.xml 425 BLAKE2B 9c0c8f8f3e0e16f4f7a567778027c58efe973849c46e2d50df71751a7e661199fa786a57bc62b1bd89b720a8444707ef65bf58425d23ecb46cd4a6d90dc50612 SHA512 6b0d4f5b10a443188474552fe06c3abf4fff696804ccc6dfdd328b152321769ac0e566573bd047221df7609de045d3238df7a5a6c14d60dfb3d7072b89298664
diff --git a/sci-physics/geant-data/geant-data-4.11.0.0.ebuild b/sci-physics/geant-data/geant-data-4.11.0.0.ebuild
index 7c666b0b491c..4de8c335e5b9 100644
--- a/sci-physics/geant-data/geant-data-4.11.0.0.ebuild
+++ b/sci-physics/geant-data/geant-data-4.11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ unset DATASET FILENAME VERSION ENVVAR
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sci-physics/geant-data/geant-data-4.11.1.0.ebuild b/sci-physics/geant-data/geant-data-4.11.1.0.ebuild
index 114c70d71ca4..3029bb0f9a79 100644
--- a/sci-physics/geant-data/geant-data-4.11.1.0.ebuild
+++ b/sci-physics/geant-data/geant-data-4.11.1.0.ebuild
@@ -32,7 +32,7 @@ unset DATASET FILENAME VERSION ENVVAR
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 361e1c40877b..9171d57d406f 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -3,8 +3,8 @@ DIST geant4-v11.0.3.tar.gz 35680670 BLAKE2B 202cd035cd9ed7520d8662c80a49063b639e
 DIST geant4-v11.0.4.tar.gz 35827159 BLAKE2B 52297887fb3467c5a08725340da959cda72ebe1b0b0d526d240213a7d954f1c68b379abf04c00b271013a019c1179ce6d6d8dbc22a5339ea66927b30342aa58d SHA512 ae5c60702a9f08e30d202dbd9270c1e1353751b369f7129d91f3744b5ba9c5a30549bf90a1bce98351e0e5ddc57624a8748132c289de1c3a0679670ab4e30602
 DIST geant4-v11.1.0.tar.gz 36412990 BLAKE2B 92d7a370ab7c3f2e91edf9bd323ba76833ee1e4973701507c40849b348a032e7cc6baeaf06bff850d76e0b92704ce042a797a41d2ed93e309ca5f4d6ed4c6f8c SHA512 b8d181e3433754b89a27fec8f3a3ebff8289fbd5ec0bc04521b18f0df7774304ea391c3aca547aa03707c83fc72501a670827ef02ab4999e113e869da9eca88f
 DIST geant4-v11.1.1.tar.gz 36404092 BLAKE2B e96ccd5b4e89def53b82220558bcab6201250fbe51530f61572a7fe57463ab4e683c52d48585fbb2a217480185881c5dea02153c53b0de658f96d106e673d9f2 SHA512 874537431c802df78d2ca7b6f243ea78f8c6c5de8dc0f90cb7638631f3cefa784f4b00c46b4a5e88ac9c40f6e4e7188b34dc240c74ec91af75918e196d061915
-EBUILD geant-4.11.0.3.ebuild 3486 BLAKE2B 1acb3168d430f34fbaeb9b40f87edfe45b787ffb537f96ebcf987bd26ceaf0606fe0356193573019e7d77bdd047c75c4cac54b5ba5dc3032d30c5c95bda217e5 SHA512 7bd51dcc1a4296d028bf73b014c70bfc3d5bd17fa4cb5b2274d6faf814a79b0aaa9c97841a95914e6ed1bd68d3696030c87a68b946fe61a5fcec8307fc864358
+EBUILD geant-4.11.0.3.ebuild 3487 BLAKE2B 1768eb178c05115125208b1c09ad2ac88dba240bf8a116d64f0719817cb07c5716d1547fc8c23fbcb676f53c47f80c67c3416605b3e3d8d9e2dda8e860f71da8 SHA512 f28bbedd849e19f34bbe3ed441fd12565f69d2b77033e41e82f6910bba01467d0c1e1a543b2b34bbdb04bdeb0d6c4d1927dbb778fb2ce32faf77122ac25e2bc0
 EBUILD geant-4.11.0.4.ebuild 3462 BLAKE2B 000d7797f428805db147eaf59aa3a42b089e35b22402cd255c314bc59adcd185230af9338f4baba85cf18b9b52816b42a39e76b5e73ddd114e98ee8f9bcbf666 SHA512 a6e3e41d665b6878302a642047d43c415384e89eb2d353f06dd8b4c823713f7aef391338d0c11acdbd06ffc5aec62842dfbdd2e3542503e34e53be66c7e3143f
-EBUILD geant-4.11.1.0.ebuild 3041 BLAKE2B 56c1f279934f93e17f929df6b09f799a8c2221dd4c9ade6471766a8c3b25fcafe87f97a5d791bd9045ae927576ea4cd7fe4c1bf548f924b4d625a98dc540ee60 SHA512 f9c837f5f1b88e0ff548a38fa2d24fc932eb218667a88cec50195878f5c43d4af28bba8bb00b68ed2e212dfadac502a3c57133a20e2ec02eea4de628cd98edf4
+EBUILD geant-4.11.1.0.ebuild 3042 BLAKE2B 31a23f9c93f7717a34ff4b68fcd2347664f709574cc3230407bffd300a8583e8b5ad746d8b9ab1c55bf5bc079f2318f4585bb7a344ffdfebb7a95dfdaf3dbe09 SHA512 24aa1b900ca65d758a62bfe0e610b37a2fecc72b57510d51bc2882788f33fcc568b5e984dcfebd5961c7d0138be47a277e4c0c3ad54f3b66a747ee8581a8d4fa
 EBUILD geant-4.11.1.1.ebuild 3015 BLAKE2B fd1f2a0372dca10b3aa41915dc45467afcb4082d8538b41e52ea24bb8f9b666fb235f6e7ad7753a2f4bea30de26244ab12d0e302b07164d04ca788520e90bd70 SHA512 77e909be2440a94b009408145fa753539e23f4d087eb747657f183f082098f06f72a992686dcd82fa562188d31ae824178e4adcdc77000bea0114eda52a2b9dd
 MISC metadata.xml 1649 BLAKE2B aa1d00d2f11d3c35231a3ea66bc2fe33466b644152171d0a1ded5f62d404816d517e992ada87adf1842d58624ee1b2538b46b3869f5a62185f361507eb78659a SHA512 02a6b99d4fae650dccd478de365c943e200909dd35ea158582b42747fb522c11392eaa84d35566b49f65834571a4e3377bba1d31d20598dd9a1c7a2d98923b14
diff --git a/sci-physics/geant/geant-4.11.0.3.ebuild b/sci-physics/geant/geant-4.11.0.3.ebuild
index 77cd061bd19f..d79f67c5ed4a 100644
--- a/sci-physics/geant/geant-4.11.0.3.ebuild
+++ b/sci-physics/geant/geant-4.11.0.3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	python qt5 raytracerx static-libs tbb threads vtk"
 
diff --git a/sci-physics/geant/geant-4.11.1.0.ebuild b/sci-physics/geant/geant-4.11.1.0.ebuild
index 256fb47daacb..ccd5494935b6 100644
--- a/sci-physics/geant/geant-4.11.1.0.ebuild
+++ b/sci-physics/geant/geant-4.11.1.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://geant4-data.web.cern.ch/geant4-data/releases/${MY_P}.tar.gz"
 
 LICENSE="geant4"
 SLOT="4"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+c++17 c++20 +data debug doc examples freetype gdml geant3 hdf5 inventor motif opengl
 	qt5 raytracerx static-libs tbb threads vtk"
 
diff --git a/sci-physics/hepmc/Manifest b/sci-physics/hepmc/Manifest
index e65076889876..c095164f26c0 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -3,8 +3,8 @@ DIST HepMC3-3.2.6.tar.gz 9344806 BLAKE2B da478157ad73915d77851e9da7b236a052cb32e
 DIST HepMC3-e05d32ebac8705c0097e9e7d00ce815a205110db.tar.gz 9346161 BLAKE2B 9304d329332c2d4eb0ef6526a3308aecd29a38c569d3ba57d94767fd38ad052514f75a7a90f301c54185230d7693a67e48d59b66b12f42626a7ef900e309f743 SHA512 45f9edc6c56f9f8494b416bff147dccca64c52a90e0e169ede560ae8cf9e9255258b7af1586dd1c856f4010c22b2e668511bab160487a3ba802b629d03015e55
 DIST hepmc2.06.09.tgz 3802048 BLAKE2B 2d2ddb558a313f34fb035cc10e8b914e25c65f21224545834471861a0f84e73957e841aa64af214ebeafc368a3a765aaf59d82ce81365d2c12135a1b5c03e7aa SHA512 c06277eaa76da3d0853e235ae5ae2e2d01060dc0c171f94eab12ecf16c73870b48f9066735f17f463735bf4bf41c3cd1e151e03f5b827aabc844fcc04b577b3f
 DIST hepmc2.06.11.tgz 4893958 BLAKE2B ac8eef250cb330a167c9e0f4bd1aaf8df82e0ffec3557ab5cdaf8bc5b0b7333d6a45f73710ce63abab52d2c5758d5663c15c2a7c940a09504b3ef2fd4517aa0b SHA512 81c100d4931e0e4de62c8ffd18cc06e7996a642fecc092892988bdc0dd0dc3c0f5b336e85f09ceb8f5e0e09456775ae5928d37daf28d82923476089bc0e910f2
-EBUILD hepmc-2.06.09-r2.ebuild 1935 BLAKE2B c9290672e5ff971aafc414d38b53841d9ace1df893c335b7f5367d4437f272ab93a8252d24e2b3bb1a0e2560034525ac00822bcd0ae2bc1c80d5118d040f8c99 SHA512 cceb05dcfecb5068301f04f03d1fb23faf76193626431d4bc44512a2ed89bc711f3faf3992e1d4b4cff4d82e214be5dae8607166156afc9ed235027f5ea8e4c6
-EBUILD hepmc-2.06.11.ebuild 2000 BLAKE2B 28b21daa04991bdb09dd3870b74268c13c3e80070ccec60ba2cfcf03cfbedc0ed173ca10d07e9be2fb875b87c691fff79d8e620201497e12d0bbad92dc705c63 SHA512 6f38dcdf0e221b071ca518d0e89ee018282298c1411e1110d70150bed7378c03b95f2c64bcced8dde014252781f7486a4419354d43fd0d6e0b4797f33f76b004
+EBUILD hepmc-2.06.09-r2.ebuild 1936 BLAKE2B 4816069fad26b33aa4891311e61207b8ef077b9490f342e589e2c1e0e2d78940f3a87b5b5124f3bbddc13c693bdb9e8d13c37abeb96ffb700f3a7077e5745809 SHA512 f6b645850aca75f3727cf5abefc55bb1438527da9a941a354c9cc6c1dc384e2d36b3754a3360924198b05a9517e42bf698a1a00f9b7a362436af64aa7430fc4b
+EBUILD hepmc-2.06.11.ebuild 2001 BLAKE2B b5dbd95c47d1fe82639f1e5f21f6f4d07db01441408bf7a030f594f533087d9bf215b15127c6be0609cf089d58db2325200396fb183634009955f4d28460e8fa SHA512 0e6f3c940bafd461afaa67c2733250a8be2837d5149233537e831ecb1cd778e1f68966dfea73bf720d2860930452a775bb5bcd6b13596dd0f65cadd944cae06c
 EBUILD hepmc-3.2.5.ebuild 1195 BLAKE2B 75292838102e62d9c2c42b59d15ba3f7fe93c09a14b9b3fe656d879abd85621f48320b733e239d0f29f9cf458981cc56e42d0adad5698ea50087598e01651c0c SHA512 ec153b19bf78bb0237231142cbd67842faf58601517f1b702c2a749492e491ca6b41fbab4e79808e9c26385ddcf559cfb205450ea35cf648197aab303df93370
 EBUILD hepmc-3.2.5_p20230225-r1.ebuild 1487 BLAKE2B ec742f493b3aef9fc63bb50db1803fd73d7150738f38721cb7de116cde7af97577509d0740c15a4c22c29cfd0d4bc519f43181bfe8621fb786c7808e68678232 SHA512 453e2e5b9b44128418928174609f5e60c68eb381198e779506b4d3770e1fed3beeef3f8b8fb29aa04970ec13344ded69982437b44a04458533a9cb0ab59d99a5
 EBUILD hepmc-3.2.6.ebuild 1398 BLAKE2B 0293fe7cc3c13f15860e4db25cf426ca113460ce66a1a319e43829262eca14eb0b378ab215c55ecd42d72f906c1482eafb9efd767f8a1f243099a0da42c828c4 SHA512 79562cbd76001d88a1e0690b5cd9f3b414caff77b90748672926f9ff22bcdc61dabcde1e68e783d6a113f4a8d8ca80346561b43b40c966aa026bcfbc1b08f82d
diff --git a/sci-physics/hepmc/hepmc-2.06.09-r2.ebuild b/sci-physics/hepmc/hepmc-2.06.09-r2.ebuild
index 4dd1c2c51e5a..236ef0796556 100644
--- a/sci-physics/hepmc/hepmc-2.06.09-r2.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.09-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cm doc examples gev test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-physics/hepmc/hepmc-2.06.11.ebuild b/sci-physics/hepmc/hepmc-2.06.11.ebuild
index 20cc48f5380d..89f4de0bd64b 100644
--- a/sci-physics/hepmc/hepmc-2.06.11.ebuild
+++ b/sci-physics/hepmc/hepmc-2.06.11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cm doc examples gev test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-physics/herwig/Manifest b/sci-physics/herwig/Manifest
index a38801defe65..a12ca3465d56 100644
--- a/sci-physics/herwig/Manifest
+++ b/sci-physics/herwig/Manifest
@@ -2,5 +2,5 @@ DIST HERWIG65.INC 32 BLAKE2B 89056a5d5bca2bfe1493ba32c73501c2a0b46c0b27e3ff0ebdf
 DIST herwig6521.INC 15224 BLAKE2B 176f3b329f0eabdf5befdbc0cd372e57a3027e6d7faf447356e72b0a5c396e21f44dd594e18f37e4139e2ecc507749175441644513de4b10e055a95731ab3046 SHA512 8254dc7a99445a7f4a61760fd8bd4ede5f8b7613e25a9c51155ae614c9cb888c7a66043b3b2ec96b8f515351dab0f697dc14738bcde58fdb345f3aebdac6f1fa
 DIST herwig6521.f 2513511 BLAKE2B 5172e07e8dfd5c731d0a8dffe061980a2629ffac5581d2df3cc619e9de166d4ecc1e66da0a07ee8527c62d45665f3740c22a92b89b88638dddee7fbd41a9a94f SHA512 c13bc74132ddb86ca0fea61bc2da21dc6908b96d14a33c378c0f37be0dce201012fdd11681e11fcfb715b345ccd72fb4d166017eaf4e0cd19762acbe6687809a
 DIST hw65_manual.pdf 934022 BLAKE2B ab6d000f236246779450a239e7b7d18ed3487189b33ec27407edcf40ae7f19134a2bdc7689c55eb44ab5637efa8aa32d678eb71b782e386e6ea340f936c6cb79 SHA512 68c4407e27abe2d34e239455bd94324d919b712cc8b031faa4635caf4e3eb6ff30d35b4e7f8dc9146c8f54886ff77cc690b296b15805dcd9302ef93e707915ff
-EBUILD herwig-6.5.21-r2.ebuild 1462 BLAKE2B 1644ececb4d329943d8c5fb032b278f08d06342dd9b652c8170b4d421db7909da2bb85602a30cdb38a0d12ff9eb32ff302dc23c3cccd720435933d815c7ddf23 SHA512 0ee7ea1c9ed2eb6ae92609182105d429ee238e60116a6ab2595e321976ec4e261eb421fa2c6900c181e2bee5ecf909d8b9399f0a11419bcada54112b37e5c785
+EBUILD herwig-6.5.21-r2.ebuild 1463 BLAKE2B cd4c37b1fb67cc8aa3e3ab60b3927a60df08e642d658452eddaeafcca803c49f024c59f9a0e7bdfed799ff51b7fe85a135a3abee8ee8624a1780803a62713382 SHA512 fa21dbffc7df9548fbf33ef447caa538efccee4935ac32f51ec169c6ce438e79edda956f17ef09e1717ea28f9dfc4adcafe9718f635ae9c4569c20bc222ded80
 MISC metadata.xml 268 BLAKE2B 3c80c161eba82e18997f46ba7efc8d858d9afc3e357fd0447775134f139db3e56716ddb3dea7d4422449b48f82311ba5b799c675b56fc7244ed40cabeafedc7f SHA512 9db6c902b3c4915b2221dd72cbe3f371b1b1259021c1d9b810437331aaa51ae0a98d51892316197b59f3c7842605b5ca2d71bef59657629e0dd3a1a36b150fd6
diff --git a/sci-physics/herwig/herwig-6.5.21-r2.ebuild b/sci-physics/herwig/herwig-6.5.21-r2.ebuild
index e119e9ddb327..ead2a6ad3021 100644
--- a/sci-physics/herwig/herwig-6.5.21-r2.ebuild
+++ b/sci-physics/herwig/herwig-6.5.21-r2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc static-libs"
 RESTRICT="mirror bindist"
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 7bb64d798b36..391cf28eafc1 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -1,8 +1,8 @@
 DIST lammps-17Feb2022.tar.gz 170036241 BLAKE2B 74d370657bff17847dce0bbe082134721722574b298832ea37d319968123b12d37ecdfea5560b2776e846c32d05a98f722710327d8da46f80869f75a36f6c255 SHA512 f2df65847906ca5890aae98efed5712eb6dd694f2b85dc062084a02b9bf43412ecd075f54df2947bff71d3b6313c1ec39c437e02497920da795e9ba0cd5dc068
 DIST lammps-23Jun2022.tar.gz 181439760 BLAKE2B b8012417257527820a4f37dbd300d3f949e3768fc7ae669c49bc7ea0cdc30b28512cb3ee25d375394184bbf1371763da6c3556b2d600f060b754816c589197bf SHA512 e882cb8a83a90b17471cd5c79b2b724378a28642b82511c695a36c0d9a0feb63681b29171c5bfb0bcb218ea3a1a5e4f00fdb8e6ce5f0fc8aed1fa83680cd3a34
 DIST lammps-28Mar2023.tar.gz 187946133 BLAKE2B 87f8ffaefd9a5b4cb7a286157d6c7808d899bf738b42a1e82af257fdafa2cf6ed2ce216d0534fb762882130efea9a5f2566ca5282fb7ef95f028d2839be59eaa SHA512 2999d8311ff83612a0da82e2453e8b25dcb2af56005382725b6fd5ed9e7f61e9ae506d04cc3c587ce75f1e2346e7f2ec05eada6351dad7abee1bc25161851682
-EBUILD lammps-20220217-r1.ebuild 3361 BLAKE2B bdec721acba319030185663d27de9700e3fa6a7284c3d7c6791d500026a47f01f7202cb381945489456ce435f3d16c9f7472dbd071dcb83a99d9afbfdfad15f9 SHA512 1ce455c4bda3435caf39318b6a2ca632c44cd978c4a515c255fa5127e44ef3010f2862940b35eb234c14e3a9ed6e25a4000475a1fb269704defa5770a8e4172f
-EBUILD lammps-20220217.ebuild 3301 BLAKE2B b6f0505100cbb6d92847efd618d877532e9d49d4363d745a1f202aded8cf4e27b4c527085bcd6063f9cf6ee59c908d2fa99224f56eaf3ff6821847a3447c1be1 SHA512 25831375ea4c3d0bd0fad0daddfcbc1e5b42ea812a51fe8a6434930cd0d6e99f133c5cae8b3e1b5d5402d2b60e942886d813a1f7a144d5dee2b7c2baac882b9c
-EBUILD lammps-20220623.ebuild 3361 BLAKE2B bdec721acba319030185663d27de9700e3fa6a7284c3d7c6791d500026a47f01f7202cb381945489456ce435f3d16c9f7472dbd071dcb83a99d9afbfdfad15f9 SHA512 1ce455c4bda3435caf39318b6a2ca632c44cd978c4a515c255fa5127e44ef3010f2862940b35eb234c14e3a9ed6e25a4000475a1fb269704defa5770a8e4172f
-EBUILD lammps-20230328.ebuild 3361 BLAKE2B bdec721acba319030185663d27de9700e3fa6a7284c3d7c6791d500026a47f01f7202cb381945489456ce435f3d16c9f7472dbd071dcb83a99d9afbfdfad15f9 SHA512 1ce455c4bda3435caf39318b6a2ca632c44cd978c4a515c255fa5127e44ef3010f2862940b35eb234c14e3a9ed6e25a4000475a1fb269704defa5770a8e4172f
+EBUILD lammps-20220217-r1.ebuild 3362 BLAKE2B d08fd17d538e328e94be8b1587e4d590880d828e78341b300948205bca7197e75d3baa5a9228b5766be6565089648913fe67dcae6b769bf4efebadabf0c10cce SHA512 8f80ea76371e49ed52ca561ad01cfc7a912108bd7c8fd99275bc84219bbcb6a9dd870ce4fa78cb8ebc6f0c431591d48cecdb728c0165da867a44907a5cf6bac5
+EBUILD lammps-20220217.ebuild 3302 BLAKE2B 9d150c28215f36022c5a094c54062b6eb2a7cdabfc1047cbd504ce5de9d5109cc55f2a7c44d973fb21817329061b5036c28f812dfa4ea442263d9a5a3bead137 SHA512 5613165d1ee6be3c39305163882f457cbda531276a9a32fbc8619608750cc913af88d2aa2c0575335f1d2248bf09131e53ca2c61b3dc81935a4068224527121c
+EBUILD lammps-20220623.ebuild 3362 BLAKE2B d08fd17d538e328e94be8b1587e4d590880d828e78341b300948205bca7197e75d3baa5a9228b5766be6565089648913fe67dcae6b769bf4efebadabf0c10cce SHA512 8f80ea76371e49ed52ca561ad01cfc7a912108bd7c8fd99275bc84219bbcb6a9dd870ce4fa78cb8ebc6f0c431591d48cecdb728c0165da867a44907a5cf6bac5
+EBUILD lammps-20230328.ebuild 3362 BLAKE2B d08fd17d538e328e94be8b1587e4d590880d828e78341b300948205bca7197e75d3baa5a9228b5766be6565089648913fe67dcae6b769bf4efebadabf0c10cce SHA512 8f80ea76371e49ed52ca561ad01cfc7a912108bd7c8fd99275bc84219bbcb6a9dd870ce4fa78cb8ebc6f0c431591d48cecdb728c0165da867a44907a5cf6bac5
 MISC metadata.xml 1535 BLAKE2B 32405b37fe2b07f10d904bb9ecd5a7d645c776ca210839d5f2cd4f1abff4188bb47d72a7ef2a149299422373289a88c6f048891743a7a0b97736c7c9c38ef6b0 SHA512 af7aa377d87a09eb2551ae2214b0ba8b2435682d5a7189da2d97adacccd2ac5763c724b516df730d1fd151e5b7c584b80448c30fd16f77495b6788246d37054e
diff --git a/sci-physics/lammps/lammps-20220217-r1.ebuild b/sci-physics/lammps/lammps-20220217-r1.ebuild
index 0c599b37fc74..15f4355d109d 100644
--- a/sci-physics/lammps/lammps-20220217-r1.ebuild
+++ b/sci-physics/lammps/lammps-20220217-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}/cmake"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda examples gzip hip lammps-memalign mpi opencl python test"
 # Requires write access to /dev/dri/renderD...
 RESTRICT="test"
diff --git a/sci-physics/lammps/lammps-20220217.ebuild b/sci-physics/lammps/lammps-20220217.ebuild
index f4e9f4f0abb4..dafbca2ebb94 100644
--- a/sci-physics/lammps/lammps-20220217.ebuild
+++ b/sci-physics/lammps/lammps-20220217.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
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}/cmake"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda examples gzip hip lammps-memalign mpi opencl python test"
 # Requires write access to /dev/dri/renderD...
 RESTRICT="test"
diff --git a/sci-physics/lammps/lammps-20220623.ebuild b/sci-physics/lammps/lammps-20220623.ebuild
index 0c599b37fc74..15f4355d109d 100644
--- a/sci-physics/lammps/lammps-20220623.ebuild
+++ b/sci-physics/lammps/lammps-20220623.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
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}/cmake"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda examples gzip hip lammps-memalign mpi opencl python test"
 # Requires write access to /dev/dri/renderD...
 RESTRICT="test"
diff --git a/sci-physics/lammps/lammps-20230328.ebuild b/sci-physics/lammps/lammps-20230328.ebuild
index 0c599b37fc74..15f4355d109d 100644
--- a/sci-physics/lammps/lammps-20230328.ebuild
+++ b/sci-physics/lammps/lammps-20230328.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
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}/cmake"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda examples gzip hip lammps-memalign mpi opencl python test"
 # Requires write access to /dev/dri/renderD...
 RESTRICT="test"
diff --git a/sci-physics/lhapdf/Manifest b/sci-physics/lhapdf/Manifest
index 314b15cdd38d..1e60e1ce6d67 100644
--- a/sci-physics/lhapdf/Manifest
+++ b/sci-physics/lhapdf/Manifest
@@ -2,7 +2,7 @@ AUX lhapdf-6.5.2-py.patch 391 BLAKE2B f5d904659a9163ec2e269e5c950c0610c9604dd936
 DIST LHAPDF-6.3.0.tar.gz 770744 BLAKE2B 02b9fe3507b87c6f0c635ceb203304eb9b3ee8ac4d17c8b83578f8c05b78b17035b63b6d3d9a0b9fe3505a3daf8e9376fe25040b8826ea4976d2a717b1447eb9 SHA512 4a5aca6e2f06b59a44acc23ef76f1fae747f38e425803e7625cc68130da0c76d1e0d534b7b1867f09c86ee838d4f769d5097257170740db704c966d91c41f94b
 DIST LHAPDF-6.5.3.tar.gz 864918 BLAKE2B 2dd1b5b94523c0cadac2b63d3dcbc73c5d621463ec9a0e6736b40cb24f6f4da744cf74484b6a5cfb1cfc10054171858dfb3968b22da565747d9b0d00cb3f545c SHA512 444e1dd75c087b0618a65b0ebda0d06dac640d75e43de3a2e4cd5733dd2eaa6eeb6cb0aac437ee559b00b60a6b839a4125b3b26d398da81d52a3a97a7b875662
 DIST LHAPDF-6.5.4.tar.gz 869707 BLAKE2B 9bd214f29ef0fb662095a045acf449bac60c2f12fb0e182c9c590ec51651f1c08d213a3f9280eda0711ec9a0d5cae620918f048c362838a9de8e69cc84f34798 SHA512 0e39f7f298e8c72eece9c3d19f471f48b3ee045cd54ecd318e0b2d60ada4f01a2151e6b2b5f27fccdf10c1043352a673492f8792be1964df7eafbe931282a83b
-EBUILD lhapdf-6.3.0-r1.ebuild 1511 BLAKE2B 0c9a07f0d398ffe3419fb13910c7076e407635ec5f9c592c8080d55b351c8038f06322ee9eab1cc37cf794687d621f2cd1f59b4b0d28b09058012f85467c0ee5 SHA512 908712862978353209e625a71f3bc5903fc3297d0cbbb5faa2968ef67993b858a6b3450ea7ba381b4fff0fba37c1f911b53bdbf132577371631bdcc7eab11c92
+EBUILD lhapdf-6.3.0-r1.ebuild 1512 BLAKE2B 6babf52606b5f509a2b09aff16dc6a26807974cdaa0a41c244a6f03a9c08588c752f2e21010b90fb6a5fe4c0d3a0e816cf82551aa81fc0387ee8f4a954d07808 SHA512 75b5884356c2f462a8a93db21d479baccabad0f0d956aaade814ca1c7663dce8c0ce8f4316d37ed4fa4e32e7d0dc131c26e3e5a5ac54d6077050d70445038258
 EBUILD lhapdf-6.5.3-r1.ebuild 1161 BLAKE2B aaa67027ed213ed83386023de26f200d022143048182fa3531fc1a2b564abc64f3d9d644f344f5803a0d2bc1d5fbe4934b5c65b6689dd147a8bb941b4573454e SHA512 1228c4d723d919928b50a07943143d1783876b996c5070c3717f649d0569985b4f794d331dc616625d2f42f5c21db0baec967f9e597cf61f19ce08d28eeecf7d
 EBUILD lhapdf-6.5.4.ebuild 1221 BLAKE2B 3cdb832c19c56115eab8c3528b5e0ac2af6095ca61b9e6d89eab24c573a421a1d40ddc2fb9798b8ac0144f97c5b4650e72935c1a4c98d173fd6e9d4d59fa6589 SHA512 787fc25a54fedfea6b2bc3054b60767639b24dfc616ef4f929735e2647fd7d265134ef55b5abda72cac4cc32cd06f34c28370fb1fb833a068bfbcc22b7baeaa0
 EBUILD lhapdf-9999.ebuild 1317 BLAKE2B d988647eeed4d92e9eaa0954339e3865cd57a8fd50b2ee3c5ff8d6945d94fb593201aa767f48faf48afd1b1eb8a6a8b3b4f26801016e1b11bc76a21e3ee78c3f SHA512 4fddbc87790e443cb832e10251026bca3509fda570be1663c8b4f4f7a7a34e41dc44c0340f5a900b0762ebfafff75e01a7b8bba447693b61510f369b2369445c
diff --git a/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild b/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild
index 3fd2c60d75ed..b2a2781f660e 100644
--- a/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild
+++ b/sci-physics/lhapdf/lhapdf-6.3.0-r1.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-physics/pythia/Manifest b/sci-physics/pythia/Manifest
index adf7af39dd47..f776e7ff7fcc 100644
--- a/sci-physics/pythia/Manifest
+++ b/sci-physics/pythia/Manifest
@@ -13,7 +13,7 @@ DIST pythia-6.4.28.tar.xz 490248 BLAKE2B aff9006a4d3a0536d39a5b5161329f058b98055
 DIST pythia6-20160413.tar.gz 567976 BLAKE2B 92ee81e41db46d49706599ee387a650f67d54a0ea165648de0d09d6cec811c2a4b22903c15cca0abaf5f34cf28333d70315a2c71f4ce0ec0bc48757c20114ae7 SHA512 2a9ea2ae299e8d49bd9750f8c68f0b7f534fb91254c2eebc60ef40828400bdf5e5c4e0956d61807e773a51db873ab4a036c3ac264f904d0bb2b85f4860e538d3
 DIST pythia8245.tgz 23737440 BLAKE2B 74fd060229a342a32ddd33cd1911708c03e23ee0656a23ed91663fa08b35bb015f75bedba2e6ef13cfc9524affde8e8b65653596eb34f1f080781e655b85af5b SHA512 25107eb98474217ac697476143e879c62fcf5653994a2daf61cfca892f91fbaea3c274019fb4469e9ef547e87d69b8842ee28db5fdac6433965a62eeb16ef95a
 DIST pythia8307.tgz 26016414 BLAKE2B 0253309d71ca4e46183de80396c3a226d072ea2e8aeaf87da33994b3303017a6ca567f6731902aba43c20fec2c0aeace0728f2ce725f9221f161a70055fa6043 SHA512 63e7a3e76f8bfe0cd7b34ef523d8bbcfa50ee780c8437384ef7eb208f0f682481b0166673647db98468baeb6df855fdbf0cbb1509dcc5eda39c90f3f3461fd2a
-EBUILD pythia-6.4.28-r2.ebuild 2015 BLAKE2B 8e26f38ac4ed140dbd49d9149a9bf56388d9809a26beb27bcd87f2f09503f9bdac7e28ea96413f0f849bfb1cf32c71f32efc2d8c1ca68a8d287168fb35ec5ddc SHA512 9d8527a168976ec0da2aff8ff220a294df566d9581913cb4561ef738eb33a6ec28b77e162fc5b6977cb06359d2264e198821833f5801293ab56a50d20431aaa8
+EBUILD pythia-6.4.28-r2.ebuild 2016 BLAKE2B 1fe9d2e29b8ed794a84fc8f7cfb070e22b49cd97df6116d70d3a17ba3a8e09633435e4474a2d0499825ef6e8cf415404d92eef8041969a2a35036c73d09c484f SHA512 0dc8ffc1166af84cedeecba440e4b242fe454909bb95789c32a562b4871ffc1bc82c39daf1286c518bed2c1d4fde55063944581348c8db008f83714e6262c591
 EBUILD pythia-8.2.45-r2.ebuild 5738 BLAKE2B a4e94f9c23ce66ee9b0f9704a001fa5ba2b9f46e393ae24c9869acf9e87ec06027e9d7b6cc6e844fdcd7d285ead16c37226dadf927a21015b4b23308f9b885c1 SHA512 84a5a2824a5d0b0f9ffc21894af521d0cc1cc88f99669f81a35fb63afaede9b552ab2e88a878763211f3f9f81702b03ee7c861724da37949e01497cd28de7e36
 EBUILD pythia-8.3.07-r1.ebuild 5639 BLAKE2B 40557ea473da0614030ce8c727533ee6a0a02292331b053fd33dac4e6b40cddbbc26183990b2d2f5ac37c170e322b78cc0fa0d02e64814e62c39e934f51f90bc SHA512 12fa4c13fffed492ebefd9b17300202d9ea6f59b3a9c0a5ec0eca9ccb2b1a63c53cfd8dbae1e04b68239850711ea564e7225cea2c229fb6c8014276fa018f585
 MISC metadata.xml 1301 BLAKE2B 0bc55c98b16d7c36f2fe63742dff66385fb077ad561ba020d188e03b8ef13236ef074d7461ac018ef9645b315cab9eb4d631a978021273250c859b4ff82e9542 SHA512 40182189f55d31d2b88ae7b61f3d4f447ecec0cc76d523fef11e40346a7ddae872948150084d803c7326501c5a29c4b9a8442018eb52d5657e3c19abb7f22d7e
diff --git a/sci-physics/pythia/pythia-6.4.28-r2.ebuild b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
index f5761743a612..9d17582d521d 100644
--- a/sci-physics/pythia/pythia-6.4.28-r2.ebuild
+++ b/sci-physics/pythia/pythia-6.4.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ SRC_URI="
 
 SLOT="6"
 LICENSE="public-domain"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 675adbed9145..5d58a3eac5c8 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest
index 62e640596079..da83708caba0 100644
--- a/sci-visualization/epix/Manifest
+++ b/sci-visualization/epix/Manifest
@@ -1,5 +1,5 @@
 AUX 50epix-gentoo.el 298 BLAKE2B 236677e59724ddda6cca138c5e049250798a249373558caa1d2f85b432710352d86cf4c4a90ac4556da4857d5aa4bbf2dbae816a2338808a6a79d44eed0fcd75 SHA512 7033d169194cffe4265569f1b048e9ec1929dc98257eb4fb63f486be1ab8162e80fa75fd3943c81b5f9a8eb0e13665e66852ef1f9fbf7cfaee949f5d56fbe9a3
 AUX epix-1.2.19-autotools.patch 2020 BLAKE2B 0b5df14c1e31526aadb6bd06ed979616c0ad91fa2555d0b77617eb37aeb902c3d9ac25dacadd3306bd0e6674bef1b9a4a75b1207b9a7ca6289635de5b94f9319 SHA512 f4d2c959031dda084d69c9c89ded0a05b4329819dd420f164a64c763c0917d0a6041ea6fb999574c0f8b640b3585f99133aca3671e02543111696fbda1d16424
 DIST epix-1.2.19_withpdf.tar.bz2 1757443 BLAKE2B 4c7d78f27d355e078ebbe81f9c5d9b1d342f4f04d5f91260460d0559bfb7fc8204668072c06c8d493eb739c492b2935bffd24cb77cd554cd863734b7d84ff6e1 SHA512 b51821256ccaf9957562964b1342ee1656d1d8456081869797d8c704df3098d2643135767987b0673aa64a16703cb2e21deea4aef7d1598e67b9661b98245cda
-EBUILD epix-1.2.19.ebuild 1478 BLAKE2B af00fc6da7dbe881ab9f72845533f2ffcfbeb109e662a94ef9d29a13cf912c8410f8df8e37948c045098ca6ae72e59e8a4efff36e1039ab93035e94930846f1e SHA512 ec505c32ca6b22cafb0619a17d685c7e0824fd634f94b5b3fbd55c6eba19670450a4e700f3f85f2c4d81f93e0a8e5854ed5ee2853bd84bd621307ce8769eeeb5
+EBUILD epix-1.2.19.ebuild 1479 BLAKE2B 147ec07959fe083213424b3d1fc5db69db5f0a362f43199d86a587f0cfb653e972ce6c26549f36af51a4506e25c45f22b73c5084f8330c98c65f8241080f2d61 SHA512 190fe7a77f5d7e17b470d6c1a4d5fbc895af666e3d5f22aa83771e76b74f46346186f781b654ccb8f757f44e0dc4ca0ce297ace25afdc56eb301384189da2da0
 MISC metadata.xml 782 BLAKE2B 80aa8163bf2d946ca47c86ca4032df2b025fef424560c209d1ccc26959b312a48e83b360a2d5f3b78feb0133fd1a7796ffb00ddf48fa60da2a1256405ded22e2 SHA512 dfcc34d1af6b731bd88d38a80f10fd96fe34a5c78e56160e3f9bda282d443c9b108ce83a7c56ff6e650c13c5a646233637d4b2228900da4a5cdbbc9811d9a0cd
diff --git a/sci-visualization/epix/epix-1.2.19.ebuild b/sci-visualization/epix/epix-1.2.19.ebuild
index 442aebc68079..68c038fba49f 100644
--- a/sci-visualization/epix/epix-1.2.19.ebuild
+++ b/sci-visualization/epix/epix-1.2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs examples"
 
 DEPEND="
diff --git a/sci-visualization/g3data/Manifest b/sci-visualization/g3data/Manifest
index af105ffddc99..9cdad06085db 100644
--- a/sci-visualization/g3data/Manifest
+++ b/sci-visualization/g3data/Manifest
@@ -1,4 +1,4 @@
 AUX g3data-1.5.4-desktop-QA.patch 234 BLAKE2B fea81baad83edaf330f23b9f4e5cbf1f3ee8e43ad02aa9fa87cb9f41171d658ccf8186ba882944e1849e9d2ef937c148a4d6c6a82639244a28ea00e4dcf7b26b SHA512 f938c8659de9ff868156823c8112ce849e9acfa3c1a253d77a94a366875d275d4632b1b810d3ae15dbb9d83f1dfdae18aa9aa6aae01456107596a6d8ae6e3c1b
 DIST g3data-1.5.4.gh.tar.gz 40296 BLAKE2B ac821f80323ba9d9fe59274bf1b9746ea53273a9b46b2a1f8366be28c5b58c6f098322293a4971ce80d6261de8e9719cea1f527b0c57a4bc3505be966ff14b23 SHA512 965e3d1f68865eea20e38bf428d32974c26407e3ccb736d2049141472d4ddf5bbe3e82fcea00195febb1de021396105217cfa8098b6724b9cedfe9dbbb3c5f76
-EBUILD g3data-1.5.4.ebuild 557 BLAKE2B 08c20f1b8142ff13fdacbde3328e7db69421d8a2ae56baf58b368ab732c9b7281593d35e157bcdf05c088df235ef1ee9020ca838c8775f94b1c4d6908f05e067 SHA512 b359e572707cfe7e9de9d4e3ec4664f3b32235ea86e3abb9d5430032c47866a37a6d196c31add7498603579a7dac59250f1a7b3c732f1f49f38905695fcf72c4
+EBUILD g3data-1.5.4.ebuild 558 BLAKE2B b46efd3a705b63d65bd50bf03b89079f25e3a1b5eac90ccc94d772044ec4e4deabdcfc5ab4458bb23159dbe831f4f5b5a3411cbb3812f5169ab204c0852c4aba SHA512 9a87cb1d659f6c671af8177a10bf3b1e6bd12de5a17ba8c31d04705546d6774ca6e49d91325dadab2559a41587ceb8c1910ae39c5948884d8bbeef37ffefa09a
 MISC metadata.xml 557 BLAKE2B 420bd535a9a6b99b2dd2b0a2e859cab98467457790c5f97cb1a27f442670953613b5cf1fd10dda1968cbde6d53438cad7269a200d83ef4ed089d87c3acf96d59 SHA512 e3f42a68891bcee652ec76146468cdf7bda983f9e3b14cf35ea46d502408e1a03225ef0e151edf306c97a3d0e144429b9f02b8f8dc87434c29bd5081f5caae6d
diff --git a/sci-visualization/g3data/g3data-1.5.4.ebuild b/sci-visualization/g3data/g3data-1.5.4.ebuild
index 9c6b9976382d..8bcc2cc9695c 100644
--- a/sci-visualization/g3data/g3data-1.5.4.ebuild
+++ b/sci-visualization/g3data/g3data-1.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pn2200/g3data/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/sci-visualization/ggobi/Manifest b/sci-visualization/ggobi/Manifest
index 73a147323831..2acf41c3e510 100644
--- a/sci-visualization/ggobi/Manifest
+++ b/sci-visualization/ggobi/Manifest
@@ -3,5 +3,5 @@ AUX ggobi-2.1.11-Wformat-security.patch 1109 BLAKE2B e629aa6d52caecb00c962f531ea
 AUX ggobi-2.1.8-plugindir.patch 426 BLAKE2B fe043ae4458c441cc0e5164023e6ffa0e75ce005a80c9740d236975d6bca02fc89dd0d87c79d318f54e08318c8d3726c00fe2c2413c41dbdfe1876de43c173c6 SHA512 3e55ca6e23d888907428d36a23583cc9067fa91204f7aa0328529039ab390ef55b62bd290b56053f70bb5b12d26e144f0dd96cedfae5b4ca426bc24d48b4ea48
 AUX ggobi-2.1.9-as-needed.patch 2157 BLAKE2B 17d09319c9328badb9b5e96bfda2bd56aae0a9f77696b9f5c8a5a858c255a127bca074cc0e74aa94b61193c4ccaadf4b11b1437650043198ed3bf382b9ef8711 SHA512 ed3ebacd819473df3a4bf712c749d354a5589a2a533d880811732da8e7d71122aaebdcea1da73056bd1aada4c2b695a9e6cb60db7f8daddbce1a2d84e670d502
 DIST ggobi_2.1.11.orig.tar.bz2 2787709 BLAKE2B e4b853f3212abda00150e6a3b3a344638225bdc564c109632c7ca2f9cb8cc41d35af9df1ee153d2ede3bd3191d9219e2bdd6bd6bc9c64f42447dfe17562361f1 SHA512 d34c6569d05d1e680101b62745012940c1e18c1588cd37b89b26b89e9eed9bab8fc53e0585a595b6cb4c9f2bb7d603ca4252cb6a6ba344bbc24e5cc5fd8a6dc1
-EBUILD ggobi-2.1.11.ebuild 1397 BLAKE2B 8d29be7911d17b820a03fd4599e644e30fa082fe2be42687947919f52a229acb7778b55b3c73ea9079746947102240461166e9f42da3e26461420166796c37d8 SHA512 7273dff694d4baf1841c744db6efa31a624919cb610cb580b1a85a29f41c2fc93b756be9e787581d3f4cdfe76449b73772f781be1b9afb7a53e2a5e282e73650
+EBUILD ggobi-2.1.11.ebuild 1398 BLAKE2B a021bc3c9dfa0d31288950b7457e00715c1c519c49692e841055ba9ff896fcc3b72d54d38acee3a3d1d6ac34c3ba6ef3c846cc7f3bb60154f93109d186d8b773 SHA512 5f0dd19e1e7215b3b5e4e21bcf792ceaa4f68f862a325dbc1543a8dac29d3a19d051f2d42ecb09e4f3bb053f75af9d53277fdeeff04a1c82185f915a67b14e3b
 MISC metadata.xml 625 BLAKE2B 5a2e7a64c0c7739ab933c6d27850b7c56fa705398c14f3315d9d92645a8f8dea1de278847251c0b7532100af2cbd82829602c433470b31d82e342cb0e41e68e2 SHA512 bae4dd5f83c87c129b08e415dc30b11a553ea5611bcc084f177d042bf8b4cc6df4a49838f4da721153138525d20dc7ca65f0327db101bc0084a5a5b4b8c9a963
diff --git a/sci-visualization/ggobi/ggobi-2.1.11.ebuild b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
index 4898989152c8..12b5c791bf59 100644
--- a/sci-visualization/ggobi/ggobi-2.1.11.ebuild
+++ b/sci-visualization/ggobi/ggobi-2.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.bz2"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc minimal nls"
 
 RDEPEND="
diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest
index 86907a75d948..947dafc64b45 100644
--- a/sci-visualization/gwyddion/Manifest
+++ b/sci-visualization/gwyddion/Manifest
@@ -2,7 +2,7 @@ AUX gwyddion-2.60-automagic.patch 1552 BLAKE2B c106acfee1e00d8a4ade965cddab943bc
 AUX gwyddion-2.62-automagic.patch 1527 BLAKE2B 85b5267bd011125c979cdec5885e8f61fc39bfdcac864405a5d37f26543e62f4b5762129e1537ae871dfbb109226364e66fc3576340e704b671df025986846bc SHA512 cd335f0a264679159bb4f98cdac8b37357f886b49d6d98662f2550ba0b5e5d911530c31b0238574ee1b42d6dbe8fc9ff77e3d8ce985baaabc5e58a145f057ffb
 DIST gwyddion-2.61.tar.xz 4982092 BLAKE2B e4949558c52d2a6e97415b65e6816061c117868bdd2f39b341c3f740500f71dd38500323a389058b65f9c30feb9d5fd1e93bc29881b464cdb66981639fe280ed SHA512 c2fff49d52e4c439bf96e68be3534948c1fd48ade9b1e59e2d2d7d607170b5e7ce09e9cde3873ecca526de1561b028f39785dc363186f9f3d4ef0d259d313675
 DIST gwyddion-2.62.tar.xz 5010676 BLAKE2B 18012dfe050753413834e8a3734ec82989f375d81ac0242a6bbaf630da1a7741e9701d3c7a8c0dc03cfde8f93de9848ae106731f057c902f44ba1caf0cd79520 SHA512 93aff13f865fab045e17bd6c7633d714c4a97980ff10093f38c35e6dd39a0ed9680185f7a81a198522b623260cf6086d40e2b6a63a1cb59bc176eadf87fb85e1
-EBUILD gwyddion-2.61.ebuild 2019 BLAKE2B 38dd714482bde308174550908b6f54c662251efd77108f42367325b8dec799dc0c97c481856d8907a3d45f00078476ae14c9807c631382ffd44018c832a369c6 SHA512 83441b1595ba5e84fcf93ccf4327937d235807f0e6c8a698eae5585d755b76ff4c4707a6879056032eb4b3f945e42c97f160c913f497c121e937dff5d90dda8d
+EBUILD gwyddion-2.61.ebuild 2020 BLAKE2B 7437d4317f4570f00dbf334a5671f5ffe70fc8ddafb64c4abffa6ef325ccaa5cc80cdc72871a4024157f1b2e194b2d998874bef2fcdfb7660b13bc0f6cd5ca17 SHA512 782023fcbdbf597f4358afee2f303b67bc0cf4f495a6582750e03ba583f59253b345531d5755011dada7b2a385617bc975e4cf0e742f6c63da042429e2f10b98
 EBUILD gwyddion-2.62-r1.ebuild 2021 BLAKE2B 409f48953f2606f72928cbf66d8bec77ea82fd2df50f32c1952f08024b561231442e46b8eca06fc3ee626962a0261fba7a433fd879cdc5bbea0e6fe63dedfa52 SHA512 d0546c8282aab928235f102f7c3add0ca0ae675ee15e82e088e1ff200b43c414bb8dbc1b3da45d9bb2114fba59ef4b89af21d9467e0494dbc863c9f77d84d1b7
 EBUILD gwyddion-2.62.ebuild 2021 BLAKE2B fafb06a9681beace78a1ec87eb1db2fa43ea05e8422dec20c31d08dc1177a7bf96793e64c8fd2195bac48661d2931558985e0309c6d961a42df91778c3cfd1fd SHA512 65dd348786e930cf3677a7f5ae6d217879c65c9e9ec5ba0e58836dfb29dfa03355ece3486fe15ab018ec5c55379d199b1ebd45a0621d1982f6ce61fe9c08f9e5
 MISC metadata.xml 1154 BLAKE2B f5b963012cfc1842557eb4a678d9f1d3dbbefd08ea53e37306b747dd41336fe04418f97487e909a5c58eac4c97dc694a8be90be7b16079449be5269e869549a5 SHA512 612def01f5ce5f6681525c129abe4f58507aac92dc61d1d5ccdb1f95cd7625c5b79beda9eabc9ebf3e76808eeacbebd92ddb4e74476eace966d4ef4c32a68f67
diff --git a/sci-visualization/gwyddion/gwyddion-2.61.ebuild b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
index 0f40e3061f4d..ebe5c91367ff 100644
--- a/sci-visualization/gwyddion/gwyddion-2.61.ebuild
+++ b/sci-visualization/gwyddion/gwyddion-2.61.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 doc fits jansson hdf5 nls openexr openmp perl ruby sourceview unique xml X zlib"
 
 RDEPEND="
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b74583d66825..1ab1c234c483 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index fc3c407597ad..a2d05e239c38 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,7 +5,7 @@ AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e
 DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae4d8d097e8939748c9bb5d5d949be53d705d1b7d903f7ea88b2abeea91e39de16e39d2f46f0a1f62f8a9e32c6faa SHA512 3da1af4af8b0fa3cf4d3f06095524e25dc292182beec10aa2c16c5c6ba751fe469d0e7f54e43413b6f3f5bcdbd1fba3c66df1d8e39d2e1962ae36a2d9c06238e
 DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
 DIST pciutils-3.9.0.tar.gz 908219 BLAKE2B 59d2a151b114691980b8f0a0bfdf8e48b9e1a0a9976df6dbc94962c251d8bfc61e7bd3b0f3c47a4295f52b5df67ad0e44ed6f2e6a87728e213e4ef0b8a55c028 SHA512 e17225c2adcc21c9ff4253998aec5805ae5e031888fa01841a1ff680796f7515f9dd6e5c2e0588edba854f66f1268ba8e28ae1a2f794574e715fec8a8c8def4f
-EBUILD pciutils-3.10.0.ebuild 4952 BLAKE2B 9c182aa7a5d33b42927beedcb313119558f8eb5498a96e10a68ba8e21445510be0bd94d73ce62f84d4c1cda4061b6f9809132ff070edfa4d33648c2a49b140ba SHA512 ccfbbc44a5358f51aef6b090a338b748b421e14b850a9f44ec2cbcb63400810ffbf78cda08f55b6d3117aaf3cf70cf0bab54a020ad0dc04f9d37c81e891d6929
+EBUILD pciutils-3.10.0.ebuild 4949 BLAKE2B fa863512f918cad6311ce9ede6d0a6c25372d1cca82af76641c666ec50f224559e7ff69b6b0bb80c9c165fe1cd6f7cb2df16a3c6286ae5da717632b3c3f0beda SHA512 b73eba69b93d0a416ea5e4f8a2aea0838db898fada42115df8d9dc51def9d06646c356f3830fb542e0d5e95bd5f501cb2df45bf676123ecc40f16c5d50159c6f
 EBUILD pciutils-3.8.0-r1.ebuild 4915 BLAKE2B ddc1ba11cefb65a69392aad79260482827a62476200518f5d5aeac8209713b791f5fd389fcdd93c4acb3e40663180338584b17c04ea7148a5123a8bd274d0909 SHA512 ea895c2400ea0af258d0dc1151e81b3f972218f03054ddc20edf847fe053794d7286932fee44f008f53f641193bcdfd8cfac8b08800f4b0a620ae30e8591962a
 EBUILD pciutils-3.9.0.ebuild 4818 BLAKE2B cc031ea10caa35e700b2dff962f682d6cba393654b111b4ddcb61137f796e36c317527a7ff25a05f3b99902c8265cee496e11a52a8b430205fe8f3fe67aee520 SHA512 0d1c6d03f882c6fe593be6814005f44cd12f7d5a6750b85da55868af4066939a1b8551068378f45fe9d6b6e8e7c65aa1964a263c7184e6c6967c96acd30db9c5
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.10.0.ebuild b/sys-apps/pciutils/pciutils-3.10.0.ebuild
index 273cc9669f25..4accb4887bd9 100644
--- a/sys-apps/pciutils/pciutils-3.10.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"
 
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 02d548cf910f..d902a66c9e00 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -13,5 +13,5 @@ DIST sysvinit-3.07.tar.xz 263352 BLAKE2B 51943290c5f41ac6eb421a3ee1529d07bc127a4
 DIST sysvinit-3.07.tar.xz.sig 833 BLAKE2B 7a05a2d44a7006f61bb41abc8ae3d5207cc4558156e5cc553cc9477f4d1366bf847013e22c382aa9112b6c4c9c33d4a5465e73ca810a041c459a927d710dfadc SHA512 50047ce638fd5af19c3894c4dfcada3e1b2e359331b18f6dbc5f526e91f250b736625877362c7741dbd83c9fee79ec8e4e7a57c4aa72102c017b23518064733a
 EBUILD sysvinit-3.05.ebuild 5306 BLAKE2B b4e6a3e983add3f0ec16c5ad95454f8a709dc6972008b3ad5de92e3e9b0dc2976b170e4986895dab69fc1ef7014c0810d15ecdc9591c6e333490be485a4696ef SHA512 bce906a7487840595464f866f18d8e1b694e304c2b262e6406ec15b7fc898a90a520bdf4755bdcee0954f7689d7463b595965a19b5a57a11d1d41dedba27b78a
 EBUILD sysvinit-3.06-r1.ebuild 5528 BLAKE2B 11e89e1c0325eec2f3b4b2f151589ad4a40ba22608731d922240dfbd2b84b6470e7562cedafbab193aa8491857ad1b6346a3ff2fbe367ed50d7fc2f6c71279e7 SHA512 96b58a3334e704e334aadbcaae230661f51417b19c3ed19976308b6d1c8dd005e4f25e534af3455690080cded639e5e9f5b72e2ed2578df327952b71a8ad055e
-EBUILD sysvinit-3.07.ebuild 5536 BLAKE2B 63f5e481f3dad186163bb62d08299e42d6733f9c48be837f2f431e5a2838ea2a55f1ade82d5dda8f47a7e2b1fdef8643d97f5c6c0d1d46e9c2f3cc076dac4319 SHA512 0df41b232e2fb71a93d1434c6a7685c0c583aa4cb3506f6872a3fb0aa357905f356dde53d1de5aded027a5d35065895f783e58ce6f0f45a6cd3d6b217a98050b
+EBUILD sysvinit-3.07.ebuild 5528 BLAKE2B a1f6e53e828454b541349b5d1e26e0e38d0079da15c91c16a80d7cca9741c47809378b8cfdad3c9f4e8b7fd38e886570ebb6dff11d8fc0e6c5fbd10c50754bcf SHA512 5ce4441a90bb654aaadb69fd75f62b871c38a31584b891249fe87af7e26f69df5f812aa255a27f10615a53d29ed038fdf6a212a7ce4cb356e227c3da856ea4cc
 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89
diff --git a/sys-apps/sysvinit/sysvinit-3.07.ebuild b/sys-apps/sysvinit/sysvinit-3.07.ebuild
index bdfb54550c9b..25ef6bca01c8 100644
--- a/sys-apps/sysvinit/sysvinit-3.07.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.07.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${P/_*}"
 LICENSE="GPL-2"
 SLOT="0"
 if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 IUSE="selinux ibm nls static"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 6c6ab64aa931..faab43f70b50 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index c20c2992a355..327e4b574cb8 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -6,5 +6,5 @@ DIST parted-3.5.tar.xz.sig 488 BLAKE2B 001d01be154b3c2fd232c6436d7a5d21a2d006a5b
 DIST parted-3.6.tar.xz 1896164 BLAKE2B 99b6d096e4db05144c98e9f0a9a97c647aa911ee5df031244b03d5223f709d43d9302cef12dd4b2f97f42ec476510561b7f8b3b1ef7cb09d0a7c4d512e7a6739 SHA512 034a44b25718acba175212019d24f092972a791c5bd1d921ae91e17478657a77c5c5dd0c832bed7968c3a07ec6c65c0785acfac2f90c1ca5e1692f3c141693ef
 DIST parted-3.6.tar.xz.sig 508 BLAKE2B 92fbf624cfeb474e36d43954ecf6c42cf86557b99c7cd477c648bdeefb3ca2b40c51c320b20ea91075276d9ccc1da4219cd843b2916157c564c92a34a35ec55f SHA512 7c845026937b29fb49085ef9e3354226b73a1c3b5f9082d440d9a8ac13d76b1d07dae0bc10d8c974d4e57bc582f38c0a908e80718dd1ff1adfad3b04699c672c
 EBUILD parted-3.5.ebuild 1630 BLAKE2B 7f9e5b84e53d62db6ea702f0ac0a97ad47c4a3009e0d3541a02bf02ddd006225ceffed3596d1a4bcf55c09647e1a3797b795018fe25b169caabc2d8b5392fe61 SHA512 5344457a9b568c86637f7af3d2870450cbe2e9a38019ca4d8b50fad2bfe8f6f8336a7b0603444009abb6dbfc5091dbfbeef2f5cb6a1b14bdd14779419ad97ae5
-EBUILD parted-3.6.ebuild 1634 BLAKE2B 858d1cb8f7f6eb72258cd044d783fdd0174021915b6e3d89c483205465e2acf4fd6394939d448b5002f563ae90b1ecad0a827719f5005ee896c408895061e6f2 SHA512 458dc8c62385e6f977bfe458c04c74745c9ea1a9dc6dbe4db32c74841d0d38aba9324cc868dddbdf3615cac4abbd471b167738954aee005098c3721e62c5b162
+EBUILD parted-3.6.ebuild 1631 BLAKE2B cbd6b55a3fcc543dc6071f04e5d681f2907c4a845ab37a8e9f0c6a8a27bba5e72d2ebc1c43ad6259c1215706b175a3b8c6a3fdf842fa63c6062e6fffd0f6a09c SHA512 1014474d90816ea9aeb3ffb7da7aa5de83d4dcd3e17896938e5d3a480161e2be23ef43f18fec851e4824ac8a8938bd4b391bec8b490bc5ae34da6f468f49187a
 MISC metadata.xml 993 BLAKE2B bb9a50448ba4bd971b4b9d9482e473004ff1b9b54a7e2dbf838e4745436da6544927c2f7e343bb1a83f2adcdf413a30ac0519b6aef2a72e4fbdde49bd89c930c SHA512 315a27fdc2a333892dcc59c39efdc7383f4752a52783f893516d66f83993c911d231d6da806dee048d8b76c96c4bccb5b2cb408ec5b0b5ffad48f7ddecf1b592
diff --git a/sys-block/parted/parted-3.6.ebuild b/sys-block/parted/parted-3.6.ebuild
index e1ec395c0bcf..0a908af8cbe3 100644
--- a/sys-block/parted/parted-3.6.ebuild
+++ b/sys-block/parted/parted-3.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+debug device-mapper nls readline"
 
 # util-linux for libuuid
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index ee99106dc012..e3481133429b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index c8a931761735..6383f8b7a1bf 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -28,8 +28,6 @@ AUX ceph-17.2.3-flags.patch 782 BLAKE2B 08cd4fefdce90bc42b9c4e3caff805b1d8c9d011
 AUX ceph-17.2.4-cyclic-deps.patch 562 BLAKE2B 4562e7b6afdb23e2d0c65c5db61aef6ce7d313716ef1e40c5b12a6afcb91ae8a38ead8432fe6ee93eeee12444c5b971d9c2ccb866c20806b8f3a57c9d8668b3c SHA512 5028bda954938a8718be6bc4729e816a178a2f47c3a2eeffdcb6b357d054fe236eba54fb0067dfbf6f6a78b5f6d805fe427f0d2e5b0349a08b2404604083132c
 AUX ceph-17.2.5-boost-1.81.patch 1456 BLAKE2B 0dbff43d17f099242e1bf0d44f6c46c6175a4c9221fdd904a152cab8a1105cb94960b7519471d86a359c35a356a7c793de2a2ac7d3cb7880dcb044ad93ac44e4 SHA512 2dcb4d7e42ab71c97c601a7171075077966c6d3bfea1a0cc7676bcc03bb3bf5a4fca774bca571c908a6450098b48951ac5fc12f6121e015b6ac56deb5d514048
 AUX ceph-17.2.5-gcc13-deux.patch 2775 BLAKE2B 9ff9a80a87417206099490d47027df0d758aa5347a09840bc736a1a7a26f613226e681e2ee7a77d85ca9e97891ca79013ca2fd33500216abe5bcd2b4895b7226 SHA512 1ac1d35c77c608fe3bb0dd0e965817ff2d4eb4a02216f7eb41a20c505e5be9eccac729c3490a2466d3251f314442296cfb7b110c62828f584ddb5bab6116d02c
-AUX ceph-17.2.5-gcc13.patch 2917 BLAKE2B 9c41c0490932fc1f28bb647f7911189cf440517673c98b09c50a86467cd4478d11067a14ea57b10113e67e7772525cbee525e2855261322ff9e8cbd47a3268c5 SHA512 a0c720e624cef883c0360d043a4c3d49a4dfca2f0e4b3f73da9318615a3a5ff506baa133a140403b9a90fc87bddb6fbe58691f629f1cb689a21b732855343b44
-AUX ceph-17.2.5-link-boost-context.patch 492 BLAKE2B 828665f353890d92b586928421d6eee837a095c371e458d166cf6c6e9663b5ca9f71f74961c3db8731e042c31153f766457813fbcc50114631bb569a15f683f8 SHA512 b794685a7b6fc36267ea668232e12cd480b307f207dbbeafdbc874147925c24bc5497b7056106f2c1feea197835856aaaaeec399fe53f76fc274dc03c9d69a5d
 AUX ceph-17.2.5-suppress-cmake-warning.patch 370 BLAKE2B 225ee73ddc24e3b398243603292949da09417c4c928daf0328729d8a69a475e6e5cdd2c9911c4c2ff6f3a6fea8b785a210e4beab5dc7bd910e390e84aa8e4b61 SHA512 e71ead89e494ac5639c08764b4d7bc3a96f87bac4ea8f9adb3e29c568f5d970551bc568c55adfd1b21be575db39a6f494de3e9d091d4ae8c04d2d5421be24f4f
 AUX ceph-17.2.6-arrow-flatbuffers-c++14.patch 3905 BLAKE2B 89e1860ff9be4ae899d99f71986a6616636dd8f5c6e1e06fdb2f5500cf86eb374b65f0364b4ca23e3c933ce3f705a0c0b6125bac77b4d66cb76ee1b4a289ba43 SHA512 8be91877d6d6f64b385e8a3914be761ecff8fb6575480e054aa738b036eace86a4dc923b3de6f554925bde55e95b2a26fd6bb2bf6ec552b12db0801600e50a60
 AUX ceph-17.2.6-cmake.patch 3014 BLAKE2B bfe19b9667c6b2952b8d09978404d6c1600572ab8adfdd4533a6dd6249d87cefef7da605260612f78a35d9f6af177487bb0a5db88a42e5a8660fc54b0c12ee5b SHA512 b007de53dd0e1e1cc972c9c98205d0957e0d568fadc2d9e4588b5c13e80e4f24915c0e48b347093c7039b3a7e43ca6e9c51a0ebf51a016270ff40e634857ba68
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch b/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
deleted file mode 100644
index c23badcc5e09..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/878531
-https://github.com/ceph/ceph/pull/48661
-
-From 74794f9d6f5c6671438085bdba730b504901a7c0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 28 Oct 2022 16:47:38 +0100
-Subject: [PATCH] common: fix build with GCC 13 (missing <cstdint> include)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Needed for uint8_t. Only worked by chance before (see
-https://www.gnu.org/software/gcc/gcc-13/porting_to.html).
-
-```
-FAILED: src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o
-/usr/bin/x86_64-pc-linux-gnu-g++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -D__CEPH__ -D__STDC_FORMAT_MACROS -D__linux__ -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/src/include -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/include -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/xxHash -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/rapidjson/include  -O2 -march=native -pipe -fPIC   -U_FORTIFY_SOURCE -Wall -fno-strict-aliasing -fsigned-char -Wtype-limits -Wignored-qualifiers -Wpointer-arith -Werror=format-security -Winit-self -Wno-unknown-pragmas -Wnon-virtual-dtor -Wno-ignored-qualifiers -ftemplate-depth-1024 -Wpessimizing-move -Wredundant-move -Wstrict-null-sentinel -Woverloaded-virtual -fno-new-ttp-matching -fstack-protector-strong -fdiagnostics-color=auto -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -std=c++17 -MD -MT src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -MF src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o.d -o src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -c /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc
-In file included from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/log/SubsystemMap.h:12,
-                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/config.h:23,
-                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/mdstypes.h:13,
-                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.h:21,
-                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc:1:
-/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/subsys_types.h:56:23: error: ‘uint8_t’ in namespace ‘std’ does not name a type; did you mean ‘wint_t’?
-```
-
-Bug: https://bugs.gentoo.org/878531
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/common/subsys_types.h
-+++ b/src/common/subsys_types.h
-@@ -17,6 +17,7 @@
- 
- #include <algorithm>
- #include <array>
-+#include <cstdint>
- 
- enum ceph_subsys_id_t {
-   ceph_subsys_,   // default
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
deleted file mode 100644
index 9ebc70ecce9e..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/src/neorados/CMakeLists.txt b/src/neorados/CMakeLists.txt
-index 3c7aee7c6fe..bda666ea95b 100644
---- a/src/neorados/CMakeLists.txt
-+++ b/src/neorados/CMakeLists.txt
-@@ -41,4 +41,4 @@ target_link_libraries(libneorados PRIVATE
- # install(TARGETS libneorados DESTINATION ${CMAKE_INSTALL_LIBDIR})
- add_library(neorados_cls_fifo STATIC cls/fifo.cc)
- target_link_libraries(neorados_cls_fifo PRIVATE
--	libneorados ceph-common fmt::fmt)
-+	libneorados ceph-common fmt::fmt Boost::context)
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 803330bfe6c9..7ac091fce9c7 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index b194e891be91..3c570b941a41 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -5,6 +5,6 @@ DIST bmake-20230414.tar.gz 834843 BLAKE2B 9b8a26c0bdba32386a562ef93cece79837951b
 DIST bmake-20230512.tar.gz 841752 BLAKE2B a9f1f64515b72ff84c2f1d2b467d3c908b3bf233bbba8feb6d11e5d44fbeadf4a675557a7412ed3b2ae395a7a0ee59b165a6a29a243cdea52d746e8b973d513e SHA512 7f1ccc4dad795827d15f7ae3a815a7dcf64ed6c9b31b25684efa42013fd4046de65d1f60130856ec4b2a3bb37a63a8cb7a984cf7d132f9169487f2d41dc4a1b7
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20230303.ebuild 1280 BLAKE2B 8b0a901f552c84562690e3543e66cb388b9a3415ecc83028748711982651b91e75fca5f6e4fbff17b5db3ec52447e9f03b56589ff991e41be979a1026f221389 SHA512 99320a95fc86b80d9449be59e98acaab416c69209528ed0110b00e1fe18b8739a5e8100c8f4a8bb302c6e1ea4f7930253ea5cf69861f5172b02fa987d3bd2f97
-EBUILD bmake-20230414.ebuild 1293 BLAKE2B b75d972463de1ebac6bd0f7c2335c2f68c1b5950d64b029735ce766deac920aaf154d00e2a1656e8a313be6876d0bbdd249e0ce00ec747c20b2490995781184b SHA512 a7b05ba1bcbe5e2b65018ce985a2aa19a99d48121e06bc7c7f69c50822fdc2cd67f48e9e979c912cad4d2bc3a79739af305721cd39dc1e7ed68d0301230ec5ab
+EBUILD bmake-20230414.ebuild 1292 BLAKE2B 7f3399acacf8307502acfaeb78368e1e4bc64f8218f44cd8ef91a979f1af7a725edc1f11fd500c0064b41ca9707ea3ed95475d8f42d3d11be20047b7bd46181d SHA512 80341c1ff1618d479289058d1b5c90933159aca68154df6ec46a88ccd95d60903ca96d9194f878816ed9efccf6d4440b10af2f93eb550a3abd016b2f2df6ac09
 EBUILD bmake-20230512.ebuild 1293 BLAKE2B b75d972463de1ebac6bd0f7c2335c2f68c1b5950d64b029735ce766deac920aaf154d00e2a1656e8a313be6876d0bbdd249e0ce00ec747c20b2490995781184b SHA512 a7b05ba1bcbe5e2b65018ce985a2aa19a99d48121e06bc7c7f69c50822fdc2cd67f48e9e979c912cad4d2bc3a79739af305721cd39dc1e7ed68d0301230ec5ab
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20230414.ebuild b/sys-devel/bmake/bmake-20230414.ebuild
index dc8808996535..f294ab58c44a 100644
--- a/sys-devel/bmake/bmake-20230414.ebuild
+++ b/sys-devel/bmake/bmake-20230414.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=(
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f287c07cff4e..8a2ded98c6c2 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 7590c57b4c80..b98184d8dbec 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,6 +4,6 @@ DIST xfsprogs-6.1.1.tar.xz 1322528 BLAKE2B f6551356ccc68ee6d0bdc50edcf9717bfc940
 DIST xfsprogs-6.2.0.tar.xz 1324216 BLAKE2B 847ad267b3667604c9c6a30857605e9cef0f184b7c375d0771b29a0c9596f621a819cc4e88af939a3f9a3ce14a2984fece5e70346bc673a5982af6eebe3909cc SHA512 71c04f744af9f4f3197a9c6eb468574d984c1532753f83f0bcd583cf737b89fab034442c072794975c813ea168572b39ae43f28d9a0428204be2fb7f1e141fc5
 DIST xfsprogs-6.3.0.tar.xz 1328452 BLAKE2B 47a4ec45c88f26b32debd52283602d8244f996c071853b6bf7cf905f917436b1324bc9b58338346c8255201629d69e771d6c3bfd81f33f4f3c3907251d0a6c8c SHA512 dbb3e77d0d9cf184a0e647b8231350401a7549a23a0bfd9121cf2a1b48e85f71d98329dff440fc6e984bcecfdcc2a72f0f27c4989560f3c55359f21f3fb434bb
 EBUILD xfsprogs-6.1.1.ebuild 2341 BLAKE2B 12fe7c625284cc2368b928f9badb2fdb762b14ba6355afb160b7b43ed2763941b7ffdbae2ac84b01df622e4bb902bfbc77529c591eff6622a15a4294e102e4c6 SHA512 2517098e1bf9f51c9baf7ee5fe4bd8428872d415365f67e46d9a6930f1c7d82119e3463af6ee21dba0d368500d1e3232eb4af69eb498fae96af7131e5c525213
-EBUILD xfsprogs-6.2.0.ebuild 2364 BLAKE2B e00119e4999415c715c0ad87db59e0874e5c6f3fd4b295489133a3f6c21820d0d0556882c4b5e8328ff27271a45d5a6842441f384176c074e6723d147b3524a5 SHA512 91a6c109441e18b526c830818192b1759a7c8eea552586f3870a2f6b08519af90af35f2273a3f8d07b89ed18453a0f263f6597b1334099b699d0dec9087b9a43
+EBUILD xfsprogs-6.2.0.ebuild 2359 BLAKE2B 4827f85c30911f45c0e2b312a90b3424f6ed80d0947df4f713b2f410a6d3c8c4f496a46d8adcf786e20522da2528fbd0ab999e6365a748f4888ad76dddbe98c2 SHA512 a2b7afb3265929938276dfad70b819f168eedc637643ca9880f4d74271015b3ad1d8f8ae32a77d077ad907b7b1b7228d6f8fe35ba243ed1b062a2d1b2854eb3c
 EBUILD xfsprogs-6.3.0.ebuild 2367 BLAKE2B f4fb5ae8beae365feb7d0b16ba034a089d43b440450fb9f2814cd7f44d868c0770d7415ac0bcdc421db9270131674d05d827603ac6877f449baf6fafd58999a3 SHA512 53c579ac829b01058b9dfa26d7547ea68f89ac3569e2a000988fdb9072b5bf7560eefefc040b555bdb03cab3a94cd2e9bc85651c785d1deef694a2b0ec6b1274
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-6.2.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.2.0.ebuild
index d065d22d5961..f9a26d57b3d1 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.2.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu libedit nls selinux"
 
 RDEPEND="dev-libs/inih
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 4dd4ff72fc3b..3ed6b61286c5 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index a0962558ded1..d77969e14a74 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,18 +2,28 @@ DIST genpatches-5.10-191.base.tar.xz 5394880 BLAKE2B 604549d0789ee4ea8b965b4aec9
 DIST genpatches-5.10-191.extras.tar.xz 3868 BLAKE2B b0c035f8e43faf78344a1f413c6030fe2001216bfc9381e402e3fee7edb3cf2798042a3a3d62db2b429f53d6a68b445fb25c9c0255bdbb85d5df00c6388584b1 SHA512 dc29b28784cb160ba0a24921986b905efd8d624902b00994829b99bd383551da0b1b4419ec8b91626b896cfb3997480a62fb9691b497b01f331db1450b09fbb6
 DIST genpatches-5.10-192.base.tar.xz 5401408 BLAKE2B 1e84821002dfa2af4f57f5cd3addcd037524cbfcf9e5cb7171725363457c6503f46b5bae92ff04ed3500e28daa1c9ab61dbff2495281732b972300284af3e7aa SHA512 edbc567165df20906acc7425d56ea7feeb3e9d402ea0d175a3c627b300eb33675552ae36248ccefc67584e2120f9e3f098ce204e9aa3858c443ca58c1d34418e
 DIST genpatches-5.10-192.extras.tar.xz 3872 BLAKE2B 8ab3d00e158a52558ee28b82235fd1df510953207d18073ca2fd8114c64c96742ec69dde5959273c451803b0f534ed7351cfcfabe3291bcd323cdf4d317a5610 SHA512 a93b072d731f9bcd2e4d50af05902ab50b9145aa5e5b02141f203ad0b4c82b308c0cb599fa6f790b84584197c65270ec701ec94a321f39e745625803a3d6093f
+DIST genpatches-5.10-193.base.tar.xz 5429232 BLAKE2B c8ab1eec55b3e282af48601c93a6e53a2974e7b255f56346954c93976ac9870117d91a6b9e8809cdfd0cdc27ec4a3eb292e7d9b10de6ecb7b8c54056380ee875 SHA512 44733f8f09f34bf792d0c7dfb6915902a71a234e8e4cd975316ceef23fdf414b01d1e97e317e48dff7af38ac2a04391ddbb0b8ce97ca13088eb1518bccf44390
+DIST genpatches-5.10-193.extras.tar.xz 3868 BLAKE2B 5261a2132d49eb98e7e292f577eed23ba8da86f3b05b57a75d15543dd1ec0c424f4dba04a39aea6b12e320792a9f0802be6d7876bc64a1f864abed03fc8e0c36 SHA512 5383cad41ca1a0fb2933de4fc07207562ff572231f17398ab9958012b3f27d382b2043fbc9fbd784ec1d5f666f0baaf27e75d0a31473c56779f4cb1a32d89707
 DIST genpatches-5.15-120.base.tar.xz 4681108 BLAKE2B 7e69c38991ab3b5ec949f48fff8564c854017b8bafac61747eede20f79d71dade59effaee29fe849b1fdbee7abcaeeeef3f55a39b95b96bda6a70af05a905a68 SHA512 2be319896281e7cab1646da40a3067c3815270ff5fb29edccda9138862a39ace2192a1cd38a4232bc14ebed0d6c0c877a9fd58f225d7cedca743664e2a993025
 DIST genpatches-5.15-120.extras.tar.xz 3932 BLAKE2B fb00b97c8b61234646388bec0dd23a1310a7bdca9d04a2048a32a4e30605662c7001188bc125170aeca2ded63954a71b612908286aeab06928dec00cedc76902 SHA512 c2b6ee91b3505dae7fe78a393001cdf6ac7d0020f8123f14d961b90d1424144996e182fcb5304d5890c041e2d940a960bac0795ebc22e85459285b16f67d9b3f
 DIST genpatches-5.15-121.base.tar.xz 4695588 BLAKE2B 2bbc7102194c0526cdc1f2e310871756ab87e5edf35273c41a2a8c26abfa56149361a2a8af68e215e14912bf2238c7610f60f69f88916404781488352fbdd95c SHA512 822e207359ef8ce3894152de6aacf66974d8b8bcbc5329dbcbda379cb6dc81d348ad9a38022abd05131c1a4df955426da25bf37b83ac06ccead4aa1277b2eb36
 DIST genpatches-5.15-121.extras.tar.xz 3932 BLAKE2B 22ef45027450ffaafa2637aab88656c56fee375fcad14403693f94894cdfab96bb2b930cec4852babcb4bac86b07bbc9e6e103de7c871b91ef3004435e1cb785 SHA512 92b785c17dd171871dbcd841810c1e7da4fd7cc5027040340dd90f6bf97153dd0e300a6bc33e61bc7354b6e6648e3bf718d161ebacc5a4ed3a3e86e885181ff5
+DIST genpatches-5.15-122.base.tar.xz 4735096 BLAKE2B 10746c787ab70dc82b688b8720144b80719ddd7f4719e9fb2215b667ca7806b2e8c5626dd66b46f20c0e6d7e05352c84eea9cad93327fdd8edceb4fe52f43416 SHA512 65437aa0e53effa3eb84e3d7b2a0497ed4f4ef85fa96e75a8c591f27a610629193094c6d03dc676c462cf41a55bda5b5277c14726d48ea6ed59e8edeb92105d9
+DIST genpatches-5.15-122.extras.tar.xz 3932 BLAKE2B 35fdaa40b4b4e297df7f8702ab017f4c49bbca2aedc652c6e5ba8fec6b1573a57d17a9c7b21f03b56b43d9bc888e3d55354ceb92e84dde0a89983dfa1c3ffc16 SHA512 176deb6aef0eb9dace274bc4ca0f29a8d657461583dc9133feb4272211f910313fbb69fed308705f00c1c6d86845f1e961ea0066b09b42cac75a3579b3d3ed14
 DIST genpatches-5.4-251.base.tar.xz 5798892 BLAKE2B a519f23086a440d560e5301b77aa1a627e97d9c2545adddc6fdfe9b55b35dcbef285a6e92d4ab615b517177723875a53b6b5f1dc9c237dec3f23acb511e08be7 SHA512 c8d228cb18f2c64631ee5a40d7de58e78c7fd2c452f54101d0e6f67149d5d3df30076b461dada5bd862e4b97daf30a6d15c3f50526b46156d9ffca946b3c65d7
 DIST genpatches-5.4-251.extras.tar.xz 1812 BLAKE2B 440f5d63b80e31753c46c2c2bb07bfdd257cac6847dfaed63a19c9e255da0e6ca31f5535718572afa143918bbab9d8651b0d8462f5bce619866d78acbc063682 SHA512 54d1ea7625daff0c8d50f8abfba616378d8bc4c62cdfdc03648bec9312803464d0c662bfa619c357a73247c00b22b9725896cec5aaefc66ef811e0f97ff62e91
 DIST genpatches-5.4-252.base.tar.xz 5808300 BLAKE2B d5cb4fe312f469a331269eca8604d9c43feca79bc6778af670fad859de3098c31cf0408fb58d95f233564e0ab2eff7a45ad041b8fc6bb97be0f93dd911224b62 SHA512 4970b66f064f53db230877fed6434e39aebb727438465667af6eca8603b712089830789c16bae5fe0249dfed0cb4bdbf1ce695cc7a1ebb6ab64bb61b1b38a5cb
 DIST genpatches-5.4-252.extras.tar.xz 1812 BLAKE2B 07013e9aa5c8a2380424df700ac7ce592732316b97d6605ffb0e75270b9b08716030a56ae78b9f09b9e314fdd78ab8a8bf986ab767eadfe0a58cf2906be52b17 SHA512 3070acc7127a372f02479f4eee5f465dc3c1fe1ac3b4c2ce0af61d2fe091c509f7e7ef2af8564eb178efe031ac5fbf2f23f48bce4ea54d4500e1b1eaccea6340
+DIST genpatches-5.4-253.base.tar.xz 5855284 BLAKE2B af86d19abc80339eb77bad98df5f404ef5db39584955094c54726d33f6a825c495d835c1f809123903debb2c31c6ad3f07d077978d10c6dafe8170cb60087c7a SHA512 5b9895d2ec8b5080802675912ea8419ed892693f82a4098e997fb3b6ce92844d605a865b31a2f06272248ec2386e36a0e9f74c163ef28e4157f29788c0e7eb5f
+DIST genpatches-5.4-253.extras.tar.xz 1816 BLAKE2B 2d3492cefc1abb1b5f35c375afb99892eaab0b90f2b5624560b5dfa4b89bc6eff729ed81737e04e33f78e66b74835a8dee260cca14261c5d2a88644b1b30f8c5 SHA512 31a201024441c55f5477b431aa94a2fe4c98977bb9c1a359af07519b8a204f16189f0595bf71aaddbb88c88e73ef918dc3943bc0a17a2a573cf34dd68dcbb211
 DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd SHA512 b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
 DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B da087dc0f3e1f683b025c16f9fc4c60fb041d9b1a7c886f6b235dbf28afedda1283780298add52e211d4bde198247413c633908f891f6d1464bf0caeaff76f26 SHA512 528ac52eb398dc272a0011384c6ca4af72cd7e0b4a75f5c81d71c8aa7b04a11b58ab5445b99bfb53bc559e99e5aeb42dd9479aa8c8b2d42510709614de75872a
 DIST genpatches-6.1-37.extras.tar.xz 3808 BLAKE2B 020021d322f4240a950fc572f3442e554645419dd64f5e15ddb44e77bd950fa41030e5f8143949ac9e6a96eabf392d317fd7557a9ddeaa84b3979d399cf269c8 SHA512 9b6ffd0a94028f2bcfb3e8a1e24cc11f722fe6637b11f3cf9e5f21883291c456108bc2b7014d5aa5733ee77db2d2b9c196bd429b70fad3a6435b5c7773f37823
+DIST genpatches-6.1-38.base.tar.xz 1956240 BLAKE2B 65193574bdd8fdf4dc5d78af616729db4f8e5ed4ad6fa22baccbe27cd0518175fd02acc218074c709b86831eda460a99013b2444c1f6ed358f545a3133afdc00 SHA512 d8015efd3980cf82f499a813589affc8d7b6acdcf748c17c9b3a4b41730676443611d6375e517c633bdb8d2119b1cbfe50bd8984885fd97c29455f00078d64f7
+DIST genpatches-6.1-38.extras.tar.xz 3812 BLAKE2B 648c0054d5088b51d17e8b825153c7fcc7988d973811dcae7ccd64bcd78b4634d410aaa848b3cb31272eec552ad410c705388b8887603d94b6cf5a5170f7b36d SHA512 313a119b47d954ebef9dea3a48024a8d4e7f3b4b62de74f19acdb997ece3e198872fc3c50e10171687b07e8bbf85c5b7dfd80045ed7184460fda3c68c29e8b9e
+DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50 SHA512 7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f
+DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B 7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae SHA512 f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2
 DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
 DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST genpatches-6.3-9.base.tar.xz 517548 BLAKE2B 1cb215f7a6dfb9723ad2b784aa463e097686e7aa230f50285f55167590d2e673f986081a9b2e37ff8f96ad206a61e2bc34ce36b6c22c652584d7dd6a18ebe20d SHA512 039e3c8bc8927d1bef377b451c957bc394186061fcd6027defe34df59000e40f2aae9924189e8e10d240fcf2197236e97f7fc5cc924c18917349e2c74a3d2125
@@ -26,6 +36,10 @@ DIST gentoo-kernel-5.10.182-1.amd64.gpkg.tar 66375680 BLAKE2B cfad675c17a5c4aa26
 DIST gentoo-kernel-5.10.182-1.arm64.gpkg.tar 59371520 BLAKE2B 66bc7e28658473cd2b43343e2d88d641b4653594e50e9963c3ef79b8523fc0360c4da460c7454715770f3573ebe313a463b3bb6fa0786dbec9cf697d498a75b5 SHA512 7085d1a293e39e2e25c02df55d181961a4a82a5aadba75cba6ef9602e423c5ccd784daa505ba3c992c120c8ec3da6c0aac9dc4f3b9f8060affc6ffa5237c5496
 DIST gentoo-kernel-5.10.182-1.ppc64le.gpkg.tar 54927360 BLAKE2B 99fe7ac3443a169260e1767e14d9744064ffca52a3292652dd28b2547434d1d045b0064dd10976d01a46b718fa3d6798b5e04c0c0cb923edba493715ab1a6043 SHA512 4a5ea6a9eca8346adc43285bd14e5ae641cfc0bba783139f119d641d940f68c4fa8b4544eec814d5b6f2dd1885fe30c3eeba8779272171d2878ef23dcb7f87f6
 DIST gentoo-kernel-5.10.182-1.x86.gpkg.tar 56473600 BLAKE2B 89eb3861a308e16530166ee0e380e5392dfa6ac5aa912241e4a519824df55298e3975d025dd874fe9a0c9f683cda04df84ab062f7109a7b1697daa6b033c0616 SHA512 50565d44a3e02ad07275c2547cf82a48ed48cec9aa4344dd024dd0a7ede6df431204b12b6d370e10192dcb8f24752492ee09fa55866429c27e997a8792b51f28
+DIST gentoo-kernel-5.10.183-1.amd64.gpkg.tar 66365440 BLAKE2B 82b63f83720c546ad3ec1bcda9cebacd31ca1ac5a14e89983b9478e1f76ddb33361613bd6719a0d02fb50251637f36b0686fa1d5b32d480bb73935ccc34505cd SHA512 9c6b0275693f2090b1e566d76bf77f90bc1a35ab08a5b9ced79cd77be9fa05f1162a093a4140a269c409bb656da2e4fc7ac61b93b371758ae6ce4d0a6484b9a6
+DIST gentoo-kernel-5.10.183-1.arm64.gpkg.tar 59371520 BLAKE2B a320f17295fcb6b4327d07fca111025a6757cbdfa6047047ed27cf00b83c3a2efcfa5b29fff3751d3ba79ca84c76d327ffe30404f38033f9199a24ce43a98273 SHA512 51571bf9e8067c9ade5da541581902c162ab4421575c8df9f2e738041968f56b77b4caa57a70f75dd7ae712b216bc8c999f9404c20c0627609dec5c4960d2f2b
+DIST gentoo-kernel-5.10.183-1.ppc64le.gpkg.tar 54937600 BLAKE2B 62c7f5b8d306ed6fc21335d0409ab640bebd3b1af451369126843023c657c7b96dcacc4472e6f89463e6bc1531406731d6c3253b6cde1441b1d1b29d0bd34ca1 SHA512 25b662e19f187f44639da56b7f17a40d2617671f4dbeca7cfa7ec660cad5572fc610d5113c42fbc8fc2edccde845b89ad23376b8354f6532f6d77ba84baba516
+DIST gentoo-kernel-5.10.183-1.x86.gpkg.tar 56504320 BLAKE2B d072c8795460e39d27527c32e6d96488c870cd3bacbae085659c21b18963ca49cfe729614f541eed5bad71ef8bb40a1d77b7e7ef2eb512cab2796def6c0f75ff SHA512 38f271474648d63b08517897ce46b325a9260288bf92fdf5898d954c25c4e74306bcc22db53a830913cc605bd1317892223d2fb65fc04fe3c91f2eb7cb633ad0
 DIST gentoo-kernel-5.15.114-1.amd64.gpkg.tar 69539840 BLAKE2B bcc43fe6a4e17363f234a4e1bbc6cb4ac64f3d39fcf80258a7d3b3d4951ed92b165d5dd7e2f0921ccb75300f8a9e5058783752bd2b4944ee30c33e5241bc56c2 SHA512 bd63fc27132d722391a23884d60baa5cf407c223d519d46be3c47eb5c9496b0542cab93ce2bd7c7a4d8d52e19b8dbdc6595a6bd25ddba89f1a467a85aaa4be8d
 DIST gentoo-kernel-5.15.114-1.arm64.gpkg.tar 62515200 BLAKE2B 985311a49f8314cf5787c51dfb683a4372a842a4976352f220775afa8c335ed73e15deaaf3dc5be577d4ef9552dfd6e42bdb75295836aa71baaffdb75dfe24cf SHA512 3b182db4df94d3ad44e712284fc83838ba3f1676639fd57ace8d9346429f4dbbe3b011fc86317836fce2c240d54eda363a1465aa9e514eeb5dad9ab533a7bf9d
 DIST gentoo-kernel-5.15.114-1.ppc64le.gpkg.tar 57118720 BLAKE2B d825703befacdea4409fdece540ff5f940cb7b91a57e8e278cd3d345588029f0a355b16256071329fedb04e29b5b43d07443591fb1c238a3e6760cd89e0b5b1f SHA512 bb734a8e2223ca26fefc4fe3234429fde15b3c6368544b9a45c7115253280c43ded8795ab2a0c02988d30de90ee71167145336be5476cd1b4c43b9a68f2a7a92
@@ -34,6 +48,10 @@ DIST gentoo-kernel-5.15.115-1.amd64.gpkg.tar 69539840 BLAKE2B 8a2b8dafe4eab7fc9d
 DIST gentoo-kernel-5.15.115-1.arm64.gpkg.tar 62515200 BLAKE2B 69432d84ffbd28591e23dca581021027c37a8a5440c06267a8858ab2c66ae18e5134f510b7b5d35651d2703055216a4c9e26045b4e1690ca2d47027a7fb37935 SHA512 beffdb2604fa10f9502a9596af00b80d930ccf2d528aa53c15a1fb025fa2b594289becf601b8ce3b0919eda17da0f0b54946770c12178d8ca2473b9be498e0cf
 DIST gentoo-kernel-5.15.115-1.ppc64le.gpkg.tar 57108480 BLAKE2B 1e1726f5c97ee2c8cf8da7a64d40a3e1023a81db30fdd50da24400fa6ea9135604d7de9801cde8e31a2ce52b21a7994e63cd545a5cb2f20785d77eec417694f9 SHA512 08230ae4466fac1b4b961398de4e5c2ee9e8514d10eefad44f6b91272a478a4dad31e02ce7a05a3298d8119e5ff8412f8f895edc14ec39dde07a7401d69fadfa
 DIST gentoo-kernel-5.15.115-1.x86.gpkg.tar 59125760 BLAKE2B 9677e10f53e21ea1132187eb618b54cb28e0922e42af750f8cfb8a6d2761da72544c6ec81380f8007824a94445c34a6f266e7491a41181d9a8d84516e24f0163 SHA512 85c55beb7d88e31c8c14632486176a06147e27ab0df8ef10328b2b52d737b094cef843e5d4c5f86661421d6d2dadc0cf380f01360ed1d8af64a96892e8235c58
+DIST gentoo-kernel-5.15.116-1.amd64.gpkg.tar 69529600 BLAKE2B a58fe916a4100eeeeafd7e67b5f7efe4fa32ed0a39d889a1f27bf62935d44c1b182d32eb79ccda4f3073dc1a3fe4a4a7c3889de1093d94b825cae5215fccf1a1 SHA512 34e7a29ef539760efd1f9da390d8f32fd3811090683627dfeb9f122097a408246a6a814e31faff47a43345138bd823200b3dec734ea73fbf3432ff2ceb59e9b2
+DIST gentoo-kernel-5.15.116-1.arm64.gpkg.tar 62515200 BLAKE2B 545af09a8f743b24d02c06736c7e7529f110cf7a84519f44613b6785d4942407fcc94896d5d39cf1d2b31132fbeeedfdf9216d0e7b0823f911ec0c22576d8e17 SHA512 f8305c6647d8dbd1fd8998aace059344f3af644d6ee7ba19f74a3da14a745d3880820e91faddb4a6c27d502faf40186e00c4d719c124926ccc1eb5e0ead57257
+DIST gentoo-kernel-5.15.116-1.ppc64le.gpkg.tar 57108480 BLAKE2B 9d357d42a7f550626553a382dd7afb325c5f4741c10bc065406cfc59e5cc791e0f7e28c1da5cff6950db24ddee4828326ad45b705aee9510041bb91940d35e63 SHA512 2e65a97d98f003df766e583e6891caf49b9bb197268f0fb9c288ef94e2e9eb9daf46884ab96d5758be592cf790b5b5397cd674c34eb820a8514baefddab6eba1
+DIST gentoo-kernel-5.15.116-1.x86.gpkg.tar 59125760 BLAKE2B a0ade34587b0d1c1850bc0bc693cba0665c19376fc89065051bda33aa9e0d488557831f2864f3eede8991a94868a364f9fc7880aa279944342236c2935dd9682 SHA512 1730cc90ddc07b07707d7bf65c53920906e62da239b1f8a6f30d386000409679e54afb63722995f1c13c43393bf309c93da2964dd8262a09c1c068a69e0fbf9f
 DIST gentoo-kernel-5.4.244-1.amd64.gpkg.tar 60528640 BLAKE2B 304077b1c25137f15984e4ce6593519186eccdf491eb98046a12194651ad973d9cc3a9bc83f9806b637e3898443c9fc0f97449528df6dd91c03ff1948dadb528 SHA512 a518e841d3b02afec7118cc344476fea2d643c9e71289bff6085e3bdd7b77e098e609b1d24336426192b5c22789f34e779d97441c6d5d22cd2b9d61b5712a9ff
 DIST gentoo-kernel-5.4.244-1.arm64.gpkg.tar 56535040 BLAKE2B 11eb5cdfaa750cb84a64f804af672834d971e8bc8df67d3c86dcb3274d710f4d4fca4ff8d611b520dcc3a9fb4c36be1892b7fc38d06bca84545ecdb4ac21cfdd SHA512 ba63594c7546afbace4eee7102c05d66f8d93d596baf889b0224d753d806c96715a8f2088237ae1142ab7b1b5cda96fab38a2af1600711402ee25aa2b5ce016d
 DIST gentoo-kernel-5.4.244-1.ppc64le.gpkg.tar 54210560 BLAKE2B 879d7c2ea090a0f09a5852cacd2409baa0efcc8436f266f02730f107ec3dfd90ba561a35bd83c5b5a7bbd68a193a4e5062f5bae1cd5fd7aa7079ea4d59b2f2cc SHA512 2bc13bc6f4823c2316d31c25494345abb79db4261320209cbce07b504eae4e70e41bc95af6ab4c01685fdba610836d5dc4de21e446972c31073ac0ef8ab80da4
@@ -42,6 +60,10 @@ DIST gentoo-kernel-5.4.245-1.amd64.gpkg.tar 60528640 BLAKE2B af046a3be180db34170
 DIST gentoo-kernel-5.4.245-1.arm64.gpkg.tar 56535040 BLAKE2B 3a4e3cf0cbcfe1ada3ad64d7e3e67e379849ad86ac3a485548198dd0f41cc837ae4dbb25525c7646308a28d084d55e9a0abe588bbd92bac8501d21a56db0684f SHA512 8f84e1087cb3ccd2e90918b2c99daf6c3596ad35fb9452e731b78e8ea0886d33bdb6c356daafcd429656228e0b34ef46b0c676b276af7e4e1d6f5ca5cfbfca84
 DIST gentoo-kernel-5.4.245-1.ppc64le.gpkg.tar 54220800 BLAKE2B 536a5a181f908e660361c59c3faf103511352fde966b2a01b7db310097f4d51502ae29bef16891d2518c8e645c7c47efc25e9af4ce7c4aaa14ed0b01b0698fda SHA512 3e2e237a7a0ff5d37a157ecea98fdd59d3623a225ad725d76ed239204c83d8cb3684462b4401a8738550504fa9aa954e185fd6a53a3e5e796fd2e0a93dd5ff92
 DIST gentoo-kernel-5.4.245-1.x86.gpkg.tar 52469760 BLAKE2B d251067b03af67aed6e950633e91c19ba71a2fb24962ead57864d38cd6e493a3fb14808191459ef98cac04b44361d6a0eb0b1d0dac6fdaa3ea13a3035feff0b4 SHA512 d7ce7c17d4f66f1b9e4961ddc67b8ce32a86d10594fd4c3481350bfc9a06aa573c5fe0da8858d6272c57def864f45a35ee82ec477c90a0fc24fa473ae112c592
+DIST gentoo-kernel-5.4.246-1.amd64.gpkg.tar 60508160 BLAKE2B 7c06588ca709e0e06bd4980334697de34ea2cc2dfd9623550338739a5e540bb8487e05a8668728578fb8360a946c44407df8b069836d2d0b7d014e4e44f9e68b SHA512 0398669a2b7f796805ae0fb5b159d168be05a57b4efca22fd950e2b9a99fd39c9b9df456c1ac83ee403b27f4a72bcdc497f12efe0098ae24e75f453492462070
+DIST gentoo-kernel-5.4.246-1.arm64.gpkg.tar 56524800 BLAKE2B 9f5a7eb079283e511e8548b7ef3ac15bee69a5ad7c42e9f1c0f4c80e5a74864df81077a7c28927c3bc280869e6902ae8d10cade7992462c4434187725d23549c SHA512 b04e797cf24c514ef89411cf79fd5e288ffd716ff44dedf345aae82fb4d3df4771d43bcf1cc67f3bf1133fb223802147cb672edc955a6816e39026025a53e9fa
+DIST gentoo-kernel-5.4.246-1.ppc64le.gpkg.tar 54220800 BLAKE2B 637dbe8310f9dfdfaa84bcc21ca62aa4af9d0b32ea932890e61815256673aab9afc1c7515a35ebb4f983c5f02cf25eaea9657c13e5052b1b0d30e4ff2d98566e SHA512 271d968e9712d1fd9f5a2b7cebf4275e448629d0f3128f730004e9a99a4759e0c709ec706805c7590696f55e3a890a4ad681dc2ff2bc0f261e05e828322176ad
+DIST gentoo-kernel-5.4.246-1.x86.gpkg.tar 52480000 BLAKE2B 16abf62566af53f3aad2c4cd7eb4003848eb5fc3bdf299295caa189c5f2212055d3e49385b653174e57a004907ac55cb55125ace3a02783d63ea44f0b0791467 SHA512 d1f61160ff3e109db01dedcdbcd26a618c1b766921947394aaa28342aa9ba2cbb35c5055920b5b34a8d45fa35ce3d75ff565a213ede519cc857f5daa01af603b
 DIST gentoo-kernel-6.1.31-1.amd64.gpkg.tar 76656640 BLAKE2B 7bf643f5c46e77546e300ef4aa58fe67d9ebfad8a6404dbf3fd166af1f9980f473b70dfc03d1ea7589f02e59c1538627a0f5fa1731331b95c76fa44ee9f51a5b SHA512 109eda5dbfa28f42d8308208bc2240f604965b21a8a2c76ce76331c9dd85823fb666b04d5113677616cd385d928d5d916e73e10fd99995019a1c91394ac92a32
 DIST gentoo-kernel-6.1.31-1.arm64.gpkg.tar 69324800 BLAKE2B 57169ac151443e6eba0b83a7973e154eb8b43175c5ff44c796ce85726cc1684470e77a77968b46937dd44cfad789053acbe04c2886bc39375c8b652b46f06abb SHA512 4a453f8a22c8bc99c6bb83377139e8d9a37e540a3ccac494762a7a49c93fee0d3c842aabcfa8e8df7a88db1a2439ca5b5165d9dfb889e5ee0780003b972f185a
 DIST gentoo-kernel-6.1.31-1.ppc64le.gpkg.tar 62720000 BLAKE2B de2262a2d4192e3002eb61ef6eeff85424684b3ff4f1f67ac9fd05c7bd33daa7d6b3576c5436a1ab7a7e9bfa741306e6c6f1a215f4b5a6aa939a5df9bfecd5d2 SHA512 f1675afd84a62c4f1552dbcdf6dd108ef5d4b11a1f7af695ae263f9c40976fcca678532a4c2b4c34485ee463e6f7c7ca7668c0ea8dd825f3a3e362839d19a455
@@ -50,6 +72,10 @@ DIST gentoo-kernel-6.1.32-1.amd64.gpkg.tar 76666880 BLAKE2B a8404de47aa0ff56d9d9
 DIST gentoo-kernel-6.1.32-1.arm64.gpkg.tar 69314560 BLAKE2B ca99caa48fd2319b16ac720a99decfc347fa3c64d487e967e1fe142f30ed45062831b8cfab488f11dde48c2eef2dfe7bacbf56087ea9c7eb20829de7f81eeeb0 SHA512 ac3ea9ca68c2171b6f4b064a0c3d004e034f9886062dc3eab1c74b3598a2da2a4bf1feb775726138de22ed7e20de6d78070b23cb2bbb703c1290778d494861f0
 DIST gentoo-kernel-6.1.32-1.ppc64le.gpkg.tar 62720000 BLAKE2B 53bf04c1cd5135dab83f1455cc15060c43696184169a6e58073641c9b3d752f768bd7731e21d66e2af386578190471b81a230dae91efc79981a115bd8e235690 SHA512 fe76bb3c46b4a62fd844852cb9039f91eaa40b1051ef1fd2928b47304b569d85abe8b12698a5d7b0c615289cc6a6abcfc33b04d80271ba58ef2db48f49cb2286
 DIST gentoo-kernel-6.1.32-1.x86.gpkg.tar 66068480 BLAKE2B 2cdf9137e3880e057af7983d4868ed935aa93ff59b674afff9089cd4778dc7882193a677852af2822cc56c3be938e60c38b65fe346432df0aa24ae737d6425a1 SHA512 37ba8029a2247bb4a5bde69d71d5c504a476f5bd5502a0ebcbb18b9d65cbfa5575c7fad62142b50bea88b6cf9bf71bec82795d2f27c7a763da6b1c81c65bd6ac
+DIST gentoo-kernel-6.1.33-1.amd64.gpkg.tar 76646400 BLAKE2B 592a8aa1ce5bd8c2729f34404152af6ec8714560a5cf7e39652dc116ec712dc29b6685d71e8aa123565f96d9cb6285242ccc1a674db73a305c0dd658bf385667 SHA512 457a877cd6b1f09bd24eff2e75bb558c35a5e555ca3c795a114641e1ce6a0fc2a04d54af9298be19351d84343a05f05dc13aff558a584f08398b2854d31f2044
+DIST gentoo-kernel-6.1.33-1.arm64.gpkg.tar 69324800 BLAKE2B 9741047e82f8daefc57ecb8fc833ce12fe8136b80dc6ba5447f5edef0efc097d67647aeabc57cf75a0f19c3b68a1b1c3de19072b60ab775083382eaaaa64edaf SHA512 50fd848b94ad031421bc3a2b2b5cb292f1a6cb41167eda2f87d05a2367ce2fe1bdb6851b8f549ee2032e3275e6c1dcc02055027ae3416aa792253173f00b9def
+DIST gentoo-kernel-6.1.33-1.ppc64le.gpkg.tar 62709760 BLAKE2B dd90d935998769f1ea9cff0ebb039b610fe3836106e689e1440ec604bb3d6e121d1542fd2b26c4706f03b1933c036293e4d33ed4f9a0c498d1793031fd3959c0 SHA512 f4e0200215c7d47ca9bd7a4d1cf928543df0cfe291c92d77adea330bb46782d27603cb24cd8beefac5e3215a4311d6c85281697787951151e3917a5b75e35af2
+DIST gentoo-kernel-6.1.33-1.x86.gpkg.tar 66068480 BLAKE2B 57597b0d1a475ac61e8256bdce4a2084b2d1690083cc70b03e7b1d25a50522c3f8301fd1e3980d77507d7bb5c8f7d3106baa0cb52a186fc98264c8bfdd2c885a SHA512 1f6ff909360da05055bedcbfe1169d8b9cae9ed86b4fb8e7921cda148999b86f3dc4680d302dbac126a20839845b265953b593bc5719973775a99d8e25242656
 DIST gentoo-kernel-6.3.5-1.amd64.gpkg.tar 83486720 BLAKE2B 936bf3ec75b75aabeb4d8ca6b5a742a006cc6c6a1fd57760ffe72fd124d1ea3dbbc9361fc1f7ac4f64c3feaa2b213372cf72515577ae381c7921389db3e10d96 SHA512 9785a27d50e95c3dd9385b928b9dbc1e1056fd7cf999b4e1f675fa3ee724663671d8bb9de74a63588927cc5b984bfeff927e3ea9a26b12ef2009c7574804e490
 DIST gentoo-kernel-6.3.5-1.arm64.gpkg.tar 72386560 BLAKE2B b089996536ad9ac90e5fd382a490041baa3f7e2f4deb8945f961f454e042ef701bfb7ccc8259acca4a0a77fd104c6f0bea0a447aa90ee523eb42a4ef7eae72ce SHA512 1c666d1f210a81b2a803da4c3eab2c8464373cbbbe7b67ea2e6d3fd8bb786a6d13ecd9ece3d4dc7cb0b7487a3aa0eacfb80f9368d0b07d42c9ea7c0338659a63
 DIST gentoo-kernel-6.3.5-1.ppc64le.gpkg.tar 64286720 BLAKE2B edfa70df90d9efca3394776bb30711f51a2dfd925d49cc5310ea985112b8c37deb3658581eb381d4128154acec9a39c369f9425aabf448a6d9d6a53f6796efe3 SHA512 bb551d9a588e2b801b4ce8d5a65a34b9eed1b965ee0843bf83193dd1692473fba9e576d81fcfa69f63418b056d9784f5ccbf36b5ea742d4cbf1098d64ec0b3bd
@@ -58,6 +84,10 @@ DIST gentoo-kernel-6.3.6-1.amd64.gpkg.tar 83456000 BLAKE2B d4004efd7df9e2cc35f49
 DIST gentoo-kernel-6.3.6-1.arm64.gpkg.tar 72386560 BLAKE2B eddfb099f35d118d98d46647a8330bfb9b33e4aa462e70b7bcf38f8139eb18aa267f720db2fc54cdbc09159441658dcfacee677209f81667ad4e8fe40a2ccdfb SHA512 7b543fcf9e0b26cb3eb135c6eb42d4eb7204eb878558d67befeba9d33182600054643b3e9a99bc14a95e5639d01b5f8755063c9381a3111800511a5ca7c909e6
 DIST gentoo-kernel-6.3.6-1.ppc64le.gpkg.tar 64276480 BLAKE2B 21417c7200e4755fa9f0506a39078a4bd04eda8ada59f0d9c9bc6e8fa2e8ed71bd968e717803f074a880287e7644e8b58b0a2dde0a4dbf1f2134ea3067e5b3ca SHA512 95797b412d1f1540ae3fa6f427a58071c4b8d07bc376463dd9ec1b57c4c272d048a2a045c2697f2d8c858c9eec20fb607a7ea972febe6f479357590859a275cc
 DIST gentoo-kernel-6.3.6-1.x86.gpkg.tar 67041280 BLAKE2B 44ad99201580e385bb7ec61a2caa3ef29d3f290d5f0a46c141616d647cef3504b4f4089ce7b9faf087460932102dea8eba49d1e5fa7b040810dfce1b09ae5ffc SHA512 215701507f8cd8e8164374bf2cb951a3982a8930fdbc1c7e4ccd0c1d297107bb19d300972c1954971be7fc490aa6a63307c5137364a0dc4ee03e35c19357d128
+DIST gentoo-kernel-6.3.7-1.amd64.gpkg.tar 83466240 BLAKE2B 632db7b4da05f2eeaf591567127f683302aae27e956773cda84529bbced54b276f86821cb206d44155c060e32923d6314421593b918549127fd56cf0fb95487d SHA512 09d60e5bc87067121708607a9a01eeba9399fcee10e329bfd0a0fbfe8f9e7923cefac3ed1498b71390fca8678c4e62f28df61a6f63ff7e9dced4277dd953e992
+DIST gentoo-kernel-6.3.7-1.arm64.gpkg.tar 72376320 BLAKE2B ed7b2658ae8cc3f1080058a71241c12d9480595d04ab7a019c42f8700f422602c3d1e7b6b8bb8d51d511ef20704fca637108cc02c0eeb66b91adc5b99f7dcb92 SHA512 0dcd0df4aaad42e5aff77965ae9d7d1d229e623057448e332f462ad9728a6c8a46dc1236e92e6301e33181d856b2552a6598bd4ae47cebc060bf3217748410d0
+DIST gentoo-kernel-6.3.7-1.ppc64le.gpkg.tar 64276480 BLAKE2B 3eac58bbc5775cc95ca34d96d36a12c819351961837d204a11f2697fc6a0b72c33b62c469ff9c6edc02e83a1a4c7585760fdd09af8de8eb1fc92fadb7e939786 SHA512 d2ff4f9f833c8c7a7056ba8ea94e01ba4a232748d5918da68e4cc46f386810be3df04c38ed150d338a957e49976bcd0e468a7e33e868a3bcc5097886ccbc0c40
+DIST gentoo-kernel-6.3.7-1.x86.gpkg.tar 67031040 BLAKE2B 51d87950247ef637e1832d952738962435c8d2524ac6586e27d6ba7c3a092f3858bdb4e6fdaaa954b46146231e727eb9cc1e7faeb72b604b76d4bb98f2f2cbeb SHA512 9cccdd2e76b34421386b5159b514ea181348e3ba9290ff71dc0cdf12b637605a0d6d41cd343db7103cb747002abf6bd54fb35cd58418676da1b1698e528d6a66
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
@@ -65,12 +95,17 @@ DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 EBUILD gentoo-kernel-bin-5.10.181.ebuild 3025 BLAKE2B 7fafb438db9b4e8c5d06545a3cf531eeff6d199652887b548a752544c838c6c36912188e06697e6b6acfd7442ac5e68aa0784fedfcf722eb0e3a03f1d87167d0 SHA512 b4438f05abc23c66bdeffddc232d29eac0ba50d779d29545751bd366190d8971b06854e918e4040048c173877893d6e2375fb0a7ed1e1066092e77456d371836
 EBUILD gentoo-kernel-bin-5.10.182.ebuild 3029 BLAKE2B c3a524d4667afa41876e5698e892b6d9c9aa242270faa317ad56c3a64fc9d7f70466d3ce4d068e331090cb1f9d715a8ee1405cca0537d51bba07a0169d404f73 SHA512 45fb0604257313c172f0239361fc72b51f98ed5019f3d85fb6a43c31b48d51be809643cb277b9bd557dd63202566b280ebe070fff46f6639f6a6d063d55cdf24
+EBUILD gentoo-kernel-bin-5.10.183.ebuild 3029 BLAKE2B c3a524d4667afa41876e5698e892b6d9c9aa242270faa317ad56c3a64fc9d7f70466d3ce4d068e331090cb1f9d715a8ee1405cca0537d51bba07a0169d404f73 SHA512 45fb0604257313c172f0239361fc72b51f98ed5019f3d85fb6a43c31b48d51be809643cb277b9bd557dd63202566b280ebe070fff46f6639f6a6d063d55cdf24
 EBUILD gentoo-kernel-bin-5.15.114.ebuild 3025 BLAKE2B 95e4eb0f4309e4141a863875ec46ea241e6e9e96260bdd3804400e11d32dd2b12bce79c1c66e0abbe6533cc9c9abf0f19eceabe46885b6feeac986287fec0070 SHA512 1f22d7d6843659d872c9ea6bd6eda48f99841e95c12aa723020633cdf30564f43e4aa63e3433f0598930230a03d2c27a1714d2b865a548edfc5725cf9f99176f
 EBUILD gentoo-kernel-bin-5.15.115.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
+EBUILD gentoo-kernel-bin-5.15.116.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
 EBUILD gentoo-kernel-bin-5.4.244.ebuild 3024 BLAKE2B 1a00a8ccac9f12f20c9f3d39572af89a077c3b3dd424133197f35123ee41804588b9763008011c3ee33f269c49eadefcb4d31c01371685845bcfd9fbd189ff78 SHA512 3fb6a4b6ec491d6bb4ad19c37dc18e40565d7d6ee248563c219a43323c263ff1fccb0863727258c56c7bb6f2397cfe968eb974a1282fa3a685a6ed0c3c5247dc
 EBUILD gentoo-kernel-bin-5.4.245.ebuild 3028 BLAKE2B 022cdf6c0db736314e0bb413422f2267146a7c22273e2149f9f8e85feff555b01e28ca044e875d82eaf4e7cb139ec530561c0ba6122059f3b0be63cfe6fb99ea SHA512 c465e8d904061fea29ed34e83879ccc2dca6f2469caf78c76b44f1a696d2e21a36826c6b3a87d6b581ee12ccf72bb02bf6cb20624a3108ad595d5a59dc92b880
+EBUILD gentoo-kernel-bin-5.4.246.ebuild 3028 BLAKE2B 022cdf6c0db736314e0bb413422f2267146a7c22273e2149f9f8e85feff555b01e28ca044e875d82eaf4e7cb139ec530561c0ba6122059f3b0be63cfe6fb99ea SHA512 c465e8d904061fea29ed34e83879ccc2dca6f2469caf78c76b44f1a696d2e21a36826c6b3a87d6b581ee12ccf72bb02bf6cb20624a3108ad595d5a59dc92b880
 EBUILD gentoo-kernel-bin-6.1.31.ebuild 3025 BLAKE2B c1d1d0b65849cd758cc662dfd4e86979d3966108628950f6b6cca4195e78b4d134245695037b07148c718cb56d3e46d515a85e9ed146d63e78b15ac26ee3e75f SHA512 90a3e330251800ee405dbab9efceb021c6db7d51920c676b54d2fa45736f99a93373818736a67f521ddf55e39480f6ea6b2e0b1761d6eebdc7f5cdec7a16afe2
 EBUILD gentoo-kernel-bin-6.1.32.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
+EBUILD gentoo-kernel-bin-6.1.33.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
 EBUILD gentoo-kernel-bin-6.3.5.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 EBUILD gentoo-kernel-bin-6.3.6.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
+EBUILD gentoo-kernel-bin-6.3.7.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.183.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.183.ebuild
new file mode 100644
index 000000000000..fb165f3f0e91
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.183.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.116.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.116.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.116.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.246.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.246.ebuild
new file mode 100644
index 000000000000..70e2f755ed95
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.246.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.33.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.33.ebuild
new file mode 100644
index 000000000000..623c8b8ab75f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.33.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.7.ebuild
new file mode 100644
index 000000000000..ff865204fd12
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.3.7.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 22d3e0965d21..2f06ceeaaf79 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,18 +2,28 @@ DIST genpatches-5.10-191.base.tar.xz 5394880 BLAKE2B 604549d0789ee4ea8b965b4aec9
 DIST genpatches-5.10-191.extras.tar.xz 3868 BLAKE2B b0c035f8e43faf78344a1f413c6030fe2001216bfc9381e402e3fee7edb3cf2798042a3a3d62db2b429f53d6a68b445fb25c9c0255bdbb85d5df00c6388584b1 SHA512 dc29b28784cb160ba0a24921986b905efd8d624902b00994829b99bd383551da0b1b4419ec8b91626b896cfb3997480a62fb9691b497b01f331db1450b09fbb6
 DIST genpatches-5.10-192.base.tar.xz 5401408 BLAKE2B 1e84821002dfa2af4f57f5cd3addcd037524cbfcf9e5cb7171725363457c6503f46b5bae92ff04ed3500e28daa1c9ab61dbff2495281732b972300284af3e7aa SHA512 edbc567165df20906acc7425d56ea7feeb3e9d402ea0d175a3c627b300eb33675552ae36248ccefc67584e2120f9e3f098ce204e9aa3858c443ca58c1d34418e
 DIST genpatches-5.10-192.extras.tar.xz 3872 BLAKE2B 8ab3d00e158a52558ee28b82235fd1df510953207d18073ca2fd8114c64c96742ec69dde5959273c451803b0f534ed7351cfcfabe3291bcd323cdf4d317a5610 SHA512 a93b072d731f9bcd2e4d50af05902ab50b9145aa5e5b02141f203ad0b4c82b308c0cb599fa6f790b84584197c65270ec701ec94a321f39e745625803a3d6093f
+DIST genpatches-5.10-193.base.tar.xz 5429232 BLAKE2B c8ab1eec55b3e282af48601c93a6e53a2974e7b255f56346954c93976ac9870117d91a6b9e8809cdfd0cdc27ec4a3eb292e7d9b10de6ecb7b8c54056380ee875 SHA512 44733f8f09f34bf792d0c7dfb6915902a71a234e8e4cd975316ceef23fdf414b01d1e97e317e48dff7af38ac2a04391ddbb0b8ce97ca13088eb1518bccf44390
+DIST genpatches-5.10-193.extras.tar.xz 3868 BLAKE2B 5261a2132d49eb98e7e292f577eed23ba8da86f3b05b57a75d15543dd1ec0c424f4dba04a39aea6b12e320792a9f0802be6d7876bc64a1f864abed03fc8e0c36 SHA512 5383cad41ca1a0fb2933de4fc07207562ff572231f17398ab9958012b3f27d382b2043fbc9fbd784ec1d5f666f0baaf27e75d0a31473c56779f4cb1a32d89707
 DIST genpatches-5.15-120.base.tar.xz 4681108 BLAKE2B 7e69c38991ab3b5ec949f48fff8564c854017b8bafac61747eede20f79d71dade59effaee29fe849b1fdbee7abcaeeeef3f55a39b95b96bda6a70af05a905a68 SHA512 2be319896281e7cab1646da40a3067c3815270ff5fb29edccda9138862a39ace2192a1cd38a4232bc14ebed0d6c0c877a9fd58f225d7cedca743664e2a993025
 DIST genpatches-5.15-120.extras.tar.xz 3932 BLAKE2B fb00b97c8b61234646388bec0dd23a1310a7bdca9d04a2048a32a4e30605662c7001188bc125170aeca2ded63954a71b612908286aeab06928dec00cedc76902 SHA512 c2b6ee91b3505dae7fe78a393001cdf6ac7d0020f8123f14d961b90d1424144996e182fcb5304d5890c041e2d940a960bac0795ebc22e85459285b16f67d9b3f
 DIST genpatches-5.15-121.base.tar.xz 4695588 BLAKE2B 2bbc7102194c0526cdc1f2e310871756ab87e5edf35273c41a2a8c26abfa56149361a2a8af68e215e14912bf2238c7610f60f69f88916404781488352fbdd95c SHA512 822e207359ef8ce3894152de6aacf66974d8b8bcbc5329dbcbda379cb6dc81d348ad9a38022abd05131c1a4df955426da25bf37b83ac06ccead4aa1277b2eb36
 DIST genpatches-5.15-121.extras.tar.xz 3932 BLAKE2B 22ef45027450ffaafa2637aab88656c56fee375fcad14403693f94894cdfab96bb2b930cec4852babcb4bac86b07bbc9e6e103de7c871b91ef3004435e1cb785 SHA512 92b785c17dd171871dbcd841810c1e7da4fd7cc5027040340dd90f6bf97153dd0e300a6bc33e61bc7354b6e6648e3bf718d161ebacc5a4ed3a3e86e885181ff5
+DIST genpatches-5.15-122.base.tar.xz 4735096 BLAKE2B 10746c787ab70dc82b688b8720144b80719ddd7f4719e9fb2215b667ca7806b2e8c5626dd66b46f20c0e6d7e05352c84eea9cad93327fdd8edceb4fe52f43416 SHA512 65437aa0e53effa3eb84e3d7b2a0497ed4f4ef85fa96e75a8c591f27a610629193094c6d03dc676c462cf41a55bda5b5277c14726d48ea6ed59e8edeb92105d9
+DIST genpatches-5.15-122.extras.tar.xz 3932 BLAKE2B 35fdaa40b4b4e297df7f8702ab017f4c49bbca2aedc652c6e5ba8fec6b1573a57d17a9c7b21f03b56b43d9bc888e3d55354ceb92e84dde0a89983dfa1c3ffc16 SHA512 176deb6aef0eb9dace274bc4ca0f29a8d657461583dc9133feb4272211f910313fbb69fed308705f00c1c6d86845f1e961ea0066b09b42cac75a3579b3d3ed14
 DIST genpatches-5.4-251.base.tar.xz 5798892 BLAKE2B a519f23086a440d560e5301b77aa1a627e97d9c2545adddc6fdfe9b55b35dcbef285a6e92d4ab615b517177723875a53b6b5f1dc9c237dec3f23acb511e08be7 SHA512 c8d228cb18f2c64631ee5a40d7de58e78c7fd2c452f54101d0e6f67149d5d3df30076b461dada5bd862e4b97daf30a6d15c3f50526b46156d9ffca946b3c65d7
 DIST genpatches-5.4-251.extras.tar.xz 1812 BLAKE2B 440f5d63b80e31753c46c2c2bb07bfdd257cac6847dfaed63a19c9e255da0e6ca31f5535718572afa143918bbab9d8651b0d8462f5bce619866d78acbc063682 SHA512 54d1ea7625daff0c8d50f8abfba616378d8bc4c62cdfdc03648bec9312803464d0c662bfa619c357a73247c00b22b9725896cec5aaefc66ef811e0f97ff62e91
 DIST genpatches-5.4-252.base.tar.xz 5808300 BLAKE2B d5cb4fe312f469a331269eca8604d9c43feca79bc6778af670fad859de3098c31cf0408fb58d95f233564e0ab2eff7a45ad041b8fc6bb97be0f93dd911224b62 SHA512 4970b66f064f53db230877fed6434e39aebb727438465667af6eca8603b712089830789c16bae5fe0249dfed0cb4bdbf1ce695cc7a1ebb6ab64bb61b1b38a5cb
 DIST genpatches-5.4-252.extras.tar.xz 1812 BLAKE2B 07013e9aa5c8a2380424df700ac7ce592732316b97d6605ffb0e75270b9b08716030a56ae78b9f09b9e314fdd78ab8a8bf986ab767eadfe0a58cf2906be52b17 SHA512 3070acc7127a372f02479f4eee5f465dc3c1fe1ac3b4c2ce0af61d2fe091c509f7e7ef2af8564eb178efe031ac5fbf2f23f48bce4ea54d4500e1b1eaccea6340
+DIST genpatches-5.4-253.base.tar.xz 5855284 BLAKE2B af86d19abc80339eb77bad98df5f404ef5db39584955094c54726d33f6a825c495d835c1f809123903debb2c31c6ad3f07d077978d10c6dafe8170cb60087c7a SHA512 5b9895d2ec8b5080802675912ea8419ed892693f82a4098e997fb3b6ce92844d605a865b31a2f06272248ec2386e36a0e9f74c163ef28e4157f29788c0e7eb5f
+DIST genpatches-5.4-253.extras.tar.xz 1816 BLAKE2B 2d3492cefc1abb1b5f35c375afb99892eaab0b90f2b5624560b5dfa4b89bc6eff729ed81737e04e33f78e66b74835a8dee260cca14261c5d2a88644b1b30f8c5 SHA512 31a201024441c55f5477b431aa94a2fe4c98977bb9c1a359af07519b8a204f16189f0595bf71aaddbb88c88e73ef918dc3943bc0a17a2a573cf34dd68dcbb211
 DIST genpatches-6.1-36.base.tar.xz 1892196 BLAKE2B 21e7b006889ce39d3b2afaa981cb04c1229050d13b944086ac2c51add6c63dc96c3ac2dda188dfa11a45343904e26589684ffea3a22c235738c1c6d8c38a11cd SHA512 b4de4f6db586a9aafddf639ae914b35ffb0e2340ef312c64a48f4a0bfc02c573437595fc61596245dec2eac7add9f62925e575e2f621d2cf2e80262096f64df9
 DIST genpatches-6.1-36.extras.tar.xz 3808 BLAKE2B ba99390043e4a62ea1322364ba601440fd70079ffb98dea924f91aeb00a7add4d2402e16589e0406e66ff9e0ec7a9d0d76e0a14276fe486507345c8ebeb82bde SHA512 ab4170a7b75c2617ccd5c08b7c5d84e68e593cacdca70dd59ed0b738639ddf3bbbaf6a4758728ff74026478a341782eb0e73a6a40ef9a7158f9c6221703afc55
 DIST genpatches-6.1-37.base.tar.xz 1905836 BLAKE2B da087dc0f3e1f683b025c16f9fc4c60fb041d9b1a7c886f6b235dbf28afedda1283780298add52e211d4bde198247413c633908f891f6d1464bf0caeaff76f26 SHA512 528ac52eb398dc272a0011384c6ca4af72cd7e0b4a75f5c81d71c8aa7b04a11b58ab5445b99bfb53bc559e99e5aeb42dd9479aa8c8b2d42510709614de75872a
 DIST genpatches-6.1-37.extras.tar.xz 3808 BLAKE2B 020021d322f4240a950fc572f3442e554645419dd64f5e15ddb44e77bd950fa41030e5f8143949ac9e6a96eabf392d317fd7557a9ddeaa84b3979d399cf269c8 SHA512 9b6ffd0a94028f2bcfb3e8a1e24cc11f722fe6637b11f3cf9e5f21883291c456108bc2b7014d5aa5733ee77db2d2b9c196bd429b70fad3a6435b5c7773f37823
+DIST genpatches-6.1-38.base.tar.xz 1956240 BLAKE2B 65193574bdd8fdf4dc5d78af616729db4f8e5ed4ad6fa22baccbe27cd0518175fd02acc218074c709b86831eda460a99013b2444c1f6ed358f545a3133afdc00 SHA512 d8015efd3980cf82f499a813589affc8d7b6acdcf748c17c9b3a4b41730676443611d6375e517c633bdb8d2119b1cbfe50bd8984885fd97c29455f00078d64f7
+DIST genpatches-6.1-38.extras.tar.xz 3812 BLAKE2B 648c0054d5088b51d17e8b825153c7fcc7988d973811dcae7ccd64bcd78b4634d410aaa848b3cb31272eec552ad410c705388b8887603d94b6cf5a5170f7b36d SHA512 313a119b47d954ebef9dea3a48024a8d4e7f3b4b62de74f19acdb997ece3e198872fc3c50e10171687b07e8bbf85c5b7dfd80045ed7184460fda3c68c29e8b9e
+DIST genpatches-6.3-10.base.tar.xz 593348 BLAKE2B e4d149963ca7d441b60d40af98939acdcc6163a09790ce103c78d33aa554de170136fbf8a4aa9285c5bde7fdd3cad54f73152d56038d7a299f8e69158b420d50 SHA512 7fddf9a02d8767c0236d8c3e1097a267d7f4961308eb08826299b596ba96b1e2fcaa84c22d986619e99aff3817f64fbc3740b87e5d0e1949dfe85d7f5450697f
+DIST genpatches-6.3-10.extras.tar.xz 3808 BLAKE2B 7a4885c76a17d73d7f03836d243bee424f5d4e4205a6547f1b4fcb709f4f6c2c4b1c61dd542b260a3e8dd724f98d851850eaf0930233988670c674a8a2928bae SHA512 f851bc9d10ad98ee74fb26344236670c0aaa218c4bf24eaf54e6376ca68d0626cc1d8f954a1dd3b61343dbd41a286d7c8d9a743ab50c295c0c729732cfb231c2
 DIST genpatches-6.3-8.base.tar.xz 502012 BLAKE2B 190e68ecc877c5520413129ad7d28f8a088775234c18f59f74a4675b1256c7da1d8dc1b323c232523fc3044f3dd4988a77ecacedda715ff3431f910b7b0d58b7 SHA512 02f4b62eb098d875e4c66325f2abc74917fe0d88c1c35ee84ee2a19da878addd27719e9e2a0dca145707335338eedc905407dcd54c6706ec18a2f0920fc082b6
 DIST genpatches-6.3-8.extras.tar.xz 3804 BLAKE2B 461a2a8fd04a4a7ef2f714f5472d2169b4119dbd42bac961feb6b890b8d7def33931ac8dbe423e9d8ee32e60d56ca01bcc4c814c18e445da8d8bbb9b58a6a717 SHA512 fc563f898ee88024d4b60eec567a7439893339c9f51b4eb9a09a0b16b1c7fa164260e63396ea923e776751dfdbd52d2cddace03f212419d4b145e38b5d670dad
 DIST genpatches-6.3-9.base.tar.xz 517548 BLAKE2B 1cb215f7a6dfb9723ad2b784aa463e097686e7aa230f50285f55167590d2e673f986081a9b2e37ff8f96ad206a61e2bc34ce36b6c22c652584d7dd6a18ebe20d SHA512 039e3c8bc8927d1bef377b451c957bc394186061fcd6027defe34df59000e40f2aae9924189e8e10d240fcf2197236e97f7fc5cc924c18917349e2c74a3d2125
@@ -46,12 +56,17 @@ DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
 EBUILD gentoo-kernel-5.10.181.ebuild 3660 BLAKE2B a00d551fbfc33807e966bc55b6a8cb7dbe25cf56214322127f33f63adc7695a1922f502d3d3de391357ca2e79a62bb4639f385f8a1f3afe144847f526e0d20cf SHA512 4b5eede3cccb9ff548323d4cf79b0659fce001ba69c02d24a99ddb9f072b6ab6eb960bf05edbd7397b16d38970304f885d98c9c9b3a35fe46546c309aa3cf33c
 EBUILD gentoo-kernel-5.10.182.ebuild 3664 BLAKE2B af024625d4014a5bf402702c3d2e637ee0eeeda12e7e2e21eee657fd019f7726256bcb2639d8872e68b49cca6eb55d39f8e6d42cbc262bc74f21bd5796228eca SHA512 e4189b5c983d2f6a194e903739cc024161f3e2f4ee40a24a29490931bbf1eba2ae622da022a8103f761c29afda7bdbeaace747903741205c13c6920c1ee9cbb4
+EBUILD gentoo-kernel-5.10.183.ebuild 3664 BLAKE2B af024625d4014a5bf402702c3d2e637ee0eeeda12e7e2e21eee657fd019f7726256bcb2639d8872e68b49cca6eb55d39f8e6d42cbc262bc74f21bd5796228eca SHA512 e4189b5c983d2f6a194e903739cc024161f3e2f4ee40a24a29490931bbf1eba2ae622da022a8103f761c29afda7bdbeaace747903741205c13c6920c1ee9cbb4
 EBUILD gentoo-kernel-5.15.114.ebuild 3656 BLAKE2B f28fc4c7aac5f5c4f20e0feb60082a589e06c40732771613b23d6e0768fe550f8e328a25e0b292bdd80b0ef50e51f85a66f509c8672615271c041bed2059932c SHA512 31784e64a5d7dedcc6ecee27b144778502b62e2afc7f5e27ae890dfe155171970081952d425fed6499750e84c68335a0317763db7a9d1f158e655d175f6ff9d7
 EBUILD gentoo-kernel-5.15.115.ebuild 3660 BLAKE2B adfae469fe7d2bc99867375d81d6a157a24d79c6314c41330c9e5460890cfe06e22780d341950f4f2002cab2a72704eb6bbd33d25683e665078b5a47eba6d380 SHA512 b168699de4088c154047829cda497d6f51aec4b56aa1f3f6eb99fc04d01d14c080ae8c5a456cfb0891f5d9477d79be7b38dff28a7040d4e04067f43fd1b246f1
+EBUILD gentoo-kernel-5.15.116.ebuild 3660 BLAKE2B adfae469fe7d2bc99867375d81d6a157a24d79c6314c41330c9e5460890cfe06e22780d341950f4f2002cab2a72704eb6bbd33d25683e665078b5a47eba6d380 SHA512 b168699de4088c154047829cda497d6f51aec4b56aa1f3f6eb99fc04d01d14c080ae8c5a456cfb0891f5d9477d79be7b38dff28a7040d4e04067f43fd1b246f1
 EBUILD gentoo-kernel-5.4.244.ebuild 2860 BLAKE2B bc1812c00d3f6c58b51d0e9389055a6ca000db0fea5dbdbed392790fefce8a9abb2766c1083c3215c09453d89d6fe9889ffd62b1bf873ff69dfedce41badbf7f SHA512 96e28a4dc569a8d6ae0ea10710db9187a26a448640e76507414031b5ea16ee494a889cbb4a44b9f13cefc9c00d4066a46e8a0887f9fd5dabba5072605d283023
 EBUILD gentoo-kernel-5.4.245.ebuild 2864 BLAKE2B 9c8cfab868459f96ae38c0be597633a33ca73abfbf3fbe6f7e970ebf02874e440b56da5acb8368f54f30b6788b9262952b88c946b36f38dfc11a9a8b54f36f73 SHA512 014eb31ea72d58680b6c5bcadb70439775b2946789ae1a9b478fa8d50355bc834dc09b4cf7357a9ef051b657f5e8bf84a73a839bcc2f86863ec6eec51f053253
+EBUILD gentoo-kernel-5.4.246.ebuild 2864 BLAKE2B 9c8cfab868459f96ae38c0be597633a33ca73abfbf3fbe6f7e970ebf02874e440b56da5acb8368f54f30b6788b9262952b88c946b36f38dfc11a9a8b54f36f73 SHA512 014eb31ea72d58680b6c5bcadb70439775b2946789ae1a9b478fa8d50355bc834dc09b4cf7357a9ef051b657f5e8bf84a73a839bcc2f86863ec6eec51f053253
 EBUILD gentoo-kernel-6.1.31.ebuild 3915 BLAKE2B cdeb40055499aa278517eff23df65612c7fb693dea99ca4351f95167a1175d3d9fab18c949cba669b3e4a400092290344333a8bcba90337da114aa164708ba9a SHA512 16fe59fb76315074103bac47e4dfd18274f09dac862381b521ab0d3c32c58cd11076404d59aab7d4351ab6786294c8c06a787b2e3a4f88c7d03c9eefac58effc
 EBUILD gentoo-kernel-6.1.32.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
+EBUILD gentoo-kernel-6.1.33.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.3.5.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
 EBUILD gentoo-kernel-6.3.6.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
+EBUILD gentoo-kernel-6.3.7.ebuild 3919 BLAKE2B ce36a0c01561205dfd8ae0c201499482c598a9a937585e76b8beb9d9f6f267bec97bba421094afe33633ef4f9e8c649f15276533e48105cfa2d3cb9722780f36 SHA512 de4378b2e5d63ad4bd5f245eb20d9e4cd1e05f35789765cb64f6f316cd2f6e4e74b1503717afaea84bad334ed15c9cfe1e6c69f49814e7008a8f00f71c9cd398
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.183.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.183.ebuild
new file mode 100644
index 000000000000..91e1b5a2d288
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.183.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116.ebuild
new file mode 100644
index 000000000000..f45f633a3dbc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.116.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246.ebuild
new file mode 100644
index 000000000000..e8d62eeacffa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.246.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33.ebuild
new file mode 100644
index 000000000000..d77da3bdbc2e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.33.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.7.ebuild
new file mode 100644
index 000000000000..fd81855a6140
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.3.7.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.3.1-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 65d64204448a..9458adb5b343 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,35 +28,50 @@ DIST linux-5.10.181.tar.sign 993 BLAKE2B 898b6e10b8f7ea288a847b28032b8d9ec13575b
 DIST linux-5.10.181.tar.xz 120619300 BLAKE2B de4963daa6c61ad9fcc11bd620eb39c2073ad13a3a2f96a562d0c94024c4d9ba652682e2744d3b8ec81bf4058037b34fd28d1b7238d56de951c069fdefdae666 SHA512 3362cb8b4b0bd488fec412ce1c96ade22b22cb66fe011fabd0af816276bb13157336dcbaa1551e22d0af14288db1a4b3f9350c1fcdcb7fa638b66904d702ea5d
 DIST linux-5.10.182.tar.sign 993 BLAKE2B a7da63cc127e64cbe5dbe82c08113a8ca451850a503b4f13ca80b42997620f73c3ba7a9e83c12c9852de26f7333f56a1b0d92df193e9549b6e2f959decf6d3e9 SHA512 a6833d1f94e25f33757ba79d81b26538ee91778e93474a8a795b471d04842e168ff75b2cfa85383d3a05e2d2a28b9dd2d06ca40156921b56ed38081c7b250b7d
 DIST linux-5.10.182.tar.xz 120611812 BLAKE2B a567ce8289e3c7423bc1c045041793f910b042952635a74643d515eae387058a2b9c32932fb9d98bbd4a495aeb4d14fa5cae8d423a8a3f19c193260bdd08d31f SHA512 99958248f63efbbe9f8f2c4d9fc6bb70e8d0bbb5945ef46b0c77b844ac544c1f847d7ee5c99682c55770fff677e229bdb609eb07962c9e3caa9e5c509aab129c
+DIST linux-5.10.183.tar.sign 993 BLAKE2B 6bf0d55a4d948557216719fa938731eb67e5ef817062ee9cd08b42783797d12156bc248499a7904a15b779f79843ec527ef1c1dd7ece688b6e88f492c805d330 SHA512 31b1c83cb32b4b057da8253447d77553149db230955345b90bd4f889a1a050ffcef604c28eeedf850a00c983fb590876f4f86b059ce8a39cc8c0781b0ef8baf6
+DIST linux-5.10.183.tar.xz 120592344 BLAKE2B 67cf1f5281ef3134317ad70e7eb3bf1936d26b0f936192a3ddc7ed3e01f71354b19b27cfa0c2b51e2eb047bc6ad3144eeaf939ce3a6f017175f139e94658e704 SHA512 8cd3ff0511cd46b97e2fbcf891c49c3e22e3531da1429c9dcb75dff9f4896df731a0d30a2e34e6ca58250dd42b9c5a007b3d015b2032ee2e70b9a2616ee82c25
 DIST linux-5.15.114.tar.sign 993 BLAKE2B aa910499d419072a092b7183cda7ac15a34d128a0b84aabd7e2ec3ce692819c1bb403973167f8640a1abd53f091cb9808c108a246849d08d59d32a650646dc3b SHA512 d5365a0738d6b950506787e1a321deefe9c728d34678cf88d984ea324950f92e0fcb6cea64e87f284a549edac36b8c0a1eccf6321334c4ef430102ff9c748f52
 DIST linux-5.15.114.tar.xz 126540708 BLAKE2B bc4a7b2f928219186e81d04d1eaa46f0976decd53112c4f01a4c698fbf7897686e02ad09ff8695e3337934824c254ddfed6ec76c66c30ec6495f4aab7fce8cd1 SHA512 2fd0a4143592f989663301f5f5d34df0ce6cca66c0c262abe2926e942739b3bb4b7a4faee0e446f6e3ef52fbf2a756cabd8cc8b18a3243c269349a1e6399218a
 DIST linux-5.15.115.tar.sign 993 BLAKE2B 668a30bb360c98839e15cc1f5fb4d0edf93fb819d7f36587cb651dff7389a642af4eb8cb148617fb666d9594891c7f0620088c0e7b4d211b91b61b16892a8e77 SHA512 b65deba6871540e7a04210c4342e28d65c754daae52f3e7944ada55c8dc32bfe2909e222f5a8ad5c3518cd13096186421590e5b5e4318742ed1407815eed94c3
 DIST linux-5.15.115.tar.xz 126539524 BLAKE2B f31880a7155c0e8191bea0d2bfbc8faf9c1380dda83db01cb0b0b90dae7b05df1491497e5e34070f32ce7d8ab786c68fa4471e787b9da39860f3fb8658438564 SHA512 b15c96e7ce3cffb67da9071864194ae447524b6ab5c5416b7b05657a46fdbc64944d2c57697d5513e05bc505257d1309464a519a3f30e39c67103b6518c13794
+DIST linux-5.15.116.tar.sign 993 BLAKE2B ad8fd0325268b7debe85ccba5d1576e9a9d260039a21a6e3aa0360e0f868d21aedd1b08138cebe5a2a5f83162558f400293eefa6ef6d9648a2f33d762b747688 SHA512 26419379d1955f9c724bc4d51d04605e9bddf222e23e8fd5e06b7cc84438e3dc11af3b1103a99dea9b2609e34e25e089708f1cd093c5808057e6029e7ab70512
+DIST linux-5.15.116.tar.xz 126548212 BLAKE2B d92824cf8ecf4894f839a2235f972da70c5658bc220b084ce088093d101046a34331efb3cca48df20f2b6b5630d5ee1c0e38fdedb0bc0f88f7365beec3ccb1c2 SHA512 6a934b1c14582dd8c958d166bed74243b9dba84008d493a1d5f89a7f3b0dbdc676b8659993768752ce971174e0ba6d48d3785f0efe157a3309bc6d7fc4973831
 DIST linux-5.4.244.tar.sign 991 BLAKE2B 777eafb4445f043a94936c89bf5da610abbd10a4ba307ff9affdf74344bb5dcec93fd8a0aa8160afdbae67b732af8131740a6e8ecabef0360fc52c475a847ca1 SHA512 85c9b095616bb45705b741f4d0eccabfe50d0571a85362c1c36575f464011c6c5949344e4b170839e603f2dcdc73ab7ca2a47ff695b41b93fcec18bf4a46b2ce
 DIST linux-5.4.244.tar.xz 113008872 BLAKE2B 2837a01c9879fe2975330f051815bd688308cfca91ff29038db899c1749964ed68773ff72e78e2dfa065f3d763401a83c880b386debd90ed6cfce6e30ce79bfc SHA512 eb1b7bee8b29103b3678cb6b3a66401d68c4b2f2c69ea603a8bae920e14655dc41ac21d79fb9593ab479668eb669f0e4a1af8628ff33f5b91db2c820f9f80cc8
 DIST linux-5.4.245.tar.sign 991 BLAKE2B 37fa9d8b93c228cb96e163b95d82bcbda8a0ca725553656935da4f9cd8d2d877ac74ad749c928f7ffb1a5e16a26fef5c3b4f2cb7fac7eed245597df420d48807 SHA512 d5991e7a52aa3201330c4afb0b02aef6e374ffd9cf82d6bf92d38c1418d3ac49c2b6b7f828915ade5682a33a4a1066dba5c30621639b14c787365104e03cbcee
 DIST linux-5.4.245.tar.xz 113003688 BLAKE2B 837448534791aae90a437d1c815f0552f6a77c28dd6d5e101b6aab93453f6616f95a932e5c98658bacdd3b8945f4fd14dcaa1f14a8cb4740d5e9c00591242dac SHA512 17c98275d9fbb4e9abd12112d6b148615913a5c829dd045346b0eaeab357361fb33c2ab1e9c8bd438a376be75704e0bab4a41f28ec3e9a4ef898ab4e5ab8bc89
+DIST linux-5.4.246.tar.sign 991 BLAKE2B 5e2748d3f9aac450fb3e589e15d004085246ea63479ecadfe6062aad38671f42ac33b0ce4f7ce6634a70d1fa0f644ca1c010ed91a2f9a89120f1c62ee6faae70 SHA512 b747dbc42331d8a944bb7ebf567eaa0337d9288bfe8ea76c5b33d2bfb377e14a1d66b28eff77314b0a1bc6a8f064c52b1dd8eb8f5931c02bb952668c9228b81f
+DIST linux-5.4.246.tar.xz 113016736 BLAKE2B 0d35d8a3620934c4cc13d4525209f125683c0169d9ee543934f96f1b6872de7be0d1e657bbd65baf17514092156ec8788d69cfc0c95f4822281e8faced9419a0 SHA512 375c48e69c6782f9a5f7de26b8b2af7e4b1f5ef1e29bcac70c3ddea9a71a1112fa116a2a098b0b5e9d5f5ae52388a440ed2cd5bb4798272507f3328fc6b707ff
 DIST linux-6.1.31.tar.sign 989 BLAKE2B 86b86704f8e01a31c70a607d572a9ec2d1014cdecb321cb1b7fac56410692697f018c6237e77cd2aad6f53758f27e8177e39065e73dd0f274d4047c4f80e6c30 SHA512 f9488296d96f54490c8a506df7018d4804725b102959b070bd0c9bc64c7ea2d517d4f39273b4ecbe975ba75d712fbf9fe0affa4159546712fc4f0f9c1bf5c3c0
 DIST linux-6.1.31.tar.xz 134903408 BLAKE2B a3eec74aa6313f387d22a57d72737cae6c5e60125596fc265c0f7bd90bc95b6f5ef5192028802995a3cb50e739be328711046aadf3adc93dd2047e4b439d4a01 SHA512 1202a47f29eb17ee074ce22289c6cd488acc381a59968728aedb6070874917cf331a2535629775f5ed3c442b5a82ceb17ed41804e719c2d3f81bcf249261bc7b
 DIST linux-6.1.32.tar.sign 989 BLAKE2B 79d8eefb6212e8f7f3e28956fe3b384e663d57649ba57c0667a6c30fee342c2328d9a06c2908a4c7fc509835eea7f8334e33a9f29bf8f9e2ade0b361bcba8590 SHA512 2929b4be377799256133aa85a0f8de9ada79bbb8b0270b925299d9219229501f3065357df14549eb70dd6ef34a8010639dfe50efe7587af49975f0167d2450fb
 DIST linux-6.1.32.tar.xz 134921364 BLAKE2B c2ae22a9dd497617c7bbfab7ef2b31ef03a62679790e6ba82892fa284b51eee50431c10e07f8ddf25b718a6db919d1c80e4089278090070a3f8aa6d94cbfd4c9 SHA512 91ffc55e9f6d4bc4daf600fc751a1dfba8d81132b3184de6b340fb871e28305de8ad2e0293b53c03b062fbdcd9a1774a9b74e301477cd1b1c6eac27c42d15867
+DIST linux-6.1.33.tar.sign 989 BLAKE2B 786e48609d244fe23131505fe8a44b07fb1028a662c6653874b5bf3ac8ea6b4ad378e9368add2ef70ea42925e15bdbefc40e852b0b12fb992f188384013d1087 SHA512 a27c5de61f9fd047b48fa8786b3f5e88bf5e4d50a3ab938757866694096c21c830d015c2f83c86050099fcf3abfb8f600dc9a12082509f5f01ca0fc988202beb
+DIST linux-6.1.33.tar.xz 134917572 BLAKE2B 47341263675a91985e5cf53c6908b19f1c55273198c16bfc4e237de04427282e72755c554816ccdbd7469f12a21a7595767fd56bea5421ca92623abcd08bde26 SHA512 02541074a597fe931370ca38d0de2689efec41073918725cc5678e7598f9017564c2a22548ab5c0eb474ed917dbb4bdbacd322aa56c1d8ec3e7cff9df200cffa
 DIST linux-6.3.5.tar.sign 987 BLAKE2B 34ed1d758eb42af9d27b6aec986c9f52426b19ad9a7483d1b4eb1b4873e7e10efd9c102fa7e17d1fba5df15ba536ab77e6597b607dd07ea9012860fe9eff2c34 SHA512 a701dea5d297c217eb2b497a9441399c0f386f39f74f726f81872f8144d83973ec02ce533b7d48cb9c49d38a98c820668d684927983a001f7a8a27067f605867
 DIST linux-6.3.5.tar.xz 136926988 BLAKE2B 646a94591eae93db9301a11e5300579c8cce7d2a544727cb88efed86d05ba070a247498d9c83d7b7cdbead4e7d46537134c877813aa7f188dd36b403c58d0c11 SHA512 91a98c56191645c4ba32f657da59b6be92021b37a698eaf79e1ed3a79b959626386e7b69c8cb0c9eab0645c287a3e53393b1710158eca67b2f66a8d3eaec13de
 DIST linux-6.3.6.tar.sign 987 BLAKE2B db87514c0b906b3faeaeb55235234f32880de042fb2cfb05035186007d3cbbfa1051f80c54b8d9b2f93ca023e393ff3f360b8eb0dcebc3cd388122bc6cf990bb SHA512 f1c9c7d5f81906f45b6c7c2bab251f56a7fcc0ac11f59b5790e1fe5eee3bcca16da841d70055f15de4d03c24ef611520ea4339d989f4ab89354382997bebd148
 DIST linux-6.3.6.tar.xz 136895308 BLAKE2B 73afc625bbdce52a288724f17a42603b45c9e107a8055172d218369d16885ab9e3ecc1358be5bc839c53ae40c9005b673de6f08bb2cbf36873a19b3ebdb69218 SHA512 2ec7f13bc9e0b15652830af0282895bd0b20d4969b1b3e30890373e3e1ec7591525a67c0e2a7e9e3a565ef3cf053595fa8bfc960a8eafa5847d7db5e7bc038b1
+DIST linux-6.3.7.tar.sign 987 BLAKE2B a5ead8f4e76e4fbb320a8eaf494a09d6a969f37bf72f1152a01f2bda2b8b1dfdf34a5f2e18f1fae0a926eb542c49cae8d9a322fafa1b91f15e48e81d70e66efc SHA512 cd31ef3c476628424bcb6bfa54d0d90fbffde9667783b35b0b5e52701d1a10d1517913854b573d6a2a2b12019235aa7eeead01ca5def7a61e8081b94dd6663f3
+DIST linux-6.3.7.tar.xz 136943112 BLAKE2B d26443196635af6a5ca339362cd573a24759ff57f4152ab2a5ced21bdc69a66296168fab0e9ea7755ef71edce3f9898cf64d2dc9aea0cfa2b126716c706ab7d6 SHA512 1e71941f44b47d9cb8bbae144b6dd352422ae185f34da3f85c3054dcd7eb2699e0a1c35f572f0f3fe67f1fdd0312a172ed54887ce35eadf12477d55ea64de27a
 EBUILD vanilla-kernel-5.10.181.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.182.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
+EBUILD vanilla-kernel-5.10.183.ebuild 3776 BLAKE2B 8123c455d8037eb8f221741523b7276ed013007d928fa7b76d4401b67a3d1d904a39519da67c466967ecd657aa2465175f4214d79a3e2ecd063df9bc19e72300 SHA512 46737c9425cad5c99bebb4f233a049e0f08d0539cc1a9eb3afdca285d081f778e6effbdaf012d0f0a58b92a64e14e33bb5b463ba4ec6e9ef45a8bd825b616e87
 EBUILD vanilla-kernel-5.10.9999.ebuild 3295 BLAKE2B d55f087638b0f40abb649765db84505032571215fa29a51da118dee67c6815b92544ac4f2baa35571bc90b7a3e83c8ffe76c24327c31ac82e018b94a9d773ab9 SHA512 c0acc21c6d0af4b59e8b687254501a77340261b6927a84e82f2ddfdc4373c580cc5e987610b844c3fca348c44b1276415443efcfbfd70c3350043ef6fb57d743
 EBUILD vanilla-kernel-5.15.114.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
 EBUILD vanilla-kernel-5.15.115.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
+EBUILD vanilla-kernel-5.15.116.ebuild 3776 BLAKE2B c24a30442a8b2fa704c58bf31061467f8f077ace3721ebae232fd81639e95def5bd06c950f73b5823f9d2667cef4f31f24ccf8d308d1b1b480ba4af7a794179c SHA512 aebfea3cc05d1af79fdb155328d54c5d9beaa86259c543b3b24f4b11115cf7c9b6e433aede426925eee67cd84524eafb223c3e75e32380b22cb630e750475054
 EBUILD vanilla-kernel-5.15.9999.ebuild 3295 BLAKE2B 1e2783cbee7e2750f9f89f6ac90245535f427c85ee9cd00aff625e3e2f0dcbb6c978c63d0801b3ee491956fe71d005c1db12d799daccc1273862f27eaf0c4c18 SHA512 1f658d769c4baebe9582a309942e10d2c4edb289753f17344941a1ac429057b031a9b16cb17c5c23ea3a0f549f689cc55729f97e772c497f56054525f954ab25
 EBUILD vanilla-kernel-5.19.9999.ebuild 3415 BLAKE2B fccd59b033a2c78ed80927aef1fb8c2e56ac60ae94cdc29569ab038af25d7d4a3234e978eb5ceb63f4527a2ec65682ea1a7fec076a3f63ababab520f3ccd1889 SHA512 7e7d154e927d8617e9fac062242388cd5372632cc9d7fb9183315d5ab2e0e116ce3531cc9965ed132b911a72bd956969ab9bfc39f999805b82a96a3320d3d7d4
 EBUILD vanilla-kernel-5.4.244.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
 EBUILD vanilla-kernel-5.4.245.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
+EBUILD vanilla-kernel-5.4.246.ebuild 3062 BLAKE2B 57f0ff3da486dcf8c18cd11607ac6835b7dadd1d792c2499ff6530f0a28a017695ef9ef6e7a0fc15d31b857bfa0359694572cea594cf1a473d639ebb55ff0e58 SHA512 a7c2010a4ac27038d55adc11bc2f5340015266b60f61d93d41fbc20346fdd5ac624673fd08da709d5a144b78ff6a46f28cfc94663f627e0a87ea97db24cb7f42
 EBUILD vanilla-kernel-5.4.9999.ebuild 2635 BLAKE2B a24d5ab83210f70c0f0b32b326b786743c07920dedbb5576994c32f5be09aafdddb5d30c660cc131d26ffb1a86255491ff6c8a7bbacac81f53af5fe92b976095 SHA512 52efbf88e5634ff7a6545aaf0edb975e3e23b68c6799d293ce90c260486bc16c8d1ecba96c301c99e2dbcfc7de85eef071d8e9ee0ca3cd7279b2545e41e11396
 EBUILD vanilla-kernel-6.1.31.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.32.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
+EBUILD vanilla-kernel-6.1.33.ebuild 3894 BLAKE2B ceb59b4d1f283b856477226d074a57d4f46201306ccbe33e6036445ad008a095bc72ef572fd31f1a26c63008e10f80ed10eae149526cf2eb7e16b1fa045022a1 SHA512 55818f504b9f43b0b866cebfc38a33951bbbc602dcf5cc938204a94b7e5854ef7c78217d644105c36bfc56a845a0bb5235bf55edbf80d9a467865847011c6132
 EBUILD vanilla-kernel-6.1.9999.ebuild 3413 BLAKE2B 3e286878f8ad61cd41dfab86e7f5a143f3e165af8fbffa7277d1c5b0a712fbdde55440d069383e273b029967c108ee02caeddf5b6782d966ff3d47bc13763a01 SHA512 4adf01bafd3116668c406ab443e3b45bb37c182ad01931d32ce08eadea26d66df7657eba9f4f199009fb80adca108cb2401fb0a6e3c1c94b2dd77399303dc818
 EBUILD vanilla-kernel-6.3.5.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 EBUILD vanilla-kernel-6.3.6.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
+EBUILD vanilla-kernel-6.3.7.ebuild 3894 BLAKE2B acee4c86bce7612f272ac8ec0f47fbe08bd4cc6db499989c6d8fae38be3ee95c2c4f3666b395506a31f3a5b83745f58f3a7ed0516a97215ff94310342eb3300a SHA512 00e190e1ca517847c6123e2cfd18196c20b032f0c4a49ba66331ac969b120500ca2856d31b97082ed86195f9280980ba8ba52005839105c4056022902e86d4d1
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.183.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.183.ebuild
new file mode 100644
index 000000000000..3d406f474e2f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.183.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.116.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.116.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.116.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.246.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.246.ebuild
new file mode 100644
index 000000000000..e60639c72379
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.246.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.33.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.33.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.33.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.7.ebuild
new file mode 100644
index 000000000000..98a956be057f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.3.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.3.1-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 377248d3b97a..f0359ecdfd15 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 9c2f8ba333d5..a02633e45fed 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -3,7 +3,7 @@ DIST libunwind-1.6.2-loong.patch.xz 122756 BLAKE2B 1d369d18e71c4b9faa79a31a917a0
 DIST libunwind-1.6.2.tar.gz 901392 BLAKE2B 3d0313f7e92cbc3e1a84ad3831a5170f21cdf772f1697ca0a59dea63cdd47da382e9f1fd77325d9ff8bcd47559a425dc883a820c646c628cd00faed82cb0f83f SHA512 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7
 DIST libunwind-1.7.0-docs.tar.xz 27268 BLAKE2B e035009c7a7df15b020b8186e18053ee0e839e4a779155057426531c28d96f18cfc7beeef6ac1dd8496781812bc1023fbfcb5de0dffebda7de0e6975b17a23e6 SHA512 c18e3664d72fa0856609ac99a7ca04f969167f9bb2cd849e9ce0df63565c27a41080f67bb6d452657471fd0796c386fd993cfc4f3881ca47086301cda069b943
 DIST libunwind-1.70.tar.gz 912930 BLAKE2B ef9cd9dc516cf906e883f40230942b18406f2cdbcfa7f7ea25673b400ebe621feb69d13ad1959bd0431bdf9c336082c7c364170214d8ae0f34eb8d285427bee3 SHA512 ec65a73db2f563784b880abf81864b85165255770e950feea57dd83700b72726d0e8c7d5b06e9485735538452730b8ecf2d52c3cc8190dfe69b765e1a9d4271c
-EBUILD libunwind-1.6.2-r1.ebuild 3844 BLAKE2B 66c953378df2de1b8bc339e982d374f7946bc799108d72e2b492b990e1137055224b3a8eab42170142119a27457531cde7e8061e064d060ab2d25c37d3071917 SHA512 a24db39ecfb03feacbc05d16c9e048269f5be73710f2456136df48abb814271852161a67a1f4ebd60413205f5d871bd8e3d895f38f8c01d9eb25f5097d8102c3
+EBUILD libunwind-1.6.2-r1.ebuild 3840 BLAKE2B 0cc6e35135624a52cd96dd74207610386f5be2133380cbcbeca74b7567b26c377cac84f4d290671f429117dd9e53233f425baf9776a28a7a1f14a29196581242 SHA512 ee26b8027395a6969e61da9da0c7ef9743467aa60469d666794833a654f7bb7d93e9609709cf2746998fae99eaaf8a07601e31f8f9612d52542f1b8b8e34f89a
 EBUILD libunwind-1.6.2.ebuild 2680 BLAKE2B 686f5fa9f0362c6669e9195e84f5f35546da5a6d8f66bdf0e9b91a580e1e20b9da4025718ed2f960dff7cbd66d325cb5aec6868b1147bed013486d9ebf4d6b16 SHA512 c44f75111e3a5f97aa85e6124c007c6216445d9ee3cff8418153229a2d97b83b5d97895576993a9c91a457e67f47d74ea50ac755fbbd55f7492a1cbf690ac263
 EBUILD libunwind-1.7.0.ebuild 3777 BLAKE2B 40f192d45267c974f1e27a6f814472b3c6cd24800d43f23464ccd57c79abd4983a363229bbf39910c7bada60b0a093035ee1565719ee368bbc29787a0a98ddff SHA512 52860437c05c092c62cc04848f7f25abf9b010aaf1e46f7c981f36019a277068268d7c9ada442acbc71d7d5e1f2b0e5ae3d8bcfd738e8b8231559b7568dae0ce
 MISC metadata.xml 632 BLAKE2B 89e326bf82b001cbf4fc665315af12062c0afda7a4ebdc6da5b966b9f918e769a516767f6b054b9915ddfe397edc98c4a4f8e6c238d5accf122d3ceb76b92faa SHA512 3677c9c0a6ea3bc90dddf8501209601bdf0b4ea188ec164c39aa6e21ce2f6fa3ce5c672fe7e8ef0ad5c344debf26f8679bc0a126860eb2862832792de9f7d94b
diff --git a/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild b/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild
index c0c39b336b4a..1ac3cb48c590 100644
--- a/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.6.2-r1.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0/8" # libunwind.so.8
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame ${LIBUNWIND_DOCS_USEFLAG} libatomic lzma static-libs test zlib"
 
 RESTRICT="test !test? ( test )" # some tests are broken (toolchain version dependent, rely on external binaries)
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index e57d0df358f6..7d2529e6a9e7 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index e2ddc106ac79..62cc0660be19 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -8,6 +8,6 @@ DIST parallel-20230522.tar.bz2 2495741 BLAKE2B 7a571ff433e56e68956e1c6895cafe62f
 DIST parallel-20230522.tar.bz2.sig 2080 BLAKE2B 74d661d7ae062ed5da40b0d16deecd51b06b11671e8eeb75e5b181af8a0f204b0ead8e4a5e8ea904db3d2c143a1d49e89dbee03178b12f92b3b829c6257b78a3 SHA512 1a8f4e5b0f2128e1b96d6dff200265ae006678169e306a2a80b016963db1385874641809c37584c78f658c4f7d941840b5f991b8d8fc9a61a9c31a8045175996
 EBUILD parallel-20230222.ebuild 914 BLAKE2B ce37126c267be3b357491f7b76da476e7694201c57d5df67cba239a635e8b79597106a101ab107b257334ac638265147810115dd2f3adeb445c2db6baefd1c45 SHA512 529bcaff4277edccd24a0f4310e1f97d5cb5234695a783e96c183062bf2441340c16e49e597aad39165c83949d791dbdd64036640975b3b43d69d7c57930f878
 EBUILD parallel-20230322.ebuild 928 BLAKE2B f8e67f5905b79b1ec7672e14422b7ea4079a10ec21af93fe9792c474853e520d021f4ef335538a1f47589733f25c3dae7109a40a2925956c1d1e6c6e2b52bdd8 SHA512 8541e2a3aae8cf41ff45e92f42fed3603302227c034a8ef76e34e117303ab71cff21b8a61fb3f2ce0dcf148aefbd15fb132c2a0c219bc3bd43acf919024572b1
-EBUILD parallel-20230422.ebuild 935 BLAKE2B c98d1d011ea377171add597408a03fd7cc2722edac5eae29b4c124fb35d42bd03b41468b8f2fd2ab8fb6c68b4fe6ee1c963ba8375bce1e020fa91ba089823da7 SHA512 6abcc2b1b075063d6190d649dabf2cac66371deecea74e69f7241525c94670cb552f4e20b73e7a04f7338818cb9fb2f1f8f5eca95dde64df55a438030c1bdfe7
+EBUILD parallel-20230422.ebuild 934 BLAKE2B 1c7fda94568cbe98f59a9ab85a0189ed2ee1826bc9e820added07a6b9242963c17b38c94401742ef79898228afe6ec7795c96152646ddf4ebb0164e2f4068827 SHA512 5c11a8403ae5814f466d7fb46becf43f4d568229c7cc864e063aeb524ad7f4fcc53b26cb2ec14686ce37810512bacee54b1c2895c825190f1f5070f00e25ba54
 EBUILD parallel-20230522.ebuild 940 BLAKE2B 5525e5307e8eafb4a310dc32addf03f9cadd3471536da4a306810a352a436fb047d852bafcc232ce3ccf5d72695e363a14d178f7c1e2354a89b30717a282db40 SHA512 75183f7dc1e1bf40afb4b3a2cd4fbacfa2fd05adde0b6d309d201e00c7db96a4df9453c183b469000f93dfd1c6d06269586032b9d9104b950c4fafd448536fb9
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20230422.ebuild b/sys-process/parallel/parallel-20230422.ebuild
index ddcde1c9f078..2e6152f32b68 100644
--- a/sys-process/parallel/parallel-20230422.ebuild
+++ b/sys-process/parallel/parallel-20230422.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 724c2ce4ed08..581a4cfda842 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 250f492fc5e1..f3270443874b 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,11 +1,16 @@
 EBUILD dist-kernel-5.10.181.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bcd4cf059ea71647dde5da02c1f76889ee103ff28d36eeb2904eb472020d77c2271193dd23a8206f5c52daf2fd83fc6ad SHA512 46a819292efff1614e7d7ebd344f528db66002ec43b72c1bd0ca6af4a3c504c299e46f99a7efd29150c84a20d47e55cee60593242f13dfb61fdb2c8014c49929
 EBUILD dist-kernel-5.10.182.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
+EBUILD dist-kernel-5.10.183.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.114.ebuild 399 BLAKE2B a864eaf52c6d073cabeb88a64ec5b20bcd4cf059ea71647dde5da02c1f76889ee103ff28d36eeb2904eb472020d77c2271193dd23a8206f5c52daf2fd83fc6ad SHA512 46a819292efff1614e7d7ebd344f528db66002ec43b72c1bd0ca6af4a3c504c299e46f99a7efd29150c84a20d47e55cee60593242f13dfb61fdb2c8014c49929
 EBUILD dist-kernel-5.15.115.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
+EBUILD dist-kernel-5.15.116.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.4.244.ebuild 388 BLAKE2B 74ec9dad235bab972e849e0e63809fd44ebf07f15209f9528694016b0e456aed1d5406810e882b1632cd99bea780e92c040e3cd61a16b79a4aeeeed1226fc3d5 SHA512 5caae3c3baa9607bb90971cebd958b9792e4596201433cb9727da362fd4c521dfdba8d559ad7d23021e4e221da8ac27b4d04a33dc01cc7e3397321d739f2f572
 EBUILD dist-kernel-5.4.245.ebuild 392 BLAKE2B 23e7307e3b46e1823a981583dc446eac90be56b46e0a4e8cc1a921d15e5fd3856a3c471c3a53a546c29e597fab22e16bfb511b7e5ac543923c8708db34ffd453 SHA512 dea200ee38d46c859203a4acafe41a505e860d8353a63a4c6629df091a022bfd1f9c5d3bc9be57e31fc823d952a5425651e0a98bb65b55d78edea0d73915e7c1
+EBUILD dist-kernel-5.4.246.ebuild 392 BLAKE2B 23e7307e3b46e1823a981583dc446eac90be56b46e0a4e8cc1a921d15e5fd3856a3c471c3a53a546c29e597fab22e16bfb511b7e5ac543923c8708db34ffd453 SHA512 dea200ee38d46c859203a4acafe41a505e860d8353a63a4c6629df091a022bfd1f9c5d3bc9be57e31fc823d952a5425651e0a98bb65b55d78edea0d73915e7c1
 EBUILD dist-kernel-6.1.31.ebuild 406 BLAKE2B d2a57d03473571929e7e2e0b24ab0de1a166019a411c63c7aac8f52d43a363e9e17d4af8845d6338b22a6b0cc3dd2bd139f884bbcb1ffd794d091c75bfbc0898 SHA512 51b4d7b63502533d411188e04f36f665d112e294e855ccab411fa6aa9b855e30a250e0f8330f2fceac1d3e08d0b1e831c86d72a2a16142e52007d78491764e85
 EBUILD dist-kernel-6.1.32.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.1.33.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.5.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.6.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.3.7.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.183.ebuild b/virtual/dist-kernel/dist-kernel-5.10.183.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.183.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.116.ebuild b/virtual/dist-kernel/dist-kernel-5.15.116.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.116.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.246.ebuild b/virtual/dist-kernel/dist-kernel-5.4.246.ebuild
new file mode 100644
index 000000000000..a0793715344a
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.246.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.33.ebuild b/virtual/dist-kernel/dist-kernel-6.1.33.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.33.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.3.7.ebuild b/virtual/dist-kernel/dist-kernel-6.3.7.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.3.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/lapacke/Manifest b/virtual/lapacke/Manifest
index d4caeb2fc7a1..bd55707eed2d 100644
--- a/virtual/lapacke/Manifest
+++ b/virtual/lapacke/Manifest
@@ -1,2 +1,2 @@
-EBUILD lapacke-3.8-r1.ebuild 530 BLAKE2B d79087dca3e3fe7e47343c056b81f1d50247a773744e7ffad0c4708f36e736b5d2b3408a1f958029103e37365b9e902aa1f1e0a5c930c974f1f7e9588f825467 SHA512 9a61cf6505a0a3b87eadcf508b68677b125ce9ec9aa5570c4213ca07fb5b432700c0fb28f541ed9ee431c3fde85f523f6b68efdd7e711498c25b47ac951fccbb
+EBUILD lapacke-3.8-r1.ebuild 531 BLAKE2B 85489443addb1dfee758f93099a4c38c16304a8b307036bc6980ad7f465b345a9ed300f033dfa2c4afd64999074c39d3799f22ec1d020f57006bd7c86c096dbb SHA512 c19e37be8270141bb26956971d7626675cc8919015a4d62c9f2b6d3cebece75ab4ce480f3a0f04538c3885eefe31ce0d47f1f537d0a048d03906b7e789651fc5
 MISC metadata.xml 383 BLAKE2B 84c8525092570794262f90183f14adae7b49558f3a94da60e630bc6cb4bde4475667f341dcc93593188a141e4c777223b23afeaadb311a8a2f7e482cf68feac3 SHA512 3a4541c98749acae1d121559ce86a54b5271b207ba63344ea3c1fc19a4fc35d4b1baf44fe7001e1935c48a4818a8b981ee11dcefa7d2c7661a54bcaa74bebcc9
diff --git a/virtual/lapacke/lapacke-3.8-r1.ebuild b/virtual/lapacke/lapacke-3.8-r1.ebuild
index bea5ccb6d488..7cd98e6da323 100644
--- a/virtual/lapacke/lapacke-3.8-r1.ebuild
+++ b/virtual/lapacke/lapacke-3.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for LAPACK C implementation"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="eselect-ldso"
 
 RDEPEND="
diff --git a/virtual/szip/Manifest b/virtual/szip/Manifest
index 73879f7d4a70..c4fbc52f31dd 100644
--- a/virtual/szip/Manifest
+++ b/virtual/szip/Manifest
@@ -1,2 +1,2 @@
-EBUILD szip-2.1.ebuild 349 BLAKE2B 152af77687a3ce3d8640cc40d3c21aba3b7af0c8709143e635ff54d5acd6c5c4472d6eb0b67d6a11bf3c51a12e4dfba7077e6501d22d377cfa0034570d7a6b8b SHA512 846d9e66569a0457db98c07315ddfec4ccaee6f7ae55be92e9f0a5c01cf4f525c00dc08748dd29597557a233b5dddca4479e2e7e2c57c8d2140c11291db2c3b6
+EBUILD szip-2.1.ebuild 350 BLAKE2B 5075e05f0e9e5fee8a264facc330cf955b1f7be941953bb08442c6ff29cef4f2ee470cac772cda1d2f16d7baaabbb13553afb3aed6417ccc97470e69fa561978 SHA512 64a6f4c3f44478b8e46f46430bae7627e9a5e97dfdd586b71fd86a1b1aa9b2c36ffe0666351c8ff0d8bf8a1aae474c298db926a2a93610bc095faee0b777fae9
 MISC metadata.xml 278 BLAKE2B ec2d276da53ec73b30c5f3c1a592d84055592026a448ffdc152835499337f7470cf92d3343f3eca3ec55b44c307878a295a55af0c3d142ef98b1cc892594f187 SHA512 e3ef5c31e448eb600e79d31d402e0822589f5ed22e61df0b45b7a656b6bb0db16d353249debcc480cf6fa0bdcf5f81b360a6e28c796a3dcf432f42f03ab75e71
diff --git a/virtual/szip/szip-2.1.ebuild b/virtual/szip/szip-2.1.ebuild
index f18e9e4fd8a1..cec6fa3bb191 100644
--- a/virtual/szip/szip-2.1.ebuild
+++ b/virtual/szip/szip-2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Virtual for szip compression drop-in replacements"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| (
 	sci-libs/libaec[szip]
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 4a170c620a58..aa0a27e95712 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 826361f819e0..5c34f9f91dc4 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -5,5 +5,5 @@ DIST passenger-6.0.16.tar.gz 8378384 BLAKE2B ae435df097b4692f62bc83c006a2abe8103
 DIST passenger-6.0.17.tar.gz 8422867 BLAKE2B 3ffc7dff50289efa4fdee5cb05254661f57ab5478138822d61f7821cfc6319d881827eb982b30c336bd0294c23e5a57ea81a609d4df6fbb0da0fd844f8148973 SHA512 00c972de84bf0aa6623cf805bdd9c41c8341e984f2a4e1675c9c5e981b369cf69c083bbc421f5d3a2dcecd3b47ba5402ba6d9c7c8ee51dd1b0310395c01888fa
 EBUILD passenger-6.0.15.ebuild 4019 BLAKE2B f0f3265c436b602b24f526c3ab7a63b4667608ddee000fd0364a9e217a48a2ff313e36c76c48d197f8394745ae36d0ee5094d7f219ac86815940cc4f2e5f7bfd SHA512 8c839d2294fb525ef456095cf3dfc1592e65b64a7be715ff7b143fee5418de786fa795254c48f29a62c745061cc29e28aaef4ae6a676cf2a82a36e37145c3614
 EBUILD passenger-6.0.16.ebuild 4025 BLAKE2B cbd7d7c2a6e46f0211cb477f4e1702c30d97dd0fc59d69db3d0e0d7eb95ab9d09468349e750457f6c775aa4286fe8cc1c2988de9cc2b11574fc8ce413abc5a87 SHA512 1f59c7781e6b69b16253481314ba3ccd1914cfc49d40192d9ba14ea8cbb06cb96323476254dc3535fab1d67c7e3912ca7dd5f918e9b4223c9431a90097033136
-EBUILD passenger-6.0.17.ebuild 4025 BLAKE2B f5338b4b6df66c9b9999315d98a8775da9a5c5ba163714a5e9b62a936287294a627cc9cb19c4c4e5156509aa24a4ffabb6382d02972d5315691adc94e0e1f4ae SHA512 b1fee7e2dfcf44d1990618f0928f92ee12bd45dbfc644d2009059fa9e34b5417f04c2606d7558a41e4740323d0a7790160b63b817621b4b5c2bfd56d840193b3
+EBUILD passenger-6.0.17.ebuild 4024 BLAKE2B f9b9f52dfbd36dc67d2a32c8398021e1f2c4414a12ff582d630bcd78460f3020bd074237d72583942b23e234c6251b5fdd287a13169c2e1d4e648bb8d55c1ea7 SHA512 92989bc30ed6a159aec4c2e74f53a7ae5ef740993e08492b634666ad93b5c4a21478b3d5314a91a6525550e757d6c7cd87534540ded578f8f4ac6a76785a275b
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/passenger-6.0.17.ebuild b/www-apache/passenger/passenger-6.0.17.ebuild
index 3914640a214b..5bae7fe2abb3 100644
--- a/www-apache/passenger/passenger-6.0.17.ebuild
+++ b/www-apache/passenger/passenger-6.0.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 # Passenger is licensed MIT, but vendored code licenses should also be taken into account.
 LICENSE="Boost-1.0 MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 2911417e8a3f..32ab8c0919e0 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 2034ed55697f..4b6f4a9b5ef4 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_115.0.5790.13-1_amd64.deb 94479992 BLAKE2B 7d64dded7db7f8abf3f77337e191c242c56c1f8596abe19424341d9ace7cdc540850e661475dfcc3e71e7d47b3d5810dd989324fe0faa5a195f583201c35ca10 SHA512 3b3cf33e4385a60a135409038c25e6e915f808955f0330ca31fc7cad1824a0bf11c7a9d9b38c0f080bbf7f8a133532544b3432ecb50176f0b7dd0116d62d5324
-EBUILD google-chrome-beta-115.0.5790.13.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-beta_115.0.5790.24-1_amd64.deb 95225388 BLAKE2B 35575fe8f71e1ec9778b8ae4b295c687b79062aa4f6bbf06848ad87c2f892e9df15cccb4f63b98cffa4a215e794574be028d22c1ad997f443bd7982048b35b78 SHA512 c59071d485c4ec29fa1afbe8312c2e2d28b20a3d7b25c01aa47fa27e185812a07fbb0ba9be589725347096ef0fd25349c0d929c76cc40a155d3e0bb260b1f970
+EBUILD google-chrome-beta-115.0.5790.24.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-115.0.5790.13.ebuild b/www-client/google-chrome-beta/google-chrome-beta-115.0.5790.24.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-115.0.5790.13.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-115.0.5790.24.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 09c17e3d4f49..58e4f67e3dc1 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_116.0.5803.2-1_amd64.deb 95353720 BLAKE2B c139793a1ee925720933942e8fff6583ae369b0d6fc22d11c8fbaf67c963b688082f7f4893fa1157153a77fee35e5ca0b938d3995581be81a6af20a8ae90a523 SHA512 81ebd4a24920df45895187ee1d516aae626eed0af71f2291bbeb0701cd29350a4f23c17b2af3789b9d88062f55345f3917e29c405f5a7a1250a78644665a201b
-EBUILD google-chrome-unstable-116.0.5803.2.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
+DIST google-chrome-unstable_116.0.5817.0-1_amd64.deb 96107168 BLAKE2B 8b2314a868034f1ed1b2feb954bfb4ceb68a1370d7c08f7be715fa1107a07068db165d0c3399054c56db3e84758ef0427e6dab69edfdf1b8b8234269083b7422 SHA512 b90bb418ee31487a81aa32f67111ac7b8c871b4dc5c3752cfdd3710b6579b3e513c41f96bc28c67fa95b79541009c6e607b4d2fd0c64df3f9401b5951079cde3
+EBUILD google-chrome-unstable-116.0.5817.0.ebuild 2872 BLAKE2B 9643117a41620cd3c953e32c14ce636e6ee81fdfd7112704020af97e843cc09df30115d8612be664cc2db4d890ead759ebd83ebe7c85f948a1234b76047eb7ad SHA512 9299a45facde8b860825af0c020d0f1b69a54b4db393aac444437870fbbae920a69599e23ba1b332383b01b1ef8e9a1aee70cc08dcf7323df15d76bb66579005
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-116.0.5803.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-116.0.5817.0.ebuild
index 0989c02308b9..0989c02308b9 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-116.0.5803.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-116.0.5817.0.ebuild
diff --git a/www-client/microsoft-edge-beta/Manifest b/www-client/microsoft-edge-beta/Manifest
index 0e3ceb89d8b1..62173438cc6d 100644
--- a/www-client/microsoft-edge-beta/Manifest
+++ b/www-client/microsoft-edge-beta/Manifest
@@ -1,7 +1,7 @@
-DIST microsoft-edge-beta_114.0.1823.30-1_amd64.deb 147267058 BLAKE2B d70db1588fddac5cd6bd2a624ae25fd8fbbe7134b60c5b4733f76e70eef1e9617b8106db22a575f5e75d4e911b55a2eeeca25a80fea8d523e8127f5c18bfc3ce SHA512 73e93a23079e2a2b809ca5a833c384d75737e0c2f39691fcfc162037f3e553092e5ffc0e1aff54b1212f0dac4335798301a67790455f6541410edf7d57532931
-DIST microsoft-edge-beta_114.0.1823.35-1_amd64.deb 147285226 BLAKE2B a22e690e3e441f6509d9476397904b55dbfb69036567fef71f0e3dc4bba8b713e570d5b85671426f8ec71351b1cc249a4b4023b9534a191929c6bc08f7ecde1f SHA512 a1439cfc17f6f956591f3c25640dfa6114c6b237f216c4d70e26e19feaf62d01e00a67c7270052635b5809161ec64d8c013c50f9fc0632038179b38ab5349fe6
 DIST microsoft-edge-beta_114.0.1823.37-1_amd64.deb 147341014 BLAKE2B 7b4e45855a5046a4ce9a5e8d717fa8c01d6587b1fb595c910331e8560ca904fc8755870716e5af3033172748294a77549cbdc866a655aee2a03f65229421fbf5 SHA512 490b3e21f3bee5fb58f0f4d464225ecaee344cafa48fc724c95c525aa033d40f6fa5a577e2f4a072f37185313e88be2512f5a9e223f77e4331f6b4722ff82c22
-EBUILD microsoft-edge-beta-114.0.1823.30.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
-EBUILD microsoft-edge-beta-114.0.1823.35.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+DIST microsoft-edge-beta_114.0.1823.41-1_amd64.deb 147343634 BLAKE2B 6c6b3796f051c4e78a989916f82bb918f963c2fc26bb7973c73c74e040b29c22ca8aef8248428b58ebfcfd06b6c3e42179cdd317ea0b77239da12a8e5e8fe497 SHA512 8e9d3369f849063aeeb1e41147e00bc40e873f35dee30936f74b45f989263502e753fecb241eeb0f8297f6ada62b88db3dc9b0094f723c195ac7c16e6b15c407
+DIST microsoft-edge-beta_114.0.1823.43-1_amd64.deb 147316730 BLAKE2B fa4835ab48917c560c9a597dd5f3a7ecb2a351bf7e07cc396bae5223939c5a60c91a582f9ba43f90c1aa54a0b11277e0390329eed9963b8b0c2f4de9708786e0 SHA512 6d7509e6b4d999b94c59d5f8528fee9e49080b22530f32d86c5db31e27821b86cf6b913650679ad2f322a6be750850ca5c013302bb285a64f3acf68268cae627
 EBUILD microsoft-edge-beta-114.0.1823.37.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-beta-114.0.1823.41.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
+EBUILD microsoft-edge-beta-114.0.1823.43.ebuild 2610 BLAKE2B 609795e4a6fc2716b624555212f9ec2038cd17ad0af2133548ac99f63b8fc34733686f3fb845637cdcd589e3bbff7259540fa06c264fb51d23ac6b2570f0a58f SHA512 7cb6604697d8f55a7da5ec1b9a8b49921f0bb62810962c2b8de5f9197b40ab21fd0e2e59daebb7bdea56df8d3549cdcc4bb02bc1b8aea40ca02ebc6bff7a5d1e
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.30.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.41.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.30.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.41.ebuild
diff --git a/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.35.ebuild b/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.43.ebuild
index ebc23fabaa28..ebc23fabaa28 100644
--- a/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.35.ebuild
+++ b/www-client/microsoft-edge-beta/microsoft-edge-beta-114.0.1823.43.ebuild
diff --git a/www-client/microsoft-edge/Manifest b/www-client/microsoft-edge/Manifest
index 9c9ad6e021e2..81c7b1b1aee3 100644
--- a/www-client/microsoft-edge/Manifest
+++ b/www-client/microsoft-edge/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-stable_114.0.1823.37-1_amd64.deb 147255626 BLAKE2B 8d2b8c269812c25770b0c7e589ebf5eacaa5e82c07190deb67f8eaa008f650c7d0703bc936b7b5577a416a18e451a6f69d84ec1ff29ceb0857a4c9d1614f9edb SHA512 d670a47fa532373a69fe2c121bb04dd47cd0563f11537e52884cf99d2475ee906b007ce5ae573c3f206745d72c847f673104e6a0897ff05d0e9322e64d743e24
-EBUILD microsoft-edge-114.0.1823.37.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
+DIST microsoft-edge-stable_114.0.1823.43-1_amd64.deb 147311590 BLAKE2B 5d3767d0389bf08817070930cebd5701109fde39f24036a8068530379e265097ec6020388613f154997b9dace7fb17af3f5238a49c51dcd777232a70528946ad SHA512 b42c22f5465dc861b694afaedc4813c0bc7a5bc8632ab4159db4c67a7daad729f78a1c36b9571716da6a6f58f5e92ed2d5c673206f299d102be39ae12d02fe84
+EBUILD microsoft-edge-114.0.1823.43.ebuild 2609 BLAKE2B 90b177b603961701034cce74e7157913a700d5d0e3c656cb920a4dfcd8bcdea12f4233a7e18d5ed5fc8e07eafa559328c8ffbd6f3a601462f6ae2e668484130d SHA512 4ae9b77a6442058170f4b72ed5b953559617a2baa6449497879b9742367dc465b15cf2a4202cee7d073d1a459faa8d984084559f14bcc52a1354929e3047ae49
 MISC metadata.xml 528 BLAKE2B ef09f12e6f9b503cd78a39ece67ab0b21c4760114b052bf105b7c5e426a1df43a5b37ff547338fc7122ac8a029b2ebb85a8793dbd4d192ae990ae71829dcdec6 SHA512 b6ab632cfce365f249a178a261eba3d469cd645cdcb99dd1bc4f1e865fbd6668cfd0f7171843e2b234ff852f8191a8b08b48cf89991cdfc7ca36337a71e5a38d
diff --git a/www-client/microsoft-edge/microsoft-edge-114.0.1823.37.ebuild b/www-client/microsoft-edge/microsoft-edge-114.0.1823.43.ebuild
index 40e3af0e1470..40e3af0e1470 100644
--- a/www-client/microsoft-edge/microsoft-edge-114.0.1823.37.ebuild
+++ b/www-client/microsoft-edge/microsoft-edge-114.0.1823.43.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index f2468b2728f3..d6028429198f 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-110.0.5464.2.tar.xz 1280752 BLAKE2B 9f17f85377d06c7c36729ca3a29d02aa2d7fff3bbbeb4cc26f60252e350c50c3a06eeb7e3c896154617ff7ee43d5881177b819618c13dc1254f7d3980bf0c363 SHA512 d9b4a52b29be287e5d20f6922c64e0e3cbfcd7eedd3109c12ff72c376ab14bce4c421be4dccea2ed1e4c899f11dcc8416545911ca84d8d6c994fe6ab87425ff3
-DIST opera-stable_99.0.4788.47_amd64.deb 105597548 BLAKE2B c841a303f1c428c37e31979a6e1af8591c9db0591d93ec5d539b3e54285ca65dc270034cd187d401364af9386d419a0bb5dd94cc78e01b0f38df48b9b5e98894 SHA512 0148097dc0600c53b9e7ef5fd5b18ec0b0a5b0d5e9d964f53720eec7f310717c8d4bd9b4c437dd96a31cdf5703e6fdd40527fe4753459e1fc8a8b2b121f1a8df
-EBUILD opera-99.0.4788.47.ebuild 3689 BLAKE2B bd61a722cb6cbf29f1326302c127d312a3157ac83111579654e06463c4ca9531354ae4950f872d9bcd5b4ed62ed2fc78dd4b4fcd31aab94c7791aefe1aeb7864 SHA512 0af77c07e5019d9eafaf8f7154692d80d65455f9bd3acf1884e6b4149444868e9e1332511a7915e141918e0b878a70525c8607dd80041663bafe2105f234794f
+DIST opera-stable_99.0.4788.65_amd64.deb 105591820 BLAKE2B 10226ebcd0c40b683c2769cbfba58bbf1b26661244d1c330dd40a642037ff620a14d734893a437c0c051b848ed960275dc9a4d1258907e21d81f2a4cfe87c574 SHA512 ed2385cec009206ea3ed4b120bf76216b54250199886c92ba7858d4254daeec55aaab89f1b14f4f8f0a0f3036cab0fc8cee3ed98054b24ba90c5b9ac17c4eab6
+EBUILD opera-99.0.4788.65.ebuild 3689 BLAKE2B bd61a722cb6cbf29f1326302c127d312a3157ac83111579654e06463c4ca9531354ae4950f872d9bcd5b4ed62ed2fc78dd4b4fcd31aab94c7791aefe1aeb7864 SHA512 0af77c07e5019d9eafaf8f7154692d80d65455f9bd3acf1884e6b4149444868e9e1332511a7915e141918e0b878a70525c8607dd80041663bafe2105f234794f
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera/opera-99.0.4788.47.ebuild b/www-client/opera/opera-99.0.4788.65.ebuild
index 0e25b4f32b9e..0e25b4f32b9e 100644
--- a/www-client/opera/opera-99.0.4788.47.ebuild
+++ b/www-client/opera/opera-99.0.4788.65.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 2eb3bd9c32ff..810441a34012 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_6.1.3023.3-1_amd64.deb 98019640 BLAKE2B b7a1ee673bc2f0730af89515959d0e83cf274ff69a9c1f2c1fe43cd4db33c3409fc094f86cebc3a15b939b6e49bd4841660ff907585b34327a7591c8891742be SHA512 e332b07ce2b4b63a1a87e973b3b47004b778cbaed1e7e3f41012ed23a6fc1686c7ea4731ee73311e22b7b1cfc0ddefdd23f08e9c5e2436506f73571b1b2ad0b0
-DIST vivaldi-snapshot_6.1.3023.3-1_arm64.deb 93535544 BLAKE2B 9c2492c38112ee2756c9627a8072a39bf4483961103f748aab1c27b4e755c14abf322d786bd0a791e2161a9a8c77889d3726e4e98921a577c9e7bbe8e5376ec6 SHA512 095698548776a9adc287d21080d993fec2d683433f790299e1a0047b982c0651bd19725805eeada9de074865d95e98c688387d84276d5842a7ef34cf0a8f2f3a
-DIST vivaldi-snapshot_6.1.3023.3-1_armhf.deb 93642376 BLAKE2B 636800843df0d5ce4051344b093bc219a37d02745398bf00284cacc62a56a0414957015a63791d9d0e29e58e5f9d2f1c10ac21551e0d24a67f777a4536f410dd SHA512 35aa1cdbd19f6cbe7cac29155d1b38633ab1ea48e7775ea45b5aef2c1ff1fa1dd9b9a71f3ab0aa831b7d82c46f179239dca0823c231b0b110e8ad69a65ee9417
 DIST vivaldi-snapshot_6.1.3035.3-1_amd64.deb 98024212 BLAKE2B 492ac02599918af86cb282b33c1118b0b32202455d0bc8299bc990bd5d257111a350fda458de1744b2ebcccedeb4ff4884e4da11e5473ec9defd65eed847d2e0 SHA512 decf441c019b91b49fc17fa5e49d503e9a2e8a0fc25bf96acc8570f0af74f44a460b4c498a225d99501074399dba8c785829dc2edc4a31f0f001df0e73c15007
 DIST vivaldi-snapshot_6.1.3035.3-1_arm64.deb 93483324 BLAKE2B 838d9eb9d6d4f8765e73d18d581898584121b99ae3747372d6a12b818c11e6de3ff95b69e6804d311d9d063006352eab9b59257c8d5a0b9ad50282cd70dd53f5 SHA512 5a01e5b022bace6b32cc70e3613ebd374bbc7d0a6d74871895d67ff3b28ede148966d866094d9621866f949f7b0cde8a139582dcffd01671422f6d92403cf60f
 DIST vivaldi-snapshot_6.1.3035.3-1_armhf.deb 93678588 BLAKE2B 3254e89a873ac1a48acbd3c5f89c7384120093197163af2a01cba23e3b0eb3322f0cc2b653f377b9bda5908f49b273aca22102f450f4e5db54a26c27e6956545 SHA512 0c6fb32bb14ab62cc8714f7612cc0b54036b75755829cc3ddf1c5f004bc5c207fc8f2d5857d79e8d596131ce8339a36e316e251e9d4ece6bf95e1f45fa25bbf4
-EBUILD vivaldi-snapshot-6.1.3023.3.ebuild 3875 BLAKE2B c86ecfc1e8f1f30a2d42ce5dd6bbcf97f1f83d3a0a766bd15b89ad348db11e93272f80dd687ccf95805edeaf6018f2143f6a80fc2ccc5365a4980b2f105ef759 SHA512 b68650bf82065f15a99bba4836848033754124e1378bba5851608da15ab467ceadc36216cbbdab4eb9c618a700de343175080b0eafea94d64410dbc3d85f51a5
+DIST vivaldi-snapshot_6.1.3035.50-1_amd64.deb 97845924 BLAKE2B 30c03e84b707d86a689a51a54258302ce4f4b9550596c12c9f9cebcb320e1399f89f842c05fc09a1687ac0a62c5aec59ce4e123009cbf3917f2338a4e17f7a1b SHA512 97b0872da2b97371848992f20ac32d830b72f26d26499591f31f7fae85ff8610f42e383868758db61c17dc76ecffb6bf1425db586807512ba023cb5b73f7578a
+DIST vivaldi-snapshot_6.1.3035.50-1_arm64.deb 93465764 BLAKE2B cc37d4fd4371354825bb147a3147f75c51df9adce52eca2e3e120942d13f9cbb983671464964d5a206ad2f55b432e59b71abac43dde69b430153f67f7a7721ec SHA512 0613b0a089fd6b70e62acac7da1a79c46b00c1a41b62e6da4d6a2c5ff7f9caaff6c6766a4bca422fb93a68840fad3e7ef0aaa180783c92c8dd0d1670eef0fa73
+DIST vivaldi-snapshot_6.1.3035.50-1_armhf.deb 93617388 BLAKE2B 4b856b3f8f4ac7bd60cc84691f6bf57e0d755a3f7bf9840ac9d5af373a4052057c555a29826b20c867879bf9a166a4b6d38c6654cbafb7d323e4b1f9a5573a8c SHA512 b7194639f50aa89b5ace81a62330a905cb5721f1406ea2e20cc3f01f46d8468aa2046bd775f8e9d30de3b818528e82046e89e075c943327d16fe8f7cb5a8b717
 EBUILD vivaldi-snapshot-6.1.3035.3.ebuild 3875 BLAKE2B c86ecfc1e8f1f30a2d42ce5dd6bbcf97f1f83d3a0a766bd15b89ad348db11e93272f80dd687ccf95805edeaf6018f2143f6a80fc2ccc5365a4980b2f105ef759 SHA512 b68650bf82065f15a99bba4836848033754124e1378bba5851608da15ab467ceadc36216cbbdab4eb9c618a700de343175080b0eafea94d64410dbc3d85f51a5
+EBUILD vivaldi-snapshot-6.1.3035.50.ebuild 3875 BLAKE2B c86ecfc1e8f1f30a2d42ce5dd6bbcf97f1f83d3a0a766bd15b89ad348db11e93272f80dd687ccf95805edeaf6018f2143f6a80fc2ccc5365a4980b2f105ef759 SHA512 b68650bf82065f15a99bba4836848033754124e1378bba5851608da15ab467ceadc36216cbbdab4eb9c618a700de343175080b0eafea94d64410dbc3d85f51a5
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.1.3023.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.1.3035.50.ebuild
index 0411bd537ae5..0411bd537ae5 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-6.1.3023.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-6.1.3035.50.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index b7acf90ad39c..dcfc35f1e039 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-stable_6.0.2979.18-1_amd64.deb 97994516 BLAKE2B 523dd44f6cf60d5d3c88d6cf7f4a47f1c9d1c9e2b8decb16d09f692b7936ec0e4e7874f5b19020b5ef9fe6a54670cc3453edd164e7bae633c82f22a1f0117274 SHA512 863c361c3b03c7a445128e061487a3cc4cfad04ab859ee81555129c31a13ee0a7eb7b391388fa3ccbc7e8b19345f60af830131d87919850a405622e5322511f5
-DIST vivaldi-stable_6.0.2979.18-1_arm64.deb 92669888 BLAKE2B 2e19aa531d7d4aa0389a93a15b65818d78e69eb03b7975420007200443d13e3c5da620bab276dd36a21691776a6dece7135de97e4a12a47e8b907228818dd643 SHA512 41bc379d18333d3e03574e2b0804a9bc353eb3f39bd9be7cd1a7376eb971bfb98f78355336a5aedd614e220833cca7f2b34a5339dc99467a0a19d0a7120906c8
-DIST vivaldi-stable_6.0.2979.18-1_armhf.deb 92533028 BLAKE2B 20ba6648eabb8bb5efb80d7f07d0263859482b2770ad9d2bfb8332822f66e0934189019c60abf88381a999934b0851226d4a661c7d8fb4c1e67cd6f13c38a130 SHA512 3445746d427d0d12026b0fa8146f5d741a1aaa1df1eba638a450cc807f3229810653058a6fa431d41a40a9ec05933ece0d84cbe7475be02014da2e8f61cafe53
 DIST vivaldi-stable_6.0.2979.22-1_amd64.deb 97994468 BLAKE2B 3f721946b10bd1d80cc6837e236fc61433cec78c2404396a08cc9ee5c5824514af04668db9e8f856cbdc8625bc05d7cb3614260a3d24d5491b22869cbfb0035f SHA512 f6e2b160ab6965f3bbe0cb94b8af2d9963bff818638310b7dd9e9cd5d6bf3a6d7536f4557df5495445dad54aa7ad7f23eb1524c495ded3e0d0e9a854a75556d2
 DIST vivaldi-stable_6.0.2979.22-1_arm64.deb 92700856 BLAKE2B 28c7c015a2a7581ce7ee93aa9642ed08688318c13f09b160afb98cee5b4a82e1a671d354fb16ea2038361b395bbaad1655cf5bd80d3c90f816030d13a22858d8 SHA512 9128bd246ac669a9428de2d2882c726269c84544b764b7ae933cdb228f8b7880daa80321a0b288634d7d93806afdeb5f040ccfc5d6bf60b340eee47caa922e47
 DIST vivaldi-stable_6.0.2979.22-1_armhf.deb 92539664 BLAKE2B c183a2053657eb0d57b9b02359dc111e8a6bb02e0494faba1b33515f8d339bf2fd5d3ccbf8c388c6a97a13a70b2aa78dc275e5635d3937c84f64fb80024fad13 SHA512 3edeef5d7a9f3e42c50a6460a833a3775154a64ccda0f8fd887dd68b7b763bf72d0b4408b8548d2b0053a3b4c91bafd79a0078ac3cf693f1354daa99582a9929
-EBUILD vivaldi-6.0.2979.18.ebuild 3874 BLAKE2B 297e746d9fbbe56edc11a73f356762c5983c7e672117cb8743290356ae6e3fc48ce2c1c6e95ee09ced16e368425fd58009f57690aec7897be11aeed7a944be40 SHA512 2ed35d2408db65937399c28c705fd3b391a96a60d43fa00f83b639406e4672f6bc9b56ffec53ee95692fa052f3190490db2c4f74182c035abe63df983d5e83de
-EBUILD vivaldi-6.0.2979.22.ebuild 3875 BLAKE2B a87ca69f0b348c5f2957b8a231f830ff8d8ad7870b75ab5b3080e60e22c7b5836bd3d82065b4821713cae3432e63828416dbcc7eb05fed3fd4ba8537fe981428 SHA512 e7bc002c5feef2b8aaa6d378ec5e20d8e373e92f76dff63520f21df1691b33e7e4f20f2691f61c493fdcc015817905c5b787f7d590fda44a52e61469af9b1639
+DIST vivaldi-stable_6.1.3035.51-1_amd64.deb 97869000 BLAKE2B b91c0b4eb646b74900457ef63a9e6fd2f32ef820237c352faee4298b06ef7ff181315d83e8739cc0a9465d8bb0fd655f9534782b56257e714f9ce9811759ae6d SHA512 bce8a75acb9648f16dd19deab4607f67af15ccab59481f9efeb8bc498b85825b45ea7b5f9a63ffffa2055af4cef34a3f302df0baab0ba6f291a49795ea2c3dc6
+DIST vivaldi-stable_6.1.3035.51-1_arm64.deb 93469108 BLAKE2B 0083e8459c8ddc6c1d5711874f7c43dbc777afb865aa7c47b46ddba4cef1a0df2c9b09433a1790a12af663d2a500ca1a9a91891521c2a664522fc38e34e3e54d SHA512 c1d992706ceb0d95e13075057b6f98cbf0e92e28ab9c12b2d4eb86f4aa4c4cb78e1ffcb92c679bbda5cbf7f5b9cb4d3937795427cca7103469d77caa7b8a3d37
+DIST vivaldi-stable_6.1.3035.51-1_armhf.deb 93646512 BLAKE2B 79a09180fb6639ce488dbb8f754eccdd9ac38b7c51fe3ca2ee9b6de873bf5090f3d54e7a48852d7538180f91ca3c8b1c64b22b7f6523771824173b5489d5dbbd SHA512 dde59299ea7027e669b6723cf0fc538bb723ee7e0677bb0d488814b8dc4d644b656d5fdb8caa58c84d92e64bdd4c1eb39d9eeaeae2c0a0a3f41d5002e02e3d2f
+EBUILD vivaldi-6.0.2979.22.ebuild 3874 BLAKE2B 297e746d9fbbe56edc11a73f356762c5983c7e672117cb8743290356ae6e3fc48ce2c1c6e95ee09ced16e368425fd58009f57690aec7897be11aeed7a944be40 SHA512 2ed35d2408db65937399c28c705fd3b391a96a60d43fa00f83b639406e4672f6bc9b56ffec53ee95692fa052f3190490db2c4f74182c035abe63df983d5e83de
+EBUILD vivaldi-6.1.3035.51.ebuild 3875 BLAKE2B c86ecfc1e8f1f30a2d42ce5dd6bbcf97f1f83d3a0a766bd15b89ad348db11e93272f80dd687ccf95805edeaf6018f2143f6a80fc2ccc5365a4980b2f105ef759 SHA512 b68650bf82065f15a99bba4836848033754124e1378bba5851608da15ab467ceadc36216cbbdab4eb9c618a700de343175080b0eafea94d64410dbc3d85f51a5
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi/vivaldi-6.0.2979.22.ebuild b/www-client/vivaldi/vivaldi-6.0.2979.22.ebuild
index 655ed5d159b9..cc99dbee312f 100644
--- a/www-client/vivaldi/vivaldi-6.0.2979.22.ebuild
+++ b/www-client/vivaldi/vivaldi-6.0.2979.22.ebuild
@@ -98,7 +98,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-client/vivaldi/vivaldi-6.0.2979.18.ebuild b/www-client/vivaldi/vivaldi-6.1.3035.51.ebuild
index cc99dbee312f..0411bd537ae5 100644
--- a/www-client/vivaldi/vivaldi-6.0.2979.18.ebuild
+++ b/www-client/vivaldi/vivaldi-6.1.3035.51.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="112"
+CHROMIUM_VERSION="114"
 CHROMIUM_LANGS="
 	af
 	am
@@ -98,7 +98,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index f9abf702554a..8e19c99c215d 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index e27fbbc444a7..47f620ce9178 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_115.0.5790.13-1_amd64.deb 94479992 BLAKE2B 7d64dded7db7f8abf3f77337e191c242c56c1f8596abe19424341d9ace7cdc540850e661475dfcc3e71e7d47b3d5810dd989324fe0faa5a195f583201c35ca10 SHA512 3b3cf33e4385a60a135409038c25e6e915f808955f0330ca31fc7cad1824a0bf11c7a9d9b38c0f080bbf7f8a133532544b3432ecb50176f0b7dd0116d62d5324
+DIST google-chrome-beta_115.0.5790.24-1_amd64.deb 95225388 BLAKE2B 35575fe8f71e1ec9778b8ae4b295c687b79062aa4f6bbf06848ad87c2f892e9df15cccb4f63b98cffa4a215e794574be028d22c1ad997f443bd7982048b35b78 SHA512 c59071d485c4ec29fa1afbe8312c2e2d28b20a3d7b25c01aa47fa27e185812a07fbb0ba9be589725347096ef0fd25349c0d929c76cc40a155d3e0bb260b1f970
 DIST google-chrome-stable_114.0.5735.106-1_amd64.deb 93850844 BLAKE2B c9b221440c82439424c2dceebdd0a9636c65c682bd0f0b6b22387fb412728d9588e3c3130e0e4e54c95d9072e57f5606458c82d19e5d4af20f8ab0f68b40dc71 SHA512 fb9c4cd882839f56013cca7535ca4b2e3779a3148654225515039d3d8ee0f21bdd1a0e1631918c4ec729041258b471a7b2acedb8027b5e55af1cc1c8cd642609
-DIST google-chrome-unstable_116.0.5803.2-1_amd64.deb 95353720 BLAKE2B c139793a1ee925720933942e8fff6583ae369b0d6fc22d11c8fbaf67c963b688082f7f4893fa1157153a77fee35e5ca0b938d3995581be81a6af20a8ae90a523 SHA512 81ebd4a24920df45895187ee1d516aae626eed0af71f2291bbeb0701cd29350a4f23c17b2af3789b9d88062f55345f3917e29c405f5a7a1250a78644665a201b
+DIST google-chrome-unstable_116.0.5817.0-1_amd64.deb 96107168 BLAKE2B 8b2314a868034f1ed1b2feb954bfb4ceb68a1370d7c08f7be715fa1107a07068db165d0c3399054c56db3e84758ef0427e6dab69edfdf1b8b8234269083b7422 SHA512 b90bb418ee31487a81aa32f67111ac7b8c871b4dc5c3752cfdd3710b6579b3e513c41f96bc28c67fa95b79541009c6e607b4d2fd0c64df3f9401b5951079cde3
 EBUILD chrome-binary-plugins-114.0.5735.106.ebuild 1178 BLAKE2B 4144d89038f8f70136a77d57c3b14e83ed1be4674ab11104bbf41d822fd28325d207b4d8a7543eff856aa943dc11e3a9185683e704640ef626a0c61652e91d84 SHA512 fd6ea3e0a93e2e848c2e4dd23618c37a2b656c6c05f31fc28440888196e02226fdd272887abddf4a6b78d46befc3aa13b81c7df499d693accc04a1d771a4bca3
-EBUILD chrome-binary-plugins-115.0.5790.13_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
-EBUILD chrome-binary-plugins-116.0.5803.2_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+EBUILD chrome-binary-plugins-115.0.5790.24_beta.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
+EBUILD chrome-binary-plugins-116.0.5817.0_alpha.ebuild 1179 BLAKE2B 22b12632b6411257f42e355b4cfd59ec1432b3b52e386d23c5254bbfbf02d34500982549db4d5eb145def8b2a4265d359b1e466e0b3fbb5d5bad31b9c2618212 SHA512 a6ccf2da3030d77c2aab71edbeebf62af1d91b3fe9f805d255902491f17ab62062e3fe389af865716edcbdb559b64632452ca698e126bab949b885309f8a48f1
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-115.0.5790.13_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-115.0.5790.24_beta.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-115.0.5790.13_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-115.0.5790.24_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-116.0.5803.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-116.0.5817.0_alpha.ebuild
index 238a410c5c55..238a410c5c55 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-116.0.5803.2_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-116.0.5817.0_alpha.ebuild
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5fb7daf65f29..0764dd3d27ad 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 5fe880cf814e..b2a13c335a5e 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -4,6 +4,6 @@ AUX xaos-3.6-buildsystem.patch 2460 BLAKE2B 7f8c5fe68e1f7f626236ffd687bb1e33ce1a
 DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1
 DIST xaos-4.2.1_p20210828.tar.gz 10918756 BLAKE2B c1431596b503d9b99c880945edae577c493ff4061020052d16dafe79f3abce0b137b789493b103a35d96ac954a47d76aa47d32972feaab0406d2cedc0e685504 SHA512 847315566c72d6b793f32b2c468b0c90e69877d9e9620f1f871e768cfdaf5b156c0d5b568274f3fb89b58ffb74c990108a96a94c21a753965b682adc5e99dbf3
 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262
-EBUILD xaos-3.6.ebuild 1889 BLAKE2B e294e5b6a209f5ed71b613d376ec70f9f78b697763c36cf43df347fba24e4e074c3d32503942cf28add956f5ab90da5242057f4d6b4784e41908928e15afb3f9 SHA512 56721f961d334d0d00a9417af5fb5e5fd98fcc832604dd542d47e911b14d4f9742ba34d7e936796b8d5a1b14aef54947274a6766d0fe75022bb6f23459576328
+EBUILD xaos-3.6.ebuild 1890 BLAKE2B 5498e29b6635b4c0e8be50d05e7ce42e9488cc6134871d667756315f665feb2c51072630332c1cf0f5afd7c1d60b072ec03f94df612025fb543c817312ab44d0 SHA512 5d10f5626832de04d9e37ffe823341c1bf99915713570933425e17778d24b64571aa177217bedff755c628793111ce01d1e759cc3b61f08c2d42a41c79c86114
 EBUILD xaos-4.2.1_p20210828.ebuild 1181 BLAKE2B 2bd92b637e2df0ca1524595fe14bc6caca92b33a32a737bf976c5875103d91547abbbb31130797cef218acc7ff472fda361b65854dbc7e14797ae885582a0252 SHA512 9ded7e023a38d2a8e9ac08d45f9e04cdaf13476935404c5635e517aeb6aabc292c889383509b11bd4028b62f72cf6b1e26128f01d8cb2343f304e0169a6b8c86
 MISC metadata.xml 769 BLAKE2B 91ebcf5120e357d029690d82d20b3612e73d142092d720f4a2d63715815010ee3be1c84255eb66de6acc17f603ca5b646a864b04c162f0033db293e8e1045be9 SHA512 3199b818cc7eed76a40c73f48eb1c81a7e03f27f52127402ddc5c81ac40f2bc560a0ef9e1a57b5094a5f793bd62a968003725ebbe311a17ed8dcee83186ce70f
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index 8ce692dd3b90..e597035e043c 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="aalib doc gtk nls png svga threads X"
 
 RDEPEND="
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index a2f809817bc7..e24e6cca12e6 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -2,7 +2,7 @@ AUX xsnow-3.0.7-gamesdir.patch 317 BLAKE2B 747eb31910be55b1086e05f685d39118e274c
 DIST xsnow-3.3.0.tar.gz 405967 BLAKE2B d2b6d87b781c894c09157ff2f06389d0b1cf401eff735b812ec324560d295195c5afaa3c9c755f569f10f4ff4cd9738dbcc393044dbdebc13454bfeb8e1a9065 SHA512 b2674039ed26c5788a137cf44396b18f07458e926ea0552034d2c78cefaeaffce35ef42f2da386ee48b8b4d8f98960a4a31edfcf737c6d269485785699f9227a
 DIST xsnow-3.6.0.tar.gz 495875 BLAKE2B 9ebc87254ce81b7fd051bbc0170faa7198390679a8dbaccdfa3674b1f584ad298fa73506b7eb8ff63fe04f168ebafcd30bc2101510c4e912e029edefe4813c65 SHA512 e2684e6d011a8add8819e16b6b649f8d501525c41a4baa0ef32d90b7603e30910a77093c2d21f52a7adb72f0ba18076f9265557e70dc246b365e0fd2b8ed4ab1
 DIST xsnow-3.7.4.tar.gz 1381177 BLAKE2B 7ebc5bf2c64ddfebf1167fd6ceb29ed52f88273bccc4d8f679d102573bbd55f5da0c3b1c01a3157a4de515d1301451ada24539555c31afd5fc015228c35a0dd4 SHA512 ac58a7ea63126d61a8f01d06422db8f12b31d23ff2edf03967f4a12e146e2d5934a24643d8487e35f6f99d35ffcf188cbaafae49d587e6ffe5019f1476358663
-EBUILD xsnow-3.3.0.ebuild 677 BLAKE2B 8f1ca00ecc766637fbb8ba547a2e9a215f1000cea83521ed22750d4828fe6c73e0237a9c9b54f6f49ffc19fba3aed566c88071d8fa4fcbf93b0a89242a14993f SHA512 7e3c87240a38b052fadf4ad914cbb12f0cc8812287c87ec768d92ea7924ef1591f2ccb3a4e9ab26118d97deb490c4a90b537337280a3eb96cb87b3fb12478a50
-EBUILD xsnow-3.6.0-r1.ebuild 1155 BLAKE2B 04fdaa337f22c772d5603387b349c728bddfec5ce85c683f25d6fef9a4d0282428610092ed560af2094c8920a9160c049c902c02bb298d1c6ef7d2fc82e08975 SHA512 8d8713144f76f5de1106ce6b6d1b192e27dc4e8f77338e274e6a355941d85c87efa3775a31c6edb9999a0bae95b004a0e12c4eb4aff596e34c4d4fff461790a4
+EBUILD xsnow-3.3.0.ebuild 678 BLAKE2B 870e3f749d7d70b4612009d56038272729722735cc5a4230fd5865bda8dcb7292eeb40b092856d2e605ac1b310f95138983e56a14b42cdfdb213464d1bc1ed75 SHA512 70c91c9848f4c28fe48ae3a64b955093505f78f1708b4c4f75e2ee46ec7ff060666097b3b8ef9f83aac296520bd084c135f52cd19be1e1201b79553075ea7daa
+EBUILD xsnow-3.6.0-r1.ebuild 1156 BLAKE2B a76244ccb0d26d73ae9f4571ca504539f09c9bf4805c7b26d27a359c8de18a293760eb9202cf9c59eefc361cd8074c33f6609a2b74566b5a5bfddd8210c6c4c0 SHA512 58e56708fea83b91c50316e22480df46843ab4bc1c45b16c5c694157a8db70e81f9b520eaf4cdc1deed9de0c2b5f24070aee80c97bb661f518eabeaab30896cc
 EBUILD xsnow-3.7.4.ebuild 1159 BLAKE2B 8875b02234348dd307b201cc8d96f1e8aebc8bca5a491c911c208a43f6a99999a73173d13685eafe5c2330698e126b6aa81e295061a6b08d8eb042437dfb9f72 SHA512 e4ff4818e4ebc85fe512dbbd8cff6c22b013d6801896617084b7cf2d6ec1b05cd7f261598b55ab237223819772bb719e0ffa2d47c6ea12ffec4240b74d386daa
 MISC metadata.xml 296 BLAKE2B 60ba9ec1cdae7e670f52fdb9d81fbffbf1d5c94fdfbf30d0d951b063b0d1abc77a147ecfefbf646d7f48f0f473c1dd5bedca14d289d869b6f5a6ebe73f75d8de SHA512 2ad28ea6866958c01004f390b983082c22418eaab3e0ea14c17aad5bb65bd7e29a4f90581fa9ad205ed6fb6eb4b2617ec8b7c8e3b656d18ac359ae533987e57b
diff --git a/x11-misc/xsnow/xsnow-3.3.0.ebuild b/x11-misc/xsnow/xsnow-3.3.0.ebuild
index b475695f2a24..c9f5caa865ec 100644
--- a/x11-misc/xsnow/xsnow-3.3.0.ebuild
+++ b/x11-misc/xsnow/xsnow-3.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild
index d524213b694b..ff9e83c41410 100644
--- a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild
+++ b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
author	V3n3RiX <venerix@koprulu.sector>	2023-06-09 21:49:23 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-06-09 21:49:23 +0100
commit	b8cc45d2d4557cadf73e3411149ffb57ebd8c09b (patch)
tree	36e9e50b71907f13105d2d76cda896f2097f8201
parent	60010a4cd6d7c12aaa62f00b5e8a158ed24efba6 (diff)