gentoo auto-resync : 24:02:2023 - 21:49:24

726 files changed, 4553 insertions, 3656 deletions

diff --git a/Manifest b/Manifest
index dd22faf9916f..a5c0974e2d01 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29454 BLAKE2B 393cfa418044b462eb485724ff691a7d4a687bea5381691775d7eddd5f5649fbf13b304b9919561836eda6c90daa35e7218c44431a1f5a0ee0e384d350344169 SHA512 426fd6b3828cbcd962a6997720a6f00070542dbbe719225d7b6d036c75f92ee6c5b7d83da6c4af4fc22c0c0e453d8fb2eada03b0e8891701439563076cdb2249
-TIMESTAMP 2023-02-24T15:09:56Z
+MANIFEST Manifest.files.gz 29467 BLAKE2B 7e086144e329336a6938accc1bd3833503c718b62758294385aad4444acc56c2dbf16641a8dc1b12eb2e0f77d83d3f1b357a49281f78c00a0d0895042783c52c SHA512 cb6f3ede46554e5067e996aed9c312737524e2fa6cef1f13a55d23569a5d2f6207149265aa16e9c49f8d23f91787a9c19ee84acc05f1a06a0c30f66c152fce38
+TIMESTAMP 2023-02-24T21:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP400RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP5J6ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD4LQ/+OAulBdV199NsCy7Gu3/IYCa4mJPkJdrCqWBsNdpw6R84+G77WmWLhOSw
-5hPwbzHVabJtJXJEqHsLUxtWF6U2JLMiJH7+gHbdNfe6Oyr250E7u5u+m+IP9kJE
-eeHdIl5thdHqQK3aC5uiZUYD3PAgY1L8pHNsBGTsrkcVbifpmHxbm/39+nZ0wg4l
-ii7oAMNfSw1RLRvqLghJc0UWhllRJgP6g9uknbI5OpL4pmzlPbpaZ11Wi4OCqdS4
-JzN8TDIGs9B5+gqzylQoxSxx2D2qIemx/8XD/ebv7SV3swOnu9JP0CdUJTF2MX89
-WSj3THLVyQgluIcQiOp7/t4nY+vEb3eoBSM4kIt4QYhRgKdvI+FSTzWKZpTH0t0m
-Sy6mrw9pr5Rjf3SJTWxFRvqvMGjXgM7UtcVgHgSc8ZS3309I25xEXPa0JF2cd7e8
-Eil5SGGBc4y3YOR401cx2u9iBHOC5NlCEy15d43x/D0zKMkUTKs4KgKy9iIRfhW0
-/H9zdH866zTjt9ADqkSiaP9SSDoR2zmX6zNzDN5+hw8rctgcNUUluCaos/pN1TyD
-O5B0fZ/uj+FBAvrAMZAAdTF7xKFmfjcCc0jFlPMH9kfWtzGv6QoDMkwhfyqkoBDo
-xRHgYMDHWdLKPBMK5UEz276Vn+kwf8xQX//NIpJjYNmmOBJpfUo=
-=epXY
+klAgYBAApaZDRrfvxC7Vt4lSDUch2JQE/cRT+2Cb6SNm/YpLrYG4/1AdF1/q57CH
+vP11ATsFFxA1OTiC2dSbzk08ckIWk5csDGJIP5RyXu6p8xdXtIT44V1v44RNFp8w
+FXf5r8+wJq6rVg4VSWAQhoG5haqYH9lx4xyG3k65EOqsLQRLktxfNYd0/eTTO4rg
+88UYSnxQfkfgAJFdb4j/p3QF4JmEBDMwQ34FSJw/Q3e0vqaW4x52rIUG/Uelu8av
+UBJEDybFckDjq6Gk2Tn2DPohZbZutWweL7WlLuXV0nE3M0TnJHI35FQvKGieOzU4
+1UowDJ+MynnoZ3QDfqAnODKADkd7Yyr5ftNBSdvCjXI95PR/Ay93IOUVod67Mzj9
+p+4y8JrLsaoFep0aATH6tFJzFc/aCkTXsSSnmVy6nSgL8YBHWhEEsMMTTL+cd/w6
+5wzU/1VUj/66v3x8rJQMtYJSBAqZS+CWDxO6kcNxIFS2jBZH7ulK9O12adVNvRFK
+Y08zfAyLg5LDT61/CVw5nu2DYXd23m/CuGY+HW7aG1/99I7YlvtdOlVbxa5J2HET
+XqOxFBOqY90vRYTG4M81QEv7S59503mJRu58Z9MEp5wociYb7gJGp5dMYJH3uT9g
+Ab1Q3y+siPqdQ+JOsi+Ev4oVm6TGRWGXVe67haX3r7u6ewP2ueg=
+=O4l4
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0908c0f8c7f2..425a7d624df6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cc7d63cffc3c..0a46a7d13d7b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 0572583dcced..431fd7f8f8f3 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 DIST eselect-1.4.20.tar.xz 180272 BLAKE2B 424653d00eda45335c3aaae50f6fbf2e89486da4529f657596516352f3b7fcb9859ceb2dc5b9762a34c44fb64e645fa27c46b86453bf50be6e8ae820664a4289 SHA512 9589ed89c4d5d31f71d535886eb50da67b84dec8a13a5df081e7569efee861dede4eaa43a0bfb9930c5b95d4f334e19245cb8820a73f7361527da262da1d1fb2
-EBUILD eselect-1.4.17.ebuild 1535 BLAKE2B 279bff17e818888cf1111fd94d4d79deb6a39d2cbc5a9f5456c5ed0df964b95985191431a0949db376345b3f5528860fb0c3328ca48d0db173f19a8ba6b09f5b SHA512 050011d552f1a2b50d78e0568f047f13f27e46408d87cb51d1447117a5f1cedb57ff3672d21903b558c690be2fcfdf5104a8c63e61bc55bed24e86da3f2fc9e3
-EBUILD eselect-1.4.20.ebuild 1542 BLAKE2B 32942f6c7f750387deba0ed6a13cbed75c563b08160e75f0ac3e518810f257d562eb55f24d5f63b27f73b7504c3676d35c5cb60b30c8b74f94832e3dd72a8d96 SHA512 cc033b7f7a91c1999d3330e2feb22ce822eaf073f1490f4f7be99e6bf3c372ab7ea02fb744530f7eba7620654b1656c9cb941e473ebfd50e9fd822669d1d588d
+EBUILD eselect-1.4.17.ebuild 1548 BLAKE2B a4d57fb4c84773907ac499c3250d1e4583f67612851400e2166c92b069fc12e6fddef205fb4774ab7203227c5f9497bda35075ac840bb967abd6e3141ee0a96c SHA512 f8e602bcef5a20dbf538bd95870bab69fe04da51c513123221d68e1a4c8c96e55b80cede4e036e63be7542cd5b4da22286b63f5274bc4414128077563af58eaf
+EBUILD eselect-1.4.20.ebuild 1555 BLAKE2B 9c6307a88e585104667c64913c0154f7a313be96b2b0ccf380d7fcef899f1f447e6c64a7692205996c755d64afcb7bddc04649f7c7f7b580d158117dd647aa2e SHA512 5d675a1e0285d7446623fe884489152a1db14d27a436a55ec31ec64aae6fe270b2b9493c5468957a66a35fad85e807b0c4ee6dc28dce8441e3b6018b8b2d95f5
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 347 BLAKE2B 58c9ec8100f46cbb91dfcc6fc6f223e4d45553f401fe7312e36c0260c433a5842b07f894cef7dfd6c518ee5b664d86e3a4d434892ad3ea9c78c26c6f621e3063 SHA512 1963bcefd43ff52163c81a03bac522ca792688ff5317691ac30ec4375c6da4ebbf07f96da7bc1ecaa9554cee18c9f51f8b867e7e15bb652bdc7eee542f4a8d2b
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
index aa1883651084..e9515b20c937 100644
--- a/app-admin/eselect/eselect-1.4.17.ebuild
+++ b/app-admin/eselect/eselect-1.4.17.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://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.20.ebuild b/app-admin/eselect/eselect-1.4.20.ebuild
index 2c4e05c15d73..338c3aba0442 100644
--- a/app-admin/eselect/eselect-1.4.20.ebuild
+++ b/app-admin/eselect/eselect-1.4.20.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://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index 009a352f3c24..344287157364 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
diff --git a/app-alternatives/awk/Manifest b/app-alternatives/awk/Manifest
index fb2dc5123e2b..ac7ca471bfc2 100644
--- a/app-alternatives/awk/Manifest
+++ b/app-alternatives/awk/Manifest
@@ -1,2 +1,2 @@
-EBUILD awk-4.ebuild 2557 BLAKE2B ac6afcaa55fe0e2cd3088c830ab73dd15ea8308ef0abd2e3cb4a9a31727794cf08c9eaba1a6d3918fc9e3e85f8d61c24966cda02a465b9916426827f4e89a407 SHA512 3244d51d466d5b0dc3dd9c4405045fbb56d9c0486e06353465448fbf2301b99a903181fbef2b5021d2de844ba5e76dcce22699f6923cf65e2da83b2540978abc
+EBUILD awk-4.ebuild 2575 BLAKE2B 0650d15256ad87939d18330ac0e234023b18769428c20c08c8bcf6a66f089095fb966bf0df563a2c2705e9e7c1f5403d43f73caf2cc021a783a0a115dc607f77 SHA512 e0e063124cd5ccaf81c789669c65d3c297d98d3e12c4d25be74daf56476c61b8c6ba191be8b08f1ff9d25e87155b404468f1933fda60a62aade723bf6e949a0a
 MISC metadata.xml 829 BLAKE2B bf4375b33e702c61a3f8553e1b63110acab32b68d4ac2d905b6dd12a2204484bc5c2f3a34b2ec127a6c60aac8c105949dbc6eb5ade3a1c8c959afdabdd3658a1 SHA512 32252970d3b12c7a5b9fc7c7ffae821908b9bd4101372e699c70e64572fd7563121427ed5971462417d8c2e6155e47f567ac3bb057d457d58648c5b4d2458974
diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild
index 1407a6fc464c..172cdcb19f26 100644
--- a/app-alternatives/awk/awk-4.ebuild
+++ b/app-alternatives/awk/awk-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/bc/Manifest b/app-alternatives/bc/Manifest
index 8bb4d6dad69c..d5e5d8cdef7a 100644
--- a/app-alternatives/bc/Manifest
+++ b/app-alternatives/bc/Manifest
@@ -1,2 +1,2 @@
-EBUILD bc-0.ebuild 730 BLAKE2B e030f9c03bb3556881860af09175c7662e61373676c82e3371e067c3dc8748c146791798c210a7241aa6dd9f87b16c27acee8a8d1c66cb0b6e8c300dc325ce1e SHA512 1ab4b0b65a47a14a850b5fa0ef22618557ca1a8e7a3c50816344aa2375e14d062d4fb59f87e249ab349ba1bb7793e713459a9f5a1f9016836d7956086f84587b
+EBUILD bc-0.ebuild 748 BLAKE2B aa5df1803449f4c7cdf30018379bc50ed9094659e5a8ab11b2d939e7059583de5650fd2ad06cb0b47ea9e02798a9733e10507f4bf0803477b4e4d30fa8fde849 SHA512 85fb3d788b41f359a2b669b59e0f21e7bdd224e44ffabe304ead35116369c5e31ffa4c3daf3a87f120bc16de7d0ad1275e5fe2f0338c24f1c686d66310cb98f8
 MISC metadata.xml 545 BLAKE2B ad10ffcda18dbd1728a7f63f504d4ecd8c3c864c7c3265416c8060bb8e685030e48df6d7e784083ee0d587b57f91be9b1e1401569880458b0c40e3fea63f4f5c SHA512 4a95c94b8a5f6f14171cccaacad08207570550d826f232033f581b8a974d095f73f2c3c0f70c3fd41d33507a7fa8644751724702b75467ae394edb39a44fd404
diff --git a/app-alternatives/bc/bc-0.ebuild b/app-alternatives/bc/bc-0.ebuild
index 0a4314eb3f6f..f7a484bbe176 100644
--- a/app-alternatives/bc/bc-0.ebuild
+++ b/app-alternatives/bc/bc-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bc symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!<sys-devel/bc-1.07.1-r6
diff --git a/app-alternatives/bzip2/Manifest b/app-alternatives/bzip2/Manifest
index 61453a381325..5eccedf92480 100644
--- a/app-alternatives/bzip2/Manifest
+++ b/app-alternatives/bzip2/Manifest
@@ -1,2 +1,2 @@
-EBUILD bzip2-1.ebuild 1050 BLAKE2B 22ac943a6f2afb46ca9f13d58052c4cbde49aba12e94a43ce28ddf7239af91d3dfec581e2f24ed89ef8d092e81b27e4b2be932404c03c090c358ce5fe56264fb SHA512 5ae37027a6b44ff9d87abc42c54014c9a4ec9d425da1af5c961132235fcf8d1d273925f6152b66c5d80e7cefe92821ccf67e8978c11737162056dd23ac7fd1e8
+EBUILD bzip2-1.ebuild 1068 BLAKE2B 026edfc4509b5c48696dcd5e56ef62df2b2130176fd31e06e895a93896aae7357731206142b8c0630b78728d675751125d1675a2e21a1c99b89f854d7e456b7e SHA512 2997cddcf22c58dbe73019694c9c4c99752c4c8beee3dc572788d9b72732763beea1a38d222857f65150afa8ac40dcbb29336b123aa5e42f89efd29a263322be
 MISC metadata.xml 608 BLAKE2B a8bd6f79e552943ee891edc7e90399c77dca3347ce407767902446d0e25720eacc137a6ed31fb851553caf8a938cf6be63c7a1451b2b8aa4a3c367995204216b SHA512 a3863d41f2b3475e64903389efa2b0f8258bf5f21df4e83ff0e28fa44519b012ab92d4a773d05089d7fcf210e4c29da63d25be8e9e098d15284e13dc75bfcf6d
diff --git a/app-alternatives/bzip2/bzip2-1.ebuild b/app-alternatives/bzip2/bzip2-1.ebuild
index 57852459ae49..dd9158656509 100644
--- a/app-alternatives/bzip2/bzip2-1.ebuild
+++ b/app-alternatives/bzip2/bzip2-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/cpio/Manifest b/app-alternatives/cpio/Manifest
index 44db64fb2b1e..d13b465a378b 100644
--- a/app-alternatives/cpio/Manifest
+++ b/app-alternatives/cpio/Manifest
@@ -1,2 +1,2 @@
-EBUILD cpio-0.ebuild 798 BLAKE2B 881a4001dca1f2aa2958ed27f0b2c19dfcb35bbcb317f19e1a7c54ad798a1977a20e450697f84d0d45af1303d3fd34fdad7adf61f268395e3fded8decbafb3cc SHA512 0fc2dbdf48383baa69fbf30c42e8ea2b6b223f6029123d4f98322e15330472ba2021efd7e345c1923aab28286ea36eead0011c3571ca7b0ffadee4501d73fac8
+EBUILD cpio-0.ebuild 816 BLAKE2B 3639c3955ab881ffd93a20ad4584feaf06f253e01413b9b21e214bb47e50588c770aa5639d96dd9d855c6b61d3d6f7b1de720c9be3ae7b9aea9438bb74ec26c2 SHA512 242bcc5ceabf08cfcbf964d51a7b865b603e8b831b377aacf0e50aa640f558e7631f909bda6dbfdaae407a02115b49c2fb8f046d854458abe8e6175b43de69e7
 MISC metadata.xml 556 BLAKE2B 50f93b411b7b21af21a4d071bba8533ed58c6ff5bfa1f18bf6025c1c11dfea1be089777f3e59972c72deefcfb54bedc2065f188e0b75c369bb683b9a17ece639 SHA512 7db5fac74ffcbe3344a06f5a9f5360c07648aac7b5080985b110f2b072412ead598ac5bbc5c2f48bd15077e1bc11e36fc8491a7bb898a761f8c6977a753f067a
diff --git a/app-alternatives/cpio/cpio-0.ebuild b/app-alternatives/cpio/cpio-0.ebuild
index a7b0273d1d09..483dab8f7c0a 100644
--- a/app-alternatives/cpio/cpio-0.ebuild
+++ b/app-alternatives/cpio/cpio-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/gzip/Manifest b/app-alternatives/gzip/Manifest
index 3a988bbff91b..288d58380d13 100644
--- a/app-alternatives/gzip/Manifest
+++ b/app-alternatives/gzip/Manifest
@@ -1,2 +1,2 @@
-EBUILD gzip-0.ebuild 1089 BLAKE2B 04a7c9913442ca5933686c9be94425e262378f42804a9002e7aef5d81b1c5c5315fd2f55ff3941139bb5ecb3434fe374ebe233d2c720f1358964e46d34fdb8e2 SHA512 69b5f59f4abb04727eabaa5a795a0f6a5f45fe0ee65860cf0ce81e7426c5e57a10c1c2bb47532ef15d430d01a9e64dca5e0f75e3f75ec14681ed654b020f0bff
+EBUILD gzip-0.ebuild 1107 BLAKE2B 44349377eed24959cb6ad70b41ddcf842abaab460d8cf5462a7421191c43ab6e9e749dc68b08a45a6d6db42910c69f4574ba161e7980e7fdabc7933c3b6330d5 SHA512 e667f62028cb33e3cd0c644ebdda92ca1af7ea5e43e5414e0a1ee0983d4b4ca733b64d571521a93cff0815fd49804e60d08cb394c41811d123b08148cf9f8d0e
 MISC metadata.xml 528 BLAKE2B 099aec3cb340caeedc0fc6e2f62162baf276b1262b4758dd39695a03ee5110c717a9b553190762c939171d7776b2048fe73c1fc7a966eef916e992abeed0ec21 SHA512 e654f8d548769c00425cd9a3f796c17af28300ea297294b335166f023164a5696216135badc82074b6a88669114f7db819af827aad8144987c7cfc7a474a2191
diff --git a/app-alternatives/gzip/gzip-0.ebuild b/app-alternatives/gzip/gzip-0.ebuild
index 4d19fb28ba7c..4b7c266a798a 100644
--- a/app-alternatives/gzip/gzip-0.ebuild
+++ b/app-alternatives/gzip/gzip-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gzip symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/lex/Manifest b/app-alternatives/lex/Manifest
index 308b081e46a3..f5baf8dd1f4f 100644
--- a/app-alternatives/lex/Manifest
+++ b/app-alternatives/lex/Manifest
@@ -1,2 +1,2 @@
-EBUILD lex-0-r1.ebuild 647 BLAKE2B 910a78bcf568b3cd819bb1321960e5a0a4afa3b0560a4b176925def2bae4038c86eba85ec4830ac64362ed3ef9fdd07f7defcd71a357906e30de47d2f5371031 SHA512 ec6f1890fe4d84ddf257afe272d027e5ffce541ddcebed05bd8a1a9156849888507c238c7201e2682a78a32f673a3e9778a8e5cc2f7dfadfbd5179e5f179e304
+EBUILD lex-0-r1.ebuild 665 BLAKE2B 446645d3b720de7c662557f5e62f0e0d2f6db549aca30283e7a35dd9e9203a28dfbda4fdd370349fd637c831c8d7ccea12ddece65891f27a3324c687a3d1a900 SHA512 0fdd01c8c44f4d0d03f660c7d4258e7f8b8eb6d68d534bcbf23aac3959605a5ea64336cebfe44df9de2ca2e6bc09c46ebec15ff7f2cf03cdea2974cd1856b190
 MISC metadata.xml 529 BLAKE2B 6873948a644263911a6e796fde57e41b69c108e3ec01b9c07a120c1786250a9718f4d736fb5918be27c9b72ee36cf5cab4621478f2917f9bcd45f6276a7e645d SHA512 d48d002ecfba6746fcea824310b738f7839c744e7bfbb4ca95c3c037258103f30dedfb8ca2284d21e6bd56910bc5e9618f8b9351a7f7e290850ae06034e37f3a
diff --git a/app-alternatives/lex/lex-0-r1.ebuild b/app-alternatives/lex/lex-0-r1.ebuild
index 74bc78455949..2b9d804b7833 100644
--- a/app-alternatives/lex/lex-0-r1.ebuild
+++ b/app-alternatives/lex/lex-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="lex symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!<sys-devel/flex-2.6.4-r5
diff --git a/app-alternatives/sh/Manifest b/app-alternatives/sh/Manifest
index 154eb8529161..2e8bd4a91f59 100644
--- a/app-alternatives/sh/Manifest
+++ b/app-alternatives/sh/Manifest
@@ -1,2 +1,2 @@
-EBUILD sh-0.ebuild 1474 BLAKE2B f9f9507505d01472d6d2f63c66148eaa7708dff1dd479689eabb5a8fbcb3707d268cd5c8f87d2160cf50edd47793f3b22ddaa15c88419ca650bcadb428990667 SHA512 1254dca3b3616e2acc1c481d32567f170da0a16f13466b8e6f00f593227dbc84d000dd8d76d639b1763477bebb75ca01c56a5b05e93e99ee699edf260c3fda0d
+EBUILD sh-0.ebuild 1492 BLAKE2B 4b8f0fe905b10468b816cc9f68cdddfb84c3ce28d4891d283d6f396c03bfea3548ff7f689a3345504e8e6950353beff8585e55b15ef7dc17b84c2006fab4a0c4 SHA512 267782a3c0c5b706d721a26dbab751c828b7a7502131a5a0f1a8aebf3dbcec622c4c92b3253a6d39e74ea02c6575bbc9f66617135f72305d6258641e65dd43df
 MISC metadata.xml 835 BLAKE2B e54fbb98c91e127319c5f0ec81d18ed6f7a8ea192308dc4927446a0f536d163d2fc53f79396ca24189e81fdbca15a36605dd6f0010bb484bf6990afd54d004be SHA512 a96a5121a92d90898d49d61a5096491c60b261292b3c8764f2e2fbd2825f8d0aa265042d7374462df3b0e9e2d547f43791867eabc8ee6a2b262ba6983a8474a7
diff --git a/app-alternatives/sh/sh-0.ebuild b/app-alternatives/sh/sh-0.ebuild
index f51bc5622d0c..09adc3362eba 100644
--- a/app-alternatives/sh/sh-0.ebuild
+++ b/app-alternatives/sh/sh-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/sh (POSIX shell) symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!app-eselect/eselect-sh
diff --git a/app-alternatives/tar/Manifest b/app-alternatives/tar/Manifest
index 4c993c88c80b..6b6c932985e9 100644
--- a/app-alternatives/tar/Manifest
+++ b/app-alternatives/tar/Manifest
@@ -1,2 +1,2 @@
-EBUILD tar-0.ebuild 787 BLAKE2B 9eeff77f5894db11d27ccc1450cac32a2ebfcee21461448c759119ef700ca98e661836a04391c122f0a1b00b83079d444b2f8aca1b23b307c161f902efc5f685 SHA512 0a3368b868ccc6d7136af1f9af9201253cbe0e090c82133f46880b6bae1e922640ac0de479fecf12506c1a0bea908a1f1790ee9f972dbf36dde70f1583418a0f
+EBUILD tar-0.ebuild 805 BLAKE2B c39d0ea07777d081864771663a54840e00c3c248bf58a3dfa57762223ca3ee10eff0a85d15ab501001d71bf78e95aba185cc1693e1eb9b84980597e905a28e00 SHA512 04e28683dc96cd2473799f69b029467a66d262828dcee05370e6a764e73b04acbcadc575c5aff1228ad66f781279cce1c3c004905359e618f95020ae5a3c83d6
 MISC metadata.xml 553 BLAKE2B 084e137dd7317424c0d3555fd867ae581bb3b629705e5be59985577dbf7acb6dbc2f250ee35300cab20f0a6e7b960af12a85192c8c23fe4d3e366b176d4ac1df SHA512 4c7467710211812afcb8f91c412ce2f909a2d206ab05c9279c616a9579be67f8a000559613c50f7c7246607626dd2dc0270818f14c14f98cd7bff2eda22a9e9f
diff --git a/app-alternatives/tar/tar-0.ebuild b/app-alternatives/tar/tar-0.ebuild
index a62d6ee20436..9aecb25fcb5b 100644
--- a/app-alternatives/tar/tar-0.ebuild
+++ b/app-alternatives/tar/tar-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="Tar symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="split-usr"
 
 RDEPEND="
diff --git a/app-alternatives/yacc/Manifest b/app-alternatives/yacc/Manifest
index e2d700c9449a..12c0a1a10596 100644
--- a/app-alternatives/yacc/Manifest
+++ b/app-alternatives/yacc/Manifest
@@ -1,2 +1,2 @@
-EBUILD yacc-1-r2.ebuild 1182 BLAKE2B b9b9ff690049e09962d3c141e3adf28aac4cbd53292de69f0f0dbb8d13d7b7bedc859da7c9b1240bfe97800eaf3750bfa0a07a9ebbfc3109a34c7e32096de223 SHA512 111e4de170a027c877a02528e881b06d295cbdaeef28cfbbdff4ad6f795231e5851bb4c0e0311be7a2a8bfe5a0f5f8faa3247bc83e45621ae14b24ae195f7819
+EBUILD yacc-1-r2.ebuild 1200 BLAKE2B 31ee57cc04bffa70bc09af037b25cd7568699172dc4b683faa907df4ab4951fdabcf8bec9a7e87cf482c9f6b64df39b856543d87ffd9ef163356663e4ba074f7 SHA512 df2fdf1120fa04bc9adc9a0cd835ff23a06b5e9cea373fdeb5835f4fcee7712214a049898349a38dd9640f26df54be1ae169a63906f96c61e45616fba6bbe877
 MISC metadata.xml 604 BLAKE2B a40366e6a7aab1ac9658b2b46cc6409486d2e2b7ac456209b4151974f48facc65e68d2e44965a6eb0680af47663a379da050bfbcf480e6af50951ec6d03647e5 SHA512 24329bbcc9bd0a589559c621a89b0dc26f304f47cdbd62e09bf5d33cb190bdecfc352527970c072080a3c9a7e4a7193b6d7c71ab0a0c83d0dcb76f03e0699a5c
diff --git a/app-alternatives/yacc/yacc-1-r2.ebuild b/app-alternatives/yacc/yacc-1-r2.ebuild
index 2ea175912138..b8fc0708d360 100644
--- a/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!<dev-util/yacc-1.9.1-r7
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f2255668f755..9f4e1fb97b9c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 7f67e60b0ec0..6577b64b39f3 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -7,6 +7,6 @@ AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a0
 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
-EBUILD bzip2-1.0.8-r4.ebuild 3474 BLAKE2B 50ef9774bd9cd025b40398f5d43f261295434cd36cbd7d3d63181e40471dbb9073b619d8329d0d0d6d07a1c58fe217e1e84a348753b0ecba7b17b2b9008f51fa SHA512 21e4c927c7e1286f99965f7979b85f1ea7e9f05cbb40f72a30fc78800d72cb49bb8df72fffa901ad6b6f43b39c4dfdd3782c1f12ec9f034c0763b6b7579313f9
-EBUILD bzip2-9999.ebuild 1369 BLAKE2B a85d94d4703d628af61968efc0a76c1f55d701b8be47dd081f342245994fea1394b044646d3e23bf6758abf24b5d65420bf74d3049827bee646d663cb6ec643d SHA512 96b75235e2e79071c2874f8028caf6d0017df56fc469f767ae12515f6d76411d646d284cc3260e8dea0f6d7a2ba9a48de8bc0a38af9068265dac651af0aecaf7
+EBUILD bzip2-1.0.8-r4.ebuild 3487 BLAKE2B b2e6782a0b90b69129d367ffbc4d981d4861ef0505f98e113a209cbd66d0196bba3efe3045ba6ba72a8685844a7f45b89e94f632494e53b45adc2236f13abecb SHA512 cb6e55546ad56423921fde72cb04a2ddfd00222b182aba27379d2547fef0b1bbddf6e1444ee08c06898e73c04bc48a05c37e549fc2ea6288cda0a5bf520a71f3
+EBUILD bzip2-9999.ebuild 1382 BLAKE2B 03246514a2ea9a7123145072068f0b3ca0092d8d87a769ef4b01966e77d79029203a1fb8b4692d1024cf9727b596231f1926b77b978e509d23ecf3d012b19d8b SHA512 5c4a20ea3691e4641e3db5b79f9f65e554f893dacafa980e2beb62f790a6c104d4b39586b9a6e81e4b34abead9045df114182321445cd86ebcbd15235f97e774
 MISC metadata.xml 384 BLAKE2B e74083bed23efd0279d23ea4f9fc048a9a0c253d48757f74a6c0044f5ca6a6b4cb86908db25d42f304b72a8dbf4c3627371ad6ab69aeab9267e8eb21c2053898 SHA512 c358db6bdaabfa401452ceaa8f85298b75ae00e5f7f189768741b4c74ed123be79405c03c7b94707db29b7d60710c441d089c10fa511262ad5a88cd106fb54f4
diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 38cb103dd55b..8486a465d48f 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-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
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-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 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index 025f6378d542..e8b4774ac56e 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.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 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2"
 	inherit git-r3
 else
-	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 ~arm64-macos"
 fi
 
 LICENSE="BZIP2"
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 470ca2c875ff..8eb21c89a5a0 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -3,6 +3,6 @@ DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779e
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
 DIST gzip-1.12_p20221228.tar.xz 806448 BLAKE2B 278eb44caca7ee16ca5d0210673726a1daebef6da7eaf0a87fc24590cb4c53d4ebe2decb6b8975440e1eb2c2cfebb69f091c658f9a7430a1717f0477fec279da SHA512 87d1fccb9603ec336c89689337e3cf3cfef70054ab4416bd8380fee011e9f517555d80a2a009bd312a58c34fdaf48778e5f0e9bea350ae280b440a325a837866
 DIST gzip-1.12_p20221228.tar.xz.sig 833 BLAKE2B b59d4677d15e2461d5fa95b4d53e94914e14cad613a9766aa3e51bfcece84ec0c4dd752c0d124cb76cc2240f9460f809c5bbbab958522c795e94026c8d4206ef SHA512 09a3a6687c80d7ec7e97ebd4c679e4d162729232d77966352c2f7ddd45594d79039ff33a93592889137605412b18b7868ea19ba4f4d162a5912a3978b3d67dd2
-EBUILD gzip-1.12-r4.ebuild 2131 BLAKE2B 2c224324e98e391123a46d32da2562a2749a198bbd067c52c666db31aec91238f2ebd58ba72185c38af5cd2a00ae50022666e655b4b3666a263243033dae2bc2 SHA512 7ea4adc05098d169c15da62391575926f14fe15f203a53f8fc3e50b515d9cd630de74bda3194a6883ea54ab05cca16e2073d51aeb6f5057e1e6a4e6e764451e6
-EBUILD gzip-1.12_p20221228-r1.ebuild 2488 BLAKE2B d1bc7f69dc84b0eb8f5df0deae24142b76b2f412593eed811fa22d08ef5d4b98f788262556ebd989523c72e5fcbe197d58cac63293c5fa0703daf1c6b5828867 SHA512 f3bb3ea65616b9fa82d256e9634514c51a579d3c24849b75cd9d5cf652891d19d143923f540a3fb5d0c464fb5ebce29cf3ab906629786c04eac05d2cb32d1044
+EBUILD gzip-1.12-r4.ebuild 2144 BLAKE2B a214b7ba838a188c7396a243dfa3b1de4fbc9f504295c8c97588e3389e7c9e04a3335726e2ec2448d44539cc633b5de7a64db7a651c47779cccbb15fd6ac1f32 SHA512 921d52240e172b3fc62fca794cf73356d45559b6f27757a33b267b4bf2d06b6398ac5e3b8b57e6ace229ba56c6f340e8774d34e7c356419cdd7e8b8e93e31837
+EBUILD gzip-1.12_p20221228-r1.ebuild 2501 BLAKE2B f62becb74f3212925747f4a22f2d94517ad0d0c4272e09b41aacc76198a36980c1836bd66c684cace23c33c9e16b828b888e75d65bc4aa1282f75e7cf7edd46a SHA512 6aba5100fe033c22edfa17c01d0b557c7719fa61caa9df7f00e75bcc2b46dbac8c6bdd5943eda03525348f501653c75e8f7391678d8d0eddeb194607168b811b
 MISC metadata.xml 433 BLAKE2B ec37d1a2da994967c16c5005c7267f5ea788dd5fea6e48e231c59313f8a779fac6241c790d292bb47b5586a734ad114774438785d6f394bad51d9f2818912e3d SHA512 98ed16e20a9c2c8210ca8a8261eecd0718b94fe8fcbf9a647b04b4912132b281b55e17f26ae41afa0429e2f2a9c3faa8b877da5f8f35a14f52a0a7482f6c1afb
diff --git a/app-arch/gzip/gzip-1.12-r4.ebuild b/app-arch/gzip/gzip-1.12-r4.ebuild
index acc085235bb1..fc60f1fba9c1 100644
--- a/app-arch/gzip/gzip-1.12-r4.ebuild
+++ b/app-arch/gzip/gzip-1.12-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
@@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
diff --git a/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild b/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
index 23e799f74e59..ac592b85880a 100644
--- a/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild
+++ b/app-arch/gzip/gzip-1.12_p20221228-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 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ ${PV} != *_p* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="pic static"
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index b73048d8b6cb..b8e8410b4436 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,5 +1,5 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
-EBUILD tar-1.34-r2.ebuild 2337 BLAKE2B bc105fb61c846997dc563cc7df364856f144fd672396e354a2367ec347d2fd27ae96141c564dd1a74a2538e5b78e4019c8817005d27ef940f5a9d9ce3b1694cf SHA512 e65a72439e50ad84ce14eb1f47fe451a6d89c5981510d0e500feac9dc021b125cf857e996caa5d9234e9d109a727e9032b7c650ed5d50d2b337ab3e1e454583a
+EBUILD tar-1.34-r2.ebuild 2350 BLAKE2B 47563f0ed793806f802dd0f10f49b2de323bdb8f99387ba8ab341e1e7074cd67d59b24a1d5c7aab10e2d3f45f6ef054670c00ef06da5f53fe879b64beb89c816 SHA512 884b7924fd749bb2f7d500b4697f1a7acf9b81a28e86d3a878d78711898cd816939f7943b5851bfb6ef7c9aaf26d66709914b2f5098691038740f1fefe97a19c
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r2.ebuild
index 9db23837e033..e6c0b272787b 100644
--- a/app-arch/tar/tar-1.34-r2.ebuild
+++ b/app-arch/tar/tar-1.34-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
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="acl minimal nls selinux xattr"
 
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 8de838e8544f..6d3cc0cd5193 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,7 +2,7 @@ DIST xz-5.2.10.tar.gz 2123206 BLAKE2B fdd9e77e21ee65482401e0e43e0b291093a227d452
 DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733 SHA512 48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
 DIST xz-5.4.1.tar.gz 2528617 BLAKE2B f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98 SHA512 5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
 DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b SHA512 2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c
-EBUILD xz-utils-5.2.10.ebuild 2905 BLAKE2B 81f4972db6afb46bbb251ae7c65686564c2dbf3bd27b585f8cc7527fffd7b752f020a4c96d2da772a6ea74493f0aa5a5e335f03a1478e8bed77d587bc2f0f00f SHA512 0ca0295c0072943b44714f63ce2a69e12329cf6c157641afb6ee75f678cd9d23b46aac97248c53676d97996623fe6f4fe5f7a207f9d3cef794652d5c80a66b36
-EBUILD xz-utils-5.4.1.ebuild 3101 BLAKE2B 9b077244b3bf8213127630be4631c0ea9848b9024d840163fc32381a155cc69a8f1f6318453654fea924838c0ad82bf14b03671ec6b492d81ee479adf94e3491 SHA512 0ff92c6688f8b544c7bb76d5043c96ec85594de145a82e0f5ccc021184fa724221feddc9d93dde886610327bd8667411d9a13fad90fcd3284f05c2ff6497eee1
-EBUILD xz-utils-9999.ebuild 3109 BLAKE2B 70874f8d2ef1507c9d1874ba122526ba204f3375bb0536844ade93baced14dd5c59f514edf373fc6941c11364945ab313dfeecd277e1f5fba357397e89952763 SHA512 f841ba60185ad23da3adb549f0a37ea905e971e95e82768b70f297f343d2e35e3e0620fddd16ef7ea14a7386188b33efebf0fad016cce63f79481de0d269405f
+EBUILD xz-utils-5.2.10.ebuild 2918 BLAKE2B 5772efb5b671c373b4d6cbb82d50bea4815b63fa2a8fc54e0e5823c7115837bb7a16c63cbc1045de139248d0b337109232b269272d2fe29129444f65a2d0aa7a SHA512 b200fe4c27ad62ed1de5d52fd2224711fd27d40c5724451b35e67b8658120fbf55ce7ae280917629e95c9e856a5951a85e5186ef993d2617318c13850874a473
+EBUILD xz-utils-5.4.1.ebuild 3114 BLAKE2B a25077bf6a903524fabce7bc7959acd7ea820741a8de98b04094f02920947d49fe9f4d0019046ac5b10c1f6907422549274b9e34db1736ddd17b0a972443aed7 SHA512 b44f2777f700852dc3d619a2b5c9e132005c158e04aaad80a0d8046c55386b50eae5a52a15d02d36bbcf0ab9caac417408bffaafea3918e0c6c54133c835ee05
+EBUILD xz-utils-9999.ebuild 3122 BLAKE2B e67a1de2f75ed5a8a10a485672756ef59eef09b348452596dd67128a9a25fb058c34077e2f110823174acaa388c651519dc9c99c77396354846dea15c5fc66a1 SHA512 afd5331f52866d4f9d2da5b67ab099a2173ee45b46964a61f54e8be25dca0da83ea36318abeb2d20c0f1be1b194848d8f100a7653f494d86b5b7aa527c59232c
 MISC metadata.xml 663 BLAKE2B 7a6625813cb3bdbab8a37845c9c64ac53ff377db394f776357d4fff60fbfe7c7b0e954fdc15abcc8874dd6c0f9ee90bc6e179a00bc5d12cd2e7cedc6f998c019 SHA512 696e573853d5d401f22079492d8e2b5f3c27e9ec4b6095f5ff46f109366b1c65c11976123abed06f302b8f03aaa1b0c54884f0156fdfdce23f4bf28feaafd39c
diff --git a/app-arch/xz-utils/xz-utils-5.2.10.ebuild b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
index b7ac59e5664e..ee655f3ae8a2 100644
--- a/app-arch/xz-utils/xz-utils-5.2.10.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.10.ebuild
@@ -28,7 +28,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
index a207c01d98f6..7dd91d3d6952 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.1.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 850c3073746f..8c4479233e8d 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index c0dd26f68f56..21dbdf50682f 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index f0a55d909e6b..b6c6faadbc92 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -7,16 +7,12 @@ AUX bacula-11.0.2-fix-static.patch 3752 BLAKE2B c910fa044c79f0f50abf5ac86b9f3448
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
 AUX bacula-fix-sonames-new.patch 2090 BLAKE2B 1d181464b599fbb40b5d463b17b6364dc144bb82071e1a3454f30d6f60c8679f738b59dccbc01a73cc14f882997ca5dae438ba2d3d7d1ea20ac148e1da3e2e9c SHA512 c9f6ec30c15f22fc57bed05ed387f99102bc234d50de4762785ec17c4ef3a68d8f560c3878e5843dc3bf1b2680b41f9990dcc89a3c238760deeb5fd95ed5d50a
-AUX bacula-fix-sonames.patch 1041 BLAKE2B 9b2b91cf3c281c1899bf545f02b4a48723bcba05f0305e531bdefb0ca822e805979e67d1d2f5ac949248d1e976126236d31c885d4e911e78c24d4ed013c9792f SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f
 AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df59d9fcd5c14bde1b943e151892648e6176cef643ede01ec710f0aa892c35b51753331c96885cbe9e SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d
 AUX newscripts/bacula-dir.initd 315 BLAKE2B e2bbd011773307a24044a761f17ec7079e5c7cdbac074d7fc064be554bd346fce2d257a789b6b8126eb20460bc7ea80afbdb691dfc012461d6aa1eb14298e8ce SHA512 cbb52bb584e8639a12930491bb5fdd88c279e3ac79a2460c1ceb5d2b9ca4cd4b4fb5be460b8a366ba21d2056befedcc6298468834648d47a5daac814733685f9
 AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
-DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
 DIST bacula-13.0.1.tar.gz 6224778 BLAKE2B 1b5d9aa56aae2de57589a421e33b9d394dcfbaf59f442e19c88c8ca8dcc234ffb42fca3f019e17836ce1d0ede75178c0fecf63b225c54c6d1b6dd0849d2fd50e SHA512 fd10857d12bb637b9f6e51a03888d8cc93604ba1e793f888304f3c115d48800d7f0d69e30a843355c6760ff8e9b5481c174a24ace1c2adc106cf4ec73646b426
-EBUILD bacula-11.0.5.ebuild 11871 BLAKE2B f47ab3915e5b4fe49680c7a784c50fdaf573056322d7d8b969d64d290a1e98fc8e1f25322f6e74dbf34ecf4fb8157b041476e1f6e5d87e8105545b4eb6280c24 SHA512 b1b8a2721877e332d98b7ed1300b061ea9cc1f624d3b16dbd09e7f108a9b0a2005751b741422968abfe95dbdf3baac87aeeee774c2f33e7da74062f66849093d
-EBUILD bacula-11.0.6-r1.ebuild 11873 BLAKE2B 76c9e91f8f0a6c042f750ee8b752cc02959b1d08ded810f39b8908dc2f58fb399477966f5669c05ad1a8b93f53cff5c047c340299fe686986c9287ba89fa2ce6 SHA512 7c140c4a74e7acb5f376093af1df61fccbc3bd9936c00cccceaa64f4ce0b3dda239cf0d3241d88de002e3e54de4b8513cc8cd08af4b42d82f11d8c1634be4fe2
 EBUILD bacula-11.0.6-r2.ebuild 11917 BLAKE2B e0a0d4ab97ad5a2b419f68f2c0ed68978cc979b4afa5d5b03910c9cd857bb81ee7a96393db2319977df848eacaf492158b09f604a19583a978cfdebc855d8354 SHA512 c7164d7e06643dd4bf1ee4044096b165753b501bcd6d1e1d70ad18912947ca977c5c08c9359abc11cb5ce696d49e42dcfec85470089378d6e347558e80b4e8c6
 EBUILD bacula-13.0.1.ebuild 12032 BLAKE2B 02eaf44ceab7284a84863d4fcbed572dde74caea3f81573e3251e2ceaf6c5fd0e53bf55b2664fff7e52602282b61694d5e3397964037a76ee154d50dd17672c9 SHA512 ec020d6133bd56d7ef6567f939cdff5c1e854e5f5ab4af51782b248c67edb474d2c52804d038eb540fdb40a5746cae41e3c096104d3892001b5641b22cb2af46
-MISC metadata.xml 697 BLAKE2B 6fd293a1009c2d461a43d404eff2883443f4e2a49d862120f4c9477f7fae8f2462be4786a7e8f6216515373e881d071b433835b9fb8da3b2f30c0701ef4a7ced SHA512 6d0077158112c26232370f11ec0d00ccb14376ce2649cc8ef79d3f99332bbe1bf18968a42e9c20d82934be3f9b49d49cf1f848e4e837143f8a5914fade6b14f7
+MISC metadata.xml 747 BLAKE2B bae193fb0ae5e5e92b0b6e935691f19235a230b0a7e69083aeb344db0e451ca55f16c9f3c163eab390621ab266e0f7f7ee1e75eff69589b2de0c730d2cf0d965 SHA512 df7c2a1296cb7da96928de07347df04f741b8b91de72d39c002dda3e5c9564341a5bc73b60f68752a806175fd5709b35f1eb4ecf00e85e1237c4672c0b948557
diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
deleted file mode 100644
index 50ddfc74dfde..000000000000
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			dev-libs/openssl:0=[static-libs]
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# remove not needed .la files #840957
-	find "${ED}" -name '*.la' -delete || die
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}
diff --git a/app-backup/bacula/bacula-11.0.6-r1.ebuild b/app-backup/bacula/bacula-11.0.6-r1.ebuild
deleted file mode 100644
index fe60047ffdcb..000000000000
--- a/app-backup/bacula/bacula-11.0.6-r1.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop libtool qmake-utils systemd
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bacula.org/"
-SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
-
-DEPEND="
-	!bacula-clientonly? (
-		!bacula-nodir? ( virtual/mta )
-		postgres? ( dev-db/postgresql:=[threads] )
-		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	dev-libs/gmp:0
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtsvg:5
-		x11-libs/qwt:6
-	)
-	logwatch? ( sys-apps/logwatch )
-	readline? ( sys-libs/readline:0 )
-	static? (
-		dev-libs/lzo[static-libs]
-		sys-libs/ncurses:=[static-libs]
-		sys-libs/zlib[static-libs]
-		acl? ( virtual/acl[static-libs(+)] )
-		ssl? (
-			dev-libs/openssl:0=[static-libs]
-		)
-	)
-	!static? (
-		dev-libs/lzo
-		sys-libs/ncurses:=
-		sys-libs/zlib
-		acl? ( virtual/acl )
-		ssl? (
-			dev-libs/openssl:0=
-		)
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-"
-RDEPEND="${DEPEND}
-	acct-user/bacula
-	acct-group/bacula
-	!bacula-clientonly? (
-		!bacula-nosd? (
-			app-arch/mt-st
-			sys-block/mtx
-		)
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-REQUIRED_USE="
-	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
-	static? ( bacula-clientonly )
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	#XOR and !bacula-clientonly controlled by REQUIRED_USE
-	use mysql && export mydbtype="mysql"
-	use postgres && export mydbtype="postgresql"
-	use sqlite && export mydbtype="sqlite3"
-
-	if use bacula-clientonly && use static && use qt5; then
-		ewarn
-		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# adjusts default configuration files for several binaries
-	# to /etc/bacula/<config> instead of ./<config>
-	pushd src >&/dev/null || die
-	for f in console/console.c dird/dird.c filed/filed.c \
-		stored/bcopy.c stored/bextract.c stored/bls.c \
-		stored/bscan.c stored/btape.c stored/stored.c \
-		qt-console/main.cpp; do
-		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
-			|| die "sed on ${f} failed"
-	done
-	popd >&/dev/null || die
-
-	# bug 466688 drop deprecated categories from Desktop file
-	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
-
-	# bug 466690 Use CXXFLAGS instead of CFLAGS
-	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
-
-	# drop automatic install of unneeded documentation (for bug 356499)
-	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
-
-	# bug #310087
-	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
-
-	# bug #311161
-	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
-
-	# bat needs to respect LDFLAGS and CFLAGS
-	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
-
-	# bug #328701
-	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-
-	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
-
-	# fix soname in libbaccat.so bug #602952
-	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
-
-	# do not strip binaries
-	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
-	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
-
-	eapply_user
-
-	# Fix systemd unit files:
-	# bug 497748
-	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
-	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
-	# bug 504370
-	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
-	# bug 584442 and 504368
-	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
-
-	# build 'bat' for Qt5
-	export QMAKE="$(qt5_get_bindir)"/qmake
-
-	# adapt to >=Qt-5.9 (see bug #644566)
-	# qmake needs an existing target file to generate install instructions
-	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
-		src/qt-console/bat.pro.in || die
-	mkdir src/qt-console/.libs || die
-	touch src/qt-console/.libs/bat || die
-	chmod 755 src/qt-console/.libs/bat || die
-
-	# Don't let program install man pages directly
-	sed -i -e 's/ manpages//' Makefile.in || die
-
-	# correct installation for plugins to mode 0755 (bug #725946)
-	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
-
-	# fix bundled libtool (bug 466696)
-	# But first move directory with M4 macros out of the way.
-	# It is only needed by autoconf and gives errors during elibtoolize.
-	mv autoconf/libtool autoconf/libtool1 || die
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=''
-
-	if use bacula-clientonly; then
-		myconf="${myconf} \
-			$(use_enable bacula-clientonly client-only) \
-			$(use_enable !static libtool) \
-			$(use_enable static static-cons) \
-			$(use_enable static static-fd)"
-	else
-		myconf="${myconf} \
-			$(use_enable !bacula-nodir build-dird) \
-			$(use_enable !bacula-nosd build-stored)"
-		# bug #311099
-		# database support needed by dir-only *and* sd-only
-		# build as well (for building bscan, btape, etc.)
-		myconf="${myconf}
-			--with-${mydbtype}"
-	fi
-
-	# do not build bat if 'static' clientonly
-	if ! use bacula-clientonly || ! use static; then
-		myconf="${myconf} \
-			$(use_enable qt5 bat)"
-	fi
-
-	myconf="${myconf} \
-		$(use_with X x) \
-		$(use_enable batch-insert) \
-		$(use_enable !readline conio) \
-		$(use_enable readline) \
-		$(use_with ssl openssl) \
-		$(use_enable ipv6) \
-		$(use_enable acl) \
-		$(use_with tcpd tcp-wrappers)"
-
-	econf \
-		--with-pid-dir=/var/run \
-		--sysconfdir=/etc/bacula \
-		--with-archivedir=/var/lib/bacula/tmp \
-		--with-subsys-dir=/var/lock/subsys \
-		--with-working-dir=/var/lib/bacula \
-		--with-logdir=/var/lib/bacula \
-		--with-scriptdir=/usr/libexec/bacula \
-		--with-systemd=$(systemd_get_systemunitdir) \
-		--with-dir-user=bacula \
-		--with-dir-group=bacula \
-		--with-sd-user=root \
-		--with-sd-group=bacula \
-		--with-fd-user=root \
-		--with-fd-group=bacula \
-		--enable-smartalloc \
-		--disable-afs \
-		--without-s3 \
-		--host=${CHOST} \
-		${myconf}
-}
-
-src_compile() {
-	# Make build log verbose (bug #447806)
-	emake NO_ECHO=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon scripts/bacula.png
-
-	# remove not needed .la files #840957
-	find "${ED}" -name '*.la' -delete || die
-
-	# install bat icon and desktop file when enabled
-	# (for some reason ./configure doesn't pick this up)
-	if use qt5 && ! use static ; then
-		doicon src/qt-console/images/bat_icon.png
-		domenu scripts/bat.desktop
-	fi
-
-	# remove some scripts we don't need at all
-	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
-
-	# rename statically linked apps
-	if use bacula-clientonly && use static ; then
-		pushd "${D}"/usr/sbin || die
-		mv static-bacula-fd bacula-fd || die
-		mv static-bconsole bconsole || die
-		popd || die
-	fi
-
-	# extra files which 'make install' doesn't cover
-	if ! use bacula-clientonly; then
-	    # the database update scripts
-		diropts -m0750
-		insinto /usr/libexec/bacula/updatedb
-		insopts -m0754
-		doins "${S}"/updatedb/*
-		fperms 0640 /usr/libexec/bacula/updatedb/README
-
-		# the logrotate configuration
-		# (now unconditional wrt bug #258187)
-		diropts -m0755
-		insinto /etc/logrotate.d
-		insopts -m0644
-		newins "${S}"/scripts/logrotate bacula
-
-		# the logwatch scripts
-		if use logwatch; then
-			diropts -m0750
-			dodir /usr/share/logwatch/scripts/services
-			dodir /usr/share/logwatch/scripts/shared
-			dodir /etc/logwatch/conf/logfiles
-			dodir /etc/logwatch/conf/services
-			pushd "${S}"/scripts/logwatch >&/dev/null || die
-			emake DESTDIR="${D}" install
-			popd >&/dev/null || die
-		fi
-	fi
-
-	# Install all man pages
-	doman "${S}"/manpages/*.[18]
-
-	if ! use qt5; then
-		rm -vf "${D}"/usr/share/man/man1/bat.1*
-	fi
-	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
-
-	if use bacula-clientonly || use bacula-nodir ; then
-		rm -vf "${D}"/usr/libexec/bacula/create_*_database
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
-		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
-		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
-		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
-	fi
-	if use bacula-clientonly || use bacula-nosd; then
-		rm -vf "${D}"/usr/libexec/bacula/disk-changer
-		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
-		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
-	fi
-
-	# documentation
-	dodoc ChangeLog ReleaseNotes SUPPORT
-
-	# install examples (bug #457504)
-	if use examples; then
-		docinto examples/
-		dodoc -r examples/*
-	fi
-
-	# vim-files
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/bacula.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		newins scripts/filetype.vim bacula_ft.vim
-	fi
-
-	# setup init scripts
-	myscripts="bacula-fd"
-	if ! use bacula-clientonly; then
-		if ! use bacula-nodir; then
-			myscripts="${myscripts} bacula-dir"
-		fi
-		if ! use bacula-nosd; then
-			myscripts="${myscripts} bacula-sd"
-		fi
-	fi
-	for script in ${myscripts}; do
-		# copy over init script and config to a temporary location
-		# so we can modify them as needed
-		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
-		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
-
-		# now set the database dependancy for the director init script
-		case "${script}" in
-			bacula-dir)
-				case "${mydbtype}" in
-					sqlite3)
-						# sqlite databases don't have a daemon
-						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
-						;;
-					*)
-						# all other databases have daemons
-						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
-						;;
-				esac
-				;;
-			*)
-				;;
-		esac
-
-		# install init script and config
-		newinitd "${T}/${script}".initd "${script}"
-		newconfd "${T}/${script}".confd "${script}"
-	done
-
-	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
-
-	# make sure the working directory exists
-	diropts -m0750
-	keepdir /var/lib/bacula
-
-	# make sure bacula group can execute bacula libexec scripts
-	fowners -R root:bacula /usr/libexec/bacula
-}
-
-pkg_postinst() {
-	if use bacula-clientonly; then
-		fowners root:bacula /var/lib/bacula
-	else
-		fowners bacula:bacula /var/lib/bacula
-	fi
-
-	einfo
-	einfo "A group 'bacula' has been created. Any users you add to this"
-	einfo "group have access to files created by the daemons."
-	einfo
-	einfo "A user 'bacula' has been created.  Please see the bacula manual"
-	einfo "for information about running bacula as a non-root user."
-	einfo
-
-	if ! use bacula-clientonly && ! use bacula-nodir; then
-		einfo
-		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
-		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
-		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
-		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
-		einfo
-
-		ewarn "ATTENTION!"
-		ewarn "The format of the database may have changed."
-		ewarn "If you just upgraded from a version below 9.0.0 you must run"
-		ewarn "'update_bacula_tables' now."
-		ewarn "Make sure to have a backup of your catalog before."
-		ewarn
-	fi
-
-	if use sqlite; then
-		einfo
-		einfo "Be aware that Bacula does not officially support SQLite database anymore."
-		einfo "Best use it only for a client-only installation. See Bug #445540."
-		einfo
-	fi
-
-	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
-	einfo "you have to enable 'USE=qt5'."
-	einfo
-	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
-	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
-}
diff --git a/app-backup/bacula/files/bacula-fix-sonames.patch b/app-backup/bacula/files/bacula-fix-sonames.patch
deleted file mode 100644
index d05b2b9a37fb..000000000000
--- a/app-backup/bacula/files/bacula-fix-sonames.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'autoconf/ltmain.sh'
---- autoconf/ltmain.sh	2011-11-06 20:34:58 +0000
-+++ autoconf/ltmain.sh	2012-02-09 17:27:13 +0000
-@@ -2428,6 +2428,7 @@
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-   -shared           only do dynamic linking of libtool libraries
-   -shrext SUFFIX    override the standard shared library file extension
-+  -soname SONAME    override the standard shared object name
-   -static           do not do any dynamic linking of uninstalled libtool libraries
-   -static-libtool-libs
-                     do not do any dynamic linking of libtool libraries
-@@ -5422,6 +5423,11 @@
- 	  prev=
- 	  continue
- 	  ;;
-+        soname)
-+	  soname_spec="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	weak)
- 	  func_append weak_libs " $arg"
- 	  prev=
-@@ -5741,6 +5747,11 @@
- 	continue
- 	;;
- 
-+      -soname)
-+	prev=soname
-+	continue
-+	;;
-+
-       -static | -static-libtool-libs)
- 	# The effects of -static are defined in a previous loop.
- 	# We used to do the same as -all-static on platforms that
-
diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
index 8a6dd3f7f7c4..35c444c8931f 100644
--- a/app-backup/bacula/metadata.xml
+++ b/app-backup/bacula/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="bacula-nodir">Disable building of director</flag>
 		<flag name="bacula-nosd">Disable building of storage daemon</flag>
 		<flag name="batch-insert">Enable batch insert into data base</flag>
+		<flag name="ipv6">Support IPV6 protocol"</flag>
 		<flag name="logwatch">Install support files for logwatch</flag>
 	</use>
 	<upstream>
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index f257cceb44ca..f49e9b55c139 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 60299c28caaf..d9c8f68929e2 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -2,5 +2,5 @@ AUX siege.bash-completion 659 BLAKE2B 7d9ce4e253a3a95af6a008fb81a421b46139fef2cc
 DIST siege-4.1.0.tar.gz 541331 BLAKE2B c3e8e0f101e27a0902de80478e7c6595f44b4d129cfb265d66c48fcacef4129f587f9ca9ddd0c4d5016513ba19d7635135add1cb02290c4d2bbed5cea501a816 SHA512 15b3b82877153f044524cedc96750a6dab4d21ccbef1be53c0069adade6c3b4204287852a30a57275eea0f51c702857dff59648bd885c28ce65feae141cf6593
 DIST siege-4.1.6.tar.gz 527103 BLAKE2B aea71c93d0243113f8d9087ab4ea02ad1c64e10d8a10918139473ba865230a8e945d5371f19234bce22c95f8a412f68e94792ea0ea00eb451f208a17a37467f4 SHA512 cc674c9dc33aac35988708cd73b5061343cb1939e8a10b4dc50ceab42e65647b58557b6f3b48a03f5c992109bcac233425bf363e1f899135cfd9333d2517cfb2
 EBUILD siege-4.1.0.ebuild 1241 BLAKE2B b979784e76530959cfe469dd4162994797dedb8574e6e62a78a9787bf18e646bd5c6e42450857c0d806445278abe8fb3374e04012f60f35449feedd27e9f5b6e SHA512 f5c7f0ae237f9bc77b611f691dc88875c62e1afb675248aab084ca32989caa3e95eb80c42b399c52b9af24c1cf595203652a8443a6ada289bd003594e5df3386
-EBUILD siege-4.1.6.ebuild 1273 BLAKE2B 7a7c0526735e8c76dac5e1bfeb42dd3ee0b17d20c9c1311d80684639cc71801de65b4d2f289d3adbad21176572bd22921b4a17750b3fb2a86a32d470a29fb39c SHA512 1218b3413936ccaa24dcc4ab66ceef2f3d757cfb8872d5c6cf14eb1ffc526e903c17b3695dfcb99989e6e10b8afd5f4cc6c92c79c3b99859f0cee8118caed110
+EBUILD siege-4.1.6.ebuild 1270 BLAKE2B c9b2de0b06e9bd756d1b6e3e5ec343d9e2f8be4e6ffc5b2bde3082a7b05fa18f21149505ab3d0c48942d7b2068388b649ca17b79f5ff5ec3c28ae7b70d9924d8 SHA512 56e860b71f99300467a43c28aa6507649536b72fd3d0a6b781d9be9fd2b65a2cf5a8151ec2f6d92c09b55334c76b15913805a4652fbb08354defd96a40f9abfa
 MISC metadata.xml 628 BLAKE2B a51d5fc78c971b479422f299365edf6f8275ec57dc166eeaf9acc480b11a2927750e21632cddf8da582a940f33c1e03f434d641ce2235275e18d9cf6b4da6f50 SHA512 11166fa23294d414bfec852f72b30a2f754e37cbd23617a8704ac79e959f8ba4557da7205aecec2694b01cbf33b4550e98fc9371f4a4645cf0508f95e51d589c
diff --git a/app-benchmarks/siege/siege-4.1.6.ebuild b/app-benchmarks/siege/siege-4.1.6.ebuild
index eff06d8f8eec..3afa0f47ca99 100644
--- a/app-benchmarks/siege/siege-4.1.6.ebuild
+++ b/app-benchmarks/siege/siege-4.1.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="ssl"
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d523cae32473..49cc1de8549f 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 59ca6c4a4e5e..d69eceaf1d15 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -2,5 +2,5 @@ AUX p11-kit-0.24.1-configure-clang16.patch 1071 BLAKE2B d12b500a4f38060ec9845cf6
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
 EBUILD p11-kit-0.23.22.ebuild 2010 BLAKE2B 0a5fd2558221b3bf49b43550b55db0844f743a71362998c5fef7edf7e6e997388bbf2b39df1cca795df74aa47753757396a7290306ed69ba0bfbd36fbed6664e SHA512 2093e6b8b09fc075161d9db832f6436f4f44501370ea5dd5f1d5a19765e88853d1dc6ac75f1c42cc99d4f5947243f8889c0acea05c6dcd22df6c8509e10c3c0d
-EBUILD p11-kit-0.24.1-r1.ebuild 2201 BLAKE2B 65f24f8d400f9c7a014db35c5949ecdf236a16b4a10fb5d636178d35f35fd78cbeb369af0330f62aa39fa0bc0cc747c0a119ebd02768defb1c4b5bbdfcf9778b SHA512 280de89b3040e1ff0ddbb4222584d0a09bc036ac5950dddab7e2e0d4fff2dc53a05103260e1c294e077663009ce6672e6cda9dcc946d80d9277d3c33f75df7c3
+EBUILD p11-kit-0.24.1-r1.ebuild 2196 BLAKE2B 088dc9dfb6f649b20e84b65b14fb17b01c7e3445edef293801047eb04a73cb398c1d675636c8a49c02de273cafa3a109e5a3677186903016b7494e84f84af66e SHA512 504a21785cac6c41605fe016250383de5e95a5870ede31d2ccb5bab25caa1f4eda90c8733f7da00096e32d9ddc54c4df1b784092b1373d64c1ca873528180e1c
 MISC metadata.xml 382 BLAKE2B 9ed935e598f60088af1877e443371ccb2c70fc397b21702cb4c47a971132c8a912763bf6ab0d27a3b1a387df39542ac7c5f59345a123808476578878633ed938 SHA512 97c120c9c10d8ee73162beb9970f07153f10b095199adee814459754a3df1414f25b8faae036a19f165a45f8ed4ad0a3087272139d69326018450006b75047a1
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
index e5ecd181f2ff..84bce023f9e2 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi systemd +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 69ce41389474..6bcbc5c73b3b 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 0d9c61ab3718..62310c67ebc2 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,5 +1,5 @@
-DIST dict-en-20221101_lo.oxt 6099028 BLAKE2B 0a8e967670de07a62c2b0d1b39878eea02eae8371eccfeab967ddf1059b9f9866202dddeaebf017c9035153753d8dcafb92eca2868103ec8754396fafe736db4 SHA512 51ea769a87b70e22c84101a131d111db2f9c186707a4fac361378965dce11f03ecd1d1c5c6908bc1199e709870e2b38c1c675ab4d0d8393022e522d765a948c1
 DIST dict-en-20230101_lo.oxt 6099782 BLAKE2B 5103d0bdf9558184deb8d5d3d9ce00d7b597d4bdf4bfa2fefe3caa68d6e0fa68e2f9295d87c7a8315ba244ccbf007c198cad017aee6faf6590914f63c161cf61 SHA512 d34948b012245c0ad07819d625cd417a85b9edc13b842ad7d3974ed1428af4d2e02020ff0b89cde64a1b844ca8c2a54a7e77f37076e8cc1b38d6a2473da01d7d
-EBUILD myspell-en-20221101.ebuild 1555 BLAKE2B 3d32279469c70342b9b4a8b01ac4ad4c67aca6174890a47e23f5fa03d5ab0e88c80901c3ce59a966b1b0f492a6641c41c515d45e6e99c3e510b294253fcb11ca SHA512 bc25efca9b81b391e7b902fe4ea420c9d3403ae4fdf52a78dea99315fa247662f6b40bf389988bae94cc0150f93533c512d38a1b1d6e87ae3a47f288b58380bc
-EBUILD myspell-en-20230101.ebuild 1562 BLAKE2B fca3555c053afc25ac0aa3e300e96a3fa8e83aca9cfc66367b874883d53485d574fd93a5e007e8f375163e1b845df7f63650105f499daa286a22a67eb9406be2 SHA512 0d18e97197d87e5ad399f605b2128aeb5dbf63fef0ea1fe28bd70c5cdb5c0ffeee82724b152f73f7b73c51449ceb509f9e047280127b5891a1781a61c3b281c1
+DIST dict-en-20230201_lo.oxt 6100214 BLAKE2B c75e6ce32020c10291909191eba888535a56cc4126f2d30c18516a967ca9ca88d7da6d26fa9026c7de75246ee42cc5977fe9db8494e224df3ca484667626d3c0 SHA512 9b9d893ed5061c32c808c91d2078e6f45716dfd3f5590edd02945e50cdb349b23bd35ff0d30aab352b0ddd318993091dcf180d5725016e238e209060eb7180dc
+EBUILD myspell-en-20230101.ebuild 1555 BLAKE2B f0549dda1068c8d402940269672b76d7019800406a6825a929324951b121cc63cba3526f5af79cb4c5955d961abce1e1d2c3ee89084fb5209a6fd851f51b6e05 SHA512 a5880cc31b860b4fb1df3adf64cee1a1771eaaa39b93b36a330a4eb0273f8447a3d0c0004f3eaf14f7e038bc87ac30ea61276b80027659fb4ffa42515e74f8d9
+EBUILD myspell-en-20230201.ebuild 1562 BLAKE2B 600a56d656f4dc6ddcfd70d06138b01dd4883edd678d914fb9311d73b319e0434db240705adcab7edb602483b3fa3f9a0b9a103dca5dbdc5fb90f5b7d5573f7f SHA512 3debde12a309bb1dae3255009520188d67fec53e21510bc25e2284a03fff94735a0116a6fe9314ddac665d90fb1d444d49b025bffc89467e79db90349e8da0f4
 MISC metadata.xml 289 BLAKE2B 3b19ce0204dedac8876e4a00fa12dd23cadca14d8b422165467e4da65edfb91e3bb924505016333bad4ed1cb2612db674bb857f1a3dc9e1033b53dcdf20cb164 SHA512 9147be5e8b62a3de0ee8aafc33c61132f9856b28653a390be9ee7a89e3057cf06cc0b53149f08c525a6f01b2fac91e8ba6d1ed89ea46e33d8c279e76c22bec54
diff --git a/app-dicts/myspell-en/myspell-en-20230101.ebuild b/app-dicts/myspell-en/myspell-en-20230101.ebuild
index 7e4459b94379..39d5d9b632bd 100644
--- a/app-dicts/myspell-en/myspell-en-20230101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20230101.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1672590731/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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 PLOCALES=( "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
 IUSE+="+l10n_en ${PLOCALES[@]/#/l10n_}"
diff --git a/app-dicts/myspell-en/myspell-en-20221101.ebuild b/app-dicts/myspell-en/myspell-en-20230201.ebuild
index d1feb0426bc5..b13a6374c775 100644
--- a/app-dicts/myspell-en/myspell-en-20221101.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20230201.ebuild
@@ -11,11 +11,11 @@ HOMEPAGE="
 	https://proofingtoolgui.org
 	https://github.com/marcoagpinto/aoo-mozilla-en-dict
 "
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1667030586/dict-en-20221101_lo.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1675249081/dict-en-20230201_lo.oxt"
 
 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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
 PLOCALES=( "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
 IUSE+="+l10n_en ${PLOCALES[@]/#/l10n_}"
diff --git a/app-dicts/myspell-it/Manifest b/app-dicts/myspell-it/Manifest
index f50fc4ab1244..3ca4d77fbcd3 100644
--- a/app-dicts/myspell-it/Manifest
+++ b/app-dicts/myspell-it/Manifest
@@ -1,5 +1,3 @@
-DIST myspell-it-20150925.oxt 1373663 BLAKE2B 89748d0dceca6a8f3aba7b76913693ac248f2a5c925e04b76e50f23edebd6b0194da72646837e806882ce6258784d5dfb6c212046f13315479603d953d95b769 SHA512 b48a5ac075b9a20b0370235cb4fc225c91a67e6311eb9e7a96b008ad5e64e56af3daf4b192d38d5892e8d23d5f6e0c962e35f8cfec11a97ed8708e29796e09d3
 DIST myspell-it-20221123.oxt 1373663 BLAKE2B 89748d0dceca6a8f3aba7b76913693ac248f2a5c925e04b76e50f23edebd6b0194da72646837e806882ce6258784d5dfb6c212046f13315479603d953d95b769 SHA512 b48a5ac075b9a20b0370235cb4fc225c91a67e6311eb9e7a96b008ad5e64e56af3daf4b192d38d5892e8d23d5f6e0c962e35f8cfec11a97ed8708e29796e09d3
-EBUILD myspell-it-20150925.ebuild 985 BLAKE2B 4cc1f7967aa65f3abe74763e62ee8fcfbf6f77ce4b8636862a18e75b65a3e02c8a64ff2ae8c9269d84edce326f833c54abb2c450cc829e2af12ab72404db76d5 SHA512 0b9b4569340120850b9576ebc94aaeb5cbfe97f470f767aceb1f319df2284019493099bef50e2cb3bcc3602b04a1e7f45ff6d530d3284c08184f0b8403de6864
-EBUILD myspell-it-20221123.ebuild 635 BLAKE2B b77512af4a1a03740a1ccf870f6de61f47d09ec263b2734a89f7a163745e57b4cc4e2556aa5ca4fb9bb2071f6f6fc84f0845a2f47a99842150a782ea4209b193 SHA512 eeeb937f106716059b040328fe5c1e1e0e75f78fcd9fab2c0d2c30bc3c8c568f5b94ddf1722f8d13ab5aa89c9c6c63736d82019bc4e9c8933c3e581432d3e7a7
+EBUILD myspell-it-20221123.ebuild 628 BLAKE2B 4ec3d0f61aed72fe3ee9456eb993b824025cd4443660e2d947f7954d4bd83201c18d86f90675834a4e9e1b6cd9c4860f86dc7e0abd85d0dda6bd26e7038e25dd SHA512 76d6f5702199f40988ae84029a9526371b0e1f3a60d579ad1ce4054cacb19815556d4404a5ca20f1bfc1dd4d3e36ffb5cd12a9159cf36fcd7d5d28c155c5604a
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/app-dicts/myspell-it/myspell-it-20150925.ebuild b/app-dicts/myspell-it/myspell-it-20150925.ebuild
deleted file mode 100644
index 152c28743d8d..000000000000
--- a/app-dicts/myspell-it/myspell-it-20150925.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYSPELL_DICT=(
-	"it_IT.aff"
-	"it_IT.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_it_IT.dic"
-)
-
-MYSPELL_THES=(
-	"th_it_IT_v2.dat"
-	"th_it_IT_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Italian dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/en/extensions/show/italian-dictionary-thesaurus-hyphenation-patterns"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/874d181c_dict-it.oxt -> ${P}.oxt"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-DOCS=( CHANGELOG.txt desc_en.txt desc_it.txt it_IT_notes.txt it_IT_README.txt README_hyph_it_IT.txt README.txt  )
-
-src_prepare() {
-	default
-	# remove useless license files.
-	rm -r ico.png it_IT_COPYING thes_gpl.txt th_it_IT_COPYING it_IT_todo.txt \
-	th_it_IT_Lingua.png th_it_IT_Linguistica-Modifica.png th_it_IT_sinonimi.jpg || die
-}
diff --git a/app-dicts/myspell-it/myspell-it-20221123.ebuild b/app-dicts/myspell-it/myspell-it-20221123.ebuild
index 54265363ab88..842da9e59dd9 100644
--- a/app-dicts/myspell-it/myspell-it-20221123.ebuild
+++ b/app-dicts/myspell-it/myspell-it-20221123.ebuild
@@ -20,4 +20,4 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/874d181c_dict-it.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/app-dicts/myspell-pl/Manifest b/app-dicts/myspell-pl/Manifest
index 83083119fbeb..0e0ff56f83c0 100644
--- a/app-dicts/myspell-pl/Manifest
+++ b/app-dicts/myspell-pl/Manifest
@@ -1,5 +1,3 @@
-DIST myspell-pl-20210428.tar.gz 2111971 BLAKE2B edbf08abcd9e0b0120be3df2b74320698cc6d86dec47dce39e7aa4dc82531bd6ec51cfdfced7216052cebea4293cac94c74407505249de682a1648839d30db6b SHA512 2d1142d83dd113ddb4601b1d7a835a96b1c39eb4eab8ae34eab2ce78817dbdedb177eb96f84a295aabafe10d5b2474e1f8c4b17848e19c377ff0de24916dd979
 DIST myspell-pl-20230101.zip 1275977 BLAKE2B d272c2f42f63a8622f72a05674a76a6d9191e53a8b9a057b595cbed7892c739b070b447b00c5c5b4c1aad8a1b41645923de9dcdcc8b56f8edea9895ea637aebd SHA512 1e5212413b9b1481664dd04ad5d436b5780bc457f771e4221d8a878709894fee71e894f870d95538729586e6f6745f8bbda49db3a4c960321049898a739e5e88
-EBUILD myspell-pl-20210428.ebuild 589 BLAKE2B a93e3c76ca564ab7a31e1c6ff43204e5a74be59f982583883213e6fabde46135d780ca536614f70c4f49d375999c445b474cacb865e0b0ffb106ce9312f4c57b SHA512 23fc5ae414a8bcb8005af7f74ed3de9d0acf87433283c92c55e5e9065089024dc06a819d1f6b807b15395002b715fc6cc40f69c510ccfa3e2a0bce901690070a
-EBUILD myspell-pl-20230101.ebuild 545 BLAKE2B b00f6474c3a7e6cb135ea172ec1a09fb7dc150cc5f11cd739d4528360609a9e84fad82a73c1bbb40b140bca25c11b240d2538b0c8e3abd8b2099cfe6c4a2ca3b SHA512 a8ea5b34e04e785f7a4918ef6367aaf676f79ef0cd34824e9dbc0ad3743d0f28f74afceb504e42f1064f527363c415ae141f8e94f1f467bbae11d1ad6e8db1c1
+EBUILD myspell-pl-20230101.ebuild 538 BLAKE2B f2eee8532a5ba9126edd7b6feae1e3b657b135b7f816e26ab14a19859e27fbde3acc81b774edad80fe9da52e1fa95afa126aba35a2bf060a7418a41cffaf5831 SHA512 f0c0f04c66f46b887f9ba5b0238dea46ac3b81d982e47fc4e2bec8f9fddb2ca3164edc8d479180945f68ba75c8ebe4b32c64fbcd34c67c8654068d8763065b6e
 MISC metadata.xml 270 BLAKE2B ee3545bb82a59ae5f708beac2ba623c99a73041753b7fdd0a66168b56796a89b59c7116f44761ef60b64b3f6048bf5460c6639926fb43029c3321526f0f7300d SHA512 db7bd08022470cf6c081627891896640170714c4c6e8b12e6fab3b2ac3265dc416ff81126de977c30a7f676e91c7fa3f325081cc5cf40ec3220490f4360f6f7c
diff --git a/app-dicts/myspell-pl/myspell-pl-20210428.ebuild b/app-dicts/myspell-pl/myspell-pl-20210428.ebuild
deleted file mode 100644
index 835039118553..000000000000
--- a/app-dicts/myspell-pl/myspell-pl-20210428.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYSPELL_DICT=(
-	"pl_PL.aff"
-	"pl_PL.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_pl_PL.dic"
-)
-
-MYSPELL_THES=(
-	"th_pl_PL_v2.dat"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Polish dictionaries for myspell/hunspell"
-HOMEPAGE="https://sjp.pl/slownik/en/"
-SRC_URI="https://github.com/scardracs/gentoo-packages/releases/download/pl-${PV}/${P}.tar.gz"
-
-LICENSE="CC-SA-1.0 Apache-2.0 LGPL-2.1+ GPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/app-dicts/myspell-pl/myspell-pl-20230101.ebuild b/app-dicts/myspell-pl/myspell-pl-20230101.ebuild
index a039563157ad..1e90eacd4a43 100644
--- a/app-dicts/myspell-pl/myspell-pl-20230101.ebuild
+++ b/app-dicts/myspell-pl/myspell-pl-20230101.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://sjp.pl/sl/ort/sjp-${P}.zip -> ${P}.zip"
 
 LICENSE="CC-SA-1.0 Apache-2.0 LGPL-2.1+ GPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-dicts/myspell-uk/Manifest b/app-dicts/myspell-uk/Manifest
index d3ecf8890cfc..ce882a87ad22 100644
--- a/app-dicts/myspell-uk/Manifest
+++ b/app-dicts/myspell-uk/Manifest
@@ -1,9 +1,3 @@
-DIST dict-uk_UA-5.3.1.oxt 1787200 BLAKE2B 1dcc1fc2427f71ba8cc71df0638e8608beba2c3b65aea7ba915b1edfaf0a759c2768d0b6c32f6df5d70feb685f505364e6d9eddfc95a84dbbe7c2f818074922e SHA512 6a1d17a7f7b358eeef84451384f0ad951b70a76070097b7c1519eab79a67da086f9cae9b4e775e8feb723f2b8d77d744890ab5a83e47237e055ac4e5f7374873
-DIST dict-uk_UA-5.8.0.oxt 1811429 BLAKE2B 887209619943b7e364a221d1dec47229df410f61c4004f87ee97118a19095041f9bc01c86a5aa374375603313b00b87fbbe428312be394657d8c2f809c77a811 SHA512 923eba0da0e541b3a4c16711f05d41ff180e1c2a108103e9960e8b403d0880fc8545a4c290b53d488da5c81964eb46e50bc5eec82d4256258b859825ccd4d58b
-DIST dict-uk_UA-5.9.0.oxt 1805184 BLAKE2B bdefddb3f5335439a8d6a2bde976d74cc7d9a47277f4391f26e85ecfee6227399a632ba04d24b005c3e7d2a21e7c59e56d94f7d407b7ddd1b90729f693615a42 SHA512 ddbfe18fd9a9e66e020411c5750dae70603102ca2cbfc701f2618e7edf988c4b2a3dcd20d049c2380d85bb12d6d7daa0a1abca31c1f4ed7136854552982cafb7
 DIST dict-uk_UA-6.0.1.oxt 1815596 BLAKE2B a81f9bf685ee2e013363dcf24df644b9637c1862320d537301e75c12fcc3e0f120bb921c63d7ce99c2f090e7a2997819d5a890cd74af969855cda6c42907e01d SHA512 4a4c2aeee0ddf17bb7eee91d0dccc0ef2dca754c679e69e2513c9b1bdd874cca97c78ca906c9b2f35cc129c613b3461bbc3704b989ac4e08377ce46245db9ab0
-EBUILD myspell-uk-5.3.1.ebuild 684 BLAKE2B 89dced310469eb69c9a4e21227741a2ab7d6070ae74f07ff2996461a1f4b16acddbf16ec3e2534799accb8696ba0b5632adc4c0133f62a110475f0a5dbb9dd8c SHA512 29297cc84c78dcd3fa003ac4fa761e52214fe9de9f1782453fad626dd8dc56baff86a27939c52787c3623f51e59c9cae7f2386db6c53d417645349a2423bd848
-EBUILD myspell-uk-5.8.0.ebuild 702 BLAKE2B 96b56f592bfb995f7889c598a8b3f9fdbc7bba5784001b2296f2153b408b9b968749f39ff848476ef9cbdf2a04466ef6533a11bece2371a1d1f4d52ff8590b74 SHA512 d327d47c27a01e0905c039f61ff3c7b1fe6994613e2f9ba467a68535b35cedc6714380d78397a85de032bd7e5aa63c20c3b11fd7fbc69c1ef2a2e3a0d2c768a9
-EBUILD myspell-uk-5.9.0.ebuild 695 BLAKE2B 1fb5176fac7d4fa9458519ea550d0acfd002993ddf3f2916fc4f0bb907b27e69c0f57f37b83d0a34c90240cb8d841bda93520a127ab93229e12253ad10b456bb SHA512 2ef18ef4364cc855bb042192cfcd7a48a210eaeabb4434e9cd6cf8e866c65aa61da4c0c2b4f5dd95fad5ab57ea94641b4007d0598262fbd3206384d10b24b45f
-EBUILD myspell-uk-6.0.1.ebuild 662 BLAKE2B cb128ea76504cfb3a820c6766720d7e6644e4c19bae55aaf3afcea0344820e1d9169a294b20ec2fc6be358d9099720a1f7af7e25b8d56167d8138d3efc64bb1c SHA512 2ff1201daa4ca7fc43fec266d84f1d081b455f1d24bd19367da0bbf8b6c299faf1cb36b7cb08e4d9961d5a747f453b7f54c81c6295b23a45e3083393d1af751c
+EBUILD myspell-uk-6.0.1.ebuild 655 BLAKE2B 9583b200dc19b935713dc782661bb384315cbc9f3bec39d3a210e6247b18560bbc7fb03bd748fd8159700825ac777d95cda5a853dd04d21dafd55f6856d0c850 SHA512 84c298add58dbf083c01cb105aa50c36bc66e8fedd54db881fad40679d9e2f3d34e7ba5ca6eeb1ab2bc7d31db2e36fc0c3bdcad02009e681c1a4e5bd3c447a90
 MISC metadata.xml 273 BLAKE2B c6b80b22998b07cf6031ca1190923607e60731e03b04fd7733ef947ef46558ed36d86cf758a11737ad4352407649ac30eadd8d26d833c05b3394433e81d778a1 SHA512 810ea152da2d8cdf690e30dcfed557952c97bf7d7e7c5bfed077efa0b21be2c7c692fd43ecdd8af7b3f81f1795fdcf317ea1308f6178e1cbcd38247c1a1cf7c8
diff --git a/app-dicts/myspell-uk/myspell-uk-5.3.1.ebuild b/app-dicts/myspell-uk/myspell-uk-5.3.1.ebuild
deleted file mode 100644
index dde76a3ae114..000000000000
--- a/app-dicts/myspell-uk/myspell-uk-5.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYSPELL_DICT=(
-	"uk_UA.aff"
-	"uk_UA.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_uk_UA.dic"
-)
-
-MYSPELL_THES=(
-	"th_uk_UA.dat"
-	"th_uk_UA.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
-HOMEPAGE="
-	https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
-	https://github.com/brown-uk/dict_uk
-"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/dict-uk_UA-${PV}.oxt"
-
-LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/app-dicts/myspell-uk/myspell-uk-5.8.0.ebuild b/app-dicts/myspell-uk/myspell-uk-5.8.0.ebuild
deleted file mode 100644
index df7eab58f4a6..000000000000
--- a/app-dicts/myspell-uk/myspell-uk-5.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYSPELL_DICT=(
-	"uk_UA.aff"
-	"uk_UA.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_uk_UA.dic"
-)
-
-MYSPELL_THES=(
-	"th_uk_UA.dat"
-	"th_uk_UA.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
-HOMEPAGE="
-	https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
-	https://github.com/brown-uk/dict_uk
-"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/1655471128/dict-uk_UA-${PV}.oxt"
-
-LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/app-dicts/myspell-uk/myspell-uk-5.9.0.ebuild b/app-dicts/myspell-uk/myspell-uk-5.9.0.ebuild
deleted file mode 100644
index b53761eaa474..000000000000
--- a/app-dicts/myspell-uk/myspell-uk-5.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYSPELL_DICT=(
-	"uk_UA.aff"
-	"uk_UA.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_uk_UA.dic"
-)
-
-MYSPELL_THES=(
-	"th_uk_UA.dat"
-	"th_uk_UA.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
-HOMEPAGE="
-	https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
-	https://github.com/brown-uk/dict_uk
-"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/1663686893/dict-uk_UA-5.9.0.oxt"
-
-LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/app-dicts/myspell-uk/myspell-uk-6.0.1.ebuild b/app-dicts/myspell-uk/myspell-uk-6.0.1.ebuild
index aadb6a0b2d39..adc2ec357d87 100644
--- a/app-dicts/myspell-uk/myspell-uk-6.0.1.ebuild
+++ b/app-dicts/myspell-uk/myspell-uk-6.0.1.ebuild
@@ -25,4 +25,4 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/1672416120/dict
 
 LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 31f2a0356c6f..8d85f5f02ce0 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index b253f6fd52b7..654fb316dd2f 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -2,6 +2,6 @@ AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f96
 AUX bluefish-2.2.9-fix-incompatible-pointer.patch 871 BLAKE2B 4c13a20687994474ae45f0704722f06446f778ee11dc99ae3b29379aca550f6fb1cd9499e1cf24b445363f9f7d8d8a35e91b673d04dd0ebb5481dd6de9241034 SHA512 3c89c37f8f747bcc82b513570bd3a99b916f8f02e95f57fd6dd9a7453cf673d94d116f550982261c25eac781d3ee1fdc63177397048d0dbe7dc8a33a211c4e69
 DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754
 EBUILD bluefish-2.2.12-r1.ebuild 2457 BLAKE2B 73c354a63a319a8729a042c8bbc33d4d344f7402e7631e61c365164d07869fbebe7edaf9fd0972ce06e155d8bfb4656dc9ced6d14a21869b60a05f05b745bb42 SHA512 b22210900cdae0a1049a0f222077219d7552f134e393766f63b49833acbbbb0381080240db0a68253d3a241a83912018c1e60bc2f1e5cc7f32d9fcd7732bddb1
-EBUILD bluefish-2.2.12-r2.ebuild 2518 BLAKE2B e8480fa2209d7d44247e0123512fe9d1e76df8acd35f698d95f3c85991824e1bae744e7fa5b8ac39f2bc6644a58af98b3349601139e17b44b5161e4620a7e758 SHA512 caa446d1a5723f6c993d47867fbe91266e35ded44c930a72afe02dc5981ccf77be75e97989f6ffc213484d8d951e453f1b3e868250d1c587d383bfad975904b7
+EBUILD bluefish-2.2.12-r2.ebuild 2516 BLAKE2B 47ee30d92b5f4fafa1f9a893b989109783f692137ea364258828009d252d2b20940799c9619e562ae2a51496c76f04790e8fa02ee6b88953322cb84be14f4ec0 SHA512 0de0ea68bf0ce9a75a9f822a1517d731eb09cdad751cef78d3a79b81dd1e4e234e3fed4806b1b1698e816ba82effdf659bae5893162df7f17608299444db7983
 EBUILD bluefish-2.2.12.ebuild 2463 BLAKE2B 82ba9fa4901a4a0a8c449de67e1009886f5d8625dfafe24b3b7b30194d4dc0a8304a74a18b5fa385a77015d1ee4940525587272014ba842cda65dd3465491212 SHA512 e4545cdf8c0a18e9ccd9138eb3cc6724c2ed5e7a9f32104756eb100a0a3cc7b3f1c204b42bf5bd22912572778a4350fae52809c1bbdc77a04aac4e709906e544
 MISC metadata.xml 333 BLAKE2B 5a5f339d26d78d99050d8324891a3d6ef97af31e3e6a397e763cc2e7561f892e43856e38fefe72be28db1962a4da153b0ebde42db6a53074bdf6b9c13eb74d87 SHA512 144b48f78b13ad3f07868b3171db5935431befd92821a6b70b6e626943996bcc4219ff27808b9062b2da4b5ff1c86dcb1c3778757b0b2a905c5bea3e90dcf152
diff --git a/app-editors/bluefish/bluefish-2.2.12-r2.ebuild b/app-editors/bluefish/bluefish-2.2.12-r2.ebuild
index 18bf1d023804..0858bcf3d0cb 100644
--- a/app-editors/bluefish/bluefish-2.2.12-r2.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.12-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://bluefish.openoffice.nl/"
 SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3+"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 SLOT="0"
 IUSE="gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 1120bfc4673b..8474de6075ce 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index e3a4d94f036a..4ea6bc0d32d0 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -1,3 +1,5 @@
 DIST g-sorcery-0.2.2.tar.gz 55707 BLAKE2B 59466e116caff697618154f3c9d8a2c11809ac0c1d367a35a7773fdcad381e283c2426310ccd4f843e10e6fc5143061f2ee575bdd190a1a51d7691be0d452d73 SHA512 a63b6a49225fbf5105666a6d8094f04534674c4773eb8008e2cb8e2eb75291011d53ff3f1bf6dd456496469d537a97151feca73b9b26553cf1fda9d3128534cb
+DIST g-sorcery-0.2.3.tar.gz 55672 BLAKE2B f94ec2f449f4b6ae71df4de88519e0a766e543200829cf3ee1535086194c8365a68abfb4156dfd1bbe27b212e1d5c90b5acc7d32b87818f6292e02715c0a59c7 SHA512 2090c93b27b66ab155b3f05ffcddc4790e5d2e68ec02b089fd21c2f56b562dfe4b3ba4820b8c37876be38b2774b466849b6f6b1b03674c3c9d0226ad0049b943
 EBUILD g-sorcery-0.2.2-r1.ebuild 1095 BLAKE2B 34240061d1a87a61924f048e228c8dc6f1bc9edb171745456304312213525ddb9b5d1e95ffad0a18fe66b88cb5fda9810d65c650cffb92435a96144b91685062 SHA512 cee95cfae1abb9eed1ee3a168c2a9a63f41a66f80a68ca7b3c75a596350f5a43fd522dfd672e1a1a1dfff4194cc8b197c8d2c764af800e1b01a9051d9778b8d9
-MISC metadata.xml 335 BLAKE2B 3e6f323e6dfb1feb21d8bbb2c4b2ba3a16d7cbb302de4dd7a49b6878f44c92958fe2fd1d0b20fafe2a9b840fa19e33184096039ee31d6aaf3caf34406da32fdf SHA512 2fad27c61de25d403b79bb06e3bc4242edadf86fafb06c91e5560d51b69fe3652a18f28a998bee225706fd2b1319968f956e58f6d9c21e7c2dccd6d8988f6fdd
+EBUILD g-sorcery-0.2.3.ebuild 1029 BLAKE2B da0e2c1f76a83e685438a775644dbe03364010217fa7a1f13af0f1126ff1213c39daec3abc0b515b9c77666c22da5d7cc7bd09c8a320661be77bfff8000f2b43 SHA512 85ebc7339bdb4dd8672fe279ff2fd8e560f9e0150310140d5313885721f63760c9159dfb48be3765c7ce96a0e89dc398cbaa216ac1502307ce3c7a3516cc62aa
+MISC metadata.xml 414 BLAKE2B 2536a56be77e445ed98deedbe0f2a5ac71e4c6c18e75f0127f68ed67159c6c75b35b66581e0b35b86391cb19798dcf2626f0d7b90d8240c2e75c32d14d07002d SHA512 c07d7892a21224541d8065205c304eeb115c8385368ad8ade845ed279388a7ae254b7524a9255fe56c18137ead3076eb83c5f85c7cbd3fc97fd4d7a8ebf57535
diff --git a/app-portage/g-sorcery/g-sorcery-0.2.3.ebuild b/app-portage/g-sorcery/g-sorcery-0.2.3.ebuild
new file mode 100644
index 000000000000..90d991f0b4e0
--- /dev/null
+++ b/app-portage/g-sorcery/g-sorcery-0.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="framework for ebuild generators"
+HOMEPAGE="https://gitweb.gentoo.org/proj/g-sorcery.git"
+SRC_URI="https://gitweb.gentoo.org/proj/g-sorcery.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2" # v2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="bson git test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	git? ( dev-vcs/git )
+	sys-apps/portage[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
+
+src_prepare() {
+	hprefixify setup.py
+	default
+}
+
+python_test() {
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/*.8
+
+	docinto html
+	dodoc docs/developer_instructions.html
+
+	diropts -m0777
+	keepdir /var/lib/g-sorcery
+}
diff --git a/app-portage/g-sorcery/metadata.xml b/app-portage/g-sorcery/metadata.xml
index c025c94e47be..329796188c98 100644
--- a/app-portage/g-sorcery/metadata.xml
+++ b/app-portage/g-sorcery/metadata.xml
@@ -8,4 +8,7 @@
 		<email>layman@gentoo.org</email>
 		<name>Gentoo Layman team</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/g-sorcery</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 75620fe045be..a88009e0a0dc 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,5 +1,5 @@
 DIST gs-elpa-0.2.1.tar.gz 15808 BLAKE2B b37c8d8ecb57277db89b399dd9151348a46269054722f5f29aff6b04511e098a6ddfadc163130d7f9dfbb1af6ff2d76feda695717e021a44422b67a3f335a15e SHA512 d17dab0a0dcabcd3b9fb0fe1a81dcd175808033b46cb7368c017561c060110bd39998117f6feab3e16ace7304e9dc3cf10e684efd0e77b252d8b249317c37475
 DIST gs-elpa-0.2.2.tar.gz 15807 BLAKE2B 39e2096e568566e8fc42fd1cbf2db98fd4f3e7ecfa4ab8e2e274c0ba2422b258f8064f4606d434df970b80074844a691a828ba7ea4547a500faa32cb84c0f93a SHA512 ffbaeaa8971bc47031f860f2a46bec1c61f2f5767ebea90126444622a57afa05d93015ce297d890cf96f8200653647d18d7f6df78079af35a58e7cef46a810b0
 EBUILD gs-elpa-0.2.1-r1.ebuild 669 BLAKE2B c3b90db2eaa16bffd3e879f9defc687b77f0a0e02546a8cf4ac65fee5f11ae5bfbecb46858a6fba4d1320b2f19aa57b3a085f4f711765ebeb0f829c37eac197c SHA512 4ed2f42b82f2848004a1399021f984da56225e37b62a6bad2fcc0d31fb8cde545291d7e5354b592d1e76428a8472786b48cf9079ec586d1d40000fea497d2cc2
-EBUILD gs-elpa-0.2.2-r1.ebuild 642 BLAKE2B d2507b39c48e8a924819b6773d04402c008297a399f968c0c2178c7c16471d19ce3bd66130789319bcee630a113debafcbfdf20a1ef16bdad5fdd910331dad9c SHA512 9f665038f6eb4f972a0bc684fccf3a03f15442844262dacdf50fe3fcfdc4471866901f826c50541e8e5d0ecd2c6251261ed979ba3c001e598c98d19776f36379
-MISC metadata.xml 375 BLAKE2B 9f073e2e46f0e1d760cfbb53583a93a74713b142a27c84dff0397ba67abec7f0537189525282ae0b5d2ae929d38e71c9f011e012fa034364cba582166f25cd02 SHA512 7b040d04358c8a742bb1724cc5a2ea5bd6fec03ec19a8bca8ae5d00e1d028dbdff60a885bea4f5f6eb0ae7e58a9831cfd359e3e9a0eed3f11ac6c65836d8dd5f
+EBUILD gs-elpa-0.2.2-r2.ebuild 614 BLAKE2B 088a915834f58470b5c9cca4d47b7abfc18c5bedb2eb8191e8aa9902f60678b970cff3eab8a57291aa72bbff4492ab2cc84ef2be30c150a98ceba6fa0f9a2c12 SHA512 957b893545a23025dcd5f1f452e259ed3e9e87816288c58cc867146ccccda56cdc0c184f83c2ec0e6f26dd69f5193eb4c1b81c1d7e42925727caca0e11b48b35
+MISC metadata.xml 452 BLAKE2B a71d4023091c5505202c472af8ae1d51c1d97ddd07af843936f4cf3d41fd677d3f3d4aa5c58c0bdc3f6b62f6140cc83b6e115a54440ced108b4a6cdee5d15e29 SHA512 a1884613720a1e4b6efd8e4ba5694e745a27248f6fb828448d0eb612c3b7aec484119e8a42c8428b26fd477973f005718bc88d3e8a423f295d0198d9abf01b8c
diff --git a/app-portage/gs-elpa/gs-elpa-0.2.2-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.2.2-r2.ebuild
index 700d6a063028..2b149ec3d82e 100644
--- a/app-portage/gs-elpa/gs-elpa-0.2.2-r1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.2.2-r2.ebuild
@@ -8,15 +8,14 @@ PYTHON_COMPAT=( python3_{9,10} )
 inherit distutils-r1
 
 DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gs-elpa.git
-	https://github.com/jauhien/gs-elpa"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gs-elpa.git"
 SRC_URI="https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2" # v2 only
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND="app-portage/g-sorcery[${PYTHON_USEDEP}]
+RDEPEND=">=app-portage/g-sorcery-0.2.3[${PYTHON_USEDEP}]
 	>=dev-python/sexpdata-0.0.4[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
 
diff --git a/app-portage/gs-elpa/metadata.xml b/app-portage/gs-elpa/metadata.xml
index 6aede0909dd6..db5c94b9bd7d 100644
--- a/app-portage/gs-elpa/metadata.xml
+++ b/app-portage/gs-elpa/metadata.xml
@@ -9,4 +9,7 @@
 		<email>gnu-emacs@gentoo.org</email>
 		<name>Gentoo GNU Emacs project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/gs-elpa</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 4fd356e01257..43e06a440f23 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,7 +1,9 @@
 DIST mgorny-dev-scripts-34.tar.gz 11957 BLAKE2B d277bbfdddd81b5b0c27d1c318c9dc33393f91ac86b0c6768124e72ad688586f099c6e4c965eb29d027e26d931ac9a4e15ee3d1e17d9e736d61e543c3fab7c38 SHA512 f9651ae5c3707dc8794d300b2c049cbaf286d48f50c25a8ad4570623b8b8271925cec08d97babe3eb8331dc658ed49b77f0e8d0a4de0215b3bdff732d2cf8a60
 DIST mgorny-dev-scripts-35.tar.gz 12300 BLAKE2B f621ddbfe73f6b5b7e80d61a8ffe667d58ba4d99d3e1d7fbbd29ac4dcc32d3d2afa7acc64c7aa71b23f38615b8d839012b4402f211758d6bef0d8649a4a17507 SHA512 170ed437a33b3dd8e01af73890e809cba213b070f7ecbf9831fdc6b582cf2d6d499a5d84a579af324cb9e48ff4792b267628dd44fe760f38b6fe3020fb72f473
 DIST mgorny-dev-scripts-36.tar.gz 12385 BLAKE2B 79310b3730fccb938e5865e551af0e0ceb90b60feb4dba91880398a1db80d03780a54fcde64a83389e96c80a26aa00ff098d373128ac36a7c82a07c56422d0a3 SHA512 8f00fa3b4fd6c1f0f0c1b3fe60e392dd271575968df0de1099050ded3d85b36b80d5c5bc52f30cc742eec870e9943172148316acfcb881290d45fb4f1e45efeb
+DIST mgorny-dev-scripts-37.tar.gz 12407 BLAKE2B 49e01dc5318c473fdf99b046c7bf8e9939aa3bcade8a481f1418878733c55777fea5a6a471bedd1b1af8009a32ec94ce3cc904f278382fd5060b69a8e276e734 SHA512 c5fc03f0e5fe0f491ada2c4eb1305f215ca33f7d0778a0423cb8e4973a5370b7da2153c0b86acfec1a7672c290acc77782f37fe95ebeb3d6b86436435eda2c95
 EBUILD mgorny-dev-scripts-34.ebuild 695 BLAKE2B b410554da320824b048f1875bfb16b4c2602565228d370e5652f2ebd7fd924bfe02ccb7f0fe8963a8690bae3b3d7d51813ec0749473653c5d51f0cc9ef973e6c SHA512 f5280de950ee5d20f4cad98de0d1d4906c8bf3d235aba574d7f76a7dc103cc30af9d6697cd0ec96391f292c8604266889a15d8b4c27e0c722596873317e186c6
 EBUILD mgorny-dev-scripts-35.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
 EBUILD mgorny-dev-scripts-36.ebuild 699 BLAKE2B 23aaccbdcff9f10ea8128c0c34d51abc98f22243ac00d096343427427325bba639de36b2577293bb0db13b771b6e05bc13c1afec7a8f95ea3cbb20f8720ddc46 SHA512 06a4e281a292eafab7c2bd7755bb51e3c20e0929110ad76688d19b3e44e8d3fd10f2c9cd298c51ee3f665bc64a0b317f9b82a85ce7d4a598295806cd253a8ef4
+EBUILD mgorny-dev-scripts-37.ebuild 680 BLAKE2B 150e6343070bef8b5a34e7bef1bbe8779ca04a5fbe9f97f3ab1bd32797dd92017ebe7f530c97deec0bfd1085e866f448e787017fd97833d27c6eea2c664a41aa SHA512 5d8723b9e58295b1db57c5a83dd692fd16655a69b1c6c1311ff45d4190b777e1e8c439d3d32d615eb62b45ff91ee44c1f8976388de87a419e6b02ca2d7001c2d
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild
new file mode 100644
index 000000000000..c1910af26af4
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
+SRC_URI="
+	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-portage/gentoolkit
+	app-portage/portage-utils
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index d4cb4c9ca750..cf45f9ed1f0f 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 3020eead91f5..77c2053ff321 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -421,7 +421,7 @@ EBUILD bash-4.2_p53.ebuild 4867 BLAKE2B 33051fdd9ab2704b6b8bba9789c7106f26b2a95f
 EBUILD bash-4.3_p48-r2.ebuild 6068 BLAKE2B 39dd57b3192bea544347f3624c7ae1a4ce992c4efb1e06948a6e662f49ea6ee362ab54496284e5ec321e07082ce6555de7b19b92861e541f2c50eaabbbc0d3a1 SHA512 462abbf2c214c70014f1f42363fa9bc0cd7add25c079252f5cb8db642cf85cb0aebdb0829c3f7767fd39ebf2bc0aae2aeb241ba9a4269963b2389705c7bb0f30
 EBUILD bash-4.4_p23-r2.ebuild 6123 BLAKE2B 46619292080e156a8e3a684e611486f8658f71d38b37c734b8d7c3e2158b13e36acd615870604b0300f5d8e4ed06f7fda44059809a2e9db0549a411276a53c74 SHA512 c59fac5c737ee4b2d1d3e6a927ae4ac8f159a51cab746b74caec1a9c25fd80f8b4d08f5754feef3d541fc59eebb43cdeda18d7a879c420c0e1d1e8ac865206ab
 EBUILD bash-5.0_p18.ebuild 7456 BLAKE2B 265a4db38cdb8be9f7d72b02a9b4db1afb052255ef9b1368565c6555d911842e615ffa5a3176134acb81fbf248df1af317996d81a96fdbc17cdd72024c6fe5ab SHA512 2fcfff0880542d36ba563150de89dfde30eb1d31d208647a0530c1ffc56c844e2dced5806c32f7ff5a2d920d7c89739f03ff2da95748c9cef856a8c5b1fc762e
-EBUILD bash-5.1_p16-r2.ebuild 8370 BLAKE2B d041f79af10ec841f9049b4e706fd6e7b68f91b8a3405cde70604165f36bb3fcd4d2a69ee4845e9c12c75059e55fb7abf1012f20f6cec305f6fc8702577af1fe SHA512 bf4e0f524d4fcdab24dd12b64838fafb86c85651a2b3974936eed0a498849de7ee161a348f636ac56bc8e6a350e9d616c171d0c363c2189ab8cfa9b19cbf3e9f
-EBUILD bash-5.2_p15-r2.ebuild 9693 BLAKE2B 35b04a86f774c83cc97cb88e69f5a10e2f37ce39a219add1a31e4a6bca3a59f636a99b499ef62997f5011bb130f21f7f7aa850a7fed75bc088f9d6504d87fb05 SHA512 7d322fce909ebedd20f81d0e52b814d561bedfd0b59501ca95f38effe5861b2924e5c91393a636276fddf0edf1e066c532db591b1e0df071837538488c22c695
-EBUILD bash-9999.ebuild 9601 BLAKE2B 0a4cf2600132c6513f09cb81bbfc1a89d8748622b4b242670d25ec362e4d18f75bd906561bc5b423727af698c9e28c275eb88d27cca0d177f64fdb37f3359770 SHA512 5107db4f8b438cda40e5d628f9088f83c80e92a9acf25452a6984b8f86f707a12992db6bd0e15fea4a0b7a4d769f87b9930a6fdf576d712d42b6d5328198b204
+EBUILD bash-5.1_p16-r2.ebuild 8383 BLAKE2B 7ab6835344291955d166c269fcc00850432f258c3d067cc0bdea4faef5b698891d46fc423ed7db766b58671cde754b976be34333134fa1ee426e0cbcc8659ee2 SHA512 2c82f7c7cd48445d558799b25051f281b951d157f173fe2007d95e3b39094dc28dca31d26230112cc67ea7ee531f8a322d48191907f8feb5599cdde51e826d87
+EBUILD bash-5.2_p15-r2.ebuild 9706 BLAKE2B 16e673b0746663978176ba660adb82c198f3e37b2f4b4fd2fe8d83c26debee6470db2ea396474d714b063f2480353a9c93fc705e8c6c4925582db3afee35ca68 SHA512 bdc10ea223e74fc2675080fa192f1bbc9e3855c0938b67cfdf108a060a1b82ba2b2e81e188a179b4f27a8a4558e3c87e2f1bd78ed8cfb6b8cfbccd1e258a911b
+EBUILD bash-9999.ebuild 9614 BLAKE2B c2bf536cc8284f5c7f1e724cb878906312f17f098a413819e14d93be9624549c809d32acf3acb7daaca9c4338cb49c2134d44261a6c9aa41117e1bbb806009fd SHA512 bf1cbea52e1a7c9553a576856fe767824b88278e36c4c4219d3af536ef8aa29695e399c939b2e64ef1df073aa89326d06d9157568f7fb61fce9025aba876c954
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 07a5a354acfe..a9b7b120cc74 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-5.2_p15-r2.ebuild b/app-shells/bash/bash-5.2_p15-r2.ebuild
index 8c7792de30c2..6d741db8454c 100644
--- a/app-shells/bash/bash-5.2_p15-r2.ebuild
+++ b/app-shells/bash/bash-5.2_p15-r2.ebuild
@@ -77,7 +77,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 15b5c4e161c8..7d9c7837f3c1 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -77,7 +77,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 346e32e24f5d..5df78c96ddd0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index bc8a50533331..76a6a856db8b 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,5 +3,5 @@ AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb3
 DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808
 DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac
 EBUILD hunspell-1.7.1.ebuild 2265 BLAKE2B 68cc8b03df9eba1f4fcbb66063ecc49157cd1c30acf0cc4dd2e6eca03d8eaa1490009281f474670a777d4479e3b1c9f21ce8e17b364e5f3990c085992290b0e4 SHA512 97b9896e07c3e004af7ed252968b21da15a626ebd4e2ad08c4bea1da61638f9c3d16a5be924c339e1d7d3164f9d13067ad53834fe2d8ffa61b8c5f82b62c4826
-EBUILD hunspell-1.7.2.ebuild 2272 BLAKE2B 5806405bc5a10fac6267ee5932daf4fce35518e26b7a194bfaf5eb7681d97d34eb2266676720bd6a13ca2e374f32cf42760fb5cd389d4b137c8ddbc0748ee5f3 SHA512 3fff22c1f38645c6880632904abdf1c7b1b1439162439877eda0cabeb4fd23b2c0349cff563bd70a21511fc18df343b70fb95edda1030dc215f05642ed61406c
+EBUILD hunspell-1.7.2.ebuild 2266 BLAKE2B 5e5a126bc493818f50f5c31bd992a75198d6a11580966885864a2fd2922d88b27865e812641369d025e3513c5994ac4891d7fe65d67e26d99ba965d57ed1dafc SHA512 3f41ff41ee184e3fa952d3c94d4d43b3af48c2061e2d3da443b2a4e70654c4f564c7d68db7e166b0467f46658bae34a63ada65dea750c59be81bf780202852c6
 MISC metadata.xml 301 BLAKE2B b51f61b0ee48d57bc3cb55e7b82b28395877d7c5b4b715f1e79330da95cf6874c1361341a0ac85ab0ecdc1420b2046d278913571ed69604142cf0cd73181099b SHA512 c83f8543e28a964670c59474527d3866c941e211c60c14b23a2c950ac8b9fad35983af5303820ad96920931ddcc676c0d7201ede9fc56f1b41e7c63e15b8a261
diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild
index fa4279305dc0..2db419cb5e12 100644
--- a/app-text/hunspell/hunspell-1.7.2.ebuild
+++ b/app-text/hunspell/hunspell-1.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=8
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index d18124d91e8c..be70f44bdf21 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -2,5 +2,5 @@ AUX linuxdoc-tools-0.9.82-configure-clang16.patch 4677 BLAKE2B 7160430998bd80ca2
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 DIST linuxdoc-tools-0.9.82.tar.bz2 550046 BLAKE2B 3bf9b9680659a3a6873e31116975fca7372167a701e630d762d37fcacf7acb9f1df4031558c4db24769e598a17b206e1c09607e341fc90f91497c15ff0cb05a1 SHA512 82560d9dc4db231e0a2c1fa3732d062bfd6af2cd3c5ffa0960939b2888533882437ddeeb54219e31acc7eaa10fdeee84ba206d32516cc5ed4f3fba2eab1ec0e4
 EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1956 BLAKE2B 6434070af0621f3da002e10a83bc38bc3907ef0ba69fcbc9438dbe2320aed950227bb15a5436ba7727aa89519c80ac73ac01610e95707b9c0194442fbbea521b SHA512 a7dc53a87a5f8b1e2ff4d55f1dbfacc84da78fc62e5b11a5bb1d0f2839e351c931204df88debb276587c9c0622f298a421da40f5c61bbfbec5d837a8dd949758
-EBUILD linuxdoc-tools-0.9.82.ebuild 2014 BLAKE2B 6ed6a20bec2f10007dd797553e09943c0f69eed800f0dcd5c03da506cdddd6c2fbc8cc97eefa97377c7bda74c1ebee4cea736f1a524b2d54d214d0d9ac9ca8b5 SHA512 816a38afd491e7ab111cb7903361c4fa904eaf59541e87d56bb62495868e5f71a34a07852874a20428304d52c5631fbfd84ec15a55c6135ce39e1617820843cc
+EBUILD linuxdoc-tools-0.9.82.ebuild 2011 BLAKE2B ab9e3d3d43cde7e3000ac0cdd4cda05320a2d1666b861aec7dc61f08231e2e8f813285062e7baa21b0b08899c1b1be2425cccf38d51c5cbffeb665449867aa07 SHA512 860cf0284cfb0f515992266b6dec1548fcdcf4df66ec8fcebbebdb0f41b9231c3f2ecd266c9a5a0a4193768d46f17af4c31c0963202ebcf53dcbdcb911c43250
 MISC metadata.xml 713 BLAKE2B 5bb40701020a2a88bccfc3293098732f464066af3317724cdff560819de1db44e33a6ef20ef3b09edce61580a50184e8cc5112d60d415ee42cabe6409e94d384 SHA512 10311f69090d7dbe3ccdf8047daf15ad6b86ae3cc58028b11629c581708c5de543c7fa1ab1bdbd173dbf5037e1dd23d68267de8e11d1a9da9e56659034f1316d
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
index b4403ab283ff..b6da8848f4c7 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.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://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index c7f3597f6ea2..8364a13bc610 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,6 +1,8 @@
 AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52
 AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5e91c3e878318690cb159a7ab83dca134d3e536edb3e9c5462f25bcdebbd25a617b0811e6175ad9bb62583ca588907f14d4b89304eeca7 SHA512 6641739c9f3fa195321f16a1d5d7ed844a0a99c6d65ceba5367270d82c0701a6c906de7c1e430ca010fcd8c35a247bb11f3fccbbfdf80c1ee28b21af2a7a2bd3
+AUX xiphos-4.2.1-webkit41.patch 426 BLAKE2B 373d93182db65e5dccb8588658d713961461f49f64170abed279c7158ccf8292fafd44b041ff7cd9ea7bdcb52af34284cba5a7cb0ccd9c5dae6e5d30046d3ea8 SHA512 8a8e8bcb34d257b07eee48249fb46db928fd358765ed3fb35b5f2b5aba6280414fcf25bef3866dbca99bbef90464257409a091e7319f79833c461e23173a2f97
 DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
 DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
 EBUILD xiphos-4.2.1-r1.ebuild 1681 BLAKE2B 4b8661873c0959c5bd265608ad677c374310eaa651984e3a864088a4d8232f18d8c00ba295e72022be7676264ef8340d3d14ae4621fb19ade211831eef57ef1d SHA512 5956b27da6610fb8c17df3d51993847842360653e4eb78cdae14585f5a2e1f43de33b6278ea1de90335b9b856cef835182f52ca12280eb9dbb1a8d09e18b8cca
-MISC metadata.xml 326 BLAKE2B 6e99d7d8c95e9bfa87837796634393c1ebf086accebfaa22345c6c262c66ab90761576acec3f90424285b9109b80a46d45b80e877a0159331a52676501eb1882 SHA512 bfafd9d630dc1419404e6fddef05f8de268b3130bb6cc34dc77233e7d05e292b7ab50eab1727d1815ece71cef6aaec881e03e30a0345b38e9252a433092efd7c
+EBUILD xiphos-4.2.1-r2.ebuild 1726 BLAKE2B b656c1c9fdb322d5d372c9cb24b480cce5cee7df3142185fc1c01b3f5c7b599c4b89b1bf9cfd8117a802bbe0e23d8a1ea8e72a24b157716b0bbb18db14475634 SHA512 ae8f4bf28e20f906da0f42204f172e0455fb494fc8c1d813f9d282be22b5d59d56514573b1e8b689aa2d9657631ca0d87b4f50a035e3ec3340106f0d8b755873
+MISC metadata.xml 327 BLAKE2B 0925684efe71dfe03c6f3aaed9bc07b49594eed7edefaeb0b47c15fc67ddfaa5e5e4f8f1ec752e5c08c8770960e4ff5732f43e36c081c75e6c9265b77ef68e10 SHA512 a8c931bd1d0c7250c51d7b9bfb684a1433422604ea992d4c26fe3fd5b871f4dd92032b1907a9cceca4a7c7c87437cf3f26e0790e7f6adb27610f13b0b17b1cc2
diff --git a/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
new file mode 100644
index 000000000000..8de40e28c64e
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
@@ -0,0 +1,20 @@
+--- a/cmake/XiphosDependencies.cmake
++++ b/cmake/XiphosDependencies.cmake
+@@ -84,7 +84,7 @@
+   "gdk-pixbuf-2.0"
+   "gio-2.0"
+   "gobject-2.0"
+-  "libsoup-2.4"
++  "libsoup-3.0"
+   "pango"
+   "minizip"
+   "zlib"
+@@ -144,7 +144,7 @@
+     # Gtk+-3.0 + Webkit2 + GtkHtml-editor
+      pkg_check_modules(Gtk REQUIRED IMPORTED_TARGET
+       "gtk+-3.0"
+-      "webkit2gtk-4.0"
++      "webkit2gtk-4.1"
+       )
+   endif()
+ endif (GTK2)
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index b844aa2c06ed..e8dbfb149a17 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">gnomesword</remote-id>
+		<remote-id type="github">crosswire/xiphos</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/xiphos/xiphos-4.2.1-r2.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..04e20aca65b1
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
+HOMEPAGE="https://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+COMMON="sys-apps/util-linux
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dbus? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON}
+	>=app-text/sword-1.8.1
+	dev-libs/glib:2
+	dev-libs/icu
+	>=net-libs/biblesync-1.2.0
+	net-libs/webkit-gtk:4.1
+	sys-libs/zlib[minizip]
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="${COMMON}
+	app-arch/zip
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	dev-util/itstool
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
+	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
+	"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
+	"${FILESDIR}"/${PN}-4.2.1-webkit41.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDBUS=$(usex dbus)
+		-DDEBUG=$(usex debug)
+		-DPOSTINST=off
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local rver
+		for rver in ${REPLACING_VERSIONS}; do
+			if ver_test "${rver}" -le "4.2.1"; then
+				ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
+				ewarn "Studypad and the personal commentary will no longer work."
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a38610c48e52..02a93f14fde2 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
index 4f04be17e0ba..16e5250075e9 100644
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,7 +1,7 @@
 AUX highway-0.16.0-fix-AVX512-detection-on-IceLakeClient.patch 569 BLAKE2B 89915c3fc3e934415026bbc8e19bd8d50b6e3e438f1942b0345832ae6067f7ffaf714d3b99efd3876c6774966cb0cdee05f1dc87788b37c072199d5c714cb937 SHA512 99333059c069f09c59281a7f464805eb41cc6da627dd11ac7dcc565fd688532f162776897ebf506c50e58f17dc7a9486214cc1ec683cb8b2c7efa8b767574410
-DIST highway-0.16.0.tar.gz 1639388 BLAKE2B 660b0079b25a12a2e982b4ba16147b923d167989a7dc1c0cb65ebe5219577f2f02c8774a554fd3fe9e1c10ef7b1cf5db747500bd8acf454e26952722f7b5ac9e SHA512 c08e66f43d9d0b307737b016cfa6c3d3a1df9bd528de435d193388104f34c264866c5ff0da633fc0a6f8c50f21df1ac653e9dd3f6fbfaf227d636411ac14cd47
 DIST highway-1.0.1.tar.gz 1730746 BLAKE2B 1c6185af91afe32fbb35285d49101d381ade7ded262cbcd3b0a8bf28b1924a76ac5a11423a1613068f3435fbbdd2ab0119aa8a1aafe2c3467e0aff1987f40aad SHA512 35b6287579b6248966b0d36fda1522fd6338523934b079e94e857f9de08354f20b99739c99d53249a3a6c583519da0e0ac5e06dfbe6e3a89262f627c75b59dd8
-EBUILD highway-0.16.0-r1.ebuild 916 BLAKE2B 17410588cab5c08a1da3ca44eb583925d599193db12c6f37defddad4013c9dd276de7ff697ebf7fd226b29ab07175061e56fdc4fa355e4c1fdfadd3b55cadc7f SHA512 378b957de0be23be595567c5ba100e958d0defe3331a8672e0c8e36158d277a77ed43fb94a5e71e49343873dc4a3b8d7dc04a5f8931d66cf7bb7794a77f7fd77
+DIST highway-1.0.3.tar.gz 1770704 BLAKE2B 5454f7e661270f25d1439a2a3d649a0f9970d7e10e0cfe6818c470b00460cc77b044ca83e912c91a3582b4a60af5d8d0f7c0aba01762acd3c98b9692fa0b20c6 SHA512 fc419c862e1686b6278081e8e10da41dc2bdfbd386a29b59e21a57375a47d3eeb5c7297e3078c78007b212121d936640b192a26a16c941e73cf599f24e081021
 EBUILD highway-1.0.1-r1.ebuild 911 BLAKE2B 394070e1f0c01816fd9e35078d22e5d15da24e111e14d594d8876300f72a82e352ab0c5e5e2583f57d2553ae57b99b41a4ef7d8d05a682417604540c7dc952bf SHA512 df57e02f5d608d133284144a0a0d7c9785b21741f649914254cf3cb8fa62e8694d06913a035504748bb78966c57b090ca14ea3e8c042a0f5e1170b3e568fb851
-EBUILD highway-9999.ebuild 918 BLAKE2B 97abbef130eed55ce85e7b65ab8539b60e699f33b12b6af25edad9628ea2d1ca876df88466bb8162fe577b0e3a4cbd4238721f185ea4ce606ada329ca77b0e4b SHA512 2b2acabbf62a5940a2b5803f145c029c104316d7436506161572b52f5479ecf1418d84ef8f98e18aa1d9479915bef8c191a402d2963702bb954ce1e413c18af5
-MISC metadata.xml 617 BLAKE2B 85392a8a226aa984039fed26796d0baf6bdb38da7084932e59ec6dcf882ba11863066adff2caffcb34b2b9f337b539c64498cf48c4eea43364ebf2522ea9971f SHA512 5ec72623048e7c940af745ca256671402dc2126004b2be29e01891619c119f847ba1ed72b99f66ee44b8076510833444f5c733a9724e1b9eb13bc58a125e16e4
+EBUILD highway-1.0.3.ebuild 918 BLAKE2B f6de6a0483355dfbc793c0fb1520cf8ca5eae7fceba7bff77c38979c18c0a82a07ea8505e972a62e7cbf0ae5abd39050f021524bc8c5680eef3b57ac3531a8d5 SHA512 a6ca4d498ff57290c34333c5553f9d80383f770103fd128cd5822046183d769deb4407f891918d0058152634bab09fa0dcd53f152ef9e8182a5cd3fd4aaa1ebe
+EBUILD highway-9999.ebuild 918 BLAKE2B f6de6a0483355dfbc793c0fb1520cf8ca5eae7fceba7bff77c38979c18c0a82a07ea8505e972a62e7cbf0ae5abd39050f021524bc8c5680eef3b57ac3531a8d5 SHA512 a6ca4d498ff57290c34333c5553f9d80383f770103fd128cd5822046183d769deb4407f891918d0058152634bab09fa0dcd53f152ef9e8182a5cd3fd4aaa1ebe
+MISC metadata.xml 700 BLAKE2B 23fb803289745f094f19cb7dc6b296f56a3bf712b39f87ee563872496edb5798fe9f36ec1d8a9d9af52d26b589bca354bc58a3c039753156e09a154de27cb960 SHA512 b47da71c110bb91b523dd970a1ed8f4d40c1cc067c170d10ef0ad412850967682303e610c352d7c6425d7bad33d58f90a6d3a34a333a38e427c65a8341c3ec21
diff --git a/dev-cpp/highway/highway-0.16.0-r1.ebuild b/dev-cpp/highway/highway-1.0.3.ebuild
index 12542df4d1cb..9dcc7e3c3d20 100644
--- a/dev-cpp/highway/highway-0.16.0-r1.ebuild
+++ b/dev-cpp/highway/highway-1.0.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
@@ -13,23 +13,20 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
+IUSE="cpu_flags_arm_neon test"
 
 DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
 
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-AVX512-detection-on-IceLakeClient.patch
-)
-
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DHWY_CMAKE_ARM7=$(usex cpu_flags_arm_neon)
 		-DBUILD_TESTING=$(usex test)
 		-DHWY_WARNINGS_ARE_ERRORS=OFF
 	)
diff --git a/dev-cpp/highway/highway-9999.ebuild b/dev-cpp/highway/highway-9999.ebuild
index fa85ceaf4334..9dcc7e3c3d20 100644
--- a/dev-cpp/highway/highway-9999.ebuild
+++ b/dev-cpp/highway/highway-9999.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
diff --git a/dev-cpp/highway/metadata.xml b/dev-cpp/highway/metadata.xml
index 211c94e70a5c..d9573774549a 100644
--- a/dev-cpp/highway/metadata.xml
+++ b/dev-cpp/highway/metadata.xml
@@ -13,4 +13,7 @@
     Highway is a C++ library for SIMD (Single Instruction, Multiple Data),
     i.e. applying the same operation to multiple 'lanes' using a single CPU instruction.
   </longdescription>
+  <upstream>
+    <remote-id type="github">google/highway</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 237040d56f07..5d3415094541 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest
index 03f2ea3d0b2f..59ea295b45ba 100644
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@@ -1,7 +1,9 @@
 DIST execline-2.9.0.1.tar.gz 100330 BLAKE2B c6d346700c5ca94ee83163b5ff5c7f0461d61a768345a1ed5cd64d75f10429d241ed007de7a09954774c4f9bec78c8b1bdcd77f8b98a399d10e90e5639d06d7d SHA512 8115a7e0e83789cfd85750fc8e96eea0201dbf6f7d1f194e5c0a008ebf40d8fad8b802a5209d3fe9805eeb9b7542af306d5328e159a15bd7425a64ef1a51ebc3
 DIST execline-2.9.1.0.tar.gz 106227 BLAKE2B 5a8fb4dfda515ba1d7699fdc49bffc2764ae4322c6dc601a9f0fac0dbd6098b466105625b8f066a5696201d0ca7eb4a9f811f6bdac8ac453ea5e4974af324084 SHA512 868cf7d2b99078b34e56c535d7cbcc2d7c6a85501f1cc5cd093ccd868906a2d2f52b872b8f60402d2c98ffc2e3145cc99ce392f3caf334f88decd8f17597b50d
 DIST execline-2.9.2.0.tar.gz 109239 BLAKE2B c274aef7672781de150ccfc6cc2f3907139274b68cdb2c4b62e6618491e797e965a768eb9ddd6eaba8ea33e04467b191b1650729350b373fa6b252b670bb9885 SHA512 74c587f49eb2cfae298e0a9f0a2de4eb4d85a03e66093c14b3c3026bc1b0350f5a8edcaec69636d421484a9edd68bba6999823e04e1c7aff06943a266ad7e0e4
+DIST execline-2.9.2.1.tar.gz 109290 BLAKE2B 55eeed28e9663f9a13ee31c4117436ad03c87323525201f66dfc552a0bb17831e4d5e3fddfbcfc9d490c209d0305f47a3a47399e2a6590146f2a0996df2dd42a SHA512 6dbe37fd73ec0bba89e1fc539e27f34fdbcf6028a4053e762cd21036e1a131e0156022bf84467ecba3cdbb4dfba7ee30574283d31e7e228e175775e8e16c1000
 EBUILD execline-2.9.0.1.ebuild 995 BLAKE2B 4dff28e6d49a1429ed2bd17ea4a92c70031341303ab6dcb82b1b27f178b264196f10aea179b8df769a62580d82b710cbfaede8aca1a4a26dd4f594622f43cd38 SHA512 f5099e61df22c921ec2a2a1dbd8a0dd905db42fd28817d5aba1945530c983828ed3b95b93bda0446bd245e910e476af09fed94484e768caab6baa27e27986f65
 EBUILD execline-2.9.1.0.ebuild 1024 BLAKE2B f16b1a0d19807a74c61aca7a1678b72bc08394133ce145acde2facb4fb0fd19e51d93a8f26ca9bad4874e0e2895ac2f6240180614c15572518d3d5fe463e4576 SHA512 c977d255eec2286972debe5c61f349bd413106cdefaada7b37684081e290b2b740050ddd4e5d16c08ad8cf48edc0273089ef8f5d13c77b8941dc1c52d7273fca
 EBUILD execline-2.9.2.0.ebuild 1026 BLAKE2B 16d004e701c72887b7c7052467a755388369e68d6481bc570606c01abb04cfd36f766af6077514bd9b9e6714407c5df7abf0d42d1283f69a149594a9e97c992f SHA512 de94c2d3f83bb6e1ba6295660b8ff8e67545253ea808262cff721ac5044452cd4b1b898f27f107e78d9fdd52dec1df1f809807007e87719f4621b21df1ecd6d6
+EBUILD execline-2.9.2.1.ebuild 1026 BLAKE2B 16d004e701c72887b7c7052467a755388369e68d6481bc570606c01abb04cfd36f766af6077514bd9b9e6714407c5df7abf0d42d1283f69a149594a9e97c992f SHA512 de94c2d3f83bb6e1ba6295660b8ff8e67545253ea808262cff721ac5044452cd4b1b898f27f107e78d9fdd52dec1df1f809807007e87719f4621b21df1ecd6d6
 MISC metadata.xml 730 BLAKE2B 6a6ad73cc84538d29b5fb47ac5a560aa524aad0ad87c1fafed91a6b28c64e27d78f6eabce0ea9308f4c48c4143bb1dc5384cbf1ff0d01c8d8863053085f87bb8 SHA512 86d1d324fbdb15cae2d64c0cc2970c0ef0d03c047b20b3c793ed66c92502a1a8a83ddeea7d82c11b7534fc7886bfaf45d4fba37f9d5456cb1f6398164473780b
diff --git a/dev-lang/execline/execline-2.9.2.1.ebuild b/dev-lang/execline/execline-2.9.2.1.ebuild
new file mode 100644
index 000000000000..99842e4ae590
--- /dev/null
+++ b/dev-lang/execline/execline-2.9.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A non-interactive scripting language"
+HOMEPAGE="https://www.skarnet.org/software/execline/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c4a2b2e4c250..08482f24bfa3 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cglm/Manifest b/dev-libs/cglm/Manifest
new file mode 100644
index 000000000000..07f32d2a255d
--- /dev/null
+++ b/dev-libs/cglm/Manifest
@@ -0,0 +1,3 @@
+DIST cglm-0.8.9.tar.gz 631331 BLAKE2B 17f6f8d379aa81ee9327315b121cc7629fcc394fe032c1e1540e5153b2d3b0a2129f27eb46a8ae4323aa826b2bfff310b9039f78953d52d0bd994ba493fcdbd9 SHA512 ac0a042d61c60eac7d6616e5bc0f5c3e77b1a45f58f6732b34edc9a0d714046777e4b490200a3b54c6325ddad5b5faeb3648a299685f748f8b0618ce66a9a7f4
+EBUILD cglm-0.8.9.ebuild 504 BLAKE2B 194380b356a82b65fe5ec1f296ba1b75d8435cffe9385129ff24da60ee605bc355616683c54f381ae221e94f82aa96a7afb5c0e21455e007c7b3318f76f322f7 SHA512 74a9dae6617598d0e35ff68dda3c39785236a60dd56ef74f19a143b644dde5e01672a88a87bf6c822c558e2e134945f14a1f8709ea2ac6067bcc78f84acf5e37
+MISC metadata.xml 326 BLAKE2B bae3dddd1d78f4e11e581e13ec9b27181bac9d1d7b3bf146c10bc4851185e1dbac9ce68b1ad14cb1bc692c7aa379eb5dfee915827eaed9382d068ae04c3562a3 SHA512 5f42f80b1e9b00854a6d0bbe41e32bd81659fb254b53d483dd27c33875b3db362c301894f2e961969ec17c06333c22ab6438a01d231bf3232a1044db934118bc
diff --git a/dev-libs/cglm/cglm-0.8.9.ebuild b/dev-libs/cglm/cglm-0.8.9.ebuild
new file mode 100644
index 000000000000..50287b0bd748
--- /dev/null
+++ b/dev-libs/cglm/cglm-0.8.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit meson
+
+DESCRIPTION="OpenGL Mathematics (glm) for C"
+HOMEPAGE="https://github.com/recp/cglm"
+SRC_URI="https://github.com/recp/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local emesonargs=(
+		"-Dwerror=false"
+		$(meson_use test build_tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/cglm/metadata.xml b/dev-libs/cglm/metadata.xml
new file mode 100644
index 000000000000..43c3fb2ea750
--- /dev/null
+++ b/dev-libs/cglm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">recp/cglm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index b34ab6878768..63742b4ea9cd 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,4 +1,4 @@
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
-EBUILD confuse-3.3-r1.ebuild 1254 BLAKE2B b91afb0b2038705eb2858d5b79c457526cdfac39df407943f95d657ad078ccdacb278f370048820368d3c98d86f0d6225fb09bef00d12e7ac39b3c1a00ab285f SHA512 2b016238869630343a45e4f0ac80f7112d68e1eea52074e8277b6823521faa9eff96b8ed2e095568267cbee36c3ec20f931d2b1432a30fcaf48aa09a10943c87
+EBUILD confuse-3.3-r1.ebuild 1248 BLAKE2B f0ce1929ac7765f0638553f37e6797300f3cd548d8e2b1608d280876e4aa2f3d4f089740d6524b0880f4007a5aaea3b3f39abd1092010157dd08a8b0d862c8e0 SHA512 6976f0ec3adee647931f00edb10d3bea6b0f3daf3bf751cf1d0c8ed5253e94bc533394a8590dfe034f7813dd482447bf4f93e0a7449ffc8b02c5a5d5a1828c72
 EBUILD confuse-3.3.ebuild 1162 BLAKE2B 867decdf55291a7acf6bf2cc5b557adcd5b2d18e50b116193aaa93532820e07212bf694dbcc4c42d42edbe00cc718b6f50cbd46f0153a4614c44b08828e6aa6c SHA512 6824fbbd39fef2b209d76e92dc4ab35947e4af35d82bef885e8717a4724d36ba634a7c3e7819aa78292f098f0c536a85773c2a4dd5bfc37b5c3fe78d65d1a8ca
 MISC metadata.xml 324 BLAKE2B 4b07d6e5ec2bd4a458f3441b4da7653d4d92b2a3d9ddf451976baac0e0631de0d66fd2fd3812447bf18c91c752e0ae84cd82a476a54af2c57999b92934d52fba SHA512 bd23cabb445578fab14d5eed7d112cf8f75c6be6b3879b56edbeeef69070beef42a6a2f6cf40f0406fdeaf38e46dcd3a4f27ef4bc14e09fc1c95c48492724854
diff --git a/dev-libs/confuse/confuse-3.3-r1.ebuild b/dev-libs/confuse/confuse-3.3-r1.ebuild
index cb45a91f7a41..3de10b11c178 100644
--- a/dev-libs/confuse/confuse-3.3-r1.ebuild
+++ b/dev-libs/confuse/confuse-3.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 07f7ab830629..bc6cbaa26618 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,3 +1,3 @@
 DIST libassuan-2.5.5.tar.bz2 572263 BLAKE2B 24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
-EBUILD libassuan-2.5.5.ebuild 1297 BLAKE2B 50b1ed338faf74eb267353a608f28e497daaf61877194209e486386304b4472d7bd9b05a9cb0ddb05093d7c618302d2fead65f4ef985386da428f061d93440f1 SHA512 1bed8caa76f27ac39eb9b6b80e7d715fd3d834a6fdb765090ccf481e9424c2c01dd801e8c0c1ed20051ac83e970ff7af526c191f73470236cec6b2e5a495ae0c
+EBUILD libassuan-2.5.5.ebuild 1332 BLAKE2B 3e3fd3920cad4ee7ed8915f15542183d85035dc883fa0b954746a45ec1f632ab253772d496122170ecffccf5b5e1f374eb1612a4e79644f5fbe98d576eab51b3 SHA512 e5f0a495c4977e5c588ccf6960073c8de1c3ab0ef6ed772de644016ed81d6d3fe6eab859e5856347fcca92f555787e0404719085c9383f0a0cb1e7821e2d8457
 MISC metadata.xml 882 BLAKE2B ca08da3ad8be4a39e30e8e28f58bd5c4c9e70147a29bc55c9b71b45921141326ccd86d9086b6ae8652465c51fabfe4e024a00be0656042011a27423ac2146f01 SHA512 603d947fcaa43d364136558cd158610edfc2349fe0227259992209894f34fcd21f393fe81aa9f2d40ecb41377c8f7c1d6f8528d6a678709d28820d3b6f253b62
diff --git a/dev-libs/libassuan/libassuan-2.5.5.ebuild b/dev-libs/libassuan/libassuan-2.5.5.ebuild
index 4e2e9a7fa80d..ba05de1d6bcb 100644
--- a/dev-libs/libassuan/libassuan-2.5.5.ebuild
+++ b/dev-libs/libassuan/libassuan-2.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=7
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=dev-libs/libgpg-error-1.17"
+# We need >= 1.28 for gpgrt_malloc
+RDEPEND=">=dev-libs/libgpg-error-1.28"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 1417a9323953..8526de8e5f4e 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,4 +1,6 @@
 AUX libjcat-0.1.11-disable_installed_tests.patch 1473 BLAKE2B 5b5705f44fcaf6f74126d4ee62c08966dc1d1816974f8fc82a57fa8f1d44ac32f0b813a669b0f638df0e5d3604864671b0a0cce47f966cce578dc0471489e794 SHA512 4bb721822d3b8965119e30f5d1b0854d5f6ec8caed04dc8fea8811fdce9847d553197ae8042ef9a39de3109a4c12564f7c3f1c56d5c0b64e7924865a58aaafa6
 DIST libjcat-0.1.12.tar.gz 68536 BLAKE2B 88328645dc38432d7988b87004e450459bebe3159f41074209f18fa9e8d0158025199e6add8b6ee531ac22ac3c87f227524ad741de6ec76ade4b39fd67b0b830 SHA512 cf60e86ad97ed786e6e7daefbb17b32d4725f3eab769f7cc480e9085b3a864fd2aad4e1db97b7b5e54352d17b84178631a4224aad3d5bc19cdac204b2fed844a
+DIST libjcat-0.1.13.tar.gz 69950 BLAKE2B 5ff85feff37c5728c8cace5e2f38c179c65a82954a23fd26794a5483cdf29e07601cdaffe27c28a28f7d2b0d57aa3800589c20e19e0a512768f5f87176a56789 SHA512 a66082e3c1641b427af971843822a7893cd40dbb82a596737fd6445fe8e1b527a111dd8f48b9e25a563f0d13e77e22d4c2364ddf96cac38d3e2df5010b37708a
 EBUILD libjcat-0.1.12.ebuild 1479 BLAKE2B 38aa3daa55960105af981d28a7e79cc913cad74738289d6ea2f96327c7efcc2aeddf7a73a864fe2d2fcab925a82e9018cf712bd26ea35f50bfd13db7467e772b SHA512 79d522121e30ffff589b9234a1673ac97f95b0602575f57ec43f3cadd3ff72f775bc9b17e647b3d1d88fa74739ec5a0403bef2e5a0fdfb67d33e71d5cb193ba5
+EBUILD libjcat-0.1.13.ebuild 1488 BLAKE2B 7b4c6c886298251f5a0f14ebb8f7f562326adb997340309b96f4e1fa1e5bf65713e0b47a341ae2568d095f9ec50a729dda12f54c27844afd0b47e592dd41b82c SHA512 e076329763a1fecb9e16bbdd0ebe30ee0c472c870ba97823e835a3531544bb767360840743a05f176b7e18f2b883ef83f9f3221d85c0c28794179015c980e842
 MISC metadata.xml 938 BLAKE2B 3b6d63d78a61aabdc8e6b7316af5e682513a02ba64bc733c788d356d0d2cbcd0071506d20dfcf3fbad5da9303c69341d5c2839be7518415c2174466c081244d7 SHA512 acb07c600ec49121f27ebf0252913345fb4dacc6a003934c16deae3ea4c055abc0db73cca204b06ca1e4a415879a645690ffe26473cf646112ac7497ea842956
diff --git a/dev-libs/libjcat/libjcat-0.1.13.ebuild b/dev-libs/libjcat/libjcat-0.1.13.ebuild
new file mode 100644
index 000000000000..aa29cae3f5e5
--- /dev/null
+++ b/dev-libs/libjcat/libjcat-0.1.13.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-any-r1 vala xdg-utils
+
+DESCRIPTION="Library and tool for reading and writing Jcat files"
+HOMEPAGE="https://github.com/hughsie/libjcat"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib:=
+	gpg? (
+		app-crypt/gpgme:=
+		dev-libs/libgpg-error
+	)
+	introspection? ( dev-libs/gobject-introspection:= )
+	pkcs7? ( net-libs/gnutls )
+	vala? ( dev-lang/vala:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	gtk-doc? ( dev-util/gtk-doc )
+	man? ( sys-apps/help2man )
+	test? ( net-libs/gnutls[tools] )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.11-disable_installed_tests.patch
+)
+
+python_check_deps() {
+	python_has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use vala && vala_setup
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gpg)
+		$(meson_use introspection)
+		$(meson_use man)
+		$(meson_use pkcs7)
+		$(meson_use test tests)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index cd8091f5178a..c8f889ea6370 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -1,6 +1,3 @@
-AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c0353bed955ca377e4fe1c84b02343e191945203db500722a0efe15a263885952a526eaa7121231054d27e4d86bb72c937f019d52f8c SHA512 265ded0f9fc7448021281eb48ed77977eb2f8f6275a18ba329dc9ad5a8c7e41585add4cb989af34e8f135a8545b1548763253204ab5905f78d90c9852546aa25
-DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
 DIST libxdg-basedir-1.2.3.tar.gz 30971 BLAKE2B 63e8197f33db1200573b03cb58e4760ebc9a58f132902f8290822d9235be27e22bc4b763150a526cce23be60d2d535cd8627259180edce4d889a077d4b0de20c SHA512 e672da0d9cd3c27c9113f6053b79127e615e5d84bde81305242f506e930869d8492304aac26a0296528d5a32530e4a743acecb6a25f58372ac597af284429f7c
-EBUILD libxdg-basedir-1.2.0-r1.ebuild 918 BLAKE2B ebe980502ede7623065b0e0e49e7c19d626c7d9bbd623461a287e36b11d32c01cc10c4be7878efbe3c4b4e6ba4e548f111d4bae3e4dc8a19b984d0080fe03acd SHA512 e2cd24b2fe461a425a185797ac12e764728d417a83b96f5ec01e79bb74d0409b85b1cf7fa856945202c9cd6d2178b3a45953bc2ac5b72e79ba6320009d9221dd
 EBUILD libxdg-basedir-1.2.3.ebuild 875 BLAKE2B ae9acbe8b43c9a92e30df53708fa872c60467f6b6aa718c65010e921f32cbcd026656da126ff1d6c4a37641fc4f8e9169a4c7094149ad73b2c8c30702f4e064f SHA512 8c038489001ba2cfce65258146dddfd9542c8b8cb1a206652ddbce5ca7f8584c5b3c8c371f0ca1107f8cce315063535013f9e15c6c3785d1e320be5fc5981620
 MISC metadata.xml 492 BLAKE2B 92a2711b0a64da12d74e40679cdfbc0f4baea3bee2bab1630257fb8a79280ba429a9c4ed516b1d5558714d379976f568feafaccf34aa873bbd7d35c087b067a2 SHA512 675d864874f1c1b8b2d9e8933b93546210399e7e28a144e0f538f29a0fd10bf8d213dcc6c337ea111d208d7e67c674ae1c0c2c0927035c8087e15a6367df8147
diff --git a/dev-libs/libxdg-basedir/files/libxdg-basedir-1.2.0-buffer-overflow.patch b/dev-libs/libxdg-basedir/files/libxdg-basedir-1.2.0-buffer-overflow.patch
deleted file mode 100644
index 4cd601cbde54..000000000000
--- a/dev-libs/libxdg-basedir/files/libxdg-basedir-1.2.0-buffer-overflow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 14e000f696ef8b83264b0ca4407669bdb365fb23 Mon Sep 17 00:00:00 2001
-From: Timmy Weerwag <timmy@timmyweerwag.nl>
-Date: Sun, 16 Mar 2014 17:54:14 +0100
-Subject: [PATCH] Overflow bug
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- src/basedir.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/basedir.c b/src/basedir.c
-index 68ab879..1a2a8c4 100644
---- a/src/basedir.c
-+++ b/src/basedir.c
-@@ -574,7 +574,7 @@ static char * xdgGetRelativeHome(const char *envname, const char *relativefallba
- 		unsigned int homelen;
- 		if (!(home = xdgGetEnv("HOME")))
- 			return NULL;
--		if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength))) return NULL;
-+		if (!(relhome = (char*)malloc((homelen = strlen(home))+fallbacklength+1))) return NULL;
- 		memcpy(relhome, home, homelen);
- 		memcpy(relhome+homelen, relativefallback, fallbacklength+1);
- 	}
--- 
-1.8.3.2
-
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
deleted file mode 100644
index 8c306a31e412..000000000000
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Small library to access XDG Base Directories Specification paths"
-HOMEPAGE="https://github.com/devnev/libxdg-basedir"
-SRC_URI="https://github.com/devnev/libxdg-basedir/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-buffer-overflow.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable doc doxygen-html)
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		emake doxygen-doc
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index ae30b5d9f342..2c88a76a0f92 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index ca97be0729a9..af9db826e028 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -6,5 +6,5 @@ DIST alcotest-1.6.0.tar.gz 288586 BLAKE2B 6e7ab4618d899346de3d8ef63c1b81f92d9cdc
 EBUILD alcotest-1.2.3-r3.ebuild 690 BLAKE2B 1535a3c750d25790caa16161acce1d7e4f67edced9f2b93b752d8316cfb9fa5c9bb81f548f1a46718798aaabb719d964a0167f39e1edd28049c0039857b27ad9 SHA512 c688fda34a8eaca0589e568bfdc52add557654abfa3b49606aa7cc71c091155f08e0b12f3454ab32de880e3091fa4725f37a39f7e20ca92a2b7316a98bb5daed
 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 764 BLAKE2B 1560cf45b491f0fd40997b1097c3efef749e4c1132dd6757642e9031790ee4f5d91d35a221808e4b4c8176c40e75e2c1943d788e4607d8b990dd8ad875cec921 SHA512 b3500c4621fea0f8dc15db8812d521163b98de3cea7c9b94779db09ed0853f3b72631c158df9beb44ceaafdb789176b0b06773abec535ac9f10e2d68d87bf0c9
+EBUILD alcotest-1.6.0-r1.ebuild 771 BLAKE2B 2cf020639dd953acee8d4a317e603a6d9e8c8c3a4e2b5a19c7febc9c1e7ec7c3053541072eb67e60c29a70cafde84c90ee4d9f8857db9a15ad693c903ca44c4b SHA512 c552ea49a519a5be216a6e8ccf637b049150090748635b4a1492aa2f1ef81faa1f9e32141f8e308f32fe18a0874e4cac6ac14c4900e4501b8ddcf2038cf003d3
 MISC metadata.xml 313 BLAKE2B 8f2a0fe29ed0694a9f3b13a3c093cec830ed9bdfc482cfcb78019fa7621f5982f4f158fd8d1505dc7972a9fd4386629433f679ed216a006176444bca75313911 SHA512 72de033c1529758f63f093c39f71336490bf8628cdd51f3c0d40fcafa4602d2a877601bd316851db15097747bf1342840f150d390cd093c843767f6785cdb3f2
diff --git a/dev-ml/alcotest/alcotest-1.6.0-r1.ebuild b/dev-ml/alcotest/alcotest-1.6.0-r1.ebuild
index 58fd8e7ecb00..0150e67355b2 100644
--- a/dev-ml/alcotest/alcotest-1.6.0-r1.ebuild
+++ b/dev-ml/alcotest/alcotest-1.6.0-r1.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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async/Manifest b/dev-ml/async/Manifest
index 8ab0f8799940..4c907662aba1 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 595 BLAKE2B 60e37812659e5f6133b4d85667fb3e43cd6bfcaae81f992ce30e1bc8baebe20149f2efb9331e26dc23c7b35ba914d7f1b883183bc45af15215bf5b1417f4876b SHA512 ebea52581eeb0fe3194c09768fd4f802d7f5dd91c214896c9368614f7289466567bcfb1091aeb9a0af52eef86a84bc5a97ea4847b3c9794554047edd9acd154f
+EBUILD async-0.15.0.ebuild 602 BLAKE2B 56b714ac28ee60200ed388c05a00eb2e831ca8dfe50d6eab20ce1d9d2d622b209bbeab083f367dea083a9653363da9176b3f1b8abbc84143becb8c85ed86cec4 SHA512 2230691cfbb99ef8aab45adab950f07b9c07437274a622df50d0c323636709cf31a05dc4a2183eb3254f8803ff051843cf612d35d8c9c2a6852057b13a76235e
 MISC metadata.xml 249 BLAKE2B b78e5026587528ac00257e953e5fc571ecb411ef3c76a774a5e43c3d7b5af23b728e7d28294ab40d4f19a45b0da04c181ef3f01cc35133dc1b991e5e046e5af9 SHA512 26af8e47dc4927f6e12e10f7604605289a0d136ca5749e1e3f569435be8c092cbb09b87e74793b0e2002c606f0cc6e12349c5b2f58d95af2aa569afa7d6d726d
diff --git a/dev-ml/async/async-0.15.0.ebuild b/dev-ml/async/async-0.15.0.ebuild
index 65139f2dd152..126420ddec3c 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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 # Need qtest_lib, netkit_sockets
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index 3907254713a0..a4c6f4f33a0a 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1,5 +1,5 @@
 DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
 DIST async_kernel-0.15.0.tar.gz 148527 BLAKE2B 535a64a204332bcc41e6c4ef5ff78fa81ec785bb29404b278ba93e093452354b045aacde98b0f2e6598bcd5fe29a86ee476f2f48f018c69acb7d217d4ba9a60b SHA512 35bf6561b0dfcfd1bfd786de9f47a78deee5718fb449de648f9b1cfd2568c00cd7044b33dce12ce48d1ed704e61fefe3f2d2b1681c9f73c6fced0aefb0423b63
 EBUILD async_kernel-0.14.0.ebuild 508 BLAKE2B 216bf5e5292aaaeb4013f0033f713fe3d5f31145b8df65b48c6c5489bcb23ddb60d66dd8efef1835061fee37498435e4803f2d0d9a36f819e10c89358c7fd7c3 SHA512 914de6610883bcb0589b07a7a89e6b15ce7279594822a5d3bc28f4b78f3f5c1d6654ab57153c7c09e43b254beab06fb1239a07c54c2eca6edc28767a1918a6e5
-EBUILD async_kernel-0.15.0.ebuild 482 BLAKE2B 68f75eeaf96572312244c29a28fe3ee973bd9d6677776d568eea4dd25cc3edc8c21cde7595938626f5ec2d3adb1869eee1b6133f07c8605dfe7398414e89071c SHA512 24ba7338d281f11afeb502c0f0b39879cfed6b57754e321441eb54b946cc37e0bb3e0264032f3a18b505f9d08715614247d24db6dd9559f23c0b64e19046d07f
+EBUILD async_kernel-0.15.0.ebuild 489 BLAKE2B f48d0e634a9fc28b1d562209e0ac947973ade6b88c0a77ff7aa8d3d7b409ecfad7fc7fe8469aabbe90b13006f71da06e49d38968e92b172c8049817d29a6d6f7 SHA512 649a0c576ebe4ba2e8b9aa1ff93ee3a8b6eb864ae0810628f9dfefefacbc2b59687a0feffaa81d12755fc7abb7903e2d43ecce64584cd74668084d0f5a9a4cff
 MISC metadata.xml 321 BLAKE2B fd8db9f53c6506db9ed49966b039aa07734345b6e0983e009e6fb9bee82fd7dd4e15ecdbb791503ce7f4ec3fd9fac2751f02626dca8a86e2fdac640919918d67 SHA512 a64a7d3dcef7d139eaa027b590915e6d4171daedfb4ae2d83ebac996edfc107e2b345bbcbed096629a23ef6f6d923497e09b5a3e3004160d33160c2b7d16d658
diff --git a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
index 53bb7d3c928b..ed38a641eeca 100644
--- a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
+++ b/dev-ml/async_kernel/async_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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core_kernel:${SLOT}"
diff --git a/dev-ml/async_rpc_kernel/Manifest b/dev-ml/async_rpc_kernel/Manifest
index f0bd25478fb7..93bb263b410b 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 517 BLAKE2B 9115e3bb18e343d59671abc4a976835c91199910ac4e454b2c546c6dc2d6031168ed933f7a699a4c70c2a99ff3c83e89b3ce9f47e0ade390cb63dd7e63315b96 SHA512 84127cbc8ccdf940167120fc209094141d3866b63895ba0bba30647d5e318e38509b49ea6439cb07d1c65375f2986717fb7f0fd12b89f69d565e1e712ecf829a
+EBUILD async_rpc_kernel-0.15.0.ebuild 524 BLAKE2B 1784c9b4e8622283430b03d96d09176c195da880761fc12f54361f6750a96d3ef9fca95ea38f7e150d04f8cebed04a7a6927c39f2fcecbdd8811cabf986e4c36 SHA512 0ec1db1b6e6d4b68a305702c43600160369d8a102bbfcdb13b24bd69cafce9b67b62f7e91f0e7cdd3402b0f9bb129550a5fade7aca5ddd47aa485c0ae659f959
 MISC metadata.xml 328 BLAKE2B 00e7d002e764e950ab396e4d7255af034993f005fb7afbcf183da5aa2156500041c925cbc83cc341d104bdc1d3e77c58bf3d7dbcb4e82c0b44d81e77a16b9a67 SHA512 dcac85b2080f8bbb61bb8659252dcda12c48e89f57161cc13d12e72a10b2bd822795e8c644f0291b9c9850acd5ac62028771f00a00c3bc20e561e6fcdfc94f87
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 b33ac23e1264..60d906c8d840 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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async_unix/Manifest b/dev-ml/async_unix/Manifest
index 234f5d43a733..5dd21e77abf1 100644
--- a/dev-ml/async_unix/Manifest
+++ b/dev-ml/async_unix/Manifest
@@ -1,5 +1,5 @@
 DIST async_unix-0.14.0.tar.gz 171624 BLAKE2B 4c55b6c8ba8cd59ede4b214ec84d8689700e46b918a96e145f94ebd011c32de6c2ab40c35a4c821ac58872259740b752e045eb2ac7954ecb0b988ceaf1b75ff2 SHA512 d90713d1d35445a648392e9104eedd25d4c7e6a10a46d0442539c1521349dcbee4118e852cc8335c8c03ba4d1050f199eb91a6e3c3c827dca8eee59501f379be
 DIST async_unix-0.15.0.tar.gz 178320 BLAKE2B 825efe071ecfb39ff0d5586cd8981c31a4692ee5b44727fdb22d68bfc08f9f1e296a363b87c308bef7cdd557dc9124da21bd1e772fe47dcde917b6bc5024500d SHA512 d6bb561ca06b3232c11c10bfe9dbd689020d52dc90f13f01751abf31f968649c7c8664f5f58de95c89f012de00c789efa9c0ca230ba32b9105c609d1afca2a51
 EBUILD async_unix-0.14.0.ebuild 551 BLAKE2B c59ea8b7c9535557833075fe634714810091bbd47782478b4366a8b58328e6f05a02db9ab57f5b29fae6e2433b04c18136130300c90320ae333c216328b96b74 SHA512 61ef35b1b2bff250c8aec54797bfcfcae6a4d48f5e329fe0b9d7db90b5910794e751a3ab5d0b80e3c4a961ec22ab051a056d9d09485f7bcb71bca0d2c6fd1313
-EBUILD async_unix-0.15.0.ebuild 503 BLAKE2B 5d904546a5d5d7febff7a3ad1d2a9e9b321b7ae0586ca2a45091be4a00e3e84c784a4445741f14d418d65d1cd039309ace7eae37caedc83390bd6adcf83277e1 SHA512 3ae12aa0bd9111ef7c0023d8e34f6074c2718a1c0610ae798a452a62d75513fa4b2ee105137e9e1dbfea410ce378c7ebc06e086fb58a950c656faf8c16d1f07f
+EBUILD async_unix-0.15.0.ebuild 510 BLAKE2B 45a1bbd619c2a70379162db81f20c1a6a9e3dd17e4f1ff7b9a0a1ca86a0d653213cdb5e451a2a987ad9941ed27fb5b94e565ab30cd16ee4d0785a0f9bf4b92c4 SHA512 57a01c99a4bfbf7510e2c22b2fd3d3c90c31e9cca6033b1565390b8c12baa77d86f4322c57cadb9b3cdaf6ec3719817798b8ef22b4a55f0d2fafe98d9c3df5ae
 MISC metadata.xml 319 BLAKE2B 057719c234859791c2afb0f8e286a8050ad1373cb0318c0d0fbd9ff9906e65131871ecd0cc0f01993c58abaae60eab700b2ba5fc8fe56487150de4aea9e50aad SHA512 5a813d9ff6adc78e1ef4e8dd30b670313bdd15a191ba3ca12c5f4ad2a9dd9d23d69003bcf1805a8490006c46440674db701275c51351b05bcb05902199ae7072
diff --git a/dev-ml/async_unix/async_unix-0.15.0.ebuild b/dev-ml/async_unix/async_unix-0.15.0.ebuild
index 83c4750ce971..fc8124201e3e 100644
--- a/dev-ml/async_unix/async_unix-0.15.0.ebuild
+++ b/dev-ml/async_unix/async_unix-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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index d625f9bdcbee..a87c3f0ea8fe 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -1,5 +1,5 @@
 DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
 DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b287b19c8ee33a620c6a1def5379d59dd7f73b531c4077a3c7ce9e2cefbf6f71c7e49b3dd21213c68507bd19b0c90c44bf5 SHA512 d8311312ea1b3dc3a1a30c87ba4984438ca2c81f8da9cbb7f111dd74fb9b16ad8226166ae2fc2b572a989af15099b07294a667646b0ab22130de4406da53230b
 EBUILD base_bigstring-0.14.0.ebuild 1001 BLAKE2B bdf7a42226a6d53ee3f05f8ff43b5a1a1651e8eb550a6cb6f3431f62ab14c436c5c2cb9c8ac019e497b0bdb5426c4e8aebb95363b44e13f5a8bb2148dfa2783f SHA512 5293036194feec3af8861c581117740c96e6630d7561c6999a62863818ea37a1c1c4e43966add9d9527f88b2d645ab132c769912a8e4c9656fecb3aba63c96d4
-EBUILD base_bigstring-0.15.0-r1.ebuild 499 BLAKE2B 5cc0ed9d35ebbfdbf5a207496e96c5253ee12f465482710588c4c98d45dd83d5a9018c690152c94695717a271a9cf9d732097b30bf01701b1075dbeb366adf45 SHA512 552e1c1d9e2e666760f816120f881a8e101f276e4010d911563831f54cb787979bfea0c2d2a3bee4be3714a45afad1acad9ad977374c5ec0e746325883b7d31c
+EBUILD base_bigstring-0.15.0-r1.ebuild 506 BLAKE2B a11bd3b94b1c0641f1db4e9737a6883058a87a4b22baec8a95f5f00faf908d153247bb2a9d474be20295991e17b49f7990495076136ed727aac70f427d98cbf2 SHA512 3fc00dfad6dd9d940ee5be6b1572921a132d42c2dd53839b865d71685ce8f94ea9e88a4b7155b7f568d5f5a67cb6cc59af12304108d89d04e3173e9ae7ef70df
 MISC metadata.xml 323 BLAKE2B 3729ce1b400ce788ad528fc85ab4c404b3a02a35051f1d73059878ca255fccdbca77cecc62dd1f1172452c4879b5dfa633acc4e5cfdfa3275f7fc4eab80db3e1 SHA512 a1f3fde83f77f720641d14178a1711ce34bae7e4de33a40aa26dd2d56042722019bb5f71011a6a516874013fd7925407fbf2f60ace38b006e00bf45b54c75f13
diff --git a/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild b/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
index 0fac7e17964f..24fbc4daa100 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index 9ef0ebadb9b3..eef864f5c605 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -5,5 +5,5 @@ DIST core-0.15.1.tar.gz 522517 BLAKE2B 1dc1245708f392161ce04ab121dfff550f13a8aa7
 EBUILD core-0.14.0-r4.ebuild 688 BLAKE2B 0236d0a340235aa8b2dd9a03fcdcb137dfb18daf160953852bed23f5b29471f8664db40618e744631c92648f73fc23c11e2b5309d8dd64a5ddf50710bb000e8b SHA512 87276c8dfdc8b2fce059a3dd4100d31b131582af46d054521bb496e207fec897b63ec8abdc900c66bb7e93a9e605100194239e8e61394c8df34b06c483b72444
 EBUILD core-0.14.1-r1.ebuild 747 BLAKE2B 6944e4b04b458ff2ffce30cbd4b27c0b86f0aad00ac3596c042ba4c1a1c74918fad2606e521651e6676e054639fa7231042d1d8918b58383d02ea7caf8d58d9e SHA512 5659a08e8d772ad14528ff703e1ad4a39b82216e000bcab8e2da1b93bab921da4268c135cdb5800017e5d790c468fd802e173faf765de15496228a13e233ba23
 EBUILD core-0.15.0.ebuild 537 BLAKE2B 1009f951e121d88893a36c3f6e14b79b468feae3169a6e315f165322198d10ba19711e7d0d5e5d6628c90b984f34ec5942232a4da9a0db35c569244168566462 SHA512 8f6f276d341083f229a92f3e41bc8201c6a1b41c3ede0b96d4d13d6672648a0a2e923f6d003221d6b8874e867dfbd528826991e40a943d0644b1424ed0a24138
-EBUILD core-0.15.1-r1.ebuild 1085 BLAKE2B 972ac7d6806f29b8e326acf7cf58e3d14494138e31afb3147a231079fd57a534d0271a2b71a34c2721a3729c07b6fa6a349f1091f84c8d2ac30c5310bb125669 SHA512 d8b04824280f5bf42eb8bdb5b3d239b31bfbd44344e93d10102052a73089724d33c0e7772ef86c99d91e92b1dc14da0dfc5be9364143512aeb127c8a81d0aa46
+EBUILD core-0.15.1-r1.ebuild 1092 BLAKE2B 589d3f136e931b932f63c1c17cf472c937a75e36ace6c59699d604b06164dbe4d336a172e8b5ee1a7f83c9f090d87ea60c6979e537075a8415ceba0e895a6238 SHA512 cdfc68ff2453677e6b50f0c6f44979db737368026f385398eee8892ebbe73577371d57c1f9f1eb8bb74d6d3b6f42995b6940873fee1967a4552e427045d2c2f0
 MISC metadata.xml 710 BLAKE2B 368091778c4347e69ea5398a3f6013d1741bc9fb20acacc861de152c8afd90d9647ef7b31143c26c7e50e0285b52f2a8688b7203821473004a9b237e65585dd7 SHA512 3d29e7a8c748a4849421fb73a1f1225f6480d032d8eb8bd70870567c8f2ac50ef1504c368204f6f063f71f5c984daff98a1109e81674abc8faca10c5a3414efe
diff --git a/dev-ml/core/core-0.15.1-r1.ebuild b/dev-ml/core/core-0.15.1-r1.ebuild
index d2fcb5141fc0..0f78b218b0f9 100644
--- a/dev-ml/core/core-0.15.1-r1.ebuild
+++ b/dev-ml/core/core-0.15.1-r1.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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 # TODO: Wants quickcheck_deprecated?
diff --git a/dev-ml/core_bench/Manifest b/dev-ml/core_bench/Manifest
index 563d927cbe66..d57ca570f37a 100644
--- a/dev-ml/core_bench/Manifest
+++ b/dev-ml/core_bench/Manifest
@@ -1,5 +1,5 @@
 DIST core_bench-0.14.0.tar.gz 42972 BLAKE2B a65585d2cae5080e23d9b8897d15f7ac6e42c36280a06ff21b5f46d5532f3265b672f7d6373573826b80f5f6dc93343b3e93bf8c3d5b471e6717162e9fac4025 SHA512 e86a04c12832ba281669139d74e942ab1ff8d7dc799ea1687cf57a50ef1c7b031191aa1cc44c50586fcfca8e83c3c6f1a8b1aeb40c724fbaaa0e0568c393d75a
 DIST core_bench-0.15.0.tar.gz 46920 BLAKE2B 44ca0845abc8a593c5685305e2175b04dff32219488945f5ca7c00a6b139d9cf99bcdb865259b17625decb865916ef04eef4feff2d4ae8299986097ad7ec9d27 SHA512 eb8574d3f1444f4aad0ce73da372d6283a7d03aa636dc47fb6e918c1a2c47241fcffe52a6015e93b7ebd98f59e00a3d61f97fb7222400f4ca59f60a7ba430ec2
 EBUILD core_bench-0.14.0.ebuild 565 BLAKE2B 717a3bf0e112fe61764e3e5de4b33a46f52a420dbd677013dac60017ebb4dc9cc93ba28860b3ec6f6dcc1aa552cd3e40a7b9c95480f1f33df0af5f15103d0d16 SHA512 55dab1511d335ef61a2721c83d89304f32621430b388da7158db6cc7226099cb5543b758296370828eca612def3afe53af6efbd084b75fcd2cb450c2d51200f1
-EBUILD core_bench-0.15.0.ebuild 447 BLAKE2B 03fcfc7e5a54e2fe0f0e48b2337466d558dec0bce125e5e5c748bc0ea4089cc8e471e1b83d93e90e5dd710b772a3ed7547cb333d3a8e5e4798003213c99e672e SHA512 925937df9fd71ddc7aac7a5f2294a0c631660e352d4cb07ebdcc48e9a484c0ecb40a142c6b262bd75f35271a3952389370584e00657fbda7302fb1b8485daeca
+EBUILD core_bench-0.15.0.ebuild 454 BLAKE2B da22dcd680dfb2cbea168d39b5f9653c7848a3b613e89d3027b63ca767c6a5990ac2da8104633db0895608191210755fdcb77e35b467bcc533127c7dbaae7a0f SHA512 fb547eaa28f2d0cb4622a23ba94b76c151c58d074ae01c5ee4312c9f6891e8ee06308ffe81878a4a1a6c49c90ab26410c2615aade6de8a3ce9edfea0874e4e02
 MISC metadata.xml 319 BLAKE2B e07f2c98a308c50d4037dd942b1a82a4b4a8c71d4be94f96611d8e2955b22c0b78a7bb729030a6ed595fc4ed65f6072bc536f03db4a8a08b43af9d75a65432f6 SHA512 32d64cd410459106199ad3d57a2ddce9651bf95be3b8334632235f9ba3963a0a3fe24142f523889ccd591fa0536b90574e9129fc594c7a7905588978b3aa886d
diff --git a/dev-ml/core_bench/core_bench-0.15.0.ebuild b/dev-ml/core_bench/core_bench-0.15.0.ebuild
index 7a6d82c9505f..438c13774a97 100644
--- a/dev-ml/core_bench/core_bench-0.15.0.ebuild
+++ b/dev-ml/core_bench/core_bench-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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/textutils:${SLOT}"
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index b428283c3db5..7095b34d3b1b 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -3,5 +3,5 @@ DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5
 DIST core_kernel-0.15.0.tar.gz 265183 BLAKE2B b1e67e8a84e1abbb23ccfb65c8320e36b3b2f91be3c2aa02e73b53c411e80da65c34b69d538d027417a52fd1dbb1a2217b9020d86ae00237ebaf3e7c06b35e42 SHA512 da28f11374fda2e869b5ef3f7131461c6d896b52413654f2aeb7c74bc77ba4a8e2a25830eb3e3ef393e0bbae903db20f54773b356c53cab75c1bba1b9ce265bc
 EBUILD core_kernel-0.14.1-r3.ebuild 1032 BLAKE2B 50eb6684ab6cd15aa6b2e328d11c19f9b8a641e7952584b08add5ad98296e46052066973007b811da43f75d0cfa44c6cc645a1a2126725b3446cebd66f0ec4b0 SHA512 39fd1af966e29654d3f37c141a6e72d8cd8bf7379cfb568186fba00c710ac1817178e2311909c169c1b687688a844f53d9365ad7523d561f51a208cc3fd20091
 EBUILD core_kernel-0.14.2-r1.ebuild 1075 BLAKE2B 0a88db73c4a3a93e948d624e235d72ba70fc5e960ae68c3472881a537ff0fa5d0690861824fd7e501e9ac384b9a93b6c3b17c600686221a83d1be73d4b1dd8d9 SHA512 b4d1ddd8a0f1e8762786c6b23fafcb388c20e7fcd842e51a876204993942b90a328f8ef36f7f81a9cf981d64f4a2d5d93f436642fb93be761d103da062737224
-EBUILD core_kernel-0.15.0.ebuild 557 BLAKE2B 87351d10ecd60fdbcd2e25d40a1be7c6b45ee64b938ce5d8339e860384d4d5815c0234475bb7987b9c8e8194e5ab735774785a9f33a38ca123696e803c875fad SHA512 b525637accfb0307fc175f366112d3814caa92e9cd58eb78a11e7a51e5cd8655e1f77b00d36306aecb3e999fcc5509c433a40cadb888815b4b1d76cb86d7bb91
+EBUILD core_kernel-0.15.0.ebuild 564 BLAKE2B b5109c4c1a3ce55581ff671106752c3363a8d337c3e4bda7b1c58ebaf71e85db527745bda768abd92d6f56f18f5becc9ca79e405c7ed88575b054583be5c5dba SHA512 3b93c92c6463975849b8778c74ec88b182c29df15da26e08d94ca7dae9847b22d39a1501e8efae393ad09ac4414106746f86d7dd35686f3b3b70f96dd6c9b933
 MISC metadata.xml 640 BLAKE2B 411246c9f2ad1ba00a0475e8195d3b54a0ffd9b7c6804c10b482540e6c27d683451ed63d65f48e2dcab87a53a69fa6215590c8b2f8bb951266697df6226e44a9 SHA512 7854d4748ccc7833d4a029e8ee0fdef9d91c2552d916d77bfe171590a1de6c9e547675e04c886afe9b5b6de8c34e200f6e52a193213ae00ce70f5823fa363292
diff --git a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
index 55b846c55ca1..08b5d6f7f6cb 100644
--- a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
+++ b/dev-ml/core_kernel/core_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="LGPL-2.1-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 # Wants quickcheck_deprecated for now
diff --git a/dev-ml/core_unix/Manifest b/dev-ml/core_unix/Manifest
index 8a0f57ec6c8e..8377ff690a42 100644
--- a/dev-ml/core_unix/Manifest
+++ b/dev-ml/core_unix/Manifest
@@ -1,5 +1,5 @@
 DIST core_unix-0.15.0.tar.gz 377928 BLAKE2B 49b58471a28c356bdf39f15e22bd21ec4363182cf744c0455847ffc15015fdad2928a428986c2a9edff647ebef9f2ad2059b184b393e979119c8f007f67ec140 SHA512 eeb53bd0c06a7d1facfb133f0a45a232d57941eff644d4ed6c2d5002acd4e6b323376ec9c05838f760ebd9da3fbc39332989ed50b3921191c175811c947fcbfe
 DIST core_unix-0.15.2.tar.gz 377836 BLAKE2B 56551ab1509bfecc59ae4b45aaaa4d336415cffe9339932239c884bc86207bdb4066aace35144618509b78b461164bdfaaaa04030ecb1b3619de6f8fe5c3a7b9 SHA512 6d59c52111235f952f3052fb86af1d7380ff3d8d89b5c8d59a66d530a14d462fa4b06cdf29f2ee2b4356a574dbefef33b82f60f9fba512942bc0e6aad07f2b6f
 EBUILD core_unix-0.15.0.ebuild 577 BLAKE2B 1fd5f1ae602502ef50267d88f5788a66388153082066863e191115b58154059d577e079dca5818982133812070909249a548ca205912ba38c184278c8a5498dc SHA512 318fb4a1c646219119c85d42205986de3745b3755031db4d2baf3f3f8bf59cfe57991a167fd14fe88e8b62b5d91f02e62ba47ecd2aaf4d0ea81439ea855f1f9f
-EBUILD core_unix-0.15.2-r1.ebuild 620 BLAKE2B 65efce09e35fdb6421837e84440d5873c9dabaef987b1a1c14c76044dfc470ef9aa88a084d1c79f6daef0db1d0a40c717231b6ca8c8be82d110919b3786e1de0 SHA512 497ab680f78684d0130b1b4f5dcbd06225372c6cc0f5ea4dfcaec78517a795d3cc37fd1060693f64b35cdc264efbf5107963896a9fddabe3b098a4e5c2d6ad8e
+EBUILD core_unix-0.15.2-r1.ebuild 627 BLAKE2B 8e13ee6b4f8d1585bbe056f6848cd3f6e6b08ff8f4fcb5e25c015cc1906e1b759e0650095f87afba63963e222fb97111e125463293f6c2e25e239490fdf140e6 SHA512 b54f5f1700bd3c5e8fc56401df81c981ef1946dbe0105880ddbd77d251c67bd165a1077b7601d1caf3e3bb0425a4c19cf760a483fd2a07b4ab96eb8fcc954e2e
 MISC metadata.xml 318 BLAKE2B 2179bfab915d936189f80d0c10ee6367fe5ad711df66647da644fa05d8b1b9778d83d2862228955fc11621368a523fa904b639c47a4d8843b42e561127f94baf SHA512 66ae67f04d4f63ed5940c7164f0bfb27097e066c30d07a01c3d773b8b40a7ff6c8f0632e1103b952d310120cc0111690b93495fd0ac6c582652c627006e24bae
diff --git a/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild b/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild
index 2c5470dd6085..400b5b504c51 100644
--- a/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild
+++ b/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/dune-build-info/Manifest b/dev-ml/dune-build-info/Manifest
index afce7692f340..c9b3fda36e85 100644
--- a/dev-ml/dune-build-info/Manifest
+++ b/dev-ml/dune-build-info/Manifest
@@ -3,7 +3,7 @@ DIST dune-2.9.3.tar.gz 1387667 BLAKE2B 3db54c780b9d13f40c774f53c3fe471dba4a640e7
 DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7b8d9a9a2d4b282166d9172582a37adf408fd037972dab7525cd240c24729b6692f403c32029b2994044bd40 SHA512 a90ac689d97acab956fd96f16f7c6cfdc95d01785fc14f0d3c8ab39231ff78e8941d2db2fa8cbfaa39bbed8f865e11b628aacae1b22df49512a57d0263c0dca4
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 EBUILD dune-build-info-2.9.1.ebuild 517 BLAKE2B a7c02238857706cecab9fe1c0efeedea17ec80c791f0fedc1361be9727ae6a45691b1746098b40e7dd25c7a22c599cfc9304254e4142c9f0f0e952055b06d344 SHA512 1b369cd3d131b4c5c293c157fadf24b600dd3dd9fc78dd120a858b19309eae6fa9ef4c7d4bb8ccbaf4add58a038ccfdd25830f47f877eac59371b2d7c8beaac1
-EBUILD dune-build-info-2.9.3.ebuild 568 BLAKE2B 4c41a435eb95cefd143374a27ca44ddca720dad1b6658d29f74da6123c99b9916198d5e5fc22adcbc8c2a88281605da0ab85d93a3928a2039cfa276b36bc74a3 SHA512 6e3bad0daa6b60854606eb8ad0781c8832286e329f9621c3dc07550f6399b6b3c331a0d69efa6d4df0eb993e45f385d55241867eecbea0cf66a9836ddb809481
+EBUILD dune-build-info-2.9.3.ebuild 567 BLAKE2B c6d1425519004bdac288656aff4e1faf56b83f7470efdc0e10dcdd3effa109b53aebb661756ab23214af3a7d9ff1e9e407d365b561587d1663ebb859951c5240 SHA512 8660257d5d07e9791b6fbe079b22edfe501fe30a7bd8666f8d3ae61bf9e9003fab817b5874a9957aa8e73c4b9275c2ff1720036f54460e3538e046a8be0b7fe9
 EBUILD dune-build-info-3.2.0.ebuild 618 BLAKE2B d806b89ad2bccdc3bad326829dd4d69ce9567511a42e83e9fe16f63a5c0670f28921f448b46a706e1b1fa1fa4bf0c2d2aa5f9f74a3b985a361a2095ed7d8f916 SHA512 886e272664f535374c0ca833d6994a13147aa5e561f23572bd43fd0c80ca10e9d0acb6ec6f1202ca4ea97a1ca5919b2ab62f2d1e388b4042a635d58df2ce1c8a
 EBUILD dune-build-info-3.6.1.ebuild 618 BLAKE2B b671c1d09e81eb843d50f1097c010196051a24c01f0fdb83004ed6eb90c2d60dad2ead239009dfc56b4ef7e94a627db9efd8e29d5e0f245fe502443f3bf564d2 SHA512 30c51f19e8422ddd2af54fff17d6f2377350c7e97c5acc550c2e9a3d290f3cafc600becafe9d316c26ee7239bc5899df70786de279b8fa78d246b3a3ee29deb9
 MISC metadata.xml 380 BLAKE2B a55122ee1d38e6491f4f2c955ab0271647054d171979d9b3a964c9d1c7239aeb17c89768008a36bd583b373069f387de809a8a62af68f725568f201f2be8b979 SHA512 9b49e03db4133c31c38c13f2502ebd56833c516d27facf46b9d83eaaf3982c3d5dd4e2dc2a1b5e5cbf8cbc60405f4aa2f0bd7a0886c3ead97598e139cac3d595
diff --git a/dev-ml/dune-build-info/dune-build-info-2.9.3.ebuild b/dev-ml/dune-build-info/dune-build-info-2.9.3.ebuild
index 17d92a5ca703..e9f1b035b243 100644
--- a/dev-ml/dune-build-info/dune-build-info-2.9.3.ebuild
+++ b/dev-ml/dune-build-info/dune-build-info-2.9.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
index 1b6d7c831636..cf60126f939a 100644
--- a/dev-ml/dune-configurator/Manifest
+++ b/dev-ml/dune-configurator/Manifest
@@ -6,7 +6,7 @@ DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 EBUILD dune-configurator-2.8.4.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
 EBUILD dune-configurator-2.9.1.ebuild 4096 BLAKE2B e5a5aa47665e30b13f1a158149f235156ec8e0b0e3172fb4629532f991b9bc86080d1d303f734e0fb215502151911d41fbed9cddd53d86ae13e7e70e11c8d7ab SHA512 bb7f6f2acb81a18fc9e0c3c67819a1724cbc2f643405c447e67d1bc17ea3e3a9e9194cdceeff0cf04dcf38bc154d31650a203beefc87dea9b8fa74e9f5d17873
-EBUILD dune-configurator-2.9.3.ebuild 642 BLAKE2B f5de51aebbdba2493f436777c5ed3eaccc58083033100b913c5cd92c3e383d546b6177f3515d3a9666eabc2adeb09cc738a0d11310b0c4c59983a3de1a546f07 SHA512 ef1250000c9182d06720e0199c4f615dccbf905c5cc9d7c8352838f7ae2e2ba50561db2ea2497d3d5738e0e85f8e0447b2d3a15a55c857d507672b9a92ddc43b
+EBUILD dune-configurator-2.9.3.ebuild 641 BLAKE2B b39dd1b859817991b7970ad9e5c33b28be0f0d9fc5ffb859949c102a4b3b9d7d28f2848ccca33b9ab46c839cd639dae80682781e6fd2e828e37098ac803d6d01 SHA512 12c1eff3a2d30214a8ea372955d50b7dafb7933d85a95e1cfe7a7b25e5f42f01f2b2702db0b5ca982de21adebcbf8af466cd46063881fa93ad653eda549d14bd
 EBUILD dune-configurator-3.0.3-r1.ebuild 939 BLAKE2B 269e8132c92e240ed5e718c4fc3b8505ab2716abaddc9ab1419ffd349f6aab7a5ede87e2c35da588c161d60b7048aec4e1ede65e936feabbdc7abdd753f349bd SHA512 d3e60cc3481bd91a827c0639fa16310a130f99f5267f28eda775f0b3764b521e545501d9c07f1b6a44a932ef39c16464c574d4335165dda898865e9f39b7d745
 EBUILD dune-configurator-3.2.0.ebuild 870 BLAKE2B 616ad1e13f0a3a3df44331ad016a0643d2248cf1110d669b224b188043b0831b372dea0f8d09e9fe3132d8da01a57bf945d764edfc748f551722fa2efe5e29ee SHA512 a507fe23d38249ac3dcd2a6e686236cb1266efebe73caef18064a3395a2243febc781c82cfd2f5b708cc553d58427a31c94d45db02f40a6d547eeb236f37d3b7
 EBUILD dune-configurator-3.6.1.ebuild 872 BLAKE2B 2694b77d3ee306a3e06f569475330ba78145a0b5502ad9ba666180c5cd0228cf1ac21d9d114e5f41ecbec8882cc6a992b2a813f9a66414e2c5294fbaed0c797c SHA512 fe04665ecc65bb8722ead5f26a520ec870c08363b4d84083c6dfffabdb7d93e96007a581bbc19b2e0a34cc0aa33bb7a9d99374b6aa66dca0f725c179e675b42e
diff --git a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
index 628d11b98de3..d665346ece5a 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.9.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 RESTRICT="test" #test run within dev-ml/dune-private-libs
 
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
index bce4499a1b44..ed579f2df754 100644
--- a/dev-ml/dune-private-libs/Manifest
+++ b/dev-ml/dune-private-libs/Manifest
@@ -8,7 +8,7 @@ DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
 EBUILD dune-private-libs-2.8.4.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
 EBUILD dune-private-libs-2.9.1.ebuild 4114 BLAKE2B fade94617c408e800bcc4abbf6adf312307d620172a8dfd39215add9b487c559f83829d442d9da4763e6f33e68011518751ff6fa7222b410953e42aa5377d94a SHA512 76da3dd2a3c2d6fb9ca5f3433cf0315c9cd7664f5f0cb57daffaabf87b2f12eca779fa5feddf5483c59aa90b091c3715a1e49e3b61eb1e03297ccec655d0c0ca
-EBUILD dune-private-libs-2.9.3.ebuild 4429 BLAKE2B 2cb8ccc69662efa56ca174d202289846a904f7d97ec8a61655556b8ea329c7056e99aa376e0c101920f9ad43ec4daf77f5176b26b304181766007e7ffd8769cf SHA512 8d1a9281a71575e0b4de321aa18a234d6d61304c093502891ed3ede71492de6ad993f2800ff9684030222bfa186bb23af2a4be45d4196cb61f987b58dece2c66
+EBUILD dune-private-libs-2.9.3.ebuild 4428 BLAKE2B 9adb46040dc1ccacdf5af11f3000497c15c2b3b6d7b64651e6391d7a6ee3c6600368285f348c952718babb8065f7ffc0a390f2c7e9b7805beddead79ce863340 SHA512 f526b95b16ee0fb7dbf9576375bbdb3bd47011310a275b89bb377cf60becd26fdf16651c38cba4743bf9dc8e79af2f9b3aeab1a3e18e4810e0b59b720b3d5589
 EBUILD dune-private-libs-3.0.3-r1.ebuild 864 BLAKE2B 501bf0290ce221b69348465d0a65e034ab3266f8e5c24a3e94cc6120ac2f77001bb33d60afae4c879c2029b463ed0a2eb98cfdd1653b8144e507147a7dba2995 SHA512 08157b52992d00ca4cf1b065969ddf7fac6591dd8490aabdeba264e52f7f439a38b4959b55d4bc74545bc073673468e6584f9a3c4d2bf98870ba9eeaee6e97b0
 EBUILD dune-private-libs-3.2.0.ebuild 782 BLAKE2B 2947af0152f8ad349bfaa2873ff912a253bc7ca42208450b64c2362f06d1479e7a89aa0eee8436ee789d3f0404f763ec49c6c4eecc213e26f88b9a617e1d9ebd SHA512 8da351970a0e88bbcc16bd8502b86cd3d47f549882062f73b308ce5e10c42a10710d0aa2a35fabd47cb3c5980d41408a3c4826868e71834316c1dc4e5b2a3466
 EBUILD dune-private-libs-3.6.1.ebuild 784 BLAKE2B 62940b51283133479f87a8a83b92a6346cbb4dc54269c0e8fc02155808638e7cb19db12bf54b40d05c3b5703f389cddb08eabbb96cfea6cb4c0ac834649d8a6f SHA512 986b83813242e72a90f705b9ae7ac021cb0900b343a7a94e0cd629b120f134828b677dd47ef0a4a3e372a456e813804e0c2ba50dc2bc45a624af3b9b13be11e4
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
index 5f201088d3e7..5c121c5dcc8f 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.9.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-site/Manifest b/dev-ml/dune-site/Manifest
index b868efa5940f..130b09de79ce 100644
--- a/dev-ml/dune-site/Manifest
+++ b/dev-ml/dune-site/Manifest
@@ -5,7 +5,7 @@ DIST dune-3.2.0.tar.gz 1754664 BLAKE2B 97ba420a5bf9dd8e14ba74c0e91b6679924fd9ee7
 DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d8f16465df3f3b7b6d332ceef5101057df9389aeb9ceb4dc7f23bc69320412aebba7587deeb933a0f8ddca46 SHA512 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
 EBUILD dune-site-2.9.1.ebuild 596 BLAKE2B fa03797d6cb98422acafc3854035967c7f8b58271f7155e4abe02061357165df76223e6eb01f76b67468ce09e1752056a242b247b3432ad086367a12b6bdf662 SHA512 c6d3e08817f15d05b9f07f2cc40b6908deb00e68fd79e5ebac95a86c57b95d2d31071e6dbe9b4d87401a5813e23e7ae1b6077ba22f74a356b93dd5a530a333e6
-EBUILD dune-site-2.9.3.ebuild 647 BLAKE2B d65e24e214dc3c1f4d3f2305f9e42c1a8e2e9e65b93d43ee01aae4756c6a3e8a07e4b7c0744322dd84ab8c26e72907a754179fe50a0d2f58b4736653252775ff SHA512 67092fe3b47fdbc45ceeb84da4f95d374abfe13533ebb6dbc2d82a05b02d5e984e54da4c39d898bf93262bf4aee6968705d382167b713209237f187ed9e7f70d
+EBUILD dune-site-2.9.3.ebuild 646 BLAKE2B 281acba07a16990906f3d9761c5a76f3449d07536eee0f95a2556f29a348db8c607ccf2f8ed8412ed17a9951fbe3cba753b7885ee6d34ce913480c0250f8b346 SHA512 3225db8db42203acc261757511c527ba780739b0c3da5b53226cde42bbc6510db79417142fed031beb076907d7effacc6eb24a527bb787449ddcc7643c1ae64b
 EBUILD dune-site-3.0.3.ebuild 648 BLAKE2B d0cb9e9cc9e960c953fae2444f3fc4f313172417a78c45e1ddbdd661eec88b8621ea7bcf28b1f43dfaaee97831f964f31ba17271be4c9a34d4e4e9c0e367c9bc SHA512 99010735c6d813698e73a17d7c3b937b2a8d07295c1fbf071461dea7e2bd4d20e78e78f3e4863da715268fd9a43bf630199bdfd100a6afdf358d387281fde0ae
 EBUILD dune-site-3.2.0.ebuild 649 BLAKE2B f4b64ddb2a62adbfd430f0436972d14a1ada870bc5adc06b9b5aadd22e854a406a47520cc091ad50d98d829063c8c6b81b82c04d30e5bf549bcb02b197d887e6 SHA512 75eb4bae3633b675fd122b39a7c474edb52f973078c83bccae51c2d208fa03417b3e88bc1593e9927e962fe1110e05e844e1edbc892de0f00a572a43cef90dd6
 EBUILD dune-site-3.6.1.ebuild 649 BLAKE2B f4b64ddb2a62adbfd430f0436972d14a1ada870bc5adc06b9b5aadd22e854a406a47520cc091ad50d98d829063c8c6b81b82c04d30e5bf549bcb02b197d887e6 SHA512 75eb4bae3633b675fd122b39a7c474edb52f973078c83bccae51c2d208fa03417b3e88bc1593e9927e962fe1110e05e844e1edbc892de0f00a572a43cef90dd6
diff --git a/dev-ml/dune-site/dune-site-2.9.3.ebuild b/dev-ml/dune-site/dune-site-2.9.3.ebuild
index b2f0ef88c65b..12ab2a7ea952 100644
--- a/dev-ml/dune-site/dune-site-2.9.3.ebuild
+++ b/dev-ml/dune-site/dune-site-2.9.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 53b34ae84f8e..a844fe1c1029 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -10,7 +10,7 @@ DIST dune-3.6.1.tar.gz 1843804 BLAKE2B 1e7bf67b596f60a553f00cfd8287ce36ef4ff5b8d
 DIST dune-3.6.2.tar.gz 1906058 BLAKE2B 7bbf1f346805432015a0e2a20bbeb1d94bbdc9f10537d31129c70466f88713d6659fddae18ab48c95d1a97f5e7931d8a5505eb08b89a27b6193b82b059f1c29e SHA512 636f6cbccca588b576f36840b752fc17d4a46b4c0625262a43c10f948bbb9820bdbee752a8d9a5cf7d5b79987bf824bdef9a44ecf49696959c9f597c4950d7be
 EBUILD dune-2.8.4.ebuild 925 BLAKE2B aaf039c23fdec35db8eafa1362e05e0a0007b4d5a59483726cffdd4c3f2738ab53cae26451001fa051fe46444f29d08ffd3e22233acaa3280db2c761822c1295 SHA512 175a4b03a248ade24a4a0fc232d13364f5332f9cd686056710dd1fce04b27ac59d81b3844ef1476867f3c5f646167dc40ada4609afc5594ac721ca5f216670a7
 EBUILD dune-2.9.1.ebuild 904 BLAKE2B f98314d3cd1daa6fd08610daee2695a30b4c751bc1d060aad8b99b8e3e138fbe9751a92b5df3e1d1f62a8235b509ed884c75f2e11673d8a8a3cb50ddc414bdd2 SHA512 10a59aa34098669ca0d6d6a568cc63d124fd174850bb66591e9798b452629cc7647d6204050a4fbda2db394782c17590155467d798783018ff1205cde4b92e0e
-EBUILD dune-2.9.3-r3.ebuild 1267 BLAKE2B 3769c49d61cc32c88cd9c3c6ebdaa3962650b04f8f7a2727d85e866a4d3a9e886037c7b8f3ff77967780f33393ac2d5326e0351b4628a6c1fa84152c043440c8 SHA512 c2f18ddf666d08a568682050e4b2c6503f8373302e4404cdeb347d6a4dd853422c69ec15815526c673bb7c6f52836e2aab63a25d406b56c15581f454def24241
+EBUILD dune-2.9.3-r3.ebuild 1266 BLAKE2B 187c0761448369e477a3f81d8c5ffd79b44afeaa51e9e037c9c14b862db4ebdc1192ca268fd15de939c778cf542d7eab181791d47ddd52c8c74f4ad5b9590e66 SHA512 0fba3e959b281509f872854c2dc3b694c0d63856813303548d54553cfefd353d446e94c204c7b076d4bcf804f36a8cf6ca4226da15783d60a8c7e1850434074a
 EBUILD dune-3.0.3-r1.ebuild 1519 BLAKE2B 73794b43fe622a63df00e38fb732d391ac8f8f062dc065e8df859b2f403d3beb65fd0c1ec2e99ba9cda22600f8120c846b3551dad6af33ea1ce462fd02a15d35 SHA512 ad686f9a6af18fa26bd49c1e3b7e03c48cbadb07ec45fba560b713677b6101dfd76003575911a7ec0c7585b284ca9e53127399367e010b9ad811d0c5e928d28c
 EBUILD dune-3.1.1.ebuild 1519 BLAKE2B 73794b43fe622a63df00e38fb732d391ac8f8f062dc065e8df859b2f403d3beb65fd0c1ec2e99ba9cda22600f8120c846b3551dad6af33ea1ce462fd02a15d35 SHA512 ad686f9a6af18fa26bd49c1e3b7e03c48cbadb07ec45fba560b713677b6101dfd76003575911a7ec0c7585b284ca9e53127399367e010b9ad811d0c5e928d28c
 EBUILD dune-3.2.0.ebuild 1536 BLAKE2B 7b0c2707650ed19052eec8911dc726697722fd4febd56f8a7136f324a4f6d103d464fb1cc1b7d1dc82d8bae612284b8bbc2208ca7f37d05032253547df5c9981 SHA512 3b3c6b9d97454a9f43b4424bbfbee3ec3be7fb3b120e0207497c71b30184f8f0c966ec95205d05ed3710bf11057a54b306ba6b1040ffdb534e2f89433cf91bbd
diff --git a/dev-ml/dune/dune-2.9.3-r3.ebuild b/dev-ml/dune/dune-2.9.3-r3.ebuild
index c8c52ad5f438..5f2540be791d 100644
--- a/dev-ml/dune/dune-2.9.3-r3.ebuild
+++ b/dev-ml/dune/dune-2.9.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="emacs test"
 RESTRICT="strip !test? ( test )"
 
diff --git a/dev-ml/expect_test_helpers_core/Manifest b/dev-ml/expect_test_helpers_core/Manifest
index de2317d36349..3f78dfed6077 100644
--- a/dev-ml/expect_test_helpers_core/Manifest
+++ b/dev-ml/expect_test_helpers_core/Manifest
@@ -1,3 +1,3 @@
 DIST expect_test_helpers_core-0.15.0.tar.gz 19807 BLAKE2B aca6103a7a50d7cf666ff6acb7b5430a5b0667efe039d200bc9ed2e430b91c4ed9a75378ceb0142e5d8d419ca6b3be508dc75c8e7fb5ff23101ebc012c70a9c0 SHA512 c08bda03c3bbc5c7ee1e970b5ba03e319826b7dd550d073f69b373bfa429c489ae1fcd388a2629f3d81729a96aac5614b4b1bcadd4040a290ffaab55b26bb9d6
-EBUILD expect_test_helpers_core-0.15.0-r1.ebuild 585 BLAKE2B 2f5cffa411af6042553a3e3909246a1944135adf5602cbd14e8194a838ec937f92508e8f3d90f16f4cacbb8278e7a922fb99758d4aa95630eb1b1fe437a2adc2 SHA512 877faf5efe9dae47d6217fb0e4dc9e6cb5f1d79ccc8f8ff6744f725dfe1e6b1b19e0ff6dd32506d9ce74b755250b5df29fe9bb2aad8f3bffae9f860ce9ee6ccd
+EBUILD expect_test_helpers_core-0.15.0-r1.ebuild 592 BLAKE2B e510be18c5d4d9dd4ab3e48f4f0858b8c68e78493cf79cdf043938265cb847a709ac629a911181b0174cdf04727c9fffbdc6b91a7eb52554c6de29e1fed82332 SHA512 851b49bb641f922bf0364af310a0f307608555e94d0a7a77be301bea06deb334d8b48fbf58bc23d7a764b8e9b6d41eb1f2207347511c08c3a2038c8272f0231a
 MISC metadata.xml 333 BLAKE2B 050b0539a697bcb91bf635dd9a2fb6ee2daadd6e69a43ba4c0a70f84e5e76e083c6acb93a3628cd04415beebd5f78701e66932ad71111c39b3411a76c563cc65 SHA512 fdfb97d9c46e137d73de63c5ae1a998964ee51e9803352b88228b075c3d72b40d7baad760dc66efaf908cfca12a62ea2c697a6c52f0e1e6500715bc3244f5cb9
diff --git a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
index 3fa127f0c818..01b77163991b 100644
--- a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
+++ b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/int_repr/Manifest b/dev-ml/int_repr/Manifest
index cd8c89cf0a1d..0b5d1dd75603 100644
--- a/dev-ml/int_repr/Manifest
+++ b/dev-ml/int_repr/Manifest
@@ -1,3 +1,3 @@
 DIST int_repr-0.15.0.tar.gz 9105 BLAKE2B a2a8197cdba7c4805c9eb9402e1c853619fc142bd057c4b42a578bcfdc97b417751634a31bab1ccd5c2e75cfbef46d33b6daf76da5ed4e3c9ec26d5c81fd3b73 SHA512 96537591fc597264347f967757df979344224f84594949bca96b40298e4ae1d7b28b40f3705ad4f85e3801724c6388fc048271216703b81fda0e56a314f3e88f
-EBUILD int_repr-0.15.0.ebuild 463 BLAKE2B cb8f686d48877a8830aedc96f4133a650adc800e6735200b2cece33adb15bb09b8246a559a1f77395f605b501f24b96c1a8dc3683fbae7b5a819c7a822b22791 SHA512 2271b2cae12f2bccf5d6df8703d29fb9a55ebd8f23901c1c15d64db9d686c2ba55f4bd67427c8e689788fa207ee2eb62e4f9a409e93e1771751e1c80d3061780
+EBUILD int_repr-0.15.0.ebuild 470 BLAKE2B 14134be2c8b23fa4cb5462c974347eecb9e64b534df14652955d73a0e9fdda51d6358fbb693c7da9571179ba0ab3918aa33d33fed9142d3be5baae9e3d6d0bd3 SHA512 87a0a855007760eb7b9776ac3ac9b891d3737f1ed5187fef2d9003c252bb323b20f2e71fe75394a1fc7715c770594bfd51aa0b151cc7a8ffcd714e412865f683
 MISC metadata.xml 317 BLAKE2B 58b512e27ebd93e11da8245933f2230bddab2c07234c6365b8f860c70fad16866cd6e5a98559034d962c2cc5509d0346a9b6f9e88dcd663967432f4e38c70f0a SHA512 1e3442d580d84254768050b55eafcecaa4b1749404879f5443514c45014d9e0110ed72375ebe01b44603faf98035f1570f5820f9f4e9e448a627d6498fa65c70
diff --git a/dev-ml/int_repr/int_repr-0.15.0.ebuild b/dev-ml/int_repr/int_repr-0.15.0.ebuild
index e0eafd706e39..b5836dc1b749 100644
--- a/dev-ml/int_repr/int_repr-0.15.0.ebuild
+++ b/dev-ml/int_repr/int_repr-0.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/ppx_jane:${SLOT}"
diff --git a/dev-ml/ocaml_intrinsics/Manifest b/dev-ml/ocaml_intrinsics/Manifest
index 94db02c1d9de..671b3fba3650 100644
--- a/dev-ml/ocaml_intrinsics/Manifest
+++ b/dev-ml/ocaml_intrinsics/Manifest
@@ -1,5 +1,5 @@
 DIST ocaml_intrinsics-0.15.1.tar.gz 24925 BLAKE2B 15d74ee891aced288aa734ef4d70a4816f2d2725d0d445620154bec7d1667d3ac06c5ddd778777d15858cbf198ecd978b22959fe68e159ddd9dbbd32304c3077 SHA512 cb0ac26bc34c97eb0429e6833342dbd9fca6f1f4a40b8121f9e6364bd2cdc40676a164d7405454727ced9a4455adb0e3cac5118beb7ab70206adbd3e7f7937e2
 DIST ocaml_intrinsics-0.15.2.tar.gz 24977 BLAKE2B eea2af5ff746cfd7b483df47a8f719c623eecc8bf82d852ed69395752e98ebb94a555ef2dd95271d45941a5582f7ff139f8e79d5dd8adf5389786aff756df7fe SHA512 21539fecd8b40420bdb45a3fe79f65cf4ff0deb103c3cb2b28bad24fddce159bdfab3f7aa6ade0028bebef1602f860b1f6cdf2cc06db1a89e232b221d8ff592b
 EBUILD ocaml_intrinsics-0.15.1.ebuild 515 BLAKE2B 3d7d3bd127410d1f55bfa9f1e48a24cf6d9961c320bf6d0376207944035568f2648484b3df6faad4d0293f8139fda912991072b819ef4b7ebc1d0d0ac6d08df4 SHA512 015d46740fe8433b24da39935cb1301c28c89a97c3d6995f4dd193a774a12520211e2329e4b14e96f07bbe129c2260660dc2aa5b7da05900377a457215d22965
-EBUILD ocaml_intrinsics-0.15.2.ebuild 524 BLAKE2B d5e59082841e24fdb5d9ca2862651b9f56485bc82e3078939c5641ebd196057821a8277e542e30c8374803bee5d4255c7df20053f3c9a2b6a50c5d91b81891ee SHA512 a7a90458273eae5b85181114a85d2b99912297ce0faa8f9d14f9f29810c9c19e9bab8117ae9836aa64829ceb31dd9605514d0c0fb5606396c52694c62cb46f0f
+EBUILD ocaml_intrinsics-0.15.2.ebuild 531 BLAKE2B c33f5d538a7ecc6021a55e45e18e25e0c17da952e7d53d5812d214250a8b3dc9e98ecc7bfa05683ec0b18bdcdda3cc44b17374e3b8d838d32a3045f28208ad18 SHA512 fb372e9395a0f23da55c33a7db85064fafc9897c529b8c0fa766cffcd994b197c82123bc24024791c3a08053b1f9d82b3a5b178e9c8b62408ef94e4d1a428c02
 MISC metadata.xml 326 BLAKE2B 737c6608b5b4282d53fb3e866199fbb672076c968f849b0f5b9a5da732c6db556b7b5f597e5d90e53a2a607cf02e7cbc01a5453e6e483721b47e2451cbe1285d SHA512 be860a17f734273b190dca122353092b24fbd0c37dfcf4121c28171227a412b29c92d063a21e6d767f4679bb3d92ac800fb621fec82f8d2fc45856252c19f5db
diff --git a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild
index f3dee6421186..c461eaae8ea1 100644
--- a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild
+++ b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index fd93bcfd0b56..e40f2e7aaf8d 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -2,7 +2,7 @@ DIST opam-2.0.10.tar.gz 641739 BLAKE2B 7cd201fe6bed2ae81fc8d9d0a7063b284621e5797
 DIST opam-2.0.9.tar.gz 644429 BLAKE2B d96ee79685a8ee8ff82c7570a747c80e38d86e513736a27904a4e471d1eaf432db72998251ac786cb8fbf1ad425fff42b772c5d26934e0929aae75c0946d4659 SHA512 0d8ee19ac0f3df9de4fd9cfa8daab1f7228f090f5e2e7e26bedf24d8c2ab377aade95048f2d7cd9ee9dbbe738729e26dc99f41f730fa2252df74953362464a22
 DIST opam-2.1.0-dose3-6.patch.xz 5896 BLAKE2B f605064ebae7d327895729962a345a3c679519895aa2568f0c2d199d4ba9d6ae948a4fc418cfd26cc65079eb6ef3545f24a35e08c969d215529664a80d0c9147 SHA512 e00da74d7baef62319e884e3a05112bcf86a02d887c274bd15fb0d15bb8198e9a37a421f388bec3fce198e7a1b4d37024b18609dc65978c6ee8a7889df9bd608
 DIST opam-2.1.2.tar.gz 818848 BLAKE2B ffb50f3cf1421aa9bff6877d636a3d1d1cc2c2e3961ecd60fcae8a35b069c8d22e7a36bf17cb8166533621a3c85a82195fd3fa646b2fd8dcea9e626b61d5b86c SHA512 bea6f75728a6ef25bcae4f8903dde7a297df7186208dccacb3f58bd6a0caec551c11b79e8544f0983feac038971dbe49481fc405a5962973a5f56ec811abe396
-EBUILD opam-core-2.0.10.ebuild 1007 BLAKE2B 88d76c31f25a248fd4996606e5f46631684b1eb75d45f2eb9789dc6d7d5289edac70f2515d41489cad79645b2d89cbac64ef4c824b91c2416a8c277005735f1a SHA512 274dabd1a46ff7e224c85a0d4ea9140e32a5693add6af2141b09b434d42ff28f2b450801eb6a7fb1f5bc381b8a72f8af51c7d73bfb83a5fef9a77438d3c0e61b
+EBUILD opam-core-2.0.10.ebuild 866 BLAKE2B e3a7e06d70b655453dcfe884ca88c543a553f4682d855def743829daa372df6f285cc787772dd32857d8b5251163ff33c4e4ed4de8d569b7ac5868db947e4a9c SHA512 9c0da82a43a859a96138ff8ddbefab2436bc0930994f7828233d1c1f456a1047916da344918540d3b949aed29211c176a9afdcad7c141f0fd9d1314cf03194ae
 EBUILD opam-core-2.0.9.ebuild 881 BLAKE2B 705dbb83da94bb76fe650492dd25bf517cf2bee4d36f2d3efba22c4d51b10e88a615d2bee910f2912723bfaf47d656bf01843ecb9105fac3c7af236f0b6a45b0 SHA512 bcfff9888dc8b4ec8f5b241603f3ba9a453b0a1e4a13bc945f1a91620271cfa81eb562421a795a4001680ed2095ffd3785f49590dafecc18ab9972a58688ab4f
 EBUILD opam-core-2.1.2.ebuild 1010 BLAKE2B 4164aaeb2c582578120abab3a2e4891715403766932740b72a2aff08ef6627ec65a5357bf44f960e49efb6a9e8635bfa1de6aa514655d97a213b1c3efe9d65da SHA512 b87643fc55b9201c69b2d0f858aa7124ee314828b7e41a0da8970d8f7f131b084cc5ec05f231001297706d21dbdf7bf75b9a0e1d51fd469e646bb72ec72ad699
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-core/opam-core-2.0.10.ebuild b/dev-ml/opam-core/opam-core-2.0.10.ebuild
index 238d48fec7b8..e546877f9cb8 100644
--- a/dev-ml/opam-core/opam-core-2.0.10.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.10.ebuild
@@ -10,7 +10,6 @@ inherit opam
 DESCRIPTION="Core libraries for opam"
 HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
 SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz"
 S="${WORKDIR}/opam-${PV}"
 OPAM_INSTALLER="${S}/opam-installer"
 
@@ -27,8 +26,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ml/cppo"
 
-PATCHES=( "${WORKDIR}"/opam-2.1.0-dose3-6.patch )
-
 src_prepare() {
 	default
 	cat <<- EOF >> "${S}/dune"
diff --git a/dev-ml/ppx_disable_unused_warnings/Manifest b/dev-ml/ppx_disable_unused_warnings/Manifest
index cc7eb6a2f1e2..27861e9cf97e 100644
--- a/dev-ml/ppx_disable_unused_warnings/Manifest
+++ b/dev-ml/ppx_disable_unused_warnings/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_disable_unused_warnings-0.15.0.tar.gz 3966 BLAKE2B b087baa50ae3e0dd926221a69d0c3121ebeea431c08d0dbcc9cf5edee28e69c076e2f77c3b992757e56d03a6487ecd6257fec6a0373294cca6cdef7f71412216 SHA512 837bb96b5cc2623205ce778e6100d97a0a029e8c20a945509c06ee44784e67b8e9033b5387681c0f86c07f48ca4541e356ca62e19c1baa8d1b52c813400bb024
-EBUILD ppx_disable_unused_warnings-0.15.0-r1.ebuild 503 BLAKE2B f03d1a11505eadaf5eccbf122e02369a5ded6b4bdea6cb6a89ce9d3241afe5d807b73d48d6fa047204f95650aeb89116d3786e0118446ffc7af963621c906af2 SHA512 a5b98791467358db84e98ba91d8227a9c3575c7bc98178a1e3548eaf5775b903d8fe3c675ec18b3b728ab579276bade87c0ac0e30596167fa54f7389ac0d8b48
+EBUILD ppx_disable_unused_warnings-0.15.0-r1.ebuild 510 BLAKE2B 489bf75f0bceb6b03785eb0b7626a71fdac2fbf2fece3fa208f8ee3235a187f301156a45b91b8ce731bc791aedaf6a9052e60a4b8315dd6bd32922a6642c14e0 SHA512 06cb114009b371f9ce582f7ba654f253418dfd75b1eaa1aa18889428c641012d2d2b4d23b695d7e8deb93f9c9d44dd31ac58091c5f2c8abaf1289b537658bde2
 MISC metadata.xml 336 BLAKE2B bfe94571dbe0a68c07075508ff585369cec562f4ff9a202972296cf1d89909085d75bc0192ca26e6fcff13ef4dd1124e471239d2cddadc0da879d933d670c392 SHA512 0346430a84b97f0b7feadf4d67b8c41f1e05bd58b907c2dc2ebf4f11e7fb001c41505e6b760b3a1654d3d5ae02d5da594b7dbeb5900d5ec98e1bfe27a7ba5194
diff --git a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild
index 8607a7bc4df3..b75ea92fa1c7 100644
--- a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_ignore_instrumentation/Manifest b/dev-ml/ppx_ignore_instrumentation/Manifest
index 502b723c793d..4b3b6478d64e 100644
--- a/dev-ml/ppx_ignore_instrumentation/Manifest
+++ b/dev-ml/ppx_ignore_instrumentation/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_ignore_instrumentation-0.15.0.tar.gz 3679 BLAKE2B 3537d4336a2299e277fcf1e58690233a9e1ecd94c80d144376bef90b45b3c2c94a8eaf5e5ba2b90b12d8f4e3afc257461c4732a2fadba8aa91c7f35ff036fb0f SHA512 ec411cb7a191fcb36f9a29f8ff3839db6f4031e30fa3444896a07235950ca04562a701b3bc7bc5df95e3ff82cfe8996be75bd5dce4bcce8a491898df1bffc50d
-EBUILD ppx_ignore_instrumentation-0.15.0-r1.ebuild 509 BLAKE2B 90d01cf2889d70d35aedc64322b24e01b4d9b86518515d3b16cf309396e06c5cf1f8a0d9148955a8d092506c7ba2f6ba5e3d7fbc9e83dff153d298746c7c80c6 SHA512 06cc24f4900899857e75143c6ae41c1bef69c11d7a922ae072d5e3c27ac9686485182bd101fbbe67dc55e2e65e7de83b1d5a7c0331112096f519ed17af529068
+EBUILD ppx_ignore_instrumentation-0.15.0-r1.ebuild 516 BLAKE2B 66638d39d8b1b9e565d07d0ecdd9d494f185456cbdb3576436e1e5a38353be71c56134edb60f05fc38afb530187f698a30debc1bc774382a9f8f8b7c0eeacad4 SHA512 af05eb50a7edcbc745c24196f33893e0a983c84253b98f034508b276415cabf77df6e3b9bff18babfc3984871e173976778cb9c983303f92a51945363db27e2d
 MISC metadata.xml 335 BLAKE2B e78fa9416dac3fb12ccd82e965f1c152b7dc905f3f54c6d0c96b14daf9644ab2afe4f307656658049a89c8baacd507bcbd39ac2796648fc5c75d94ff2a5f8d39 SHA512 8c07521b5ed071d427b7cf30e05105be47f0ca857b0443502312d5080c4501612dfdd36f3858e7d6020def0efd9ab2630fbe13ffa0bfa751d557f8695bb48ca2
diff --git a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
index e4e8ed1d1d19..8aa5c3d50113 100644
--- a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-ml/ppxlib-0.23.0:="
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
index 76f45a9a725f..ae58a3a3fe7c 100644
--- a/dev-ml/ppx_jane/Manifest
+++ b/dev-ml/ppx_jane/Manifest
@@ -1,5 +1,5 @@
 DIST ppx_jane-0.14.0.tar.gz 4593 BLAKE2B 787fc0701ba0361446cb210c23469881da8fbab28460262a7bdca8723af158ed8deeb4597a31c8d89a4d44e5263c74e0ebc504b83827e0a34870a503b2ea9053 SHA512 b51bef2330ebb8d361b3f856a0526a5290664b68fa56a02de7020b0e27aaf5a378f1b22fc9a24007bfc812af67eb79343b2bdc3ca550108393323b99e29c623d
 DIST ppx_jane-0.15.0.tar.gz 4647 BLAKE2B c8916e7327301a2dc54b36cc29ad61f3ef016aac2f07dd8c1421a84b144b406e9b189e229680f700efaf2138c508f30e0d132dcf726165ac60ad3120f67549d7 SHA512 e594a0caea66e0f976615b2a1db50aad89389888678d9ec7c023b2adb3211817a841a5065de9a65956bde0cb6088ce1b0b3afed6b57b618b9b50e5c07684e3fa
 EBUILD ppx_jane-0.14.0.ebuild 1215 BLAKE2B fdebce6e9ba624aba1868cc9dcac1dede1b29a966cdc4c964519c709a12f39075682ce695f1299f596310216cbf68ebf83b76499dc3b1a4c78e55822c26804c6 SHA512 d0916b659619b7274e8b5d49f9d912bda2d4fcd5bf0e5f493a0ee06e928bc9520dc0497d6296766030218a9df864fea3c13ac05e0374399aea24c2e7bb18f4cc
-EBUILD ppx_jane-0.15.0.ebuild 845 BLAKE2B 619c597ade2bf23869d41ab66fd435d73177772f0c5f1b07ce77fee5b72f17e2bd0c54d51a69ec5c4539645355728e3dfad9017e2e25bac2b1b99381bd1f1d30 SHA512 c53dec7453f8d260b12912ba6254c6ac7022e31247a0374fb60155231e20ae7b992d4f9e57049842e1fb5bb7683f69facd3bd0aae482e9397d39aea1f7a8b2a0
+EBUILD ppx_jane-0.15.0.ebuild 852 BLAKE2B 907ff68e3c2d083056d3f2963f2836d249910095a7c9be7e3ec329ba0397d042794b0c463a94d2e28b06418b5e1f8e9204d62afdbcf77620147d0f1a67ca99fd SHA512 3b002608e75d98cc9021385b97ee459bdc15f1a159ac04e3a941ed8049ae7952b6d488d4ac083516a280b2b68e8b3ce90d5e1497506d850ab4bf0622b337a6be
 MISC metadata.xml 422 BLAKE2B 8f12580d0fe5fa2b0b225ee0d6b1bce1bbac590ccee469f07bfa01c337d7211c00d14d7d22a7e3c7601913f4fda2c0beeab853d80be71b988ce04e9553ca2aff SHA512 64e2d501e8957929ec015ef2ab95a5d910a906e80ff204b5d7ab60aa435d04cd74845beadb82bd9f1e111b3c209b7ff17ee91251172177c5aaf7596824f6b250
diff --git a/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
index 2330950b9620..9d6de03812aa 100644
--- a/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
+++ b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ppx_log/Manifest b/dev-ml/ppx_log/Manifest
index ee8ecd18c019..a48de4d12dcf 100644
--- a/dev-ml/ppx_log/Manifest
+++ b/dev-ml/ppx_log/Manifest
@@ -1,3 +1,3 @@
 DIST ppx_log-0.15.0.tar.gz 6672 BLAKE2B 3b45e705dfe6256d95e52b3fb1b1f98599d48fba6d4c565df95319566d5ab62965182d265db68a9b2f0b7e32103861639ff9ca46e1980e93e63abdeae83e79cd SHA512 1585f82615def2fc1c94853e9a1b9e3ebd2ef8193067f229f24580ea124c06736a2b361377801b9a44b7347e1938da051ed652764142e2270de3d3e8f375bf46
-EBUILD ppx_log-0.15.0-r1.ebuild 520 BLAKE2B c360c98a4dce88f3ef2b2c7046ae6ec5b0083d4cd581896a95a5538b9a8ef3f033e9407d4d42ce3d905cc16cea43a1155ff88592c005393cd473ced4ab276b3d SHA512 5c69648b4b4b80865b24e3b345112e8a1b226ff56dc3bde7ee2f482dc3c2c9ecf2882191df948d1e78ffffc870c4c52dea9f2306e42ace78b595d13c2bcc468b
+EBUILD ppx_log-0.15.0-r1.ebuild 527 BLAKE2B 4a64bcf5a5e813faa211c2546e979b4c9593bbb1253d48fcf1cbe457b402cfc76f7e3ba5590275f214dac547c2ef8ed445481b19ee03f62d6a49129ce8ea8a76 SHA512 b12a63d41043953edf3772d603c6706da5d3e27a4effcc0e8bc080f7fbc0f059ead8f251155311c5ca296bc70fc3708d0681556767ce177d416335278ba37bd6
 MISC metadata.xml 316 BLAKE2B 67c67501b1b464809f108550e0185b2ea88ac412684b5324232f07bfa8c79592780673800f88cfdf6e907e82743da67a1da8c3527d93f9ca0b9901cfc4849a00 SHA512 1c596376ab905bbb0dc74b176f0e37b4afae66c79f5a04dec08d28025b852feaa625e434853c6cd290da0fc310b2d926261e97597d68374eaf4e52a2fd022827
diff --git a/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild b/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild
index 25070d35c8e0..fd377b76bbdc 100644
--- a/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/protocol_version_header/Manifest b/dev-ml/protocol_version_header/Manifest
index d1e938a50745..2dfd5efd541a 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 471 BLAKE2B 91f6a7db514c11943c791c6334a18beb18a5e6aa3354acd0f9c4eaba17cef41437ad9b3c067516ebc967195da9fc69892e4963bf2481703dbae9235225cc30a1 SHA512 f6fba65f07b58fa133139e7df18aff9ef9e436e6a928e61e089453e3f2c9e8c36252f31fa068535d62798500e64ebfa77cdeb265fa3fb952fc60aa56c8bda1bd
+EBUILD protocol_version_header-0.15.0.ebuild 478 BLAKE2B 7e67945f8cec8a3129e4cc2766952733b61361dd3150d68b8d74fd608e31da57d144d81e5b562a85d9dca476f0dcf14be0271165ed89df834c9109d8c903c74d SHA512 05b328b52b67c6b423c13a195c9d44f1ddc23cd732dae5460bc60da52e88f7c7e5042148cf3e3b9129a0cc1f6f6f0c553cfcc2fb5b34d5c9821cba0c56dafa58
 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 c717ef40e946..36895583e411 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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core:${SLOT}"
diff --git a/dev-ml/sexp_pretty/Manifest b/dev-ml/sexp_pretty/Manifest
index e4dcbc90d417..177855ba491d 100644
--- a/dev-ml/sexp_pretty/Manifest
+++ b/dev-ml/sexp_pretty/Manifest
@@ -1,5 +1,5 @@
 DIST sexp_pretty-0.15.0.tar.gz 22407 BLAKE2B df8d246ebe1164f0d2d3ae78074c8249d2aa255a089e02eb9fcc0c21b808dc172da2da264d3b21b92dcc7bf9e51a2921ea8631eb45b45a46035447ead7abe02d SHA512 bc2a7aecfc3ae379a56e8940b9cc80ece686009c9f67233e7993e25ebbe251d62559601923db718a0f967cf42fc84024597c069659842760bb2ac5ce0eab8df2
 DIST sexp_pretty-0.15.1.tar.gz 22410 BLAKE2B e3819bce21afb8addcf391aff7a330db7f332c338d11f87cf0264d0e8d45ead7897b881a646a908e6165e2b60b9d49c6f2cb4da26ef7f3402ddbc864ff6b088b SHA512 900accca43727f8e7603f21adb0b2bc5a121b1444112b152ed1bfd6ace553b3cd4b2f80371a8f924b636ea33cfa26e913bdcd0ab42e5af5fd24f21ecbca8e736
 EBUILD sexp_pretty-0.15.0-r1.ebuild 526 BLAKE2B 73891124ce6695ea1ca31026ce783350934b0efb56a0e6961b1c0d429c191dcf27f29c2f6928719357fe6dcc76bfb253fd9f14dfd97523b592e5de4a6f3d56c2 SHA512 46e65aeff23e710f19389faef93129750d82948caa7ad0d0f39aa9b9ce4a919bbffcdac65d98225245ace9f1a3f6477b075abb6cd7632ec5067076b4665e7a19
-EBUILD sexp_pretty-0.15.1-r1.ebuild 562 BLAKE2B 874aca71de27879fd3f6100d5e298284a5329d1c31b6ae8c63799977e6f21cca700049a69d022148754adfd757dff88438e0a769bb2cacf0bed81739751fed5a SHA512 82153f57ca86d01b9e923dc68e8e2e2bf914048317fef311c1426cba7e8d83c5cfe97d8a3d6d68dd040f2b1516535c6c0a9cc0ce21ab9da5eca16d91936365f8
+EBUILD sexp_pretty-0.15.1-r1.ebuild 569 BLAKE2B 2c9b8aa4ec19feb4767fca92fc71241133cc5b491c72fc832d26d386daf43d27e99725012f56d84f2ad3d2bcdcc4e3388496f2f20659b6879d679e318f404aab SHA512 8a11bfcf13333c21a60262b77e6ba5cef7e5aed59ac704661472e88d6cf0eda32daa0049ab2ef019d3e2f503a93c4faf8729b8a6e89ef9fe0f980701fcbfd041
 MISC metadata.xml 320 BLAKE2B eb891c246afc84774ab5d03ec3048547c4bb0ef5058f82e8fe3ef172274e352acd868c21df8da52c99c419159b2b8c84fc1b4899b3e16703e5035f8baaddeac8 SHA512 2d3f66b309fa519afc0c4e4adc5fc38009130e7f8b2210517166e70998d628d1a17c7d869f29284ab6b1d53abfa2b872ca9c4289137fe4cbea35faec7e865d84
diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild
index ba20240c565b..6f3040ff476b 100644
--- a/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild
+++ b/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/textutils/Manifest b/dev-ml/textutils/Manifest
index 23d3c5a886d8..8d1239b0f2c5 100644
--- a/dev-ml/textutils/Manifest
+++ b/dev-ml/textutils/Manifest
@@ -1,5 +1,5 @@
 DIST textutils-0.14.0.tar.gz 13261 BLAKE2B f4e1f364e72af47d70d1b674399c923672a780aefa1a2de731e786ef6a5fe03789d5605d326e883b9b37b0ac6fd98246b243980b16c25a4cc8baed29a2142cf9 SHA512 e8dca3f0f5c096846201a4fddf06e7bd3ad721a21df054189d0a7316a8d5be73df6633b045f7027d03b8023448f017aab14dbfc13985a11b5a2b58e5498b6de3
 DIST textutils-0.15.0.tar.gz 15477 BLAKE2B ceb8482f8c76323bdd08c9c065220868dcc5405e4461d2b787e78e458ac0f7872519955a3c8247217517b12ec4450dd4452d7ae4d5a851151aa4e47f655f009b SHA512 d45dd57a3490330ab800cd06903bba760e89fc46b1209d3ad91395a729f999fec1af62f3c74c08d0270fb7a89de115f1cc08bdaf77d74a043183e629fc367e1b
 EBUILD textutils-0.14.0.ebuild 497 BLAKE2B 8e3a80f13a44a12929cbb0510960d78f325969259237577d7f3cc03983053580c53e7cdf18f9f97d40bca50cfdea99417b108d65300b7efc37387a0da5d1f908 SHA512 e05ac6828e85c8e1472f1b89b45f3e5feffbe20da48d3fdc37e2b84d25d8e5f0767e413c6e1a32b4084cdb848b24fd20fd2c0dca9a7c7a12ba5f3b6dffbf595e
-EBUILD textutils-0.15.0.ebuild 468 BLAKE2B 54ea3902fe5ddfe4fbddfc322ec65ff77ac23d283b9097230d1ecac3aac5a30c7a888fc040e7455a0b5c37ae47c38004c5ad203358ceca48db65154e004d1d93 SHA512 0f5f0abb030754c4697e07a672c3b55662e17e55972dc80cab0332a760c21ec3484d55629be1f533968c9360b3f5278476e0ff16ae6eb0da44757201b967e7e7
+EBUILD textutils-0.15.0.ebuild 475 BLAKE2B fc9c8bfc6f40c0903cda9aa32ec23cf78a80b255870ca33ebfc77142aab9ad8823668ec18ec13361266d283379e713fe059a317dc758c900113550f42d5be19d SHA512 f3d3316d046f92463adfb151287406c1352a58dfce6cc1871820dc602c0ab05e9ab1f5ad0c7eaa57c9fa3f94738313013bd2be9c464677a31ef97521149c4e64
 MISC metadata.xml 328 BLAKE2B a428cf4bcf6772e5a555ab899e3f160ab30963ff3faa22b6a90ab5ac95853d82a052c1de5b2f459975a31434267fb4356fcef6f523d97341f5557af994ad4af3 SHA512 abb9fc53236fc132e341924fb63cebe843168669f5447d7392843ee6fb14c0466d0c1e4641f72ab0550b02e216706f84f9e3f72af0fdf5c4fe55b9a518126925
diff --git a/dev-ml/textutils/textutils-0.15.0.ebuild b/dev-ml/textutils/textutils-0.15.0.ebuild
index ae3356cdc0ba..ee2222ab126f 100644
--- a/dev-ml/textutils/textutils-0.15.0.ebuild
+++ b/dev-ml/textutils/textutils-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 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/textutils_kernel/Manifest b/dev-ml/textutils_kernel/Manifest
index 1f24f9168c24..21f34302af9e 100644
--- a/dev-ml/textutils_kernel/Manifest
+++ b/dev-ml/textutils_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST textutils_kernel-0.15.0.tar.gz 17691 BLAKE2B 564a2bfd6d6a1248e9c004dd6740be1552219a11960872e67eae2c2485f01e662fbd108345992f4a924dc9b125516ac39c1c5b211a35aa296f64ca473a9bef3b SHA512 6295f0285e16829ba2282ca23225e783a422edfc2ea1a1e7b02df519430efd05b7e8e21a61078a1a523ddfb3668dba04f44836341efa260ffe3e9738603afdaf
-EBUILD textutils_kernel-0.15.0.ebuild 488 BLAKE2B dd8af2da5322b6dfaa015d8802abbcedfb272c3a9d3be43acec2625c51b988269eea633cb502e44157616a64520095bed076e1201a92d23bbdad72d23c853930 SHA512 0bfaf4305e9de8d8a5f25e3c29c01a6ee65733c6b854aed01f33895149ada7b944bc3b92414b89bdbf2bd96e8b59a498a832cd2f5040626379871f89d037aa8b
+EBUILD textutils_kernel-0.15.0.ebuild 495 BLAKE2B c3c5fcc6979b5cfc92a114cca96425695c78dcfc9d5b83a1df4530697f8f6db5306837929f74c4fbefbcf833c2da1c5d51bc39c7ab0c1902e7cb976c4a14adae SHA512 80db81eb70d10c5edfe96f935a9be4933c06be3bbb3c53a907ddc363626f74d1caef37a0864aa56ae3c0f0bed45c35025fe40889d2bf5ab632ff0ec1a1ec5d41
 MISC metadata.xml 335 BLAKE2B 6b4a60dd0c12b7739cd56ce99bd875bf2651c1a88b311b0009ef376faa0565effa9041cc81bb187e6031b804024848993c8e580786bdf03bb0217f92b2e8e75f SHA512 6c008fe31318425fd4c27dbf2547cabb4d02418ae338b3faefadbd0c2b8419236a1af6e3a1e17540ebe4f0d54bc463ea5f4945e7c8c5062c971a69cdd832ef1b
diff --git a/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild b/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild
index 37a06a64ebab..fd8bab382476 100644
--- a/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild
+++ b/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/timezone/Manifest b/dev-ml/timezone/Manifest
index 2f4143903087..5f30eb181c6f 100644
--- a/dev-ml/timezone/Manifest
+++ b/dev-ml/timezone/Manifest
@@ -1,5 +1,5 @@
 DIST timezone-0.14.0.tar.gz 9480 BLAKE2B d9f65420671d8a0607d16f91c6b10b48def78a813a87ecbbc3e036367a2084d53a256c698521f10b407dac0606208e1f5f2cd56c475e0a173cfc0a3e5a5cdede SHA512 39abb7ebc9e08520a9c969da948bd3de0dc9dc01c75d5ca324afacf231671edca3eadd6992ef3037cc23218990af8061419e5580d9ab246a43d31c5788599cc5
 DIST timezone-0.15.0.tar.gz 9480 BLAKE2B a47fd0efcd659e2bd3adcb07776a4ca25ef65fc5ba4af87ef361cd4aa2c45e3641e9f240b033f50c0e6108868deca7bf57eba6e8a753947ef7b14f03c74b911c SHA512 d50cd1e8f116f9121383b2d20d5dcbf99b5388a2fed915302f0566c6f2d93bdf1480c2f998fac6b81a636be52b601b38981b3083adaaf405a1154b63c0b0d6da
 EBUILD timezone-0.14.0.ebuild 489 BLAKE2B 11dac57aad8d5a65501534c86b3a3bda04e6e6aa180afc6bed4f9677261cedf73e181cd1d449b8994a1a13420737445384cfa692451ab2a94f9859aaa5e937be SHA512 7f35a0b8797c0017cc8864c409a82bda853584ebfc622691c95e052f266a21ab1d8fea655d3feda2188e80c90978be388ef2837964726b59b3d9ba1595724528
-EBUILD timezone-0.15.0.ebuild 440 BLAKE2B 30843b2f38023195b285388fd165dff0eb690e9e328370dbaa99921283df75d21ad9c5138119ece10fca232ae89c13042f68249a9f4e9f411b0faa6d7ac5b7d7 SHA512 a431f5931dd1188bfd2d880758ad4ca2b3089d31a19672b797d3549685b362bea903d4365b4fd1bd905a4b9a3467b19d055a48887a2728d6c7607ae4a63630b3
+EBUILD timezone-0.15.0.ebuild 447 BLAKE2B 91aa3331b226aaa22b690995e715bd03769125c41a4c1d57ddea5a7d90bca71cb990c964ca691e31ef0f6d09a04d6bb3c5e210a19925cb08e9cb2ae9cbcda8f5 SHA512 9fa65545c5874bb0f875d1428e2a48dd092fffa04e5a5537b5cb84b34d4ebf0e7365140d559ea0d8c39f1d3878ae9db74936768795fd2722ae272cc99354f637
 MISC metadata.xml 317 BLAKE2B 2c8122e72010c3adb8e6f58fb7e3f30c7c790110e35d371cc7339670f58088a695f441559f194d85781a0f28fb1bb52c6388cb59b9fe55f942540815accc8928 SHA512 3f6edd5919bc0c36f2339b3af3fc36884a1c7c646eb521c4be1b14a017835a6aa9a10fa6d9952bfd310cba1e9dc1ed81ad51b5b2fee99d6363e37e6f86d3c17b
diff --git a/dev-ml/timezone/timezone-0.15.0.ebuild b/dev-ml/timezone/timezone-0.15.0.ebuild
index cd887d7ba9bc..d38c1d4f6b66 100644
--- a/dev-ml/timezone/timezone-0.15.0.ebuild
+++ b/dev-ml/timezone/timezone-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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core:${SLOT}"
diff --git a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
index 237ab6c1b445..8f1eb6757ee0 100644
--- a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
+++ b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0
 	QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng
 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBIx-Simple/Manifest b/dev-perl/DBIx-Simple/Manifest
index 480d911e76d8..7c525545660c 100644
--- a/dev-perl/DBIx-Simple/Manifest
+++ b/dev-perl/DBIx-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST DBIx-Simple-1.37.tar.gz 20397 BLAKE2B 54868347dcaa13df92028b848f56ffc9ca85c49f836f78c55de3a4eeef71b825bd7089fec6b1c7df9f9ac52b1752bedca0daa35f29e09c01d22d5518e3d95fcc SHA512 f79b26bf52db33629950bc95f6c17dd13a2af135deeaf6ff5b0570ad852911fd0d27196636e605a93e9b3d740699110f2ece7abc24fcbbfd08a2f3ddce5d65b0
-EBUILD DBIx-Simple-1.370.0.ebuild 916 BLAKE2B 24220f744738f32d03f200510a19091a451c3322a4b14ee4218fa51a9271bba64313c6e04a73c7a813875168c87b4b1fc59349e431a08ab2b3234d30dba4c5a9 SHA512 7d8266c3d9848785692f4cf1a850bcad858a731df3b5c20f0aa928b4343a7397d7354c2c44ce1751f6ba25761248ed8a243ecd35b53b1575ab75962ca12f0b8e
+EBUILD DBIx-Simple-1.370.0.ebuild 921 BLAKE2B 55c58530ce98683bf8f523cfb2159c03e30d69c8efdd41f9c289bbb1914a8d35c5222dc6881037cadbd8b4a4f26350eafef423059f9a69c9c4ecf9830131860e SHA512 0fe1956102ee57da4a113836bb006cf6d0c899519968c1583eceb938f7623bfc9cf0087091c94119e15720f3ff02de72e16245ae90c9c4ef064a6fa8a2d52ab3
 MISC metadata.xml 473 BLAKE2B 7ed35d4a2182a54050d0a91c6e23dc1b0dae14cf27bfca5c009a209c98229ae4d02dffbe3606e8a113bfb600978bf387531db7ae2da3f5e082f06052eb6d7bd5 SHA512 c67426372abc4c367016d9b7e2b8071485ad39eb104e321b8887b23d6edaa9344d52ecc7f0f5f0e361668549578e10ac3f39c63ddbf5cec98deca712df4029b9
diff --git a/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild b/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
index e16b705dd54a..5df6cca4142b 100644
--- a/dev-perl/Email-Abstract/Email-Abstract-3.9.0.ebuild
+++ b/dev-perl/Email-Abstract/Email-Abstract-3.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=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="unified interface to mail representations"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Abstract/Manifest b/dev-perl/Email-Abstract/Manifest
index 60c6bbe78654..bb02267adcbb 100644
--- a/dev-perl/Email-Abstract/Manifest
+++ b/dev-perl/Email-Abstract/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Abstract-3.009.tar.gz 27897 BLAKE2B 5c5ee204bb83368e84c89a3754552a9d299caccbe7e43681a6dabdb0613a36d687efe370d091397d067807126aad0d37051d682e7d5d9f8f995afdcc06e392c2 SHA512 e2c2a497d942ef56d723ab109f8844f840bc14a4a23ae0febea32f6ce814b943ac0599dfce0a17c24d6631826240d8692592292a1c4f1fcc599c1983b37e0705
-EBUILD Email-Abstract-3.9.0.ebuild 635 BLAKE2B c1ae838f52264568fb7bbd600a63e9534a5e282b236423272e847a6ea08905907a7110e75cf96f3256c302f71ae7ee7171f826827e6dbd521e6495576abd0f1e SHA512 a7dcba696945d605b91a113b43ca9c509421a94c275d04d73a3f578749200851a3372a42791cc45c8a311f16a0a10252ef52300fc64b237052db9596b14bd889
+EBUILD Email-Abstract-3.9.0.ebuild 640 BLAKE2B 7e83ece220a7ff2ba8fb58ea66acb8e0bda63a6ea6cf42f5c7918ddfbd25a94ddf1431ab6483e5a77c035fc650d7d036f8dca42e31a8b3cf24ce2b76545f3eea SHA512 e5190b88bfdf3ce3c0176d2b9ca4795768834f8c177aa7b70c4f2a78988cdccba0c6da75552649073c83be772691fb6314cbd7e2a1864a854df220f1bf8ac370
 MISC metadata.xml 905 BLAKE2B ffda450ce63d657f5ff93057018285bb388acb9bff9d72eef3348b6d059295b9cc17e631c88de9a9face39ed3879f2f7cee09ee76f07b5688dfe949b168e6c4f SHA512 a350cbdcf94c32d562717431657b53d0e3572f60d03402b0dec1178d679073af99f915a5c6416949cb86aa3db9be9eb26362a7ce942616a8bd11c256ecd8abe0
diff --git a/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild b/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
index 488e7ef55ddc..973654587d3b 100644
--- a/dev-perl/Email-Address/Email-Address-1.912.0-r1.ebuild
+++ b/dev-perl/Email-Address/Email-Address-1.912.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="RFC 2822 Address Parsing and Creation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Email-Address/Manifest b/dev-perl/Email-Address/Manifest
index b24448276520..116ed4e3577c 100644
--- a/dev-perl/Email-Address/Manifest
+++ b/dev-perl/Email-Address/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Address-1.912.tar.gz 42390 BLAKE2B f6a05f967a2c98f785e1c615a83e3cca68a800eb49659b6ee6586d46e5693c71f5cb5a4824d9370085460d78774cdd0167e64a1e748169f9fc22a4869e3f110f SHA512 fd8a8c09829f725609aa84c79ad89d1e44cbfb70cc44cae6a9f31174589404f56cf60ab3a4186137f7ff9838a3fe34a95a7c584e0eec2e5d1d79c919610f6e1a
-EBUILD Email-Address-1.912.0-r1.ebuild 601 BLAKE2B 3e2ab1304217b13636c1d00bab75c79fb0c404cf8d800e1cca3bac058cdd899d79b959b5ff108ab956c97ea46ed417bfe9aeeb552054908d6a452045eda2cbc3 SHA512 76225693459d2a5aa1cdb4fd0bfc4c16c662a0a15d51254493db1af1b6a7ab307415159c75a19e734cdf55be423596af929f388af3463fb590639ade7b37243f
+EBUILD Email-Address-1.912.0-r1.ebuild 606 BLAKE2B 48467d0a562d5e19e428a57d9b0738c1c03779f1180fd79fd95e1985f0ae1b07ca6a4d2b5b4fd8be486149cf0593abd6c20e2ed35105b4ded1c80c46b5983705 SHA512 09698d828f626c363494bc596243becd79b4a2ba2d1d5991a6d34342c2d880aa3e283fc0585c54489004fa716df08b50ef445baf97c0bc7b0f35e75579409bdf
 MISC metadata.xml 473 BLAKE2B 133ab6451fd543d3d747542a2549f5ba61ca15ac8f83dc0eb6fdd48e8a5d2d934dbb2096e738877be0d2685bd6614010cf07603641c9a36bd13d371bd18fdd62 SHA512 6dc33e2b97cd6920c4e297def1ecf56295c037d779143eaaec600ef05440ccefb33b64b7c650e269d3aa06e1ebe0489d8435f1b5172e47ec61d8dcb8a7f1ee9e
diff --git a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
index 5346bfa0c073..8ad7cf0ccdf3 100644
--- a/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.0.ebuild
+++ b/dev-perl/Email-MIME-ContentType/Email-MIME-ContentType-1.26.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse a MIME Content-Type Header or Content-Disposition Header"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME-ContentType/Manifest b/dev-perl/Email-MIME-ContentType/Manifest
index 7b45d29c9b58..d90bde8cd84b 100644
--- a/dev-perl/Email-MIME-ContentType/Manifest
+++ b/dev-perl/Email-MIME-ContentType/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MIME-ContentType-1.026.tar.gz 23063 BLAKE2B 3a07522f5dee0f4cca5f817a06c51078cd71a9ec58794d1ea9e9d939b2fe1b525fcd5fe8a01bf52f42ea514d27b3245199c4e5f14fe02ced05737ca249a3b422 SHA512 8ede8df5baba4f5e89ab3418580e0e6dbbabffbdbf25e1f5f738fceee929ba4b495cd7e6793cba030412bf7bbe2a524136afda962f6410d6ca169b68b1eeb065
-EBUILD Email-MIME-ContentType-1.26.0.ebuild 682 BLAKE2B 27eccf495ea34c0b99ceb36ee9864b0217fec473375674a53b8a36eb069ba17990d5360cd6f24011b17666ef790e77c5180e0b52d5dde363c01f270107d6b02b SHA512 70cd50c512337ba1ea2468dfe04696e30a93d62405ed8aa946502f91c54cad6849ada9ac5845a31b9f4f4f343dbf7e7fc597a3d3b099d5a80bd2337fc177806e
+EBUILD Email-MIME-ContentType-1.26.0.ebuild 687 BLAKE2B 35bc04b63613836647b04f1f0741836e196bdb2875d7e8743dc3f9926952eddde72d80e77e19551e6a7053dc3dbb370ef09b28ad43f89388f52e304c05e77176 SHA512 a540ca546f47b732c2f2502f484fec571441c2295691bef896953f12e2e65b0a01b2d46a2cb7da0b50d216617e5233b82a0448d5e50e3479b2d8720ce1321816
 MISC metadata.xml 487 BLAKE2B eee2291224a7a205e2efcf25d646834cdf5b3b4141964e2f706b6d3ac260902b2ad76ea51930ab5ae243b3dbe16240b2f7b3f6a8308d7c6a0571ae4ebcb061f6 SHA512 80deffadaa32036ab562347956c25a516bc4338155b8cdd1aa817b5e850e26bedfcc949fe34ff4955a306aa6d425a5efa1150ec51fb28660c6093a11450e8db8
diff --git a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
index 24c26e6ba1a3..34efe1706c7d 100644
--- a/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.0-r2.ebuild
+++ b/dev-perl/Email-MIME-Encodings/Email-MIME-Encodings-1.315.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=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A unified interface to MIME encoding and decoding"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-MIME-Encodings/Manifest b/dev-perl/Email-MIME-Encodings/Manifest
index d100fcf0ebcc..b597d6dcf2e9 100644
--- a/dev-perl/Email-MIME-Encodings/Manifest
+++ b/dev-perl/Email-MIME-Encodings/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MIME-Encodings-1.315.tar.gz 13564 BLAKE2B 4d86350a510662e657b86527baf794bf8f701ba5b0697924cd8c8a9f7f8f4a62116215ef45d151958b87644b2a1be8f72f124250df44b6189182269003d78e9b SHA512 4cd787e099617b70963c8ef6372e2a16038c61170fdd343aad88a024ecd15c789fd2c8cc19830c3518b6648e428301eed1ae20f496fa97afbdd8bb7f3ae432aa
-EBUILD Email-MIME-Encodings-1.315.0-r2.ebuild 586 BLAKE2B 532d3de37d796e8af4b1a3bcf33783c8e2bf12c17469155d64eae36cbc231f40e8aebbc0335b9cdd166cb63d04d92f4c0b3b8d209b1ad4c1aa0ff216ecf32748 SHA512 7b5743dbeb1eacd7034b601c97ead8d4131bc8b9799ba4b53a35175def4b372205557d3f00bb3eeffb367854ae35bb7e6f8c348130b333952324e4078cfca88e
+EBUILD Email-MIME-Encodings-1.315.0-r2.ebuild 591 BLAKE2B 89e45b0d51d1dbfbd333970ef075210ce15cefbc7d09ccda8ca4caedfeee3156265c1566cb2f8795e22efefc5b6e66c3ca31fd16cf8948a92ed188e5cdf4a46d SHA512 6f5b3d486eba94f0080d476e2f462a3f1f3ce6b75edbc04ccadbd941d2374bd6b13085edfeaff886b31c6bf6ad2c42cd15c82be961c95a6cf4fd440f93d51fd3
 MISC metadata.xml 481 BLAKE2B 7a2bba5705a82d4b7a7c8d882a6a3ec3659a8b6d4ce4a83c3e7c7733a1f9a4f2ee91f93e2cbe2c0208a6125d094b4adbd63afdcb080fcaa173535648061e6464 SHA512 b812d3b2c5ea5ae5e1a11677474fb4a10eb6dee4b7f8d797e4f95a86e7762951d73cf2c579d891f956529acbca7621981e8f1d2a3e3406bacf8c61337b079565
diff --git a/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild b/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
index 2c54a604301b..2f73c4fa04e4 100644
--- a/dev-perl/Email-MIME/Email-MIME-1.952.0.ebuild
+++ b/dev-perl/Email-MIME/Email-MIME-1.952.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 @@ inherit perl-module
 DESCRIPTION="Easy MIME message parsing"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-MIME/Manifest b/dev-perl/Email-MIME/Manifest
index 5ada9fa9d6ed..a7d7c2238133 100644
--- a/dev-perl/Email-MIME/Manifest
+++ b/dev-perl/Email-MIME/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MIME-1.952.tar.gz 124514 BLAKE2B 89f294a6b8bb648b4b745fafb6c7009ba4943b070300544a535a5aa98d38275b1d1927e9bd41a7574aae73bec55191dbcb7190cc026b74cd0b189adc5c6c096d SHA512 bae81cf6e4db11848951c8a900e58de7077b30e8f16cd28fd5a7bbe44668b09419f51acb70b393d292b83c32b61f9c91af1abdc258453cb3b1590146f4bc6d70
-EBUILD Email-MIME-1.952.0.ebuild 820 BLAKE2B 73d769f4e006452096f9c90b86f72b59f18835b012a4ab6de23b80f0f81e7a51e24459a17089a3054e26319a343a1a8b11fd24acac377221db8918b856ab117e SHA512 ac30ff1f29fc23f8b83556ff9eb5862346a10323b7e49c869baecd0064f5ae8d92aeca6fbd929085bdf0d68d4712006a0188e6122dca2bcd2862bd82de90f58f
+EBUILD Email-MIME-1.952.0.ebuild 825 BLAKE2B 644129d7c857b34ef0324d4cf69e98634bbe46954d5d8fad6203fb09486d0d4ce4d386df5a5562121660b2667eb16f66dd942223ee5749c1d8790bd8f7441e22 SHA512 ab11c6bc21a9de83e0ffc2f65f9ef039ee43072b18cac36868d2390ac714c27c74385af17ad6f0b3d120b2517d8477a0ff4aeb92679352f230bc2ab2a3276a80
 MISC metadata.xml 796 BLAKE2B eb3e31cb122eed0cc89f482f366695e00cd45e8327644adca8feacc358250fa4e4de35725e09436b4c85ae7ae956d53a3a32c9e3d16384a5cda444109727f2b4 SHA512 161826ba0ed3ec2a5e0f409323c5eeb9ca47fef4af9efba87cd00de2d77d38ed83d583a159f0e4d41a14ae03827070974e7e770bbb6238e55a14666f2ce964f4
diff --git a/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild b/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
index c743566bdae2..8dbb25c76a53 100644
--- a/dev-perl/Email-MessageID/Email-MessageID-1.406.0-r1.ebuild
+++ b/dev-perl/Email-MessageID/Email-MessageID-1.406.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate world unique message-ids"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 
 RDEPEND=""
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Email-MessageID/Manifest b/dev-perl/Email-MessageID/Manifest
index 633095db526e..c793e24d76a5 100644
--- a/dev-perl/Email-MessageID/Manifest
+++ b/dev-perl/Email-MessageID/Manifest
@@ -1,3 +1,3 @@
 DIST Email-MessageID-1.406.tar.gz 16247 BLAKE2B a32e932629513a5a18bb3042a79ca5f9a61e84c37c769248b244fe3c96aa9bee6b05422237f8a79d7f50c1449d753ea8b51fa712de23469e99cfb166c42caf83 SHA512 c36861267a127372076391e5e6458ee19bbdc8d09c3b1ce3131d0cad1a82a6f9b2bc5a29df8bafa2450ea0e5c06993abf98928f2246e694d05875e40b7e36109
-EBUILD Email-MessageID-1.406.0-r1.ebuild 461 BLAKE2B cfe8e9ef991ab5ddc722576961708f85b933112a6b590d0dabaa0be3f5172c45bdbbdcbd0a51e74c769201f841a97c55ed09fadc05c45c62756ed788948d98ba SHA512 6025eb84e1a97b343674a0714bf9a9853a1831ea10d5b005aa9151708337874bfa5db6a2177614d5a9de2e356358308c34cc0d0a1597323479a45cdfbacfb40f
+EBUILD Email-MessageID-1.406.0-r1.ebuild 466 BLAKE2B 4970e1a9a256a314116d76b29b5c0d4e9455dd9f4dbf3e6d9b0e449ee44fe61b109dc7f68744a9458684bfaed5a94560c73b6643fd2540656118bb9f8872eb3a SHA512 63740e6f754b8cd441d945520419f6e90f007b7ff140040de2ed44328d4cd8206f57fe2900ecac35a223791bfd3b676dc16edd06dac55ba7a7536a509f203f6f
 MISC metadata.xml 465 BLAKE2B 0603ac7af88cf3e962469972f0db0a7fd395d1fc6975efbdaf11e6e96cb9ea0b31cc839d3cfaa9fbb3bf55ef5154a236822f8cca8795777304ec7796691db49f SHA512 912ae1c089167c6466bc505b5f051eedc78b665a4614eb5d9ea13dab27cb7b4623adb51be45bae66d47752c9a88933591f1e6bd0ed14ac34fccd8047dc06375a
diff --git a/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild b/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
index fa541cc9ea30..9cc6d09f9377 100644
--- a/dev-perl/Email-Sender/Email-Sender-2.500.0.ebuild
+++ b/dev-perl/Email-Sender/Email-Sender-2.500.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 @@ inherit perl-module
 DESCRIPTION="A library for sending email"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Email-Sender/Manifest b/dev-perl/Email-Sender/Manifest
index 9316567d6d50..42ccef8d8475 100644
--- a/dev-perl/Email-Sender/Manifest
+++ b/dev-perl/Email-Sender/Manifest
@@ -1,5 +1,5 @@
 DIST Email-Sender-1.300035.tar.gz 52327 BLAKE2B 236e0ba6f0b1429f26b72d0e9a9b3d97c3c79330c95f2160b17eb83669338cafa5c756a8587d746e9db478a51404bf86c154db372a3078e5d0420490a1b942ca SHA512 1592af000d9abd4ecb410b3cb317d5b2b0e6dd938e1b3f3d8a561527845fe27ff53837761fcc47e10246a19e1dba2521422c96831970354ec20bbbe160d35afe
 DIST Email-Sender-2.500.tar.gz 52593 BLAKE2B 16a633f064ed3d1f34dcc8fbbecc9a7be5e1bcc775458f87b0043be36c00d2ff34f9640d8abb2a24f530cee901edefb0c4f4ccee26331e9e7f0bd949f62fcb12 SHA512 d7b9848ed7e218abaa9a47ef3c3f79f5fdd728a67795904655ad4df4b536f1df40bf80e0b6838112e26e71d56341e88b6044e6867fc351d41918b117a52ebbf3
 EBUILD Email-Sender-1.300.35.ebuild 1003 BLAKE2B f6dcd9383bad700d69041068b7ce52a38ad5cdebe3ed42e911bd808eeacbb44578840f409d63106a414ff8e248547d71e6f3e1a137546323951e8a4053fd3613 SHA512 33ed116604c30f582164819b1e3c7f304682d6416924824d455fc4f63ac432173d2f0333eb9e9542c524d425e5d3f47b7a18a8bc12fed9d74b555c6b9dd38b2a
-EBUILD Email-Sender-2.500.0.ebuild 1000 BLAKE2B 754f039b4df1589619a99f84ec9317797e143f9c835e46ea41b7622f226e12c8e84bf67207c8cf220099d20d4f468f34c2046aa8b76961b0f0bda0319bf572ce SHA512 936b305cd1b0048fa09a9ac9b37cd2fee51e5bb4b7fd4ebbfe0cc5d098fc1323b50741506ba0d09ca39d2bebd86ef8aa7d4f3e2d4985a9e6f749b3664149bcaa
+EBUILD Email-Sender-2.500.0.ebuild 1005 BLAKE2B a45b0a2bcde9ce7d618cf3173b4d6799694e9d0250210f9ce50e61354a5c64961c7e4a4bd326a11472ea515628d59c35e6369d628966a1bb6d23dd86b4f4f362 SHA512 e747ba9e0df8f3017fc7b3e620108f04270b47fa7f005fe426781a2d78515d5471041e5fab2fa0ae5e9af5b6aa7643fa56eb257c3075d947ef67b1a082656308
 MISC metadata.xml 2220 BLAKE2B 2910bcc8319062aa08b3621d8dc139774bf02fd5ece1b5f8251d79be459443c32f5edf8a6e692fcc81a81ad8c6b9b2beb8e90d101156827858ce10d94dc116d3 SHA512 2ad3d62fdb7a79b1cb582cdaa036c02f316f6210c8e6c98bef483c0347a94e41b2f91a01eccd0a76cb0a42eace09eeec49465241c132e35a74b17e8dc517b7b1
diff --git a/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild b/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
index 31882b451ff9..f0e5619ada58 100644
--- a/dev-perl/Email-Simple/Email-Simple-2.216.0.ebuild
+++ b/dev-perl/Email-Simple/Email-Simple-2.216.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple parsing of RFC2822 message format and headers"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Email-Simple/Manifest b/dev-perl/Email-Simple/Manifest
index bb107a1ea54f..e243ad949621 100644
--- a/dev-perl/Email-Simple/Manifest
+++ b/dev-perl/Email-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Email-Simple-2.216.tar.gz 39695 BLAKE2B 2cb0f727a7799ccf29b8b23662a02bdf264880d33ee5a7d487c696bd8cc19f68257f2d154df37ff6a58b428b9784e0e80d587d28b1e6dbbfb99a5f3946b45bb5 SHA512 2d729b6ad3cc493d27a8b3f775c046ca16dc53e7fe701fa78c87fbdeb350d3c9fe546ab0721504747f443f0f4e33d395b08b53374b32f89a842ef09a5b1dde70
-EBUILD Email-Simple-2.216.0.ebuild 610 BLAKE2B 9c7a26b14f2996bd1c02b699a0d53251e0e178195fb0dfd57e7be35bb114a42f47d3947b064f1d25c0e5a49b6da3f7466630eedbe40f433397a56b90573bad6a SHA512 b7b6ed2dca2a77732037c2d27f594ec8defab9a34899918b81d86fcedaa2d87f0c3d56b7ab1d726afd52e84b091a8fae656033f07f4ed8f4b6e6b03670b0e61c
+EBUILD Email-Simple-2.216.0.ebuild 615 BLAKE2B 2781085b92527d296f179a413871f47aea614d3329744d383b38c666ff7515dc4db45210285e013cfa216c58fadb45fa7b4b0067c0c93661f94cdc9e2e199f1d SHA512 8c62f93ce5218ddb778317fcc23b8fb110f5f224e0b8110766d04aa3946d9429d44b8499d3e1c9a0cf1913b3b19b5a08d1f176d12de55739a52e77a2a7f552a0
 MISC metadata.xml 593 BLAKE2B e01a0f1939e01fc3879fec85862d2bf684054e9e6c79f15ccfc22cc6f74c540b6d5480ee2024bb460ff9558247ff71c95ee13870c321b50de7223b01deefdfde SHA512 14c3b41d49045be1c97dd164436477eb36c5d99fe2fcacff5033406cee3496d0f9dad2aef2b06d412791be355b61ee5bf508c099cd2a2a49e57c16a576843c09
diff --git a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
index 89f8dd2792be..bd408ea92a21 100644
--- a/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
+++ b/dev-perl/Mail-DMARC/Mail-DMARC-1.202.109.270-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Perl implementation of DMARC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal"
 
 PERL_RM_FILES=(
diff --git a/dev-perl/Mail-DMARC/Manifest b/dev-perl/Mail-DMARC/Manifest
index 710fe1ac619e..df99b0cd77c8 100644
--- a/dev-perl/Mail-DMARC/Manifest
+++ b/dev-perl/Mail-DMARC/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-DMARC-1.20210927.tar.gz 794723 BLAKE2B 3b0eeed4ccc6498c0af3afe20052e9ea0b0c8ba1625b80ee7b211d7f4235a4f595f7f15862b6b79642423dccd95755047ac53d54b30a5db0b0c05a6070725443 SHA512 eef5d0fda54ea45c04e61b4b6f7fae995404978c297289e68640d0409528542806ceed9dc4c701376c81014ac5d5df25f541a789f54fd982be8c4518fbcc524f
-EBUILD Mail-DMARC-1.202.109.270-r1.ebuild 1922 BLAKE2B 9f0e97c92b1e0775b87a289bcdb28d51b45fbc173b988966a06649930dea1ee596ef64430c0fc60e316ed76efc4e99c1e3935ea840f1ce7d3224f0a9c708f6aa SHA512 0406e174079ea931922872fd9b82621aa3f8c21e1fbab16db582f357120bfba11180b3c7b8b02ad2457b6cae1cca25a06d1acd0fc77d53037f9eff12d0333163
+EBUILD Mail-DMARC-1.202.109.270-r1.ebuild 1927 BLAKE2B 28f4894fe541c6bce07d6c72b0e8725e5422ea37d6d896e88616408168172c0595e2dc9961e6b2c20d4505a6cf92188b4784b17853514a0827178d1effbd8885 SHA512 a5253da9fb05719d48226f85370d7495a24e4d910814eb16f9c9dd839d285c86bab1b4786b612178fb73378d012a2bbf56c76afd3876c9868e2c14f034a32d79
 MISC metadata.xml 2239 BLAKE2B 7ce9d3d8be07ad9043047fda77be9bfcfd50fa61221b6040514e7178cc156f50e121f48f243e7c8af7e5dbd5b26c79706536fd619ec0e5ebd0289dae9930f681 SHA512 a43245d8d48cabb4b5b103168de5d2dd708bf59596a84ecddb0cf79f4e66d8003f43d97bcde808be300a5dc5cc00b39006aa5be9b1063e0dc16ef73067741605
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 1024e2d5b563..2e2904f96e03 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/MooX-Types-MooseLike/Manifest b/dev-perl/MooX-Types-MooseLike/Manifest
index 168f10429674..38e417f13fa2 100644
--- a/dev-perl/MooX-Types-MooseLike/Manifest
+++ b/dev-perl/MooX-Types-MooseLike/Manifest
@@ -1,3 +1,3 @@
 DIST MooX-Types-MooseLike-0.29.tar.gz 18804 BLAKE2B 3007c5a58d708430c151e1b8bdaa3940c941774e24ce80079272ab168b8a41683b0fb29c52df32532c7c555a6e4f86eb1be49053dfe109495133c4391b23aaee SHA512 69ddd0d663d1ea23dfc7e47ec35192f1951f195f70f788bac47cc93e98d9e888394c07fc39f1740b7c1fd04f8724f2b0dfa14183fe33bceb9f77c1f1d1b8752e
-EBUILD MooX-Types-MooseLike-0.290.0-r1.ebuild 590 BLAKE2B 624cb7cbd3c0842638cf67aa8a064c2688097d9a528a0352277686b8d449ec757f892bf079ecbb4b9607f5158bb17e691400b0d198741d3126d1069e9f2f3a2d SHA512 16c69e0a0edf5d170e3660650a2c6ceb591e65c5c87c20c852b700b0ade9aa7dcec16449edff9a2cbaab73a59b39e9f66af1e1adf90ae3ccc3a363cb80e7e9e2
+EBUILD MooX-Types-MooseLike-0.290.0-r1.ebuild 595 BLAKE2B 93baf2ca3c295e2b922b1ec2439f6841d22629debb17f3f414f64582a6797eeef4ba5ef2291911a3a25f535be828d1aafd6477b08b0f61d94c120c74747ac0ae SHA512 270af73a7a0f006f03649bb815471def0e4e465b5c5d368e14f4519193131c1c4898f8394b0702562ced04aea2534257a99245433fe4d3fa4dd345c2359a31a6
 MISC metadata.xml 618 BLAKE2B 201750ec2531dd26fffde147c4796595fbc0fd1e7f726b766e5be1eb378f810a65678f8fc41cad813fb284ce7db8613b457c3f353b919aca20997882949d9679 SHA512 dbbdb4bd4a979010c0ce549e77ca52ce8d27d56afc701fed41903e60d1a2346f3bd08ced35213ca408b8f07297e1d89c31cef43fd759862e3383279f4f10c30c
diff --git a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
index 36b7b45fd6eb..8787a5cc5f9d 100644
--- a/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.0-r1.ebuild
+++ b/dev-perl/MooX-Types-MooseLike/MooX-Types-MooseLike-0.290.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Some Moosish types and a type builder"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-perl/strictures-2
diff --git a/dev-perl/Net-IMAP-Simple/Manifest b/dev-perl/Net-IMAP-Simple/Manifest
index 716495b2cb79..dd78a609d4f0 100644
--- a/dev-perl/Net-IMAP-Simple/Manifest
+++ b/dev-perl/Net-IMAP-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Net-IMAP-Simple-1.2212.tar.gz 45917 BLAKE2B e5f7fabbc6cd36af0a07a0c0d76ad5f65c888b23748abea54ad49cf032fa860c02a18a58c65b1bbd9c60133d60550b058a5822005789727b0084261daed040a8 SHA512 0c34388e9358864f74aacdd7bb046590a4d821f025ccfdc2490db4dfe017fb5ee3dea1cae96a408ed6518cc7e3bae20fe92296b9822d62c9ab2b20f26f873e74
-EBUILD Net-IMAP-Simple-1.221.200.ebuild 556 BLAKE2B 553cb307b2d3aef8ced8f9acedd66fe798a2b64bbdf679c0e0f14cafac6b69c3481c6948f275b815f05b6ffcea680ee8a1f73dda67051cad8c231db1bbf47ff0 SHA512 8047297671b49031ad4c10a4d0bd6a8706b2e9a8affb2087e1a8c21d91cb1e55f81d62794c631404da3f81ec5565eee678026bf47c61d69cebc393dfbaf25008
+EBUILD Net-IMAP-Simple-1.221.200.ebuild 561 BLAKE2B 743b3e30f57cd616c6a5d577f06334d9b7d254fe444c2a46f03ed69f53292db45079a26d4e1c53fb0730f2a95d20381cf5017d5c99f8d79e3a30638358e3158c SHA512 109469da566369a199cce847b4b602c3e642ad2984fd255260b4afa7af259f67d24c171bb0eada0698ca80dbd1c09a583e8768c72168e8d4e4a9e7d620a9ed76
 MISC metadata.xml 764 BLAKE2B 3e52c7847943fceec75da4c8dc20935fc054df949747cda27c34aec2eb86ed24d5302c544c1b6a25de5212863bad5d92ec4d95e329e9e4d88dbc7f53e2c1df69 SHA512 569da0be6d998733b53d597f74b7620e9eec422834b5783f31793cfefe6ee47b3e06bd3611df419e321b1fa2ee1cdb8cecce56c87bfa2975114b8ae0dcd892af
diff --git a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
index 9ba65cae0b93..91659de94952 100644
--- a/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
+++ b/dev-perl/Net-IMAP-Simple/Net-IMAP-Simple-1.221.200.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for simple IMAP account handling"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/Net-SMTPS/Manifest b/dev-perl/Net-SMTPS/Manifest
index 206e097b3a93..395ee60868b6 100644
--- a/dev-perl/Net-SMTPS/Manifest
+++ b/dev-perl/Net-SMTPS/Manifest
@@ -1,3 +1,3 @@
 DIST Net-SMTPS-0.10.tar.gz 5309 BLAKE2B 6832b95d40a92b8fbd5ff381967122ab8d03ae8550181b00f931e1526d8f46ea7557ec615ca07675228daa1759b7856442307305916892052f6a7d70f4a600c5 SHA512 e9d2202f63c5149ea72d8b37e27a5c0a7d0259de6a2afd7dad4b59ce00121cedb212d73c1f50d2b6ac77a0e0934bdc750fed3be4865c5f84b805befbdab802c4
-EBUILD Net-SMTPS-0.100.0.ebuild 471 BLAKE2B c09698f8d7b7c37d31100f2f7293ceb4e92bab71031c3860870b2a1399d47e819a237942e5b14c5ccc44363a87633ddf84b4fa5dfb0c79d16622c98c61eb3927 SHA512 0f1f98596260558722b9e0d49f1888ba7b70dee6acc4e8cdb8aab5d83051cc69af24197ad11a0d89824ce246887d00a6513b3b14d1a4452dd4a69332e191bcbd
+EBUILD Net-SMTPS-0.100.0.ebuild 476 BLAKE2B 34c7acd1ba59ceed49346ed9a55eb5d201b1f4f001ae6dea31fb1366c25321cf68cc7835754e77c56b534ce85d0d4e7aad9306a7f56805f4370590fcf51d70dc SHA512 a4bf131ae94d5f96c35fbf2fcf3b0181c2a8d22057a81f6ab9967644ec4998e0fef6164b9134c7cd66d5953a38b90f6e777571dd0ad994b2ba6aed61e796fb51
 MISC metadata.xml 391 BLAKE2B 3ca0035db0ab987520e11cea275256d545570e4ea5c0137aef0bf543377fd312e6a256af0fb7ed1777de4fb9bed3acdfb2fcb558bf932088408840a2ee7dc77b SHA512 4616a8f4b40e6c21f2c5a63b5ea6dfbfc4f521461bedc90e9e9f9b60488cffff9cea13c4b533650b10a4ac08e3c32a5cafea691cfd47d6e1d3a71d34b27155e4
diff --git a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
index e10d73fd3ed9..9b642018ba9b 100644
--- a/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
+++ b/dev-perl/Net-SMTPS/Net-SMTPS-0.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="SSL/STARTTLS support for Net::SMTP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-perl/Authen-SASL-2.0.0
diff --git a/dev-perl/Sub-Override/Manifest b/dev-perl/Sub-Override/Manifest
index c66b259da074..3e0e47bcae60 100644
--- a/dev-perl/Sub-Override/Manifest
+++ b/dev-perl/Sub-Override/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Override-0.09.tar.gz 6462 BLAKE2B 27345159d3475c30c40852fa93db246c91b4d83806154adefcde907ff42ac0726d9c84880735a148acb6ce929a14c43d30287dd71307e41667841bf25db3bb99 SHA512 35000e8cabb6ca4cc0cac53af99fc9cb8ac14b1e71dbfa27dc58a339cb1b54e439064f2241798e351cc5ad297a2f9e4fde870ca97e2eb09a2430c11af589d412
-EBUILD Sub-Override-0.90.0-r1.ebuild 393 BLAKE2B 2538c96865d38410758a7935f91657a7fa2954870ebff1da2410a2e1de0455b9b9b184128586ddbeaa0419dfc03adeb7779cb8eb8adee15e42ee676c46d60cba SHA512 d58d6f444244263c330cdb766e213ed3cbd5ae5f6beba8060f447d2cac757ba267c6dcc0f841518a450fc3ac0b9d9484187f3cf9d73088766065f834c0922df9
+EBUILD Sub-Override-0.90.0-r1.ebuild 398 BLAKE2B 587d16811b3039049392d0f097cf1ce2d5a14598fde2d75184c1b013aead6473bb7aa18292df908b41d2750e1db2d7d5b2b978b1ef485fff758fbd29a458062d SHA512 4ba0c568ac94e16ef53d5f85bff79490e9e2886ecc0b2e65464400a4617e949e34e49aeee9cc478ff5ad24642805b876d396f9889ec29494e30f52ef5b39645a
 MISC metadata.xml 397 BLAKE2B 1a61a411220f9585aaaab226adb8fa83c98ff6d1070627e87546bcde43de61062809ffaa2e8775fa83edbad2141f1a50af687e63ae1931c27683164047376190 SHA512 cd767f5bc903fbc917a652cba9d5dea536730f13ce32b742b249cfc826ff3992c6bc9591602017ceb524509ae343a5a9a8c53ae8889b2ff138518c1d60f5a0f8
diff --git a/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild b/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
index 076938544c17..0a631e971c49 100644
--- a/dev-perl/Sub-Override/Sub-Override-0.90.0-r1.ebuild
+++ b/dev-perl/Sub-Override/Sub-Override-0.90.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
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for easily overriding subroutines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-perl/Throwable/Manifest b/dev-perl/Throwable/Manifest
index 7a1e0cb60556..5956550dd7b3 100644
--- a/dev-perl/Throwable/Manifest
+++ b/dev-perl/Throwable/Manifest
@@ -1,3 +1,3 @@
 DIST Throwable-1.000.tar.gz 21875 BLAKE2B afa787b0e29f8d962589edb87b93aa343d703ad00bf7e9d96b2a4a66b95ffdde5877a775a7aba053ee7b4d0ad2b7ba46677a1ed8d416003f70a2fdfa176c296e SHA512 d81d2e3eff78ad396e6e61ad09ecf3c1eaaf33ae24c8b74c8336b568dceb1b62aa03f9e8417df2edc55b0c6806599c7e88ccc43f2b45c11262fd8139706a9bc3
-EBUILD Throwable-1.0.0.ebuild 640 BLAKE2B 365e8096e1b68571ee76d4ebb117371590c45487164f4aa258e452678a1ebc54878568f23733d5b4ab565cef976b2bd38017d4ce622b0e51470400405ed78d9d SHA512 6d4f218912f9967b196d1cdaf1c624f3dfe29d3a9e605306e9105b1ea6700ef1595819da5236b15f9698498059820c41976f4c3101810729f131af457c7f8d33
+EBUILD Throwable-1.0.0.ebuild 645 BLAKE2B 9a0bfa46704aa078d345ab2d6e5bc16d51fadc1039e07885965bd3af09f210d75b4b36bd55fda4392b7da606948d56610e8240524378befd6795cf34d024cc26 SHA512 07be6a73a127cb82d0b79abff79c631cb22daab8a83bbaacd7eae30be9c37e3c6bb8079b1f75ebd6b8c148d6c151d5a61423f261ceb9a823066f8d9732b648ac
 MISC metadata.xml 516 BLAKE2B bd949a1514219b6558a4f98d79fc22fde82c76e0d754cbf68ad78a5ef04104dddeeb2c22a9f87b460a57486a58f5f703ab432b1bb4a89bc1a1d99b9686fac7d2 SHA512 10311fd94cb3484c138c924e5424cf50401bffeec193ee93645d4afd211607faff0312c16df0f50fcd52e68ecda7b8a0608bdd4c7a630489a1ac0a3217474e44
diff --git a/dev-perl/Throwable/Throwable-1.0.0.ebuild b/dev-perl/Throwable/Throwable-1.0.0.ebuild
index 1c379a2ae3fe..312a42e7a07d 100644
--- a/dev-perl/Throwable/Throwable-1.0.0.ebuild
+++ b/dev-perl/Throwable/Throwable-1.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=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A role for classes that can be thrown"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 13a9942263a5..d099004a2c89 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 47f942655e3b..8bc1dc128063 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,6 +2,6 @@ DIST coverage-7.0.5.tar.gz 796171 BLAKE2B 87ecffd87c2465607bf1fd330296e84e174953
 DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
 DIST coverage-7.2.0.tar.gz 812120 BLAKE2B 17851996635a1621643e64025ba43f11d7e844fb8757c5bfd6794dbff85cf2c218dc61119c8604f19f951c83264eb13f9c8f0cf7f070f6b213603b25b756a59c SHA512 a913c257702a77b115b6519c0feaf9336973330c9264cb376453555c30f305db2b924d5dd8ff7b58bb89d9f1765b069512929d1ccc9c1c234bdd08d6fc82213b
 EBUILD coverage-7.0.5.ebuild 1879 BLAKE2B b23b76f71ed197fada5e15ea5987f5e352f016ef1744e664b76acf52b9424721d0ef30291ded16faf1bb41b19011edd3649210ff383579eae9baeeaa263fbdb8 SHA512 0c80cc5065ed1b2d1881a522bfc9690ecf86b3c2121cb5bd0307a78341b7974fdd737d576f2aac98488ae7c67641a255c3017f5ed655867101be28a07e78c6e8
-EBUILD coverage-7.1.0.ebuild 1887 BLAKE2B c4406f2647f98034fa9a3e6551d3154022b4d59d994ce239bd572ff684030af9dc16821ef621d1551d70f8e6bdc5aa688d0bf35d70703d5c545a73dcc9062430 SHA512 a0b57a71d64ad347ad69456a89566759b77d06e691ba73f35eee5d019dfaff03cda676ff332f1ac6455377795ca585070cfdaad6477245ed6d4f3d3aabc739d9
+EBUILD coverage-7.1.0.ebuild 1881 BLAKE2B 775191d671c07b917ed543b504457dc15f99946160381602d0bcce8ddf415d724c899f413c585883d76965211b111c2485731f64697ee0859f9e2c545171ac29 SHA512 7407b3dc82725d13f1a6045817d515395206a04c76ea18e7d576d76d4eb750804874dfa5d632bdc1cd9e2372955fabb5df091d1bce08e7c285ce81cabb6000ad
 EBUILD coverage-7.2.0.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.1.0.ebuild b/dev-python/coverage/coverage-7.1.0.ebuild
index 07c1d5505c42..0b8e283213d3 100644
--- a/dev-python/coverage/coverage-7.1.0.ebuild
+++ b/dev-python/coverage/coverage-7.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 7d148277c098..0db2b873411c 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,5 +1,8 @@
 AUX hiredis-2.0.0-CVE-2021-32765.patch 923 BLAKE2B ea62b3f4ca1ea622ea9eed89af3ee267b0e5355093c872e582346130c3107e6cd109b8a266c68b79c00440f550f3a73c3c1c12d3cb3cd3c61fd22289532d5349 SHA512 7ad798620f7cfd62aad7d73568410f04001edd70ea2a3cfe26242b309f4dafb44dd78e9de399a050e12164ebbe8160ed324f594ec4d1cf44b5a7b5b70d27d9b3
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
+AUX hiredis-2.2.2-system-libs.patch 1421 BLAKE2B d10de294e0e15ec1b816505c852b0e82140874bd3f1434515ecd69d04236efcc8fbf24f6b261db138979d1547892bf71e1c3c5e74317ef43c3597b379c03231e SHA512 dcc64f1a83cfe5c956c65c1bf1f9ef31b3c66e393d0dcec342f9f8cd6265a41309a03ddae7d86fa85806a05dac7bb89d29a3b7ebb955d62409fbb719e7c8004a
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B d50f1a59a9a056880cbc51a5b5bdf22ce735b5262d460494c108fef131e5971a900e91242e6fc98a3e8589b967eb6af3de00b10d77c31bc74cb1b195de710b11 SHA512 91c458497cfd29ef0dd1a51ee7667ad9bfbe094f46210dd39644b8ef03b9046dfc1e68a36e24c0594c2f356abbe94f0ded05074806546ad22016083caa121d0f
+DIST hiredis-2.2.2.tar.gz 84086 BLAKE2B f8a3b3baceb1b68d87202fe1fdd954d1e2a3320dab93acbe2d6f86a462ca18814c41416f84b8ba306a7c9af18560375e6523025c3b81f3c92e89620c68ed6a7e SHA512 abb6883af0d186f0ada10ebb2128cc31c8e84273b75de762097489b25a28ed4442bf33a9c088152843aadfcb4daaae6ff65a21cf0e5d8a07a60a7e3fac1ab855
+EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B 431f260350264549e704c43257e0cadabdd5b0736c0fcf1e7fc1533de191b7dbd390b7f80f076b7e162b05319881ab956f7e33ac84e710d006d8e5711f050c37 SHA512 b934178ce581f3dba577e69d0dbbf368a76830179fb1f525f4661274ccb715ed590880225be992f52f991ec6edc2a13c48a241f6199a8a74f466ead5d8e6f4cf
+EBUILD hiredis-2.2.2.ebuild 604 BLAKE2B 430cfc9a02a0c2620268ce2636d35c1a5afaa29f44cc08c58a115e1a728abf4ecd13186b9108cd6c56ab9a3d77e3acf76ac3f9cd49482daeaaf77e888d26c5a0 SHA512 16ec93824f16aea8f2ac2ddda8642815e70f2508bb688b69252ddbd823118fb7592f44b99c981671501c3fe12eab65209e863c66cfdc89d70ef2ba700699627f
 MISC metadata.xml 590 BLAKE2B 546eb7e337de194c605799553964c62f4376e0b28588b7b8f7e1d22d82bb347c7dbff99d1dc947c24491c045b506aa3965e9a1bfbfcb97741d5a0c7e075576f0 SHA512 76b32faa707c7bcca41b1018c58e9782283e707865a8b99926f0f6060f915cbd4ea6b35da1a906385b5925d714ec3bd4f587f1065b01a826d8a6a3764af92a87
diff --git a/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch b/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch
new file mode 100644
index 000000000000..67f6a5650f66
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch
@@ -0,0 +1,53 @@
+--- hiredis-2.2.2.orig/setup.py
++++ hiredis-2.2.2/setup.py
+@@ -18,8 +18,7 @@
+ 
+ 
+ def get_sources():
+-    hiredis_sources = ("alloc", "async", "hiredis", "net", "read", "sds", "sockcompat")
+-    return sorted(glob.glob("src/*.c") + ["vendor/hiredis/%s.c" % src for src in hiredis_sources])
++    return sorted(glob.glob("src/*.c"))
+ 
+ 
+ def get_linker_args():
+@@ -38,17 +37,16 @@
+ 
+ def get_libraries():
+     if 'win32' in sys.platform:
+-        return ["ws2_32", ]
++        return ["ws2_32", "hiredis"]
+     else:
+-        return []
++        return ["hiredis"]
+ 
+ 
+ ext = Extension("hiredis.hiredis",
+                 sources=get_sources(),
+                 extra_compile_args=get_compiler_args(),
+                 extra_link_args=get_linker_args(),
+-                libraries=get_libraries(),
+-                include_dirs=["vendor"])
++                libraries=get_libraries())
+ 
+ setup(
+     name="hiredis",
+--- hiredis-2.2.2.orig/src/pack.c
++++ hiredis-2.2.2/src/pack.c
+@@ -16,7 +16,7 @@
+ extern sds sdsnewlen(const void *init, size_t initlen);
+ #endif
+ 
+-#include <hiredis/sdsalloc.h>
++#include <hiredis/sds.h>
+ 
+ PyObject *
+ pack_command(PyObject *cmd)
+@@ -32,7 +32,7 @@
+     }
+ 
+     Py_ssize_t tokens_number = PyTuple_Size(cmd);
+-    sds *tokens = s_malloc(sizeof(sds) * tokens_number);
++    sds *tokens = sds_malloc(sizeof(sds) * tokens_number);
+     if (tokens == NULL)
+     {
+         return PyErr_NoMemory();
diff --git a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
index 6714e80ba795..5e6e08f77029 100644
--- a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 inherit distutils-r1
diff --git a/dev-python/hiredis/hiredis-2.2.2.ebuild b/dev-python/hiredis/hiredis-2.2.2.ebuild
new file mode 100644
index 000000000000..c92b75861004
--- /dev/null
+++ b/dev-python/hiredis/hiredis-2.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="system-libs"
+
+DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use system-libs && PATCHES+=(
+		"${FILESDIR}"/${P}-system-libs.patch
+	)
+	default
+}
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index a4cadffc8a6f..9af681474496 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,5 +1,5 @@
 DIST packaging-21.3.gh.tar.gz 80471 BLAKE2B a16ba1e74f0c868816131a7cb07b7aa0c14760cf3ad4c3d6737ac30ef99276c33b1f018d29e710f28e8d0cfb0e3e6b91e375d1d17e2b7ec6302164377cd503d0 SHA512 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a
 DIST packaging-23.0.gh.tar.gz 84318 BLAKE2B b600fc124e368ce583e16c3f4ee478e5774a830818884ff29c797410675c206b37e3cbac8e9ddd724b40ce53c00b1f0b6a58a9dacc1988e3bf59165b656b134b SHA512 5dd2f4a596e5a1ed01b461a37e063573f5ae08e181df40377a167fe2483205b3d965e10dc403cd173d0f87e0bdcae3cde05bd39024783fbe44541d0f777d94de
 EBUILD packaging-21.3-r2.ebuild 1287 BLAKE2B 2870f831684796f8e4c223304d0cb4a58332daa2cf9873c34ad65556974ebfb537fab34efedc4a75322a90d6060a380aec719fdf359542128ada7bddaac12197 SHA512 077ad101bfc78ab66a78e97979f93665aa4bdc47ba183dc257ad3cd93897673a32f9a1df10e492f705fc746a64aa65b110644908bd1f6890ed328f5a9cef35cb
-EBUILD packaging-23.0-r1.ebuild 972 BLAKE2B c7c0b7b159d32409cee6f11c7ebf76348a222f2ba5f5fcbba18e0c8491d33b169736ca72a3d6556f4f78bdf3243fa73dca74e3374e844a8991751fdd63b0505c SHA512 e51c4b9c3272bb1149d2b8f5608f0ccbffd45574c7e0b4d884967c081223ac178c1e656093201aa974a85def09a60f712bc07ad7be291c02450801265c7319cc
+EBUILD packaging-23.0-r1.ebuild 964 BLAKE2B 53af0fcbf61d06bb56b704d53d6a2c8513e0c2d31e8f711bd1bf0463d2dc9c6a7a64f8acb731c5db2f31065374e0e3ede14742cc27a5b60513fefe0ad8022116 SHA512 9aa285780504dbf11ccda62d29615b26926241b65adbcc92e832a3e20d18af9793b00b0736a101db995bc1929c36fc3072783d96b39cc7d0a1fc3606fc8b42e6
 MISC metadata.xml 391 BLAKE2B 0d73ed3809b26e3069048116ab247ceeb9e2932e0d8d6063b97cc1f0ed8359e73a54b22035fedb169524e502b6a07b8203e6c35d801f738bbed685d90e12bf96 SHA512 eb4d1ca476a45232547fdd961a4e6715dda24c7ab82e1f1995ac977b9825793d5d10a2ac408b1ee0b7c8b8444f2c42be33d6fb1012461f96db9a71477cca67ae
diff --git a/dev-python/packaging/packaging-23.0-r1.ebuild b/dev-python/packaging/packaging-23.0-r1.ebuild
index f77e47da0ec1..39645e861130 100644
--- a/dev-python/packaging/packaging-23.0-r1.ebuild
+++ b/dev-python/packaging/packaging-23.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 7ccf7a5b1fa0..ee6e3fed6f30 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,3 @@
-DIST pathspec-0.10.3.tar.gz 45821 BLAKE2B ae7c29bbb58d896de555b142ac18879f8a82437a2a701abfb259d40e3a5f992989c274a24c8c70ee6cbe6dbbe6a5030c67c1164e7f3eaa5563ab54cdad403581 SHA512 d0876374ab20d3624f1ba522de30472e401220ef3b269df9ea2e20526d5abddb8fd19866b0e3405a4746beb3a4b4b6f21ada4da5b7292a46febd6d418829e0f3
 DIST pathspec-0.11.0.tar.gz 45214 BLAKE2B 96b84fe78c8540ec9145c2735936c437b6eaff4e4f15e37de0c13c147e15c8852a19db4f4c9ce0dcf43dc543ac021edb148321b3a099b0915380ec243dd87041 SHA512 accce445ff5257baf9a3c055d337d8668f1c8db2b9f9641f174ae9d2307dc15810a1f45947d2b2a3838b85dd03ee04f54660d6d5590e24861021532515f6dff4
-EBUILD pathspec-0.10.3.ebuild 598 BLAKE2B 9c5e2e9b7df4e2cb69215e9892f3984ed97845cde02283047fed86a1dce37dd1704945a5cf8017ff0d5cd2523b477d6de08a4ad44976badd92a0d924e3676323 SHA512 e6fbbc86383576032cffd4df26ca122006b204b854978b9c9f85ff69a60446dc9161afe37d262cd4b36ba2ddf8d8e83854df4afe639c77bbc92d2a1a6ae0ddd9
-EBUILD pathspec-0.11.0.ebuild 600 BLAKE2B 6010978590a55c2d0384cbfe1395fcb123ca42f5d62541e3483434c5929c7398f926338fe6f5b6aed35f864d744015d7679a05b8404026c6fc8263ecce38f4a9 SHA512 50a6ef277dbb37587b1621d1e969d43c6afe4a7146e40b607e3c9b6750d1d855d0548c029a2566dfd2fc56852ccded5121eb998602872613b364d1698d382a1b
+EBUILD pathspec-0.11.0.ebuild 545 BLAKE2B 1c828edb50868491bb2a9b284893faeb78b7354f6cb9947fed13ebc8969f30f88fa56400f99d5d6d53c39960e31a440b5a8e5a7b30ddab13f29d756054687eb6 SHA512 35efb017842293573edaf9b03f4ee24bda5d9871396b7dd62ce1c9351da3ddfcb9de750d995e3121285ba37b0a79c18d07d23098c25d4f4a8388eb13e855fe7a
 MISC metadata.xml 412 BLAKE2B 145cc9a575db3e6097a04e456acad82441f9f0e4d73b4184aeb1eb94d67b998c47a41f6015b646c6275322a30e187c8f3082f3d2fd749250f15a0f79e9cee9aa SHA512 f3ac82f97d8506ecf7fd2bd5eb7105a12588b6694bb2fc0a797cefaa1d9844d2982a80d11202b275e160db27a342e84670abacb3322c82eb76fb3a70fc8e9c23
diff --git a/dev-python/pathspec/pathspec-0.10.3.ebuild b/dev-python/pathspec/pathspec-0.10.3.ebuild
deleted file mode 100644
index ef34b0fdabaa..000000000000
--- a/dev-python/pathspec/pathspec-0.10.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility library for gitignore style pattern matching of file paths"
-HOMEPAGE="
-	https://github.com/cpburnz/python-pathspec/
-	https://pypi.org/project/pathspec/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pathspec/pathspec-0.11.0.ebuild b/dev-python/pathspec/pathspec-0.11.0.ebuild
index 7fd0f71c54f8..e494a04e25f3 100644
--- a/dev-python/pathspec/pathspec-0.11.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.11.0.ebuild
@@ -6,17 +6,16 @@ EAPI=8
 DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Utility library for gitignore style pattern matching of file paths"
 HOMEPAGE="
 	https://github.com/cpburnz/python-pathspec/
 	https://pypi.org/project/pathspec/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 9e16e0579498..748994979239 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,13 +1,5 @@
-DIST pyproject-fmt-0.4.1.gh.tar.gz 14853 BLAKE2B e06e3602290fdc4df00fb48dfe9d6d516a623ef29eaa535ab3b11754a577385611313172f207966b121f072a5b453774afcbf5e8699a0b7fd4426f5332e48e5a SHA512 f00999470e66e7f11e9299a902b686342fbad27a07634206011ff7712c7c422f9962d8a4eeffae6a6263712620b787bbdcd78c2129cb4b164631b56a45910363
-DIST pyproject-fmt-0.5.0.gh.tar.gz 14906 BLAKE2B f75482988c8e10fbfcffaa518e6004f0e96b922e8bf929e43c7be26cf16149b3fa97a3070fabfbb90641ee3d953ab17bd854ba2e107b776f65f6bc802980bd54 SHA512 58ec7975f7c69990b1d2a0ee8a29681731d7143e59754343dc64e52e135cc5d280adf3c31b6818f042982697a7221a36aa0842ffba1ede28b57cefad77bf065c
 DIST pyproject-fmt-0.6.0.gh.tar.gz 15082 BLAKE2B 9ec7126530c98b984c5346bfd65fa817967dc7def60d16eb93e63ff690eaad53209d49483e19b5e87caf7b879f6661862a68606a0adb3b4513ff119262ff99a6 SHA512 50c9dcb468213de62e86edd500ae001815a83d8374ac1d36467fd7c560a5774862b001414f687d588fc0622ba5896c83338d6833ac4c248d2b4aa111fefe33ce
-DIST pyproject-fmt-0.7.0.gh.tar.gz 15249 BLAKE2B ad3b86af31ed860efb5eefbdd62629c3f3dfdb79a01b1e9904bf5a808699e410d870ca688fc82e28307b07841502f57870754cd694c10998ab1e1e0eef177669 SHA512 361a7bbb4a96659d3902ddb317c2f9b49999010aca4b91f8663d810971d6d1bb0362e26cc63ee7b16b0e1e1518af429b57d06de71bcfc56efad462dfc2c04abe
-DIST pyproject-fmt-0.8.0.gh.tar.gz 15307 BLAKE2B 270a07220bc5b2bb81502de55727dd92d7a0cbde33c5d2a202d1b41de44a08ebd84f26bfd6c0cdcc1793f494f880c9a5e3db391069796dd6cbab6bdf1e4e6f64 SHA512 12f622176a9032173d73dbe21ab3da89ab9c3cf8c49e22b3d7e30abd5d1f9c4d988e519025a2d60a17324e449df719fd67f58d7c1ed49de9b9f50573863dad9f
 DIST pyproject-fmt-0.9.1.gh.tar.gz 15434 BLAKE2B f9dd55b4106e875c80127ac60b3a54d4bdadf3555266a74cfd811ab96500879a7efb8eac71a041b2c33486bfcbc1f818a26a3ae3c50685f35cc3712691a85bb9 SHA512 ade87f43927c74e0328ffa8ac542bad204cc283d694f6921c40c86ae0a941ae50cc43fa4078ddcec28ff0d6003ac34a54232ea23d2820b5b2582482b22ac2a7e
-EBUILD pyproject-fmt-0.4.1.ebuild 864 BLAKE2B 8427fc3294f2f73ecedee5653a9077259f9f2e0f8860804396e877970cf65c859400b997bd89d11d04ce9fe657711899ce972f98f413de145abf774fa03c38cf SHA512 d95e86a7d3ded2fbc783a574313ba3af960f023fb7164a43a5583ba5f6f441c808019f1d633575f296d0ae3d0a8c13f8fe0f385ac7e57c2cc7ca0a51240ad1d7
-EBUILD pyproject-fmt-0.5.0.ebuild 872 BLAKE2B 96641bb2330b5e1c929ca678171726efe2cb45ff7eabe9522b26863ff49b7730d200cbb9a17da5e107d0288a57f16f559ec43877a8830a0f1023be1a6404e778 SHA512 e9039e7b77ec6db80c5d7a7177e08bf702a454411b4bd21cb3f51a6dabb8fdbfa9c44bce0ae4d6c61b7de11a0c0e69ac1e489c61a72bef33c822eb3d28cde7df
-EBUILD pyproject-fmt-0.6.0.ebuild 869 BLAKE2B a0539489724d2079740af64ef020f0e69d50851c4bedcb0ab7dac5c41418391ff5f4d973e71ef71ba16109667d2168cfdd425970e99a7db413d0d2950388f3b0 SHA512 b6f4da4bbc9187e8843408b0b83704bed7547f03627aa957f99508aa1329789fc4d0188245b3e57994b38a0f1e3f1fdd4885aacbd043c9e77b9f01fda3028543
-EBUILD pyproject-fmt-0.7.0.ebuild 869 BLAKE2B a0539489724d2079740af64ef020f0e69d50851c4bedcb0ab7dac5c41418391ff5f4d973e71ef71ba16109667d2168cfdd425970e99a7db413d0d2950388f3b0 SHA512 b6f4da4bbc9187e8843408b0b83704bed7547f03627aa957f99508aa1329789fc4d0188245b3e57994b38a0f1e3f1fdd4885aacbd043c9e77b9f01fda3028543
-EBUILD pyproject-fmt-0.8.0.ebuild 869 BLAKE2B a0539489724d2079740af64ef020f0e69d50851c4bedcb0ab7dac5c41418391ff5f4d973e71ef71ba16109667d2168cfdd425970e99a7db413d0d2950388f3b0 SHA512 b6f4da4bbc9187e8843408b0b83704bed7547f03627aa957f99508aa1329789fc4d0188245b3e57994b38a0f1e3f1fdd4885aacbd043c9e77b9f01fda3028543
+EBUILD pyproject-fmt-0.6.0.ebuild 861 BLAKE2B 8d4b076b7b2af9273591b0022f86c15aa97ad14b62d345305bcddd3f59a964e44756ed10a55dee26b867dc002b3f04ba81488ae4b624b347fb549d197e79d54d SHA512 2cfc68b195fccbd3baa2b6a3d9911b226fd501daaf260996d420ac612045d51d193eb70659dee44c00c9dddb59946a4064198fb3b6b35bc2b87a72439d10f93c
 EBUILD pyproject-fmt-0.9.1.ebuild 869 BLAKE2B a0539489724d2079740af64ef020f0e69d50851c4bedcb0ab7dac5c41418391ff5f4d973e71ef71ba16109667d2168cfdd425970e99a7db413d0d2950388f3b0 SHA512 b6f4da4bbc9187e8843408b0b83704bed7547f03627aa957f99508aa1329789fc4d0188245b3e57994b38a0f1e3f1fdd4885aacbd043c9e77b9f01fda3028543
 MISC metadata.xml 380 BLAKE2B f139b3f6c22d40d7c91b9b35db262813e299d1a3c1a1f8d6129e457fac62e3e7029a05315a3bddd9c4542764a33160c89b58b3b62f457efb088a7ae7cd86a936 SHA512 38bd0633defb67ee1831480c8b3896e158d0735ec74057b13b3c389cf26bd6ecb878f21d172f83293789d81ca2c30afedab8eaeb4ab1774b39972fdd5f805a81
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.4.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.4.1.ebuild
deleted file mode 100644
index 283bcfed8026..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI="
-	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.8.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.5.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.5.0.ebuild
deleted file mode 100644
index 9c67644e9961..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI="
-	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.8.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.6.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.6.0.ebuild
index a802c14c305f..18ae3f04023d 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.6.0.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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="
 	>=dev-python/packaging-23[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.7.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.7.0.ebuild
deleted file mode 100644
index a802c14c305f..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI="
-	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.8.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.8.0.ebuild
deleted file mode 100644
index a802c14c305f..000000000000
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Format your pyproject.toml file"
-HOMEPAGE="
-	https://github.com/tox-dev/pyproject-fmt/
-	https://pypi.org/project/pyproject-fmt/
-"
-SRC_URI="
-	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index e3bf4a122657..03cbc974a81a 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -2,6 +2,6 @@ DIST resolvelib-0.5.4.tar.gz 14474 BLAKE2B d1424bf6a019e16e9b662741b6c089258bfef
 DIST resolvelib-0.8.1.gh.tar.gz 766632 BLAKE2B 59bb02a08cf0f9bc6070cd5c5109826a7cacc5bda07479358fd591ff018bad761b53ed48f0a330e5ef60b8fa8d5db14ef044b662423e372aad7fc477df5b97ef SHA512 bc99d0661f3605d97074066df3c57edec8db40f66111f0d7a23ad88097ba4a162368ab396ef75632d09cd8a76417fbee2554d0cdb2f797795c246d16e7e3b955
 DIST resolvelib-0.9.0.gh.tar.gz 768502 BLAKE2B a5f0ab89f8b44125da59bc93bbfd78e8f35c3af82459732317097a79db81d5366e9fdfdf75ed12d1726441d1d0275304a953c489e987832134be936b92766878 SHA512 cb263a60e958e190c92dc333afd61eba76e3f1b1cf8f825c39292ea37c90f440afaacfc2d574987e26f6bb1d3a155ea8d878dd29cf82e78d912df36f4a10eb7e
 EBUILD resolvelib-0.5.4.ebuild 509 BLAKE2B 4445d147d6f81b10f571b4e2c4e5211b78013c5f67e29d1c5b1115176073ea4f0f3b26f6f45d591f417f357f84df1c95a8fec9f0eb77a1c5ca915000b0544603 SHA512 610d77146dd39ed441922f997db65589fc706ef47deb9a81ea87f1304da8a4bffb0480acdb0af69967121f5e0c31b6252f05fff43ee998cab9f7dc089640c285
-EBUILD resolvelib-0.8.1.ebuild 609 BLAKE2B 59ebc13a348835dd33cf48fd4b51c202a9fe8311a2729a689816e416976abba578700d1954843e9daca15ffd2f9c5132e894703bd899dd49696a15f1f741c331 SHA512 5f1092713140f1c29a392a7b5c30c227a98fdd46f53e47854d023d845887e827be185a708ce089021c018ea27aefde452191cf83c2a95343050e6f27d76ae2e3
-EBUILD resolvelib-0.9.0.ebuild 667 BLAKE2B 14f1f73c2a1b731c9d261f8f68240cdb3ec232135ad07be531a5cf1f855fd70389907ae799b77d90ba00cf215550e85649d32003b58f656cc4fc1ce6ae9d45ff SHA512 79cbfc1c4a1efdfea7028044a88ae1cb2c72aeaf2320a9238f795f71cef4cfe6d15b8f102b68586eb2459b0b6fb9e46d4801b5453977f3c6255a26747ab95ca7
+EBUILD resolvelib-0.8.1.ebuild 613 BLAKE2B ae174343346660b2772b7d84564c771b614ce700cd89606fa7ee0c04239c43b1a38ed1fb8b896eec756613662d969de8b3567e3be457513655b76e7aaa80edb6 SHA512 b9d2328a352cb278fa5918b50ce3f18989313b854c5fe670aaa44f5a23306b5626cd4f5c167e64093ce38371aec2c76cf650ecedd467c63934b09dac2d68e705
+EBUILD resolvelib-0.9.0.ebuild 671 BLAKE2B c7aa5f54c8eef4427f177f092864206dd8d035517ea80207091e796bb906e79ca9f730054733085168dc00fd6871a07f802824aa96276b6426007e9a6f198e48 SHA512 f1b867a01dbf2930eeb40e2776650c6b513d7aa1a8ccd6c672cb0dd380f4e846d870d61f908ea26e700452e67ccbc2c4adef29b5626036519a85fed2f2855edf
 MISC metadata.xml 864 BLAKE2B e62049b9f1eca68e3148fb112e0b1b51713ec88deea5ddc7eac28b84003e427f6e17d018ebb27f68b59a5007e7ace47cb89e25af12df432a1ebf13feaba9dff1 SHA512 7af7a80800ba0c3da0789f545a6b3e51c35cdba8785e2aa8761c1689d5ec7a3b9f428f28b182d86ed6625042d2d85d52ebb1095134bd2c7013302abd4ecd19b9
diff --git a/dev-python/resolvelib/resolvelib-0.8.1.ebuild b/dev-python/resolvelib/resolvelib-0.8.1.ebuild
index 055cb8178ef2..5f9d426e4dbd 100644
--- a/dev-python/resolvelib/resolvelib-0.8.1.ebuild
+++ b/dev-python/resolvelib/resolvelib-0.8.1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 BDEPEND="
 	test? (
 		dev-python/commentjson[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
+		<dev-python/packaging-22[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/resolvelib/resolvelib-0.9.0.ebuild b/dev-python/resolvelib/resolvelib-0.9.0.ebuild
index 8462c1a77bda..498ec1247b07 100644
--- a/dev-python/resolvelib/resolvelib-0.9.0.ebuild
+++ b/dev-python/resolvelib/resolvelib-0.9.0.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 BDEPEND="
 	test? (
 		dev-python/commentjson[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
+		<dev-python/packaging-22[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index f4246d04d662..488073e2bee0 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,14 +1,8 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST setuptools-65.7.0.tar.gz 2618315 BLAKE2B a0989c3fd0ab476d69885d022eccf1a89dc670a17d0b3e73bbe4ffb530e26a838fcd1cfffc4c2720ddd19cb8ba45d42bc31441f1e3bbc32fa71850d208f37cc8 SHA512 0eb2d9de9ef2565cf012db7d68ee18359a1432dd42ecd3fb7d490f73d57b0e7ba2a67e0401f66051127e913f29c2e221e88c0cbf523b0ac9abe7f00b6ab1ded8
 DIST setuptools-67.2.0.tar.gz 2475665 BLAKE2B 1d82e21d5c5f7aea479d468ae5c29c62a86a552e811203794f2246bc715647c18c66ab6d37c9da3092fc2b402cc865c1ab85989092c9beccc440913ad7d51ccd SHA512 2d15719d7a0305535ee853e82b5196af2eaa29cbcf73c59515c2fa8e8c910c25fcf3854aac515789a51a845555b19c95e8d06fef4199cf19ba4a45dda5b7ab66
-DIST setuptools-67.3.1.tar.gz 2478867 BLAKE2B 5f2796b548c43e3e3bec71d81fc37938f97eb15256a93d30d749a3175c0c5278316d7b513de651c85b367e49b3bc3e14003a3c7607cf445e5d6137afa5b2c3f1 SHA512 5b0d71572e4107a673a95dfea56a363492a62a3a04ecc8f3095ca79686dea452299358a52b0571179a738226ba92c35d04a2e37d3504fd6c510053cf71e2680d
-DIST setuptools-67.3.2.tar.gz 2478825 BLAKE2B aef884a135f78ebac0505cc62c785609e20d8f639ae4c678dc685711095e87b41da296f5e99b20ef8376be3d3a58cac1f338f14cca3dae1bc42404be2e89d851 SHA512 55e69cac241109d8fdcbe6bbf4ea36a7611f8cd77b875d456181f85622797b78f385aa7459283c02bdd442585b79768452f69c830591579234df279fd82290b5
-DIST setuptools-67.3.3.tar.gz 2478985 BLAKE2B e9dcf43a8706b4d77c0a57c72c3dcdf06996563a1778b4543ed3f4e79bb68f4bf9b2c8f08f3d247571a1770518e6ebc636c380cdb2b906dcf78185ab3f4f47fe SHA512 35f3438fa178e6bd066d59ae50d816bc9b7591035c118bef34c1c0387267ce46fb6162630be7a96cf63d9ce45ef3cee4493fd8f3613938d8159daeb64bdc3c27
 DIST setuptools-67.4.0.tar.gz 2484170 BLAKE2B 5c72b2bb813a84337e00c30a1375a24ca997a07100ca7f83afcb76d1fbde1432b049faa76d50ce8c74b3ea753096e63a09359bdcca2cb0d1d57eea21bbe5c2c9 SHA512 d5865283e13a8f42b6b49f9c507f6c41e75a92ad2c4e4c2b4184a410003fadfe7629ed5824340110400143e2ce82cde2e50e9b2898335462376b28f440648cd5
 EBUILD setuptools-65.7.0.ebuild 4450 BLAKE2B 0d6c6b9a30319a5f80c03b5a662067f8343400ed80384b2b1680d2258332667d28d28451e67f9332b6079362862392cc7f9c9d5121b8c27c43a7256c54540e48 SHA512 33a6cf573592f6489b6bbee633032a14c79911bcbd828db795020e2f3ea0060af65a85b4db7faa623817a68f9bb6419183fcb6a0451e33566502f84497d2a81b
-EBUILD setuptools-67.2.0-r1.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
-EBUILD setuptools-67.3.1.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
-EBUILD setuptools-67.3.2.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
-EBUILD setuptools-67.3.3.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
+EBUILD setuptools-67.2.0-r1.ebuild 4433 BLAKE2B cf2ba15d1bfe77157a9979b977c670df7d91244fa6569f4b253c6f605ebdb77da527edd9119997247584dcf585175d172c65b30134752b45f492cf56bc2aed8f SHA512 f6647cfb891d475fc91a849bf31cfdd8673a971784c69236e4c4bd13f2cd7becb1f3b5c8c950a487e84bb1fd510bbc4590b37fcd1914826702ab6f0241b2c499
 EBUILD setuptools-67.4.0.ebuild 4441 BLAKE2B 502ad9826e05099dc359c607d8c03fbd7a2fbba68dac832371b4296100162e36d64b18f03933797838439b2d79c88d7b2e0274c02d0c259f03156a46eafd9182 SHA512 474307f3790a3c46f5e23f7d9c1f1285dbdce8da0bcbc50134eff218093283433530b23d8c0b607461aa5e6e9aa1d7e8f0d70bd98d6f1006eaa0999e1b22991e
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-67.2.0-r1.ebuild b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
index f46eb55ab7f3..1801c2ffb416 100644
--- a/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-67.3.1.ebuild b/dev-python/setuptools/setuptools-67.3.1.ebuild
deleted file mode 100644
index f46eb55ab7f3..000000000000
--- a/dev-python/setuptools/setuptools-67.3.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.3.2.ebuild b/dev-python/setuptools/setuptools-67.3.2.ebuild
deleted file mode 100644
index f46eb55ab7f3..000000000000
--- a/dev-python/setuptools/setuptools-67.3.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.3.3.ebuild b/dev-python/setuptools/setuptools-67.3.3.ebuild
deleted file mode 100644
index f46eb55ab7f3..000000000000
--- a/dev-python/setuptools/setuptools-67.3.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b667e037560f..6c74fba55221 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 1f8f0e7a3c21..0d0320bfb0a6 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,4 +1,4 @@
 AUX hpricot-0.8.6-fast_xs.patch 650 BLAKE2B 5ad93195325fa1e26c2d207fefec83c8e01bbcbfdf933e6925a10bcf74a56c94b8517c7000a3c1aecff091b4d5d1cb3c29c9c899af7a5a5f5f0a17b1967118da SHA512 cbb1aa6138ec98e2eac9bcad8d06ed7c435a8ca503e062776576cfdddb944b294b270dd30e2c2924441ea527445df149e7ce34d085652ca6f184c4e66d209b8d
 DIST hpricot-0.8.6.gem 293888 BLAKE2B 5c054c6fcd5c3365dbf44f3c502bc4c1c3885f4aa43fd1fd15365aea19600ef0ef48157c39ef1709386bda0bc3fb6bba6d98862e8e28bdb5c173429969ef5ab9 SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad
-EBUILD hpricot-0.8.6-r6.ebuild 1464 BLAKE2B 1102910c4ef2efd09c38e0d6cea404e32561e673c6ed5c132c589b6e0f4b56e2c0ddc1b57703e2010378e0ced9b63fa0c382e96d201ce89c73ceb8c3cb2d1de8 SHA512 c3f8c229d6a7307653d5a22a4a18e2d23ce98c1be72b8bb6c98c8cd6ab0c88cc6a8dd7ba24da3f8f42a8085cef018c78311630f4e6de580ce2220471517d6e59
+EBUILD hpricot-0.8.6-r6.ebuild 1459 BLAKE2B 08243a3b49e686595d7c00fd9b509ce16eaec915d9525fc0f8af209b90be7b9f0a108c2f768d375bfbcec72484b23795b0379d298547e29b6bf54e2b759d1ec9 SHA512 916300caa6bbe240b596fdbf775f7502595233960857007577c69b79687d029c42acbaeb1527a2514d3527275f04034da1b4a2f2ef74bcf53dc2bff6326ccb4c
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
index deb64395aa5a..faae50028ebc 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r6.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 @@ RUBY_FAKEGEM_EXTENSIONS=(ext/hpricot_scan/extconf.rb)
 inherit ruby-fakegem
 
 DESCRIPTION="A fast and liberal HTML parser for Ruby"
-HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
+HOMEPAGE="https://github.com/hpricot/hpricot"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-ruby/ruby-augeas/Manifest b/dev-ruby/ruby-augeas/Manifest
index 2feafb2e1e4a..e3428e4c9546 100644
--- a/dev-ruby/ruby-augeas/Manifest
+++ b/dev-ruby/ruby-augeas/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-augeas-0.5.0.gem 24064 BLAKE2B 7ee13cfed3e38bbcb7445305323d44f519239e177a9a0e2e98ee362629f6fa0166338e128ab31f48ffc3a37095ba450433128779be006a8add26eb0523e76142 SHA512 523742368543c617baa2b393e4682451d7fe20aecbcf9ab50fed0f5575119b3fbc06f79f0894cca728d2fee7d441cdd9f075dbcf81628835ba870930c3d2ac8d
 EBUILD ruby-augeas-0.5.0-r4.ebuild 605 BLAKE2B 30fe8e99a33faa1ad315538b29b5ed1451db8e9fc2cd8feb513f1c239cebc7ad78187894ab2932fe7c69e14c5301696e7178ec55eb8f3490762ad47100c85eb9 SHA512 063660ae368ea2ba689986d45d1ac313f76b76094606c012ba02ffc248c5577a10a5a816323ecb93d81abd1a437d866049db6e98c8064fe3237cfa1d0b351d40
-MISC metadata.xml 328 BLAKE2B 699ef1b3cdbabcb5ebb270f571310e639923a4eeec31323b4c4d7f957b820337653b6f69be730e6fca7cea9460568de75374a45d19ca4f8fbc948caa6df81c62 SHA512 9698d620d6f1b05ba50732410900d6d989690350f32504f81010683c734e1459e5fa532af4482b12df0ad13e5d885174d107705d182e75b1d5cb0bc613d0319a
+MISC metadata.xml 428 BLAKE2B 11bf486e510416cfdbc43f921d7c24c524a08949c8561031e5c65066c578010f2d078cabd6673999d70746cb095a39b693b107039004502a221ea4bd61fe893f SHA512 59b86095e83ec0e1fa5cf963c1e744bbc0c2a2367c3b9bb91b4d47ab2d4b570a791c8fe79989a0fbb2b7d297aa1c8c9454fecf11a6a046f9eed07e8a6eb9a729
diff --git a/dev-ruby/ruby-augeas/metadata.xml b/dev-ruby/ruby-augeas/metadata.xml
index e7a14ad6931c..ed057f07708c 100644
--- a/dev-ruby/ruby-augeas/metadata.xml
+++ b/dev-ruby/ruby-augeas/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>prometheanfire@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-<email>ruby@gentoo.org</email>
-<name>Gentoo Ruby Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hercules-team/ruby-augeas</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index abe7b4fb532b..bea1ba1cc5aa 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index d031785c2877..54ddb4ecfb51 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -1,15 +1,17 @@
+AUX 0001-Change-cmake-name-for-msgpack-5-release.patch 791 BLAKE2B 12cf15b06c3e8de4a17f231f408d17daceb4fdf828b5f20119fca271684424ed6f6b4278f05970e1f3230b8bc7654d5a7669ab6ee45908680ace08c2e63f1e5e SHA512 8b6a1e8ec2bfca5b650e79474f454247cfde453a24aa46ebcc0af0bdc00e727da6dbd8bd427bdf7fd710fb0950d862ca750f09579ef678a0fce860ffb96ac7fc
+AUX 0001-Detect-prebuilt-tensile_client-in-PATH.patch 1175 BLAKE2B d8359a8613cee5b47887e0cfda10e9aea04761cc5d850dab1530d4462e7f88b8a087de62bf94e5d0c9bab4baf0cf0950644ea5da45eeee042bb70e56dc387e40 SHA512 07f3a2b846a7f17a55730fe459ea3b8dbf63a571511593d8aafbea5ce9b2e81c1fb2896d381196180aaa998009d489bab053b1fd6ab7e61219625934df3a3e2b
 AUX Tensile-4.3.0-output-commands.patch 1629 BLAKE2B c43395d8e8aeb956d5eb84c8a34ad4b995ed32499ceababeb22d5ca3ac5ee6e8ef353a1467a77943a441f0840b9a6ad1f53202ec8673ef3753aa2bec1395fec4 SHA512 45bdae1d87f6e31d337b22f146b9dee25f4f87357c6ac52bd843556dd742431db10efb55fb8ef815cc9941b5b9f05970d43a6fec0f2d9195c30c633e33d138bf
 AUX Tensile-5.0.2-fix-arch-parse.patch 424 BLAKE2B 43e716ccc9256c2f98cc1d2807e776599b384875161233d4a010a53f11a5764fd7a5b4c50ded1762737e9fbe7923b64e9353ee4590fd1b6b9b03ac621af35c9b SHA512 5913e7fc42bc5b43e1dcca531e4ef88b524325b497601171a9844013906c2ffc87469a4c55037c721ace5757c6aaf4d8bf8ca683f659f9d8988555c90425802a
 AUX Tensile-5.0.2-gfx1031.patch 5561 BLAKE2B 244bb644a90ba34f500f4d0cc634acf041cce42f9a5a9f10ee7bd1feff3b78b626b56f3b8cfa4005cc422ef643cd60a7da954618ff9f8f460568ff4b011136bc SHA512 1cd1dd95e481a76fde21dd09aac1ac02f1372e552eeb45eb100dc970639e28f52a709735aca6480d2286b8c747a75435aa7f2e2a288ffe2a596d6f75e4bd17ec
 AUX Tensile-5.0.2-use-ninja.patch 897 BLAKE2B f06a3831a43a4b6c00e7eb231cc13901f7b4a3a924a50d85ba81f9def535951c450a01504506476c1ee88317cbdf0c0c00a57cb5cd198ab44e8e0b94aefda25d SHA512 15404d3cd5dbc7b74e81092d86f9c49cd45fe4df645602849ff515baafa3890fd68ca808cbebd6ae37e951b382ff4446a31089306c950f8549431dfbe75c3b53
 AUX Tensile-5.1.3-gentoopath.patch 3350 BLAKE2B 890ab24fbd99aede187bde67c8d6f586f625c30cff34da39e12b199b022170de8df3087c3581f9e635d5d12f31db0aa944a2628733417322621ab51b0292b01b SHA512 d17a948146e7ef2447ae92b2822f53cd77b0992297fd2a43598434db4f7c2095d269138ce5c0eedda73a34e193fc56401f22471f9eca68ec6026577f07a7fca1
 AUX Tensile-5.4.2-fix-arch-parse.patch 538 BLAKE2B 80b83774452c06f4ced24988ed5e988068e4650870db2ea0dc03d083c2d78ee30c0edbd0d4f3d9484d10908d7ad9c427112276b25296e8bc88de8e50cbbc6bed SHA512 4a4b7ea54854aedd0d36396352824b3934452712eadf10853b90fd93f8ea58e8825bf0e3d56d79190d35dfe58a50c1a6bca1f99b007c83a5b53c473f134689f1
-AUX Tensile-5.4.2-gentoopath.patch 3147 BLAKE2B 4834c0f9b1241b79704fbda954cffcf70e19be9a7bee7564a309b3b52bf67d3ab6876e644e5599dbb820bbbf3c2d44aab15e74f589c1c3d2e11798e83b063c7c SHA512 e8f6ac86bb96b1ca2c34dd10691e99d4121e6c214f9371f622caa17a936326c2b33b39529df888e6feb8ba9796b33860d047653c945604813023451888048990
+AUX Tensile-5.4.2-gentoopath.patch 3149 BLAKE2B fd033093654683524f4ce51ee36ea1d84d53dc95c0556f9eb86d3f7870728fbac744322c8ce915a6dc13907b2fb249543a791ccf6051701feaeee595e65f32e0 SHA512 ab2afad72ffd04328701462161bec9627bf35a42be7be4775e8601e51b3b50b9cd18acbed547d51621923e3ec33ec4872039025124a2fe593f68145f468df30b
 AUX Tensile-5.4.2-gfx1031.patch 5051 BLAKE2B d043b94403069f9b4b4c379cf7c361b30f3c0c145f740d37e5cf787636fa3f5c00ca1b7c375f311c9f067e8e6c7d383fbc34157e4b9d4f65a93ed53e9e14b814 SHA512 53cae079788f0478ba7a0af48ddb279a39496a3238263352ff17f555f588ebc1e9463d5b466f1e819ba29a4857c65a644d7a93fe0c2dca3403f994ade4f2bc0f
 AUX Tensile-5.4.2-use-ninja.patch 1164 BLAKE2B 41d6dbb68fa41b53d230afd06af95acb014163d14b7f0e61d5a2945ef02c7a3d376f327a3f82fa86085c8eb95820d95883bdc05024e87b69dad61caf39c3b124 SHA512 b73271b637b4b3c045813638b1cebf6c3b4ac50350a62a76351e6fdf3e74b20104bbb135085c96c9c0e99f20f971af316d9686c8347a894361ee90abb66175fa
 DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c
 DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734
 DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80
-EBUILD Tensile-5.1.3-r1.ebuild 2723 BLAKE2B 9d894b023b6d6aeef26422e770bf4195ce3b40f6086f6e121f635c2fb351fb9f4a22d5dcea58c5bcc51067b7c8c8a2d63bd8b68d2db2a00a72d2ded2332663ec SHA512 82c586818ceeba2eb55406d309e743ae90f7cddb0ed129773b51edb694c54ec016860aae82df2e1d8bb5111a896c3d7a33a0a2a3f3b7ebf2f49614b82651959c
-EBUILD Tensile-5.4.2.ebuild 2623 BLAKE2B 011221e2f0f2c5b3f52cb6a1266caa15744ad0c5ddf7d3683a730bd53e82c8d480527225888947395bf6ed57a1fc9fe17a6b669b425451ae3c5156c8ff6c642a SHA512 aec47b07571b7360bd9c0736ac9fb07e9b459bb575d0465c974ba084cf04d513f0cf93fd3db6cc120fbf6bd32097747777cee2745de7f986c0e5f96549a0dd83
-MISC metadata.xml 350 BLAKE2B f621bb03aafc000672f022db9cad9a1fed65b912129d26ed7e717ba8e5cfb11f0d6b309905b6e12b07993a7aa0cbebf18aeaf92d643eff5419d765e31b3c52a7 SHA512 99b497edddaaf6d84159df959fb8b0a5d18ea0ecc879d600a2a1fc004554612e1422b258a2f7c5f73148caca93f9283481b53669f7247d62782401fdb112f69e
+EBUILD Tensile-5.1.3-r2.ebuild 2812 BLAKE2B 9a00f3d3a635c7dd5eff265f257debe06b9309d6136aa437b073ec5094b4f7679fa933f04324a5ba770107065dc5bad2700cf63335a8a083dffb3e54fa86fa16 SHA512 2f7b0c113b453b0a820d8bd0aba2e6ff1f2812aa6e34c4a87f0c4bc7a933ce6fad1b54e64c1e014de7b1ade0e01e0d16ab481332fc9aa1f1da6b2297fbac60bc
+EBUILD Tensile-5.4.2-r1.ebuild 3349 BLAKE2B 1a77ccf129b4781221f581ab0039ee03bf347d8ccb135876a9560798119a99be43bfef8a49a45d25733156426f4f943c600c95a820b50c49cdec180407850c9f SHA512 313c73a40be226ddc6d2cb539a24c8b2eb86f0ed06299b2f302bb4ddfc0116e322374ee8b00ca305670996c767c55574219f89dfec81be90e43376afec0ce9c0
+MISC metadata.xml 478 BLAKE2B 4931f453630761d3272371d09065c23cd9fea6e9a80f3b78a07e672e5d2e891c2ad7661883e1cb1f41e89fb2cd725a7189937c7b3cc7fc39b23ef0caaf0b3ce7 SHA512 d57284ff50913d95f092a5b8e4e566d0d6668b56afadfeb2e7003f2af6ed2106f14df82be880b2ea71dec29b614c5cb286a085098fbe8eed16e8bd3588149be6
diff --git a/dev-util/Tensile/Tensile-5.1.3-r1.ebuild b/dev-util/Tensile/Tensile-5.1.3-r2.ebuild
index 3105b82b83a7..2f487059341f 100644
--- a/dev-util/Tensile/Tensile-5.1.3-r1.ebuild
+++ b/dev-util/Tensile/Tensile-5.1.3-r2.ebuild
@@ -23,19 +23,20 @@ SLOT="0/$(ver_cut 1-2)"
 RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
-	sys-devel/clang:${LLVM_MAX_SLOT}
+	dev-cpp/msgpack-cxx
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
-	>=dev-util/rocm-smi-4.3.0
-"
-DEPEND="${RDEPEND}
 	dev-util/hip
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	>=dev-util/rocm-smi-4.3.0
 "
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
 		  "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch
 		  "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch
 		  "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch
+		  "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch
 	  )
 
 CMAKE_USE_DIR="${WORKDIR}/Source"
diff --git a/dev-util/Tensile/Tensile-5.4.2.ebuild b/dev-util/Tensile/Tensile-5.4.2-r1.ebuild
index 1e347fdcee56..8c23e68fdb21 100644
--- a/dev-util/Tensile/Tensile-5.4.2.ebuild
+++ b/dev-util/Tensile/Tensile-5.4.2-r1.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 llvm prefix
+ROCM_VERSION=${PV}
+inherit cmake distutils-r1 llvm prefix rocm
 
 LLVM_MAX_SLOT=15
 
@@ -17,27 +18,30 @@ S="${WORKDIR}/${PN}-rocm-${PV}"
 LICENSE="MIT"
 KEYWORDS="~amd64"
 SLOT="0/$(ver_cut 1-2)"
+IUSE="client"
+REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )"
 
 # Not compatible with recent versions of pytest
 RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
-	sys-devel/clang:${LLVM_MAX_SLOT}
+	dev-cpp/msgpack-cxx
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
-	>=dev-util/rocm-smi-4.3.0
-"
-DEPEND="${RDEPEND}
 	dev-util/hip
+	>=dev-util/rocm-smi-4.3.0
+	sys-devel/clang:${LLVM_MAX_SLOT}
 "
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
 		  "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch
 		  "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch
 		  "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch
+		  "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch
 	  )
 
-CMAKE_USE_DIR="${WORKDIR}/Source"
+CMAKE_USE_DIR="${S}/${PN}/Source"
 
 src_prepare() {
 	distutils-r1_src_prepare
@@ -67,6 +71,26 @@ src_prepare() {
 	popd || die
 
 	sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die
+	use client && PATCHES= cmake_src_prepare  # do not apply patches again in cmake_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+	if use client; then
+		local mycmakeargs=(
+			-DCMAKE_SKIP_RPATH=ON
+			-DTENSILE_USE_MSGPACK=ON
+			-DTENSILE_USE_LLVM=ON
+			-DTensile_LIBRARY_FORMAT=msgpack
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+		CXX=hipcc cmake_src_configure
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	use client && cmake_src_compile
 }
 
 python_install() {
@@ -86,4 +110,9 @@ src_install() {
 	doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source CustomKernels
 	insinto /usr/$(get_libdir)/cmake/${PN}
 	doins cmake/*.cmake
+
+	if use client; then
+		pushd "${BUILD_DIR}" || die
+		dobin client/tensile_client
+	fi
 }
diff --git a/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch b/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch
new file mode 100644
index 000000000000..7f8fb95123ee
--- /dev/null
+++ b/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch
@@ -0,0 +1,25 @@
+From 66f5f943bbd0fd3b41b02ce7a563bed9f59f9c38 Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Sat, 11 Feb 2023 15:37:11 +0800
+Subject: [PATCH] Change cmake name for msgpack-5 release
+
+---
+ Tensile/Source/lib/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Tensile/Source/lib/CMakeLists.txt b/Tensile/Source/lib/CMakeLists.txt
+index 47a5d15d..f1a6118b 100644
+--- a/Tensile/Source/lib/CMakeLists.txt
++++ b/Tensile/Source/lib/CMakeLists.txt
+@@ -97,7 +97,7 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK)
+ endif()
+ 
+ if(TENSILE_USE_MSGPACK)
+-    find_package(msgpack REQUIRED)
++    find_package(msgpackc-cxx REQUIRED)
+     target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1)
+ 
+     if(TARGET msgpackc-cxx)
+-- 
+2.39.1
+
diff --git a/dev-util/Tensile/files/0001-Detect-prebuilt-tensile_client-in-PATH.patch b/dev-util/Tensile/files/0001-Detect-prebuilt-tensile_client-in-PATH.patch
new file mode 100644
index 000000000000..116711db44fc
--- /dev/null
+++ b/dev-util/Tensile/files/0001-Detect-prebuilt-tensile_client-in-PATH.patch
@@ -0,0 +1,33 @@
+From 3c806ec52f46d0a1f770f524d1e4f0ffeb8809c2 Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Sat, 11 Feb 2023 17:48:08 +0800
+Subject: [PATCH] Detect prebuilt tensile_client in PATH
+
+---
+ Tensile/Tensile.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Tensile/Tensile.py b/Tensile/Tensile.py
+index 961ea88f..123f8a7a 100644
+--- a/Tensile/Tensile.py
++++ b/Tensile/Tensile.py
+@@ -38,6 +38,7 @@ from . import LibraryIO
+ from . import LibraryLogic
+ from . import __version__
+ from datetime import datetime
++from shutil import which
+ 
+ 
+ ###############################################################################
+@@ -127,7 +128,7 @@ def addCommonArguments(argParser):
+         action="store", help="select which library format to use")
+     argParser.add_argument("--client-build-path", default=None)
+     argParser.add_argument("--client-lock", default=None)
+-    argParser.add_argument("--prebuilt-client", default=None)
++    argParser.add_argument("--prebuilt-client", default=which("tensile_client"))
+ 
+     argParser.add_argument("--global-parameters", nargs="+", type=splitExtraParameters, default=[])
+ 
+-- 
+2.39.1
+
diff --git a/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch
index 2aed8082de05..eda9b0307c52 100644
--- a/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch
+++ b/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch
@@ -35,7 +35,7 @@ Index: Tensile-rocm-5.4.2/Tensile/ClientWriter.py
    callCreateLibraryCmd = ["python"] if os.name == "nt" else []
  
 -  callCreateLibraryCmd += [os.path.join(globalParameters["ScriptPath"] , "bin", "TensileCreateLibrary")]
-+  callCreateLibraryCmd += "TensileCreateLibrary"
++  callCreateLibraryCmd += ["TensileCreateLibrary"]
  
    if globalParameters["MergeFiles"]:
      callCreateLibraryCmd += ["--merge-files"]
diff --git a/dev-util/Tensile/metadata.xml b/dev-util/Tensile/metadata.xml
index 97a4d2e3c600..32364cb13b06 100644
--- a/dev-util/Tensile/metadata.xml
+++ b/dev-util/Tensile/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/Tensile</remote-id>
   </upstream>
+  <use>
+    <flag name="client">Build and install tensile_client executable to run benchmarks and tune GPU GEMM</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 9bf816705c54..87c24d51a6ef 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,3 +1,5 @@
 DIST bats-1.8.2.tar.gz 143952 BLAKE2B 0c2302f2c77f5ee0446a6559355d24fae8bb2f178b5b17778fea44ec2f069c061c2930814f73e56671bf6f7cea44a74cea9b6436ca80941a1747197ccddcec02 SHA512 7eace32f19789e081112af1ce8ab33ff210d52bd3ea84962bbec226349b3b8d8912b6a495f5524f9cc7cfe692f1d23d684c93c24e182752e2b30731670d6eeea
+DIST bats-1.9.0.tar.gz 151817 BLAKE2B 33ff5ec2b89a1605de2b838f3e6f68c1fc4dc15b6617fe001e87c387ccc4013d643b697fbbc7358950aaae556b36a614baa0ae8b38865d7428b3d8ee544516fa SHA512 743a1b3907c3a24eccd5d6fbfbdea3aec472ecf2b5c8cdd428d9dff8daa7f029ec30a2873f1beec2d758173e6f5ec892c03623dc70e56d73665c83343c9808fd
 EBUILD bats-1.8.2.ebuild 956 BLAKE2B f61beee7859da93e9cf8eea900c639c8f62e53ab8d25ce0d2e529744dc3c7deb05d6c8f988b954fe81bf9ddcf9a52c4c9ea91d6ee450ccdaee4bed42ede3dc0b SHA512 771519c4ea68640aa2ee10a4f01b49adc661d9d2b3aa158f518372fef1fcf81dc15fa4f32f8077e2b6fcaa6c6dbdbda5531d76a27f1b049ca5896013145a698f
+EBUILD bats-1.9.0.ebuild 958 BLAKE2B b320377ea58603d05b0912b2db05ce4a3e99badf141d7d8931b1a98806d62c4c2d5958c61c7490cd4c932ffe40c76b11d32ea4e3a5a49a2e1e1eb1d7ccd3820c SHA512 c23e030d43e17e52bfee4dd28ac48e25968616f1ae1003d22c61b4245b39e055121dc704fb6c87f003ccd79ae69fbd0e64dda24aa9aa5bf7ce5fd1865bef51aa
 MISC metadata.xml 960 BLAKE2B 1eef5273fa063fbeb31bf73be2dd264f83a37a75ae5bfc116cfe6e97a0707349b9fdd6e0700505d7f698e63eeffeec2f72f9f9e853be3c3eb70ea80891fddde0 SHA512 906495ef8f00981f362302c4cc0f24aca8a9a7d4898e4f729941836b3bb126590c7d4863b37b6d216c1485cc96502c330ca03801c9cb271793ebd298285f8923
diff --git a/dev-util/bats/bats-1.9.0.ebuild b/dev-util/bats/bats-1.9.0.ebuild
new file mode 100644
index 000000000000..e29cd9e8ea34
--- /dev/null
+++ b/dev-util/bats/bats-1.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing optfeature
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+	local my_jobs=$(get_nproc)
+	if ! command -v parallel >/dev/null; then
+		my_jobs=1
+	fi
+	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/${MY_PN}
+	doexe libexec/${MY_PN}/*
+	exeinto /usr/lib/${MY_PN}
+	doexe lib/${MY_PN}/*
+	dobin bin/${PN}
+
+	dodoc README.md
+	doman man/${PN}.1 man/${PN}.7
+}
+
+pkg_postinst() {
+	optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 5155943af261..a3a276718dda 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,5 @@
-DIST CLion-2022.1.3.tar.gz 785987464 BLAKE2B 5b23d54f260a8e6023cce936ba50320c9c815d7024495d4a28a6fe9fa795d9944cce36fedd7b619ccf8188750708eb3bca887f9fc856d2d4defe096505742852 SHA512 5caabc409e9e22e59a26886cb5a5785cc0f2c193e7548a9757d11b4e2b7dad5af7545f3c71b83e3111deb0e0c90507eb5ee6020dcba40e413c0882f2743ac49d
 DIST CLion-2022.2.4.tar.gz 895935196 BLAKE2B d14fa5bfd91df50f48fcc581133ac1292476fa6706eb486f020141d4addf6d902294766ec9e848974d3e10a31668307c32ef2d7e8db42d65c53d3f36bff4e7dc SHA512 af9cc8a0768877e9fa997655ac3bb5e8fc0fe1128902707bca8574855cce99de855a866d8fdef9c53ef970dfae6bce9edbb2b763dd49df1dc76d45ef85115dc0
 DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B 7e1814bcc683126f51eefd350b3d171a22d320ec658bc24b8831db1198756c59ee1be951665d10f2c3e76831f0d8ab55c0ae5fd9abeae0acf4e7009ce00f1faa SHA512 7ca87933323c0e1a4800eb75fbe40d179af987f33de51bca0e6b35264aaffea991712187719b837e07bd11457f8891f9f6038fb10f4e3157170d7818179b7531
-EBUILD clion-2022.1.3-r1.ebuild 2962 BLAKE2B cf320a340c3de6bf4b949faad24ef89976e1395c743f28f7adbb63446960cd9426d4c7290aa36216c02a85c958400b6bf9ce7cba257599f6d285eadb75b15fb6 SHA512 8fbf9ca8b1d7315f225470d83942e28ddfa41b235cb27b14222e8669c2b355170f884573f319fb5246b024d6e4d4d2cf24d513c7ff5d9b2b38a4ecf557b8836c
 EBUILD clion-2022.2.4.ebuild 2921 BLAKE2B 4150a87c2b0a153e804e4c6a4b55bc4a4dcb2db5b1734696254e1733a7b679dd5acb1bf9ba6e2e08c8a5a01a0175c3dbd67537f6949925dbeac7da4b53c8e7f3 SHA512 e384e940f1e1e43250ff3fda8a2991df31e006d0e81080f3d951ede68481e52d6e93813050d6d647d0bbdd3164734956ac0c6cbc8585af3aefe4eeb1293b736e
 EBUILD clion-2022.3.2.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.1.3-r1.ebuild b/dev-util/clion/clion-2022.1.3-r1.ebuild
deleted file mode 100644
index e3be5c083ec2..000000000000
--- a/dev-util/clion/clion-2022.1.3-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="https://www.jetbrains.com/clion"
-SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
-
-LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
-	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
-	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror splitdebug"
-
-BDEPEND="dev-util/patchelf"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-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
-	dev-util/cmake
-	dev-util/ninja
-	media-libs/alsa-lib
-	media-libs/freetype:2
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	sys-devel/gdb
-	x11-libs/cairo
-	x11-libs/pango
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/cmake
-		bin/lldb/linux
-		bin/gdb/linux
-		bin/ninja
-		license/CMake*
-		lib/pty4j-native/linux/aarch64
-		lib/pty4j-native/linux/arm
-		lib/pty4j-native/linux/mips64el
-		lib/pty4j-native/linux/ppc64le
-		plugins/remote-dev-server/selfcontained
-	)
-
-	use amd64 || remove_me+=( lib/pty4j-native/linux/x86_64)
-	use x86 || remove_me+=( lib/pty4j-native/linux/x86)
-
-	rm -rv "${remove_me[@]}" || die
-
-	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
-	do
-		if [[ -f "${file}" ]]; then
-			patchelf --set-rpath '$ORIGIN' ${file} || die
-		fi
-	done
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
-
-	if [[ -d jbr ]]; then
-		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
-		# Fix #763582
-		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
-	fi
-	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/ninja
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index b1e2d80a4533..b5450555989c 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index e23815b13659..a4fee45689c5 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -14,6 +14,6 @@ DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6d
 DIST Mail-SpamAssassin-4.0.0.tar.bz2 6371055 BLAKE2B 86f2167f6250a10a6bf871cc291f63ee9ee2d853b4183a637b4267e6979209196155be1b26e5e5b1093cf63841f9819a249de65e7002414a7e790ee1b67e5206 SHA512 a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f
 DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf4080807ad3c3fd9eff9f2eadadadbfde828e542bc57b5cdcfb062c7f210be4d721bdf9cf85aec9b1fb491076165453b000b47990f0d SHA512 b87a80d2b0b802f52df75e485878c53cc4fad52935ca2b14b1b06e46d334b52c673e66d61cc2155b5e812fa6a486f8e61f6a87794be2524acea1fd8ac42e7d6a
 EBUILD spamassassin-3.4.6-r2.ebuild 9832 BLAKE2B aeae24c04e90169b1e87605b53c23e57d3a14a825c023c39dae7a316860fd4f2a9393c68a5963838e4b39bb231db9cf94f417bc0baf9ab0f6752f842424cb523 SHA512 7fb3fdcf03bb93b8e8534dab572408a895c519e6dfcf4fc9016471d539f5ec00220cd5a4246c738d288a553273db78769b2c3feba4ce91548777293604cc44d1
-EBUILD spamassassin-4.0.0-r1.ebuild 10150 BLAKE2B c202c9b58ea82f17f867c37e41f1d7571cc095d0d2613d12d4dc0bd74a49b0c7c313a0c45d9dd54c6ff502fdc185596baeff1f025660a7a1d8ea838ea1eeb243 SHA512 333849e19da0a064bd81a266960df9ff77e834a4b6ad4602875c4b5de9e84685343c5868187f4c2a052773e90e6de6388183ab58b2d9e2586c33f08c5504cf07
+EBUILD spamassassin-4.0.0-r1.ebuild 10155 BLAKE2B f0539f081e4a9b394bf44034c3f05a9069529b386a328e09407cb81522a65abfd442ac161145a1cead2f5ab6a6d2f0a525b497ed333f3e6e886d6dd94e667d67 SHA512 477138d50429c90143b6a8ae7b1124ebf906793e27511e117c315293232e7f8a1222b5facc747c94cbcfecd657ffd0b4def995810cab7d42c0ba148825847971
 EBUILD spamassassin-4.0.0.ebuild 10129 BLAKE2B 2919b4820dea51958e9298412ba5c6ca592492ffaff948fdb00e61f8f34a920c40bfe45346d02eb70c61c533dd69b7bc0c518048cf7ebb5965472a5e5b6d5bff SHA512 4db07c5f3cc550eefe127e0f5024451c88dc684c3fb5ae7c02c834e550654ef9c4a67f7ff82817e6a7c0e8bb109c7c32a5ece4e7a5afa8d3875f80f24d854a83
 MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild
index bb4fee77b367..65b4859f8e7b 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index f7f80bfd5ba2..ddb89473e7af 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index c2cbd30ab449..3560a6f994f2 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,4 +1,5 @@
 AUX apache-sqwebmail.inc 347 BLAKE2B e77a680065e064c300d01ec21db524f3a440623b685ecd870607b563ebbaaf1106091074e55346743877cfa44d425c29592ec3f60dedf8c7e2b6355cdc84e558 SHA512 e3f8f4f01563184ec4afc98d61ab739d5900f7d8757638fb06ff21ca3604f8c6f708730af514f6ca662559980503dee5955ba48c5a643e473054f3eec49b89a0
+AUX courier-1.2.2-fix-getgrnam-buffer.diff 2468 BLAKE2B ba01b7a98aad1df059ab8135a94fbbfdb10ae9196ddf3985ce41a365946e5a0ec25f4e4d932cf1b76ecd971e3e17837d02f7f86e957192888b44668dbf0ff948 SHA512 7ce3ef8c3db636370b60ac04c18390fef9b9d0702e99aaf82b7d899e07fe23c47cea2cde26e22270db7788de70508d0686b0df02311987388d0f59969f094331
 AUX courier-init-r4 4965 BLAKE2B 09f29543599abfb6dd5df058f832e979bde471be3f9d293d975fdfc28787e8622ddab797c9d51fa89207fbc1a1ee23fb82471617366bf1467d1e7f2d7d3f2bcc SHA512 ca5e12bfa4fe2166cd2c1ef8c68e3cda957fd33011971237f3f76ec9d4ec1503eb22d78ec08ed42671d8858790ea7761c272a4896c680a51691c094696fee5f9
 AUX norewrite.patch 488 BLAKE2B 663b52ff5936d5c8aa24ce2a226cd803f09a972a2f358b7f81d1711319b4fee2d7a9c4a8b498e8550b27d796939f6ba042790211592e55072bbff6b7f7172ea3 SHA512 5c2329f497951220bb1276058fe7fe2e0eba710fcad65c9ff1143827fec7c8d9745703fbebf624fecf740fb767401eeba9f0e91b09cd891622d01899578326db
 AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d
@@ -7,5 +8,6 @@ DIST courier-1.1.8.tar.bz2 7655220 BLAKE2B 189c87e416fe8d232e1fab8be47ff8258a54d
 DIST courier-1.2.2.tar.bz2 7841858 BLAKE2B 93ff5cbfe6cc8e51c769718a7933c6f7acc7f910fd3c966c3f0703a8775d360b899f846e34174b48152d397d1c7e89f67b511ec31a63641649f015574149deec SHA512 801893f77b3e18e01f3cec4a9d73abe8fc7aaca34d3c853fd5e6007e30c2b47f9e2f54e50fbff5a5bbb5ddb72ddcb5e4b7f862f17146253e44ad61b97bc556b0
 EBUILD courier-1.1.5-r3.ebuild 9233 BLAKE2B d0c7f609140f624ee3b971f240766b80bc467d5f9ce649b2ff4591096d48eea997e2a9951fd56bbbb5511557609bcc21c7a5e992931597e52d0a584141eb9c90 SHA512 6563cd00e122b641f4b2147b02edcda05dd6bc6e662a2d4a55fa9f4d5327c3c48931bd4c8d6d536eae05726f91f405d20d534e70a50f1d2193d22a53ba5f6d6f
 EBUILD courier-1.1.8-r2.ebuild 9239 BLAKE2B 37bdf7f22ac01545fe89f6a3d63a58ab984c5f27efd0d8a6a5d751b15bd184afb53e92ad04e7fce78cae5557dc960e22ca3135aee5334603804ab00e29a02b47 SHA512 46489020884af61bac01a18dca9704a931ba81ad07f08873511baa15fc401c722c52f882c136eadc36cc46d3f590e48bb7aacff54b129b265384baaf0618da3f
+EBUILD courier-1.2.2-r1.ebuild 9457 BLAKE2B 4a8e8dcc45fd9381fb735419c3ba0b445b1f3585d525992f8b165cad294732b3190059374b917a00b38625445b0d574ac9d42697ae2d4af613a918770f483b43 SHA512 5b89f7e14d600edcd90f98eadd1ac0774c83905fa77607884a447ed2a2bd8a1552b91ef3c87e5afa5fc46975a0cda15c8a5b5729a4166501c58b35dea2cb32f2
 EBUILD courier-1.2.2.ebuild 9263 BLAKE2B e5656abf60207172da2e27674b32e4a45d6874c20130c13634c0df07e5e4049ce9bb398eb4e2a0397b94839257cf0cf043d63b3cd2f40d18a974079cfa24f367 SHA512 1ac12e88befc9f6f1e7f9a2ee4e72697c47b4f4575b9ed7dc1ef3df67ee4fe7d9976786f993d394da1956b2fa1f59a8d26739788f16b025e29dee6fed7ee66fc
 MISC metadata.xml 756 BLAKE2B e3d128790b1620d9005c9a14cef1c452488fc8e465b235791cc196f431cb2ea8348aba342b0867282878d0c73392694be0db0686dc048d9345b286c3bccf1cab SHA512 c3fcd1ba4b22f91b1acf49faeee41562a7963b51d37e1593156086b79a1eb4172a12e7226b71a9aa55b5a4ef7d734351752451a2300375d061ae20481778b273
diff --git a/mail-mta/courier/courier-1.2.2-r1.ebuild b/mail-mta/courier/courier-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..7ef2ccb961ea
--- /dev/null
+++ b/mail-mta/courier/courier-1.2.2-r1.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+# Avoids failures on systems with large numbers of users in a group,
+# see https://github.com/svarshavchik/courier-libs/pull/30
+PATCHES=( "${FILESDIR}/courier-1.2.2-fix-getgrnam-buffer.diff" )
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.72.0
+	>=net-libs/courier-unicode-2.2.6:=
+	net-dns/libidn2:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=sys-libs/gdbm-1.8.0:=
+	dev-libs/libpcre
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	postgres? ( dev-db/postgresql:= )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+}
+
+src_compile() {
+	default
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure DESTDIR="${D}" || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r4" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc libs/tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	dosym ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		# Disable valgrind checks
+		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
+		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
+		sed -i -e 's:VALGRIND=:#VALGRIND=:g' libs/maildrop/Makefile*
+		emake -j1 check
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [[ -z "${ROOT}" ]] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/courier/files/courier-1.2.2-fix-getgrnam-buffer.diff b/mail-mta/courier/files/courier-1.2.2-fix-getgrnam-buffer.diff
new file mode 100644
index 000000000000..73384098189c
--- /dev/null
+++ b/mail-mta/courier/files/courier-1.2.2-fix-getgrnam-buffer.diff
@@ -0,0 +1,120 @@
+diff -Naurp a/libs/numlib/changeuidgid.c b/libs/numlib/changeuidgid.c
+--- a/libs/numlib/changeuidgid.c	2022-03-06 20:02:45.000000000 +0100
++++ b/libs/numlib/changeuidgid.c	2023-02-24 17:26:02.452835861 +0100
+@@ -52,10 +52,11 @@ void libmail_changeuidgid(uid_t uid, gid
+  */
+ uid_t libmail_getuid(const char *uname, gid_t *pw_gid)
+ {
+-	size_t bufsize;
++	int bufsize;
+ 	char *buf;
+ 	struct passwd pwbuf;
+ 	struct passwd *pw;
++	int s;
+ 
+ 	/*
+ 	** uname might be a pointer returned from a previous called to getpw(),
+@@ -70,35 +71,39 @@ uid_t libmail_getuid(const char *uname,
+ 	}
+ 	strcpy(p, uname);
+ 
+-#ifdef _SC_GETGR_R_SIZE_MAX
+-	bufsize = sysconf(_SC_GETGR_R_SIZE_MAX);
++#ifdef _SC_GETPW_R_SIZE_MAX
++	bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+ 	if (bufsize == -1)          /* Value was indeterminate */
+-	{
+ #endif
+-		bufsize = 16384;        /* Should be more than enough */
+-	}
+-
+-	buf = malloc(bufsize);
+-	if (buf == NULL)
+ 	{
+-		perror("malloc");
+-		exit(1);
++		bufsize = 16384;        /* Should be more than enough */
+ 	}
+ 
++	do {
++		buf = malloc(bufsize);
++		if (buf == NULL)
++		{
++			perror("malloc");
++			exit(1);
++		}
+ 
+-	errno=ENOENT;
+-
+-	getpwnam_r(p, &pwbuf, buf, bufsize, &pw);
++		s = getpwnam_r(p, &pwbuf, buf, bufsize, &pw);
++		if (s == ERANGE) {
++			free(buf);
++			bufsize += 1024;
++		}
++	} while (s == ERANGE && bufsize <= 65536);
+ 
+-	free(buf);
++	free(p);
+ 
+ 	if (pw == 0)
+ 	{
+-		free(p);
+-		perror("getpwnam");
++		errno = s;
++		perror("getpwnam_r");
+ 		exit(1);
+ 	}
+-	free(p);
++
++	free(buf);
+ 
+ 	if ( pw_gid ) *pw_gid = pw->pw_gid;
+ 
+@@ -149,7 +154,7 @@ gid_t libmail_getgid(const char *gname)
+ 	struct group grp;
+ 	struct group *result;
+ 	char *buf;
+-	size_t bufsize;
++	int bufsize;
+ 	int s;
+ 	char	*p=malloc(strlen(gname)+1);
+ 
+@@ -168,14 +173,21 @@ gid_t libmail_getgid(const char *gname)
+ 		bufsize = 16384;        /* Should be more than enough */
+ 	}
+ 
+-	buf = malloc(bufsize);
+-	if (buf == NULL)
+-	{
+-		perror("malloc");
+-		exit(1);
+-	}
++	do {
++		buf = malloc(bufsize);
++		if (buf == NULL)
++		{
++			perror("malloc");
++			exit(1);
++		}
++
++		s = getgrnam_r(p, &grp, buf, bufsize, &result);
++		if (s == ERANGE) {
++			free(buf);
++			bufsize += 1024;
++		}
++	} while (s == ERANGE && bufsize <= 65536);
+ 
+-	s = getgrnam_r(p, &grp, buf, bufsize, &result);
+ 	free(p);
+ 
+ 	if (result == NULL)
+@@ -187,7 +199,7 @@ gid_t libmail_getgid(const char *gname)
+ 		else
+ 		{
+ 			errno = s;
+-			perror("getpwnam_r");
++			perror("getgrnam_r");
+ 		}
+ 		exit(1);
+ 	}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index a44fdf909540..dd0fe17116b7 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/jetbrains-mono/Manifest b/media-fonts/jetbrains-mono/Manifest
index 13960af8a9bf..e448d907988a 100644
--- a/media-fonts/jetbrains-mono/Manifest
+++ b/media-fonts/jetbrains-mono/Manifest
@@ -1,5 +1,5 @@
-DIST jetbrains-mono-2.225.zip 2981614 BLAKE2B 5ac8dff566378da7e9ac23218cdd696be8ff612a7f9b4f87668400c0c0bfb3a1fcff2a2a813a1c7527e1a105125c493e80abe4daefdbcd837ef59492d7bb3e5b SHA512 ce72c2d2a2f769c6b8a9ad70e7e09b82cf66a0928534f18556238e36fec690737c89077f6521a67850bfb0dc79bb2260b5c86ae4134d76b2210755d5053ade0f
 DIST jetbrains-mono-2.242.zip 4099695 BLAKE2B 814dc53be8a57d2d9abef06ac4ff81025225891fc0ac1889e34325c607eda410e91c4aae7fce914ce3df751cf109205172a52171ba2aa93f32fbd99856e081ed SHA512 03c08a2cf5603103baaeed4fcef8aa7bdfced92fdc71b207caa7f913eea49dbe178d020f15a3396b11417f9b906778cc8bc8483f4eff2b04f25163fa373186a2
-EBUILD jetbrains-mono-2.225.ebuild 462 BLAKE2B 4a343b0a4007fb60d7fde1a30019997cab6b6c7c3385b23c8bf011b9ef7be3b3e16d9de0933de0610e0566968b336aeaac305cf820ab10dcbc8d22da5411257b SHA512 8880b260ac815942deebc91fe1c48dc15197d0b90399409a55d58b2b4108ce607d96a93cbfcb0be740458ed227ea8d0eda55fc525694b51b091f85f40ec4d16c
+DIST jetbrains-mono-2.304.zip 5622857 BLAKE2B c54913d1d7f11150afeb2974238ee26f09be5ea2b1db2510c00bafb2ae0d807d6ca64d4fcef5dfc95d524bb4f2f3324243fc6a693bd2b81c79820f48cb1e9909 SHA512 1889354a5ab1b20a523eccd67686dd6c5aea550a7e9b84d0301b1dac9193c4dde4b6bdac3892bf10603dc0c5f13f2e68363c70c294cc123b91196901f793bdab
 EBUILD jetbrains-mono-2.242.ebuild 481 BLAKE2B 1f6e275043f8e4e7cfdd79c376a16645a8d447c82281d26b8bc094c293d8362b3c5af433cefe6273a5e352e4f139e58a74cd79bbb8502bbb89bd984e2c4d73db SHA512 be343e1e17a82ead3361a57e0c0614a2b463aff59793f4714f149a61f411ed9e88a222b6a07e4013e341cabab4661e73daec17124bfd4d8b0aed4b610e845b1d
+EBUILD jetbrains-mono-2.304.ebuild 483 BLAKE2B 40928fd5628557caecd536e1eff9299e6b4f803d5ea7a6db71c3288113cab5a34d1c04a6136ce98b1223c343a8d84a4c425cc13c93346d719fe26b6571a97d87 SHA512 998ee402dec100d732f079c95eef0513b4e20fd465dc0471cc53f4b50b196a7d269560f337f3658df3dd8b05a7ffa60f2b6d1ac87c8d08756102baf0606a19a8
 MISC metadata.xml 477 BLAKE2B c4132fa3ec27867f40b8704208814e7ef3e4195230c33b2fcf8dbd4df6bc770a1ae3c88a0c7f020e096a1a3af5977b9b216a12d41a7eaf134e36b72cc28a90bf SHA512 0f15943f66489c1ed7c26468ba28fef62f1f40c86f9bb162caec8782ccf4396c137a80cb8983b0054c9f092dc3a47ab60e2a11ed9c081049e707d33d12b606c6
diff --git a/media-fonts/jetbrains-mono/jetbrains-mono-2.225.ebuild b/media-fonts/jetbrains-mono/jetbrains-mono-2.304.ebuild
index 6a4cb7fa1eee..b41aabc32033 100644
--- a/media-fonts/jetbrains-mono/jetbrains-mono-2.225.ebuild
+++ b/media-fonts/jetbrains-mono/jetbrains-mono-2.304.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit font
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JetBrains/JetBrainsMono/releases/download/v${PV}/Jet
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~loong ~riscv ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-fonts/joypixels/Manifest b/media-fonts/joypixels/Manifest
index 5fb67a72ecc7..424b7650808f 100644
--- a/media-fonts/joypixels/Manifest
+++ b/media-fonts/joypixels/Manifest
@@ -2,5 +2,5 @@ AUX 99-joypixels.conf 1152 BLAKE2B d68b04bed7c538fde05b9865b55fa670dc4cd55689320
 DIST joypixels-6.5.0.ttf 25348564 BLAKE2B 4e38a3bb04f71292ba9003b52d050c04afe96eac5b99073560a6e39c781ad895102812093f4aa3b64670ff2907060e8ca1cfebbf00a22abc68315a1691713cc5 SHA512 abe44c631e5b1e7f7a2c59ae979beb381bbf10c04a157f67ca022cff5ee4c5162e3108b34fe55d4165f4b5e062755387f421363fa8ca8d600d5a005a534b0f4f
 DIST joypixels-6.6.0.ttf 25445808 BLAKE2B a07ca010b469b5b720fce86521f0c6de35d463c010dec7da7f0e601c1e54f399b0e2c7a6e5250c1fcca0c0c4f345501e2d73ea5dc2a7c312f85f321ab6133bec SHA512 6a8aebb8f37a22821a1b55364619bbe8d5eb180505422808d6005d06afba2e25051a962a6ecd00ad386eb0c6495cf10337892deeb424ee28d85cced73a540c16
 EBUILD joypixels-6.5.0-r1.ebuild 1047 BLAKE2B daebaca18075d825f82b4252c2dba6c7d641809b95181eec6db107385ef1fe3a628bdf74bbef2cfd546a51a1223291dcb76354eccfb90902be80e0cb13c583b6 SHA512 cfa9c3b4165140135e161d9204e544ca50c3c44d700beb98d3743fd60f02c168c0e4b7e107e5ba7b11bd1a1a692c85d130a5c7d78bc44f6227d769bd1d9ba588
-EBUILD joypixels-6.6.0.ebuild 1056 BLAKE2B c41eb6400851aa0b322c797f9000c37069ba18437e8733d0dc10a2a61c7f8099430aec270ad8cf8a521c2e9c57d4b9224c93feac3e1f427e81d3ffaa19d5cd6b SHA512 9d966d267e97b7a4d5b5d4d6bc22f93ce0e1037c523592378f60f39f6614d4e525b8b63607f4250e0dd610c73a9725dc0253fe62107e8040cfeed4d8855844cb
+EBUILD joypixels-6.6.0.ebuild 1054 BLAKE2B 43370a499198582e3b022109d6c3811f434fa9289bd5d30a9893348c1957c2a862c2350fe9141784a4de1a8ac897452f4b8ac6891e10ad006f671faf14f07626 SHA512 afe33b7146fc6d9dce46419ccacf7fed9e9d80daa174651effee6dd96c40fb6ec9e597dd03eba7aa6e8e476af8b721cafb5714cb7573b8f83ba53a9d34dbbc0d
 MISC metadata.xml 169 BLAKE2B f97e770609744c72ba2fc05bac60582959f25c4cf8dd7b0f65208fc7078770bbab6cc11db8894b6aa4362c1f2b6ab54ffd925ced1dc796cd02d8528882f9d454 SHA512 7a46ba961797f936df2f35f0796a6d474ad8bc992faae5be38f0050b22a6fde87decb42a148c235e0803b99a6f0b3c390aa21b6c2463f6b5fdaa91f9f76ebd60
diff --git a/media-fonts/joypixels/joypixels-6.6.0.ebuild b/media-fonts/joypixels/joypixels-6.6.0.ebuild
index 55e78f206a07..c40f77809d1c 100644
--- a/media-fonts/joypixels/joypixels-6.6.0.ebuild
+++ b/media-fonts/joypixels/joypixels-6.6.0.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=7
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 #https://cdn.joypixels.com/distributions/gentoo-linux/license/free-license.txt
 LICENSE="JoyPixels"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
 RESTRICT="bindist mirror"
 
 FONT_CONF=( "${FILESDIR}"/99-joypixels.conf )
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index fe648b9af5c8..0c30cf5791dd 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -3,5 +3,6 @@ AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c6a36e733acf88a6089b56004f9d2a265851278cbb85b6a5d2c2ab18e46f12fcf84d7185e768cae2e3eafefeb3bc06869e5 SHA512 5bcb05c6b7a1e0970e1ff67707a1a5d49b22ada4ef4677d3bb9f9874e045d79f1d35419abc80b39bec81512f547360eb705dffeb421c48296a9646c618f75f61
 DIST noto-emoji-20220912.tar.gz 178768907 BLAKE2B b998a74903e0a559e6c2d87f6d05649054728d5359659882c89b99fc41ec80f9dbafba6f418500059acef7bb85b9d60b189abea286c9c4cb5491f501095ca425 SHA512 4e9b01be1ac7853d840379f84350f2709212401ccebb221308eb83982a8673af9a8ef166952aba4d6f8d9939efc4989f38a7db69e022eb055f265ccba78884a6
+EBUILD noto-emoji-20220912-r1.ebuild 1083 BLAKE2B eb52dff9e53f15a1b1c83400b4b4a6536b667d9dab7a6bf101fd6e3a7ace80c530903490e190d4e5637849082e70b7b55be8c6a04cccd2a49e9a7c3cb62983c8 SHA512 1feb2ed35e79ab3aae2b8d36facc688114ae7175ee15ccc8df1e1b88afb17243af019cfd67aaa6c4d6d1b2b6dbcdd7600af2d09731ff19e5fd66b2f8210f820e
 EBUILD noto-emoji-20220912.ebuild 2864 BLAKE2B b85b2c4503e49bcfb66141efa6171ba4aba9cfaf1bb973215af16578374695e34471051938f96ee6607831511de78823075a0f7a7757243bf5706c95d061b71c SHA512 347aceb8a8c7618fd3068dd68017dc6d56ba62b7f14c913395fd44371cdf3856eb9f9ce720390a971022ff57188a0e93c85b13d0c63f19043b2f8981a72b9ae5
-MISC metadata.xml 421 BLAKE2B b78c0443456d46d6cd93c57a585f47532b3464fdcc2d93f6e863045285818fe0ce1f4af88b7d68de2a15f7a858853c7fca7bd9488d3f21dbb32783f54ce6c109 SHA512 03faa98eb4e0d51a2e367171814f7d2a49e2a3a07900dec191ee6addbe8535b8f25c0da88d35f60083ace8b05125e25bada706510759c321ee5f48a8801eb546
+MISC metadata.xml 479 BLAKE2B 8a281cfbeb2b5d2dbe2c573ff8063df9e5d508585c6b6b0131ba9ed00fa491b83bd98c9f1ba6de0c845750e7b8c34aa6217f7bde8e8eafaa2899a832dd2a215d SHA512 9821208a23c3303935421609cafe7961b38a0a37b507aae01fb4a2e96b09854614d2e77b89a78f1a467ebbfdfc63d1f9a5524dcefa206ca47f8d38b4fe75a10e
diff --git a/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml
index 1f615adf787d..a1229f4979e4 100644
--- a/media-fonts/noto-emoji/metadata.xml
+++ b/media-fonts/noto-emoji/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="buildfont">Build Noto Emoji font with supplied images</flag>
+		<flag name="icons">Install Noto Emoji icon theme</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">googlefonts/noto-emoji</remote-id>
diff --git a/media-fonts/noto-emoji/noto-emoji-20220912-r1.ebuild b/media-fonts/noto-emoji/noto-emoji-20220912-r1.ebuild
new file mode 100644
index 000000000000..6499e36b1e77
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20220912-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit font
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
+
+COMMIT="e8073ab740292f8d5f19b5de144087ac58044d06"
+SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="icons"
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+
+	# Drop font for Windows 10
+	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	FONT_S="${S}/fonts"
+	# Drop non used fonts
+	rm -f fonts/*COLR*.ttf || die
+
+	# Don't lose fancy emoji icons
+	if use icons; then
+		for i in 32 72 128 512; do
+			insinto "/usr/share/icons/${PN}/${i}/emotes/"
+			doins png/"${i}"/*.png
+		done
+
+		insinto /usr/share/icons/"${PN}"/scalable/emotes/
+		doins svg/*.svg
+	fi
+
+	FONT_SUFFIX="ttf"
+	font_src_install
+
+	dodoc README.md
+}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 77df27b4a934..7a78102be632 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -2,5 +2,7 @@ AUX 66-noto-mono.conf 326 BLAKE2B 5bf5d20d31635e0b84f34d9a619df0de842431d319c283
 AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e770411d8dedda2e6ae62a921642f23db1f0849d6d08295ebe44f1b204fd93a27661e3f5ca52e5c6f8bd76cc SHA512 80c15846c014c723830aefb84c6d3069f9addffd1ca227a8a7b17023c64a949254152541f7e81b4afeca690ddeab959f35f390366f7e697e3b7715d692ea7c98
 AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
 DIST noto-20201226.tar.gz 903613276 BLAKE2B b6ae0357a854b775ca43768609775624370d2f13ae65d05e699105cfacff4bb919ca19f757d4f2fbfde2d24fdfe6c5d6d3b5993a071b0d081948ef8ed6c5eb76 SHA512 240ae214729388e7000a4e12a1fc81b0b562ca6f3fcb4fcdef66a27c1b193825fbf2d0fd4cc8fbae4cd17f57e21fd1589150cb02b7b618d670742692b748f9ff
+DIST noto-20230201.tar.gz 1006343445 BLAKE2B 42d8c4777751f28d03ef45335e75f8c7b267f80a83dbddd9d6939a8e43f194bea95691d2d9e9977244a2e33fc9b29967db7fb1211c8ec1ca4a1a6232ed740ba6 SHA512 3884c89659823fa25d95c48edb89856068d506eec36645e2f0e06f7465d3feac28b68c71d584ed513c7ad1e1d2b322a6be5576ebf15963fe10c92d25461e2fa3
 EBUILD noto-20201226.ebuild 1428 BLAKE2B 2878d731ce90d40ec7c0c0f22fd60c4bb2d99e1454e17304ce921ca6a6c4ca427f1f452823c458239ddadecc399b490f3f279bd339e9cb9155aafd2e1c655c77 SHA512 afbc4795e26b2ea47780e8f4ef59112a985b312d556ccae094a499a28e1cc8940d377e58c3d5b55e40ba8e6c38d3c025dd5485b577d7cc3b89b67aeaa0ad89d3
-MISC metadata.xml 417 BLAKE2B 4f6ccecc493710798420e45fa37daeb46a876d9014ba6329c86df47f6a91ef6a290cd0e00cd1a8324a1eaf862e32ed7bab3af85e65e0b011ae72a1b21e8ca37d SHA512 0b6d9eabb97c0838fdfb28ca30e861d314f0472c77e078da0d0ded6fc67411354efd5c7fade1934a43e21ca6ac00671f3ea1ce4a51fa3fe111654ac3ad4f2cac
+EBUILD noto-20230201.ebuild 1338 BLAKE2B bbc277f305ab73b3be594d8d3224b945c15c46c3d72530aa7152c304a4e29817ff8b717cda29421f2f140126193fc398a12db6644ccf2923cd627c4b00869a0e SHA512 5f3ae21bd954dc1ce97ed464fc438c27e38dc5deefeb40f1bae7ccb1300e26e56ccc1c3159a2e2e43379d5df9e56b28cadfaaf43512e3d0daebd014fd18dda66
+MISC metadata.xml 564 BLAKE2B 8a5a57d0c7d0595cd149b35ca37bb0657a59e32c8be70ab9f1db87f091fa2c725be532cc6266c05440582fb4b0a7bc90c2e96eb9ce54a4c957d48f25e5daf504 SHA512 058b6a482169a2b4839f79de7ff1eb98bc98c4592785cf7d431d69bbf6622ac620b718670a248011d42a258620a35fb98c7e992adc0bfcdfc8488698a891ddde
diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml
index c82d60b7a612..c79f009d06f2 100644
--- a/media-fonts/noto/metadata.xml
+++ b/media-fonts/noto/metadata.xml
@@ -10,6 +10,9 @@
 		<name>Pacho Ramos</name>
 	</maintainer>
 	<use>
-		<flag name="extra">Install full upstream font set</flag>
+		<flag name="extra">Install full upstream font set including condensed, semi-bold, extra-light variants</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">notofonts/notofonts.github.io</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/noto/noto-20230201.ebuild b/media-fonts/noto/noto-20230201.ebuild
new file mode 100644
index 000000000000..4dcad07f1e0e
--- /dev/null
+++ b/media-fonts/noto/noto-20230201.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/notofonts/notofonts.github.io"
+
+COMMIT="f589dbf1a59852047e5e506bf8f3ee93be8d6cce"
+SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# Extra allows to optionally reduce disk usage even returning to tofu
+# issue as described in https://www.google.com/get/noto/
+IUSE="cjk +extra"
+
+RDEPEND="cjk? ( media-fonts/noto-cjk )"
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/notofonts.github.io-${COMMIT}"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/66-noto-serif.conf"
+	"${FILESDIR}/66-noto-mono.conf"
+	"${FILESDIR}/66-noto-sans.conf"
+)
+
+src_install() {
+	mkdir install-hinted || die
+	mv fonts/*/hinted/ttf/*.tt[fc] install-hinted/. || die
+
+	FONT_S="${S}/install-hinted/" font_src_install
+
+	# Allow to drop some fonts optionally for people that want to save
+	# disk space. Following ArchLinux options.
+	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.tt[f,c]
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9034aba54259..01b4bea02a50 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index c95fe432b051..1d65f6abaed7 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,8 +1,10 @@
 AUX gimp-2.10_fix_file-dicom-return-value.patch 581 BLAKE2B 57acc6c2ade824a29a5ec5778958b9f29a524b0a4a366fc25bc5b2ea535694d15a9dca445543d0a59b2e827d9b9e4c7a3de734acb86fe6ed75235e6cc7760578 SHA512 a5f6c0a6b263a61c83c505182e9ceb0d1a26dfdff26175e349e212621f3b9e1d231d9d96843ab0484378f7162c20be27d519fdf814fa946b614224122ea06908
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
+DIST gimp-2.10.34.tar.bz2 31405329 BLAKE2B 0b2d3a81abf89684bb90e2101896db3479a25c5da76738543dba8d0378e64608eee9aeb24888e15f5e347f72fa1df3e9b82aa27e503ee61d1c4d45d44fa7bddc SHA512 4802ce3758daba868570f1ac97a3f1cb41e1130fcc6376f9bf4c999441f8fd25937aa71b6f726d82d7c780f4153b11d2595bb76bc2356a42266909fbcc0bd34a
 DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49 SHA512 6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204
 EBUILD gimp-2.10.32-r4.ebuild 5792 BLAKE2B d540c13b099e3d07089ae3ec68dba083bdcf5d27f860eba9ab5117dfb72b3a0715d1530eab54e06a2a4a93af78ae1b878ea37c3d187ee090bc208b88160e44d4 SHA512 7cbc3ae79e6add3294644c71b94528f1865bc22d951463f70fe05fae3ab7273891f3c1e82fe803c05e382dd7ce56c59f503df45cffdc5a9b151820a35d8fd818
+EBUILD gimp-2.10.34.ebuild 5696 BLAKE2B 4e9b445b9242a50d2aa9036dde848b928a36bd24bd4a8bdd23725498db7f22c76f7cc72707c4add5c264ad53cb93f50aea0a51d42e622be4a24241acf659491e SHA512 4c24b1a9572dc05f17ad487f5bb0048fdf47c992c0c638a61b4279402790d5531547114d508c2c9e506497a95299c769f098af105dd386eefd59737e35f2f469
 EBUILD gimp-2.99.14-r1.ebuild 6865 BLAKE2B 96aca299a8aa07c49e447bf7ae78a404f2da5d769319d191f367a61b4d4e34f334606f1c53ef0c0c1d8d37d12bdd52a62fa7af163d377f08f81cfe4208030099 SHA512 81c8bd180f2999d1a7c594f03ed51eebc10c07833bb5e0288a7095e57292afbdce67c55f87e97ff4227a1570c78f8f842b9c89ada9debebdf8c3c24e89776f2d
 EBUILD gimp-9999.ebuild 6684 BLAKE2B 049f99cd38d7fc3ac83dde87373784800e0e8cba1d4bd904e356fc83a7a16da0bd363e2455a57f51d15d61bb69ed02fc5bc748a9dcffb6a24456b1b8f030d8f1 SHA512 7b0dbc11addcbae623b3e314be7f3d89defa54ba64c98178b9ac2bb67285e2b916e83fd744dfb0248c58cce926e596a9d9736f40442a59bfe184fd8767631ca5
 MISC metadata.xml 648 BLAKE2B 3454806e0bb680d45e98fd571cc5ad2e09d1083a84b44efb49ea527432be8a255ae02c1c53ff6bf47ce9e9e1a471d422212fd4c08d4983476c2585fa9b96e541 SHA512 dc39d7aa41dc6ae6ab850eec0ce9e10b0085aa8f4b4d762305f7ab70b7a1f7bbe454c21f3d87e796c29c41a4b99f7b3ca38a54261188e7b8acbf8bd3d79dfcd0
diff --git a/media-gfx/gimp/gimp-2.10.34.ebuild b/media-gfx/gimp/gimp-2.10.34.ebuild
new file mode 100644
index 000000000000..5cdd6b4b938f
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.34.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.100
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.42:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:=
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with jpegxl)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+			mv ${plugin}/{,${prename}}${plugin} || die
+			mv {,${prename}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index b1cb6d0dd676..46594ba3fae3 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1,5 +1,5 @@
 DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5
 DIST pngcheck-3.0.3.tar.gz 63766 BLAKE2B 962f90e6a05170a14fba45372d65f8cc94d1b4f6119c30d252a67644b69eb8a925c20b0d020b917673754f491305f73ac7e294df9b2a908a93011cec420c3629 SHA512 cdb2620cb508f9df748bd3e9cb657d2c503a1f62171f497f1ff1e0f220287364829f03164869567c83b5797d8bc478495ad6c35860196812ef8262fce4cbff26
 EBUILD pngcheck-3.0.2.ebuild 690 BLAKE2B 1e51643aa788db7736a3ef873eb897550636bda3acd514cdfaaa20920c20dec4cbd1e6752dd8910cf3d74c6949f1ce9c637974001de85ac5f4822433681f4ee0 SHA512 97b469bafb99f807b7d62089ccbed09ae0f6f5f2fbf6b47f672ba1122e12d75691295b557acc6628951eace4022a2c12892bdfd45e759d60ce3ebddc74f3cd1b
-EBUILD pngcheck-3.0.3.ebuild 698 BLAKE2B 0ffa5926388fe60b020aaefd0c8880b1aa7e119591839d868d8ac6c37b8dea18dc37e3b46424af6f7246aa65f842821745de5603a950ce85a2c29e1a9432f4dd SHA512 73fc2f88672e50f9337dbd1990fd6e1eb2f8682656073c2500be928fcf38afb46825db78de9a542364f0ffab989d92c2dc845d3696d51dc8b30266e38c2e2732
+EBUILD pngcheck-3.0.3.ebuild 696 BLAKE2B ca6243ef70a236644110b9e4dcce87a793613430465617513c2373ee5d71306ad5e6985e8d5167a3f07d6eff317ec7109d2ae5ac55ec7c3d78a652d9a30cb275 SHA512 8e69784097d1b9df1efcc91175df7836e22624f179cc06c29f7db977ca0860d4c737c38c4609b14375ef797f6f05ddad510ae2caf63286ff738c3ff382fc4733
 MISC metadata.xml 245 BLAKE2B 30ec91c1f9ea95e1a599102f696a4fe4b20d1f4f75cf7e7be32c5b53716ab4944b46f2e03bfb03bc1c45779f12768a6f6c14fe34c074678a02c705aaaceda709 SHA512 ed5a8995a5bbcbc8f921f25f096f6211ba40548527e4acc752fd93a847a133857ee14a91bf9ab3c3f9aee14213a06a72c1c23e9428a1b37815b09324d0344ee8
diff --git a/media-gfx/pngcheck/pngcheck-3.0.3.ebuild b/media-gfx/pngcheck/pngcheck-3.0.3.ebuild
index 536c33d0495d..1679a40f32a0 100644
--- a/media-gfx/pngcheck/pngcheck-3.0.3.ebuild
+++ b/media-gfx/pngcheck/pngcheck-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=8
@@ -11,7 +11,7 @@ SRC_URI="http://www.libpng.org/pub/png/src/${P}.tar.gz"
 
 LICENSE="HPND GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b371e950e9ca..bfc220c834c2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 3b872b2f100f..aab9955aae08 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -2,9 +2,11 @@ AUX aalib-1.4_rc4-gentoo.patch 1245 BLAKE2B 59451b7cad10881b27d5eb13211106c278d8
 AUX aalib-1.4_rc4-m4.patch 241 BLAKE2B 0fc63b7936334bfa171cdafdb0d8813ce499d3dfe29f32b59e8ca1873d5ca55f1154a3f2e1aa5c187b5ea8f5c138c60992378b4e7ba8e1fb4e646bd6ea85200d SHA512 bea8e769596ec8d529d67a2b6081d2a7c1e47d9089551a31356f8b15a4dbfd36fdc97839754ef188621d8870628707b274f2183cebffc219ea0f3784fa12d8f1
 AUX aalib-1.4_rc5-fix-aarender.patch 1354 BLAKE2B e9456d951d0ac69685dc79243d1f17abbc304acbe247390a832208c5d9ea691ace9383dd0ce34b8edad254d95857ed729db6f26f16dc82765542981a3f73ef00 SHA512 4e30144ce0df3e1f063fc1bef34690ffc88719f3f52fa62f25f4d2e28a22b59713b5ea23f14c07f0fec5b3988a093572b3e9886ef052cbba48a028f84eb84588
 AUX aalib-1.4_rc5-fix-protos.patch 2105 BLAKE2B 4b701691a61a400a52a7ab7cdc213f0e47bb47c7f7d5f72ea862b7744641df5b510b434e85f0b5bfcc2c88f864ee6d651441d41571283661a9008018068c7e0c SHA512 e46268f5fb972500851f5489cc6311171a07a8b1a7a564bdafe5760008db72787650ad74e5144cbdb30b7fef027ee646e5534dd2eabddbd057bef1b27229af37
+AUX aalib-1.4_rc5-free-offset-pointer.patch 404 BLAKE2B dee15643e51c9d6c481215b5d8135a3e0b31ebb061432fc36bd6d45992b36cd767aa44d262d8ebfd7ca8c600b9418843eb384d4c3ed4de5255df39c6b177ce24 SHA512 57d92c401057cd5ba8e034378ab137d1eff777dfaf51bde4281bb4882459b2e47d374f20b7520ca0b0d17371cb0942de75d9faca16a56aab7f47dfa0ac7b3c72
 AUX aalib-1.4_rc5-key-down-OOB.patch 504 BLAKE2B 1742e3d22889e7faabaf0fcacecc7db4dff4d126361f02d0311e11a93a2a1445de78f1e5a38cb43860bee1809c8350829715b843b52f7354f2ffe22cd21e7e1a SHA512 e3a79459024e25180b5407b92031c1b675659038289daff5a62485a01dc79afd8223652f9bd3e521a975158ecaa8210e35e536dfe3719259f2631a87d83e19b7
 AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f1f780c37f5d5282c27985ef064e53221d369974c3147634b1bfb1af6df7232088a71fdd12230e587c475c5817180a602c SHA512 c2b723af88a0ca70505086bc7436e5c213d2f52698b293392be2a6b18ef26ef285a09e460577a4a60b328df45b1d61c50064f3ba1f3df43a844082f2c5da25b2
 AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
 DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
-EBUILD aalib-1.4_rc5-r9.ebuild 1948 BLAKE2B 201794aa10275d9f503dd3ea21df8ccd0b252cdd627d62442177976ab12cc55f44dcd9b6d1e4344e79f3caf4d6d8a42e237d944d567419d2fa3ea1b0516ebc04 SHA512 30d0b14f423481a0a987164e7e63923a40cd0a952285281f7ebd25bd9ec5b5fa474af497e3069d91073af5293da4e01689a7e526ee7a7ba43b7ff53cf3e3b104
+EBUILD aalib-1.4_rc5-r10.ebuild 1943 BLAKE2B 1c52e7e4ba10479137e4132b34a2762867cd41bf817670eedf20ac492a19371d5e739660f6bec5c92976285f2c92842f7addada1cfce63e7215fffdc555427f6 SHA512 e5ffdeae8e0cedec1b856a638eda8bc72888b3379c77d6c9015d469224fda05af1dec8ef539286c15acfb8cbd5fd6219b8049f3dc866ddad246db522b3ffdb20
+EBUILD aalib-1.4_rc5-r9.ebuild 1949 BLAKE2B 83585440398d08ba7905f6b8e716c92f3c111b281f00f6194e413f0c5064448946324d04441af427c5c804f4365e6b0bb0f1c9f34e0ee30a9edcf4252a7c1e5e SHA512 b533c7d386c1aaf72484b7cdd6262b3bfe7234c87e5c803a0a7e220cd12543f0bdf5ebaf07cbaab399d6cf2970ea01576a3d36994ac655999f4060dddd4f400a
 MISC metadata.xml 410 BLAKE2B 2f08a7a6bcc149aafd7d9493ea4f87945b3c38fae8e79a80991fb8b23506b7c503d7a0f4c3acd815537a823b0f2f6f49d727d0d34d1476b988811acfa6e89905 SHA512 b35f23f666eb8225269db37aeadf96af19d464b3835933d8fbae839c574cff6ff71bc9553260e383a2a77ca798063eb2529452c99057c4fbd0a0c028ccf86cdd
diff --git a/media-libs/aalib/aalib-1.4_rc5-r10.ebuild b/media-libs/aalib/aalib-1.4_rc5-r10.ebuild
new file mode 100644
index 000000000000..366beee3347f
--- /dev/null
+++ b/media-libs/aalib/aalib-1.4_rc5-r10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal toolchain-funcs
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${PN}-1.4.0"
+
+DESCRIPTION="A ASCII-Graphics Library"
+HOMEPAGE="https://aa-project.sourceforge.net/aalib/"
+SRC_URI="mirror://sourceforge/aa-project/${MY_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 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="X gpm slang"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	gpm? ( >=sys-libs/gpm-1.20.7-r2[${MULTILIB_USEDEP}] )
+	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
+	"${FILESDIR}"/${PN}-1.4_rc4-m4.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-fix-protos.patch #224267
+	"${FILESDIR}"/${PN}-1.4_rc5-fix-aarender.patch #214142
+	"${FILESDIR}"/${PN}-1.4_rc5-tinfo.patch #468566
+	"${FILESDIR}"/${PN}-1.4_rc5-key-down-OOB.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-more-protos.patch
+	"${FILESDIR}"/${PN}-1.4_rc5-free-offset-pointer.patch #894978
+)
+
+DOCS=( ANNOUNCE AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/src/*.c
+
+	# Fix bug #165617.
+	use gpm || sed -i \
+		's/gpm_mousedriver_test=yes/gpm_mousedriver_test=no/' "${S}/configure.in"
+
+	#467988 automake-1.13
+	mv configure.{in,ac} || die
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		$(use_with slang slang-driver) \
+		$(use_with X x11-driver) \
+		PKG_CONFIG=$(tc-getPKG_CONFIG)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 53a76ebdff1c..509be2da5485 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.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 @@ MY_P="${P/_/}"
 S="${WORKDIR}/${PN}-1.4.0"
 
 DESCRIPTION="A ASCII-Graphics Library"
-HOMEPAGE="http://aa-project.sourceforge.net/aalib/"
+HOMEPAGE="https://aa-project.sourceforge.net/aalib/"
 SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch b/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch
new file mode 100644
index 000000000000..3ae697e3189c
--- /dev/null
+++ b/media-libs/aalib/files/aalib-1.4_rc5-free-offset-pointer.patch
@@ -0,0 +1,14 @@
+--- a/src/aarender.c
++++ b/src/aarender.c
+@@ -63,10 +63,10 @@ void aa_renderpalette(aa_context * c, __
+ 	errors[0] = calloc(1, (x2 + 5) * sizeof(int));
+ 	if (errors[0] == NULL)
+ 	    dither = AA_ERRORDISTRIB;
+-	errors[0] += 3;
+ 	errors[1] = calloc(1, (x2 + 5) * sizeof(int));
+ 	if (errors[1] == NULL)
+ 	    free(errors[0]), dither = AA_ERRORDISTRIB;
++	errors[0] += 3;
+ 	errors[1] += 3;
+ 	cur = 0;
+     }
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index ad40b7d4cfd8..fcb18f71b32e 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,4 +1,6 @@
+DIST babl-0.1.100.tar.xz 313808 BLAKE2B 068693717d6b9535b1e562d014350e7fb9e891cbb2aab54b6a146acb3c202c54add4b6599624e200c872f6fc44756b62c6e4daf06f806a03abbc5faee61f61a3 SHA512 19d2f656b2c758f7b4b5ac090c08689617db0eb8c304ef501ff002ca32e9ddd7eeb99d5d9aeaba79c34c4c551bda936f5a1b209fad20cd73db85b0ddea82f9da
 DIST babl-0.1.98.tar.xz 312516 BLAKE2B c12626e4b8127a5b2e17507e20cf6ce324834a58d64fa54b80fbe00ef2468d3d29c870d44a22f08f7e74404cf6f47321084c854a4ba017cf0c8c199d8210849f SHA512 33b2e3f8fbcd6602bb82d6242dd2911bb2232e69350f7a0e70e14b1472052e27b0e2a1fa6a2b6d0449fc9796353336e311c8d4007c532447cd61f95b684a3120
+EBUILD babl-0.1.100.ebuild 1972 BLAKE2B ce5bd512818ecd7d830b07f0112a8b60c4a9ad0f4f67fc5555934ecf50b7f91e1a78ac7cdfd95a7ff1fadf43c4f84161608be3c3041a30be314cf1e8cc5324e7 SHA512 98d6529f426ee91271c0d38b8e9f9a85058ba83dc1308806179efe7228a9dd8e3c4bbb713f04ee340c43ecc2dc4800c1866b8811522672aafc53b43b6b8a5c65
 EBUILD babl-0.1.98.ebuild 1916 BLAKE2B f2448dfba8c3d8e7ecadd672c4dfff367188231cf6d029206e25a2238d9189f3a2183e12e6213fc8a788824a5b62bc6e856fa2691b7671ac005e5aa119f8ce2a SHA512 35fc9ed03e73b78cf7ef943263ec1b4f7dd33200fbdccd9df1925c3bcf8863d315a2b52f02c17ae85824cadadabf94079512a8ed5ba9eeaba59a9e7ab2524469
 EBUILD babl-9999.ebuild 1768 BLAKE2B 06e15bedd34ca86198a759f664afd31fc6abf3609da2ea8f685b9c319c9a6ab58b1ba49d21a21f19a32e9d3fd084ab5228d80469fb2827f6b65fafd555832ba9 SHA512 1ce5acb7bd4d2b9f2995628ab03833d05047463629456ba64f4d3f9af6b85929a2127d5d8d5ed184a4986d833b18e43db9879a59e4657692d16eb24d0cb5b962
 MISC metadata.xml 482 BLAKE2B b87a2ff4b72fc2aeed91042dd7b6a65032aa4608c7079fbc94c1d1f85e681bc446aa1fcad5f14cba510febe1430b290417cd498ff09c797ec8b28c84e6451e4e SHA512 3345414f92106c39f8364c1554e0325cfd45cbf94f84315d809bb305faf4093b3b971c79f7c32ea998a8fd0c6c9369c249ce10063a1521690a624860e20de995
diff --git a/media-libs/babl/babl-0.1.100.ebuild b/media-libs/babl/babl-0.1.100.ebuild
new file mode 100644
index 000000000000..fa71efb6d66d
--- /dev/null
+++ b/media-libs/babl/babl-0.1.100.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="https://gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="
+	introspection? ( >=dev-libs/gobject-introspection-1.72:= )
+	lcms? ( >=media-libs/lcms-2.13.1:2 )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+}
+
+src_configure() {
+	use vala && vala_setup
+
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	local emesonargs=(
+		-Dwith-docs=false
+		$(meson_use introspection enable-gir)
+		$(meson_use lcms with-lcms)
+		$(meson_use vala enable-vapi)
+		$(meson_use cpu_flags_x86_avx2 enable-avx2)
+		$(meson_use cpu_flags_x86_f16c enable-f16c)
+		$(meson_use cpu_flags_x86_mmx enable-mmx)
+		$(meson_use cpu_flags_x86_sse enable-sse)
+		$(meson_use cpu_flags_x86_sse2 enable-sse2)
+		$(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Create symlink for backward compatibility. See also bug 871690
+	dosym -r /usr/"$(get_libdir)"/pkgconfig/babl-0.1.pc /usr/"$(get_libdir)"/pkgconfig/babl.pc
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 3bd3096e4eeb..1732cd0f2cf5 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,6 +1,8 @@
 AUX gegl-0.4.40-libraw-0.21.patch 936 BLAKE2B af0030e4d069f75751cbe7d9eef2e2ea4b26c685a13ee1d15939f89993ec21ecb436a1914a724c3308c36b3290061dcf645dcfe39575ad704bc9f5d8b86a4b22 SHA512 5481f781594c868e5191fedb15fdcdd1deb32e7c1db3484c0331531e4f38d5cc34e8a0e8b157feb11d9e6598926a11bd220cfc009bad19379021892af97db836
 AUX gegl-0.4.40-strict-prototypes.patch 2555 BLAKE2B a377756270ea1cae19a5d890305c1075144389937294c23ec0cff6454742551b6e3bba72bce97d429c39f56517451597a564a19805d2bc19fc08d675c2a9e558 SHA512 8e8e223414bbf8499b622213ac73bb4566cb6d1b4d982eb63785a79a45038392b36c30cb328a6e89ae218d40813479b0b7fbba6dd980f050055990832e51b2fd
 DIST gegl-0.4.40.tar.xz 5784744 BLAKE2B c4466a76ec4f7939161e9ead6980b8a701f3fc459c40c3de3e09caa688aae12fb1f4a9979ca82e95011437f229532ba07012590d00aeb97b610b69968faa454f SHA512 99ace5f1b916e56f31483b60a38f885d0e09652c834122390bba4439d9bb1a137d84770e1518187330c44f3491e53393cfb8802ba9ede20658e1c8122e798888
+DIST gegl-0.4.42.tar.xz 5787100 BLAKE2B 6ae3ec98e72b1057b9d84551f56b675edb511994a73979bfccf559e24d3d636ba915aab10d3b3a1b38989d69c63692d3f312c621819700332c8cc1a4b3e86875 SHA512 29ccd93faa6127b6a9b1180eeba47f1b6f9bc06da8a5c9d68315d7474b77ff19d1084a6f4e7b218666b355329b17bc562f5906a334aa2baf93840d7caa0adf57
 EBUILD gegl-0.4.40-r1.ebuild 5056 BLAKE2B 70db81c565564ce7330f36d1435b7abd2c368ac5e967cdb684784537e1752cc2f95453826fdb30d01d93bec5f5a5a94a1fe78cf8e1c57579aef56326d20d0f2d SHA512 3ce0f2aac7baaa4d654d7eaef917ff6c94fa2a4eca16ace26be6423c23facefce5de1e14e82496b9b32c20d12574aab62a3093d328b04308746117b6832b3fcf
-EBUILD gegl-9999.ebuild 4728 BLAKE2B eee2f69b1252c29c77a4b64e5b0e35b13153a579b6e3ca669232877678c935c22a90ef34ec630e30661ed6ad3664725204e07efb339910e0e27847fada96839e SHA512 2cfb14b0357749cb37bc193e2829ab8c2a3e34b18ec412c5f5e4233f57ab52d69dd4a64c736121af9baeb718d5f244406d5cb8f05b4583626abecc7282188467
+EBUILD gegl-0.4.42.ebuild 5036 BLAKE2B 83435d2c777534f13f75db6bbded832d94210624a529dd701854bc42ab5da641d6ba336bde4ff48e0f1f231ab726bd31be32a61d6237e0d642f3c6808d024d8d SHA512 bd752860e8817d5e07b4d3136e4b5c224dc4e70dfd40a7344e366ee2f4e03977bb8ba5e0b972914b072b496c006fb015da554c065d9c2e21538ad4946db3e7b2
+EBUILD gegl-9999.ebuild 4749 BLAKE2B f9c275c0ce0223df7af16be825474e687a6447dc78d19342a3cc90504a76aa3c98d65cf9609e6628e7d9fd650c99251be19c283c2f1fbe7be84571420a7096b6 SHA512 a7f6d89d928ce2e7850bbac75bc4af7d7c7d9e2a06724477c83281a4310418782ea340ec1caf9b7d904bc4dbbc3cae8e759a1031344cf7e5c1ec64801c7e69b8
 MISC metadata.xml 761 BLAKE2B fa74f6ff5ae13c05793505d0a27b7bc8587748ad356fa4f3ec5b48bd2919c6197788ab02bdc02fbdbdfe2f376d93222b600e30915e50f4ee4643e973ce054d86 SHA512 8cf93e9c5130a017bb864144e88cd2a4f2eff17b5543514a3ca84066b90e394dda6ee64a5e49d8db3b48eb905df5eef815f3b2689bc2be9772a01dcd2cecad30
diff --git a/media-libs/gegl/gegl-0.4.42.ebuild b/media-libs/gegl/gegl-0.4.42.ebuild
new file mode 100644
index 000000000000..89deb6434997
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.42.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="https://gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+	svg? ( cairo )
+	test? ( introspection )
+	vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.68.2:2
+	>=dev-libs/json-glib-1.2.6
+	>=media-libs/babl-0.1.100[introspection?,lcms?,vala?]
+	media-libs/libjpeg-turbo
+	media-libs/libnsgif
+	>=media-libs/libpng-1.6.0:0=
+	>=sys-libs/zlib-1.2.0
+	>=x11-libs/gdk-pixbuf-2.32:2
+	>=x11-libs/pango-1.38.0
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	sdl2? ( >=media-libs/libsdl2-2.0.20 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:= )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+	vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# patch executables suffix
+	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
+	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
+	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
+	# skip UNEXPECTED PASSED 'matting-levin' test
+	sed -i -e "s/composition_tests += 'matting-levin'//" \
+		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
+
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# fix 'build'headers from *.cl on gentoo-hardened, bug 739816
+	pushd "${S}/opencl/" || die
+	for file in *.cl; do
+		if [[ -f ${file} ]]; then
+			"${EPYTHON}" cltostring.py "${file}" || die
+		fi
+	done
+	popd || die
+}
+
+src_configure() {
+	# Bug #859901
+	filter-lto
+
+	use vala && vala_setup
+
+	local emesonargs=(
+		#  - Disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		-Ddocs=false
+		-Dexiv2=disabled
+		-Dgdk-pixbuf=enabled
+		-Djasper=disabled
+		#  - libspiro: not in portage main tree
+		-Dlibspiro=disabled
+		-Dlua=disabled
+		-Dmrg=disabled
+		-Dpango=enabled
+		#  - Parameter -Dworkshop=false disables any use of Lua, effectivly
+		-Dworkshop=false
+		$(meson_feature cairo)
+		$(meson_feature cairo pangocairo)
+		$(meson_feature ffmpeg libav)
+		$(meson_feature lcms)
+		$(meson_feature lensfun)
+		$(meson_feature openexr)
+		$(meson_feature openmp)
+		$(meson_feature pdf poppler)
+		$(meson_feature raw libraw)
+		$(meson_feature sdl sdl1)
+		$(meson_feature sdl2 sdl2)
+		$(meson_feature svg librsvg)
+		$(meson_feature test pygobject)
+		$(meson_feature tiff libtiff)
+		$(meson_feature umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(meson_feature v4l libv4l)
+		$(meson_feature v4l libv4l2)
+		$(meson_feature vala vapigen)
+		$(meson_feature webp)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 95d76e51ce43..e0cc3086c9da 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -62,7 +62,8 @@ RDEPEND="
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/perl
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 84ea05941aad..adbd2b6bf43e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,12 +2,16 @@ DIST mesa-22.2.5.tar.xz 16524904 BLAKE2B 5891e76e818dcd665ebac6dadbf223f38238020
 DIST mesa-22.3.2.tar.xz 16988720 BLAKE2B 8fdadd77a7bcac1b0ba6955b452a89cf823650ad3296128b82471888da666a33407e6ea2784ccf3f49c04a34fecfcd6a172372828fd2200e74d7dcf97e9c5938 SHA512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f
 DIST mesa-22.3.3.tar.xz 17009624 BLAKE2B 2d5381b21268ed616f0adf1f479958492d812ac9f4a5dbe96df0c37ac778fc24f8522bf13a1d8da9c8062b04e642b0929f3a376738c6ccd5442c98d39e241ec5 SHA512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1
 DIST mesa-22.3.5.tar.xz 17069488 BLAKE2B a24e1c93d08e045e9a5d3b4105ed7190c621479494e778411048f96419c2acd9f2cd0278155db23d4bcfcc56cc71fca2602cf3eedac2ae5ce2afe5033a6e8017 SHA512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85
+DIST mesa-22.3.6.tar.xz 17099008 BLAKE2B 36928135568129f21c87afd6c43af805096215d5922e52ec56fc8e562a88b45f3d556b285e80139ecb682071b8a6d0699d4a328c10d780c3fd736f7c821e4d01 SHA512 506fc69ace128504fe45b7ca0b6b1d1d2a33837d74bff7ae7310fef5100b162136ca77ee6a50745a5bda270d0b8cb1ee99ecc19190eddd83cc78039bd02b1bb7
 DIST mesa-23.0.0-rc3.tar.xz 17427732 BLAKE2B dfa4f77b7e43ed505c6cb00806965fa4a809831888baa270f3f05bccdfa560fbd19d150fca68fba4b7653d284d72dcec6f016eea2ee36de589e5c4b875a121ef SHA512 adad86189ae27eb5cf89d7b6e0626a78f49f5a72cdea0f4eb59d76aae74c657251d07c3142c578e1e13edef73947d4807c25eebf9598b8a0e16a70c584916ce5
 DIST mesa-23.0.0-rc4.tar.xz 17440412 BLAKE2B 879619965527a7e80edf05ef7431344590f4d67cc462bbce1db207420d7613e986ac96a504beabafa98cfab743ae18ca6d2d84bc2ae7feacbc11e72fb62a0438 SHA512 463dad021bffd1b6cae8eb540ea0f51da8753e5f5295f5d1ab6398ed6eb140ccef7ba62b458c099cc19a26d6dcb4b620280893425572fae75fe7e880d8e3a403
+DIST mesa-23.0.0.tar.xz 17492236 BLAKE2B f543856c9d85411c86b4ce28cfd412762726c60a3381c7e3f81f70479ff8c01a597279b6a18225b41db51cf5e8786f6955cd3127c8c3244422bc1bca4bc0dfa8 SHA512 127e2759a2a31cacd65a0891719ab7bb4a9188844022b4bccaebbedce9c550b9ccb160ad519178ea0d851c4bcb8f0f56febda248ed2ba82b5ddf804855e4694b
 EBUILD mesa-22.2.5.ebuild 12662 BLAKE2B e7fec8b5b563e96173125e559fe4bc8222e59f8371217a32a76768906fbe1a5cc6d13d4830ed37ba7eb8b07689f2d33970533a6db89a9f00926921da98c44fac SHA512 de9088f4d19d360be2516360da5b6fa21f2aa659b856f025917efe68dc5815c7bc3cea6f5d5957f562cc0cc15839fe9226d3a70ed69e90fbdfc043e89cd9e8c2
 EBUILD mesa-22.3.2.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6
 EBUILD mesa-22.3.3.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6
 EBUILD mesa-22.3.5.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
+EBUILD mesa-22.3.6.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
+EBUILD mesa-23.0.0.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
 EBUILD mesa-23.0.0_rc3.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
 EBUILD mesa-23.0.0_rc4.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
 EBUILD mesa-9999.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128
diff --git a/media-libs/mesa/mesa-22.3.6.ebuild b/media-libs/mesa/mesa-22.3.6.ebuild
new file mode 100644
index 000000000000..e85c95eeb1ec
--- /dev/null
+++ b/media-libs/mesa/mesa-22.3.6.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	xa? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+				>=virtual/opencl-3[${MULTILIB_USEDEP}]
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="16"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:16[${MULTILIB_USEDEP}]
+		sys-devel/llvm:15[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	vulkan? ( dev-util/glslang )
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	# opencl stuff
+	emesonargs+=(
+		-Dgallium-opencl="$(usex opencl icd disabled)"
+	)
+
+	if use vulkan; then
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
+	# to match upstream defaults.  Mesa requires being built the same way.
+	# https://bugs.gentoo.org/883955
+	if [[ ${LLVM_SLOT} -ge 16 ]]; then
+		emesonargs+=(
+			-Dcpp_rtti=false
+		)
+	fi
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-23.0.0.ebuild b/media-libs/mesa/mesa-23.0.0.ebuild
new file mode 100644
index 000000000000..e85c95eeb1ec
--- /dev/null
+++ b/media-libs/mesa/mesa-23.0.0.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa zink +zstd"
+
+REQUIRED_USE="
+	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	xa? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+				>=virtual/opencl-3[${MULTILIB_USEDEP}]
+				dev-libs/libclc
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="16"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:16[${MULTILIB_USEDEP}]
+		sys-devel/llvm:15[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	vulkan? ( dev-util/glslang )
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	# opencl stuff
+	emesonargs+=(
+		-Dgallium-opencl="$(usex opencl icd disabled)"
+	)
+
+	if use vulkan; then
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
+	# to match upstream defaults.  Mesa requires being built the same way.
+	# https://bugs.gentoo.org/883955
+	if [[ ${LLVM_SLOT} -ge 16 ]]; then
+		emesonargs+=(
+			-Dcpp_rtti=false
+		)
+	fi
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fed9ce4d1895..01b51819c8fe 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 1eccaa519251..796f58a7a1ee 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,6 +1,6 @@
-DIST shotcut-22.04.25.tar.gz 4600941 BLAKE2B 5f8ba47897c3a8ce078a35c06c90454c8c1df9bd9bd3330466a1be869b7b9c9ec45aaf6d3b5aad0587857ff5613ef22f15c4b5142c8247b97c81bb8345b3ff4d SHA512 e5c51868a7f6e2ead3993d8577b5439408e9c54ee20274658c822666e2ca5fceb7d2360d02b8808b464c69005d83b6742a3a750ec244ffe69f82f2abd5ad39fc
 DIST shotcut-22.09.23.tar.gz 9096319 BLAKE2B 4023ca82f72e5fb3dca9dfed18912f0b8a99ef5915b0bb1ca983269b99b4b057747558801e2dfe65c89e68c4e9fcfc0a1cc9bcc24ce4d44d1e5453b94d639da2 SHA512 3c680a36ed4e22e857a824eaa25a63aa6cb830751e9730d4cd5e0a6fa2b087d9b63900232155fe5f656a4d70ae27dabc5fad52ed39d6b53f99188c954f9896d8
-EBUILD shotcut-22.04.25-r1.ebuild 1382 BLAKE2B a52d4612f5934aa66d0abca7f702798b5f58dd209bea2d0038ace89113366dc91175fb2d716fa71990a9bcd6e59b997096aa8e21e19b31d0a0afc8abafc20f1d SHA512 43926b473f57533214e4ab29d026e5ac737b3751fe01fc9df3b288fa0e9439ca7ebe8848111cc5ca96421263adfa183ee3e65eb8e1ced395106a96e1c21555dc
+DIST shotcut-22.12.21.tar.gz 9857227 BLAKE2B 94739b1f2d66c8d4ebc69ded7c90a75f973b17889fce538855403f92b5232514df45f6e3648ef772b9a22c27b547ce2b7f0f6eb391cc47dfebaf9907f0c6525f SHA512 95ca399657934becedd71c3daa74749bca1b625a0cedf8df4bfd212476602f83f5b807b26ec7c8275ee720e54893102931bf109c95153fc16f348d344e50395b
 EBUILD shotcut-22.09.23.ebuild 1256 BLAKE2B 9528de33473d3a68e684eff2b948cdbe3ee80b1fc93d6cf9c6e516024a4d0449e7d83d7458e0bd130c69510385a76acebc98545557537bd912ab86265a6420fb SHA512 58524526fffff21ce7c920728ba0c72c07d06a33525f04228b4dafe7a373b3cd3b452f04d5cfb518d3dfef821eaf07ec9870b4572e085241ab004fae639589d5
+EBUILD shotcut-22.12.21.ebuild 1289 BLAKE2B 843b147a1ce9922d0c2201b4ae851fd9ae0c8f7c21c168b00c47869cb6c50120d61eb96fa8abfc474c1c44a32d58f9c9978cbd594c3b8c5fcf72c17b16337a0c SHA512 7fab35c9dc50c4e852b4040fe2576528d3e3dae8a97e9f719e6a5cdc876d147abc2b1e89d957304d0ad1b0a9606289e5112c563c433414c36617fb4a406ab2a4
 EBUILD shotcut-9999.ebuild 1256 BLAKE2B 9528de33473d3a68e684eff2b948cdbe3ee80b1fc93d6cf9c6e516024a4d0449e7d83d7458e0bd130c69510385a76acebc98545557537bd912ab86265a6420fb SHA512 58524526fffff21ce7c920728ba0c72c07d06a33525f04228b4dafe7a373b3cd3b452f04d5cfb518d3dfef821eaf07ec9870b4572e085241ab004fae639589d5
 MISC metadata.xml 481 BLAKE2B 183f296894a3deb21038399eec0a637f2080d029fb8ea539a5a165206868704e472ed554bec67325fb54a4d8aeea54c01857635e32abdd229c91f3ba7855d095 SHA512 95af90837128290393f798b1561ebcbad057da1b5dafb583f9f9ba56878ff1d48245438ea3605601fad608e749235619d2195290c04c5c31eb8bbe627b58f4a7
diff --git a/media-video/shotcut/shotcut-22.04.25-r1.ebuild b/media-video/shotcut/shotcut-22.12.21.ebuild
index beb71ab8d58c..db68f3435f7b 100644
--- a/media-video/shotcut/shotcut-22.04.25-r1.ebuild
+++ b/media-video/shotcut/shotcut-22.12.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit qmake-utils xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="A free, open source, cross-platform video editor"
 HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/"
@@ -24,19 +24,16 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 COMMON_DEPEND="
-	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
 	dev-qt/qtquickcontrols2:5
 	dev-qt/qtsql:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	>=media-libs/mlt-7.6.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
+	>=media-libs/mlt-7.8.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml]
 	media-video/ffmpeg
 "
 DEPEND="${COMMON_DEPEND}
@@ -44,23 +41,17 @@ DEPEND="${COMMON_DEPEND}
 	dev-qt/qtx11extras:5
 "
 RDEPEND="${COMMON_DEPEND}
+	dev-qt/qtquickcontrols[widgets]
 	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtquickcontrols:5
 	virtual/jack
 "
 
 src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX}/usr"
-		SHOTCUT_VERSION="${PV}"
-		DEFINES+=SHOTCUT_NOUPGRADE
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release)
+	local mycmakeargs=(
+		-DSHOTCUT_VERSION="${PV}"
 	)
-	use debug || myqmakeargs+=(DEFINES+=NDEBUG)
-
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
+	use debug || append-cxxflags "-DNDEBUG"
+	append-cxxflags "-DSHOTCUT_NOUPGRADE"
+	cmake_src_configure
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2f8d9485288a..5418ac1b9e4b 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1d0b99d784b4..f7ee327bcd19 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 24 Feb 2023 15:09:53 +0000
+Fri, 24 Feb 2023 21:09:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0d754ba26bf4..9d696f95f76d 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-24T15:09:56Z
+TIMESTAMP 2023-02-24T21:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP400RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP5J6ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCbOhAAiNx6HGStjn9NMzZwCEwoXwTj3PjpVxzsKUB8vuiDYsKPPtib27Q+RX3O
-kBYjYC1jJb52nHntK7wPNk0zG+Evm4k+7SESMbN8DbKsPkUf/70FkIgJjasz0znq
-VLWIN3K13ixsqMJfRwNB3x+6EnXUsPnvH8whFUqOC0WKWct7etlGCyr2Gw8jbwje
-G1g5TuhIyzJIUdBZC0Z3mLv1sVOcJg2Z02kr7lH1FLTQBoz1K63R1A/gmP9D8X0L
-Kx3zFwOW0KJ8WIzct0j1VJXX6uESPyvCZ55p6PQiGuVx5qAm4GbLpeSM+HOGUUHo
-/sNDrvTpOqNHjtz2MHYeQO59OF9+FBWUhlMj4ABTiG2rfhbIl5rnzlgOw5LQo652
-OQDr2RJr7OIyGxJ2s1eSrg+NmVHMJvNeH6dQ4179sBMswSYdHc4ORq1/OL+Yp6sZ
-sNZRoS8Bklfk5P4Hlzm88WU6qmSIBIN8HIL6b5BC6riFy+45s98k7EYx6MdNMZxo
-/1XPdqyujGD+DijKrdi6B1coLamInK/67L6HR1QDGRMyqMICJgxVeIiOkM3cwKGi
-af5DUOczTZNGH7n/huRVBeOxvmy2gxDDLiLObK82ByCf9ft1LxhGtcbmBLHb9Dow
-41nMERZmFoNJuZMKKoBLGjiN6ed8EL/t5gduHjlSTiUpZFbYyMU=
-=1V/7
+klCMew/+JxtffJTZFMzkYHXWfsRmif5QQNbKeWzJzS0vQmoFEiQf6PetyLxA22yu
+acZt6UeYeq4oPkgGwQXhTOhRvNQtGlS9nAuLnlCrqo6zc4ipKafRvEItnGBiGjyP
+SdoYQip2j/PE7cIan8vaI7PRIsTI0wlcmWhdwvLlm79lAJ0XhPYIP7r1NoQM6zOZ
+Knta5AcJZRhN9UvzHceYchA/d9kYKMx3x+hYFBY6RzDJ74urjUbaTjwNzgez42UY
+TrmmboQpNp49e1jPFfmdCMbdN0y65OFPwzS4p2u6XpL1fAsKwHdhq4tcGawPCPyf
+XNsCg+FjKMN3orhuJ1TtuMrr6Wgvgp+PvdlwpEIl/lybPYUZBtAQNNZJUFPkw9YA
+J6M0wQdIQKhoIUFEQpiF1akxoOMujhe4I0QMteIv6ievwRVYfXlhueqStwYVvD7V
+PRkqh3xfkVsPsyeGL4vaSyxnLPuoZdD7b5aD1ulPcXiOOS03N7n97CILF06jAhEq
+Ej2W/H593hnzA8rc9kSLNitKIUA4xSNT6E5+uqdtpa2qdc1wJAonRqxeejjl7kYD
+kZ9mxzLlDXboYAXDtJZkeTlPW59aB/Ikp+qRLzHeCPYbEwjAD0KrOJ8JD1nJqiH1
+MJ1/iJ+ekZ8U5EiSnglBDfihiMDfzdqcwpRVaiytZuvJZWBaWAU=
+=hbtb
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1d0b99d784b4..f7ee327bcd19 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 24 Feb 2023 15:09:53 +0000
+Fri, 24 Feb 2023 21:09:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6cf4e2996fdf..36468346fec2 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 594e59386ae8..ed726321704a 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.17 b/metadata/md5-cache/app-admin/eselect-1.4.17
index 23c059c6d8e1..d57a08f9d9a8 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.17
+++ b/metadata/md5-cache/app-admin/eselect-1.4.17
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 INHERIT=bash-completion-r1
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.17.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=490b8f045318669434ed72979d49414b
+_md5_=67cce06bf2982a09d9f8befcf1a95741
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.20 b/metadata/md5-cache/app-admin/eselect-1.4.20
index 32a13406b217..6c386bb4e16c 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.20
+++ b/metadata/md5-cache/app-admin/eselect-1.4.20
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 INHERIT=bash-completion-r1
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.20.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e16e793a5130df5f650ad3c55264d7b3
+_md5_=52a854a629962b8c55f19f729a3b1428
diff --git a/metadata/md5-cache/app-alternatives/Manifest.gz b/metadata/md5-cache/app-alternatives/Manifest.gz
index ec9f0355d58e..df184b117d9c 100644
--- a/metadata/md5-cache/app-alternatives/Manifest.gz
+++ b/metadata/md5-cache/app-alternatives/Manifest.gz
diff --git a/metadata/md5-cache/app-alternatives/awk-4 b/metadata/md5-cache/app-alternatives/awk-4
index 0533f6ad2004..64b19b8f4652 100644
--- a/metadata/md5-cache/app-alternatives/awk-4
+++ b/metadata/md5-cache/app-alternatives/awk-4
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=split-usr +gawk busybox mawk nawk
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!app-eselect/eselect-awk gawk? ( sys-apps/gawk ) busybox? ( sys-apps/busybox ) mawk? ( sys-apps/mawk ) nawk? ( sys-apps/nawk )
 REQUIRED_USE=^^ ( gawk busybox mawk nawk )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=bdb74a8284878bf25cd59acc601993cb
+_md5_=7d0ef7d4fb3a0ff5791dd4e478abe788
diff --git a/metadata/md5-cache/app-alternatives/bc-0 b/metadata/md5-cache/app-alternatives/bc-0
index 7c03278792ea..ab642edaf9d5 100644
--- a/metadata/md5-cache/app-alternatives/bc-0
+++ b/metadata/md5-cache/app-alternatives/bc-0
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=+gnu gh
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<sys-devel/bc-1.07.1-r6 gnu? ( >=sys-devel/bc-1.07.1-r6 ) gh? ( sci-calculators/bc-gh )
 REQUIRED_USE=^^ ( gnu gh )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=ee0e5b6f02e828ea64db75211b653bca
+_md5_=2943fbb48740e31537583362970962ed
diff --git a/metadata/md5-cache/app-alternatives/bzip2-1 b/metadata/md5-cache/app-alternatives/bzip2-1
index e343984a53e2..bb65aa8b7872 100644
--- a/metadata/md5-cache/app-alternatives/bzip2-1
+++ b/metadata/md5-cache/app-alternatives/bzip2-1
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=split-usr +reference lbzip2 pbzip2
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<app-arch/bzip2-1.0.8-r4 !app-arch/lbzip2[symlink(-)] !app-arch/pbzip2[symlink(-)] reference? ( >=app-arch/bzip2-1.0.8-r4 ) lbzip2? ( app-arch/lbzip2[-symlink(-)] ) pbzip2? ( app-arch/pbzip2[-symlink(-)] )
 REQUIRED_USE=^^ ( reference lbzip2 pbzip2 )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=eaec66454b4ef6ca98fd06faf97ff385
+_md5_=54fb10f7f8a7be786e2ec796eb25f3f2
diff --git a/metadata/md5-cache/app-alternatives/cpio-0 b/metadata/md5-cache/app-alternatives/cpio-0
index 013f31fdcab3..aa4c8504b0dc 100644
--- a/metadata/md5-cache/app-alternatives/cpio-0
+++ b/metadata/md5-cache/app-alternatives/cpio-0
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=split-usr +gnu libarchive
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<app-arch/cpio-2.13-r4 gnu? ( >=app-arch/cpio-2.13-r4 ) libarchive? ( app-arch/libarchive )
 REQUIRED_USE=^^ ( gnu libarchive )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=88bb0b2c4dfa0603306ebdfbab013d59
+_md5_=b6bbb902baa228910d617d6c3f94fe82
diff --git a/metadata/md5-cache/app-alternatives/gzip-0 b/metadata/md5-cache/app-alternatives/gzip-0
index 3c14681d7591..079f74baf08b 100644
--- a/metadata/md5-cache/app-alternatives/gzip-0
+++ b/metadata/md5-cache/app-alternatives/gzip-0
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=split-usr +reference pigz
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<app-arch/gzip-1.12-r3 !app-arch/pigz[symlink(-)] reference? ( >=app-arch/gzip-1.12-r3 ) pigz? ( app-arch/pigz[-symlink(-)] )
 REQUIRED_USE=^^ ( reference pigz )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=7c3ec469d602d2c67949bca5118732f4
+_md5_=74fae66d9dfcc7fa790b5f210f26b356
diff --git a/metadata/md5-cache/app-alternatives/lex-0-r1 b/metadata/md5-cache/app-alternatives/lex-0-r1
index 19c5c8237a5b..67b649fbdb98 100644
--- a/metadata/md5-cache/app-alternatives/lex-0-r1
+++ b/metadata/md5-cache/app-alternatives/lex-0-r1
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=+flex reflex
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<sys-devel/flex-2.6.4-r5 flex? ( >=sys-devel/flex-2.6.4-r5 ) reflex? ( sys-devel/reflex )
 REQUIRED_USE=^^ ( flex reflex )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=addf88bd03f7a869a5483b855cc62937
+_md5_=4a63f024e889a7f3eaea0960b450f211
diff --git a/metadata/md5-cache/app-alternatives/sh-0 b/metadata/md5-cache/app-alternatives/sh-0
index 0fd6b9f95e65..ee043a210dfc 100644
--- a/metadata/md5-cache/app-alternatives/sh-0
+++ b/metadata/md5-cache/app-alternatives/sh-0
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=+bash busybox dash ksh lksh mksh
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!app-eselect/eselect-sh bash? ( app-shells/bash ) busybox? ( sys-apps/busybox ) dash? ( app-shells/dash ) ksh? ( app-shells/ksh ) lksh? ( app-shells/mksh[lksh] ) mksh? ( app-shells/mksh )
 REQUIRED_USE=^^ ( bash busybox dash ksh lksh mksh )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=6dc0940f6ed5178245ae106afa81161c
+_md5_=c7e609e8741846de9ad34eff2075c93f
diff --git a/metadata/md5-cache/app-alternatives/tar-0 b/metadata/md5-cache/app-alternatives/tar-0
index c9cbab2a0561..43eb31b5c291 100644
--- a/metadata/md5-cache/app-alternatives/tar-0
+++ b/metadata/md5-cache/app-alternatives/tar-0
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=split-usr +gnu libarchive
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<app-arch/tar-1.34-r2 gnu? ( >=app-arch/tar-1.34-r2 ) libarchive? ( app-arch/libarchive )
 REQUIRED_USE=^^ ( gnu libarchive )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=9af666d0389be1ec1eb1d0a5ed97cea0
+_md5_=141cc5898f87e40544f34939cfc2852d
diff --git a/metadata/md5-cache/app-alternatives/yacc-1-r2 b/metadata/md5-cache/app-alternatives/yacc-1-r2
index eaa7e03d1e74..6575cfde0de8 100644
--- a/metadata/md5-cache/app-alternatives/yacc-1-r2
+++ b/metadata/md5-cache/app-alternatives/yacc-1-r2
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
 INHERIT=app-alternatives
 IUSE=+bison byacc reference
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0
 RDEPEND=!<dev-util/yacc-1.9.1-r7 !<sys-devel/bison-3.8.2-r1 bison? ( >=sys-devel/bison-3.8.2-r1 ) byacc? ( dev-util/byacc ) reference? ( >=dev-util/yacc-1.9.1-r7 )
 REQUIRED_USE=^^ ( bison byacc reference )
 SLOT=0
 _eclasses_=app-alternatives	7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=f18294c81e2b294cbba0db160fc42d40
+_md5_=62de86bc9e631bf84d8dabeef69948f4
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 9e6541aa15dc..afc4bfbe0903 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.8-r4 b/metadata/md5-cache/app-arch/bzip2-1.0.8-r4
index fb60e8e1059b..268a77b48597 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.8-r4
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.8-r4
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://sourceware.org/bzip2/
 INHERIT=toolchain-funcs multilib-minimal usr-ldscript verify-sig
 IUSE=static 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 split-usr 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 ~arm64-macos
 LICENSE=BZIP2
 PDEPEND=app-alternatives/bzip2
 SLOT=0/1
 SRC_URI=https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz verify-sig? ( https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz.sig )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=0fc0c55fd8d6d25347174f62a15f6a23
+_md5_=a5160155308108d3772eae20c1fa2453
diff --git a/metadata/md5-cache/app-arch/bzip2-9999 b/metadata/md5-cache/app-arch/bzip2-9999
index 723df8a48645..97b55ac78a46 100644
--- a/metadata/md5-cache/app-arch/bzip2-9999
+++ b/metadata/md5-cache/app-arch/bzip2-9999
@@ -10,4 +10,4 @@ PDEPEND=app-alternatives/bzip2
 PROPERTIES=live
 SLOT=0/1
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=0b3f696bfbf938603db888776fe96b2e
+_md5_=ce87b58e207a41917627f83047e23c0f
diff --git a/metadata/md5-cache/app-arch/gzip-1.12-r4 b/metadata/md5-cache/app-arch/gzip-1.12-r4
index 8df88630e2ad..30c4a30d6017 100644
--- a/metadata/md5-cache/app-arch/gzip-1.12-r4
+++ b/metadata/md5-cache/app-arch/gzip-1.12-r4
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gzip/
 INHERIT=flag-o-matic verify-sig
 IUSE=pic static verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 PDEPEND=app-alternatives/gzip
 RDEPEND=!app-arch/pigz[symlink(-)]
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.12.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz verify-sig? ( mirror://gnu/gzip/gzip-1.12.tar.xz.sig https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=22ab59cf055bedd09d72a4daa3260ae8
+_md5_=da95d72696c0accac7d4593ca2531f0d
diff --git a/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1 b/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
index a3318a8d68aa..710747624e47 100644
--- a/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
+++ b/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
@@ -11,4 +11,4 @@ RDEPEND=!app-arch/pigz[symlink(-)]
 SLOT=0
 SRC_URI=https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz -> gzip-1.12_p20221228.tar.xz verify-sig? ( https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz.sig -> gzip-1.12_p20221228.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=8fd47bd50438a68dab3d28609abecc67
+_md5_=2d5d41d70a3564597b17e07e218d4c77
diff --git a/metadata/md5-cache/app-arch/tar-1.34-r2 b/metadata/md5-cache/app-arch/tar-1.34-r2
index 5b132f134f8a..4bdde961129a 100644
--- a/metadata/md5-cache/app-arch/tar-1.34-r2
+++ b/metadata/md5-cache/app-arch/tar-1.34-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/tar/
 INHERIT=verify-sig
 IUSE=acl minimal nls selinux xattr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 PDEPEND=app-alternatives/tar
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.34.tar.xz https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz verify-sig? ( mirror://gnu/tar/tar-1.34.tar.xz.sig https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz.sig )
 _eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c8daa96ab184add7acd064e6cff2c979
+_md5_=90a81ff666fd3a66b8e13edc3427f0c7
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.10 b/metadata/md5-cache/app-arch/xz-utils-5.2.10
index e73410944769..d39967ee1f44 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.10
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.10
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
 INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
 IUSE=+extra-filters nls 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 split-usr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/lzmautils/xz-5.2.10.tar.gz https://tukaani.org/xz/xz-5.2.10.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.10.tar.gz.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=f7f580849022c1231a081d41c47457ca
+_md5_=b3b15c5ae4cc8bf9503d8dd36804b52f
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.4.1 b/metadata/md5-cache/app-arch/xz-utils-5.4.1
index 1aed7d8e3e78..4ecac7036cc5 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.4.1
+++ b/metadata/md5-cache/app-arch/xz-utils-5.4.1
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
 INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
 IUSE=+extra-filters nls 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 split-usr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 SLOT=0
 SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.4.1/xz-5.4.1.tar.gz mirror://sourceforge/lzmautils/xz-5.4.1.tar.gz https://tukaani.org/xz/xz-5.4.1.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.4.1/xz-5.4.1.tar.gz.sig https://tukaani.org/xz/xz-5.4.1.tar.gz.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=51daf6c08aa252c635f748037527177c
+_md5_=ffdc935f2413e48620437270d84e8515
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 3a529291dac3..9fe6b5fd337e 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -9,4 +9,4 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=1299b71a2464cc3bc1b10147211ac4b0
+_md5_=ec176fc079ccc847c86b6585a417227b
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index a890ed73be6e..c12751dad221 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/bacula-11.0.5 b/metadata/md5-cache/app-backup/bacula-11.0.5
deleted file mode 100644
index ca15cca91ad2..000000000000
--- a/metadata/md5-cache/app-backup/bacula-11.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=https://www.bacula.org/
-INHERIT=desktop libtool qmake-utils systemd
-IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=AGPL-3
-RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) acct-user/bacula acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
-SLOT=0
-SRC_URI=mirror://sourceforge/bacula/bacula-11.0.5.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=014d72ce8984dad47fe004bd345057ec
diff --git a/metadata/md5-cache/app-backup/bacula-11.0.6-r1 b/metadata/md5-cache/app-backup/bacula-11.0.6-r1
deleted file mode 100644
index d9ed589fecf4..000000000000
--- a/metadata/md5-cache/app-backup/bacula-11.0.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=Featureful client/server network backup suite
-EAPI=7
-HOMEPAGE=https://www.bacula.org/
-INHERIT=desktop libtool qmake-utils systemd
-IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=AGPL-3
-RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs] ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) acct-user/bacula acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
-SLOT=0
-SRC_URI=mirror://sourceforge/bacula/bacula-11.0.6.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5944f3cfe1c15887a0fe848b2e425518
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 5ec1499f8a7d..99fa420c8f69 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.1.6 b/metadata/md5-cache/app-benchmarks/siege-4.1.6
index ad52c879658a..45c8d5718dbb 100644
--- a/metadata/md5-cache/app-benchmarks/siege-4.1.6
+++ b/metadata/md5-cache/app-benchmarks/siege-4.1.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.joedog.org/siege-home https://github.com/JoeDog/siege
 INHERIT=autotools bash-completion-r1
 IUSE=ssl
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ppc x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=sys-libs/zlib ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://download.joedog.org/siege/siege-4.1.6.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=df5a202828912b62017881528b30dc92
+_md5_=e0e2dbebde504adc08102dbb20008f00
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 82a30330149f..97ca32c40feb 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/p11-kit-0.24.1-r1 b/metadata/md5-cache/app-crypt/p11-kit-0.24.1-r1
index f0b99c2e6351..0c2795749550 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.24.1-r1
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.24.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://p11-glue.github.io/p11-glue/p11-kit.html
 INHERIT=autotools multilib-minimal
 IUSE=+asn1 debug +libffi systemd +trust abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:= ) trust? ( app-misc/ca-certificates )
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.24.1/p11-kit-0.24.1.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6c824fcb2eb0cdeaa075b64618a846e9
+_md5_=5a6aecc8801411dc94d347fa906d44c3
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 91dc0078c130..409180c163b4 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-20230101 b/metadata/md5-cache/app-dicts/myspell-en-20230101
index c15d157a9001..8d5d89c9b352 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20230101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20230101
@@ -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 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 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/1672590731/dict-en-20230101_lo.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=c37d924fede373f671cc8673660efd32
+_md5_=932c05739dd0c27aa74a92eebae62c8c
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20221101 b/metadata/md5-cache/app-dicts/myspell-en-20230201
index 6667b822513c..a52a4157f200 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20221101
+++ b/metadata/md5-cache/app-dicts/myspell-en-20230201
@@ -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 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 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/1667030586/dict-en-20221101_lo.oxt
+SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/1675249081/dict-en-20230201_lo.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=5a5fc3bf88a53da1d5c99ece752b5065
+_md5_=1d1e5e1a23bd5ecbd92e8a79a3941d2f
diff --git a/metadata/md5-cache/app-dicts/myspell-it-20150925 b/metadata/md5-cache/app-dicts/myspell-it-20150925
deleted file mode 100644
index 0a371cae8488..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-it-20150925
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Italian dictionaries for myspell/hunspell
-EAPI=7
-HOMEPAGE=https://extensions.libreoffice.org/en/extensions/show/italian-dictionary-thesaurus-hyphenation-patterns
-INHERIT=myspell-r2
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://extensions.libreoffice.org/assets/downloads/z/874d181c_dict-it.oxt -> myspell-it-20150925.oxt
-_eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=62942e2708e5ab76fc3449a5812e64fd
diff --git a/metadata/md5-cache/app-dicts/myspell-it-20221123 b/metadata/md5-cache/app-dicts/myspell-it-20221123
index 40b8d04b4f07..0fad94e31298 100644
--- a/metadata/md5-cache/app-dicts/myspell-it-20221123
+++ b/metadata/md5-cache/app-dicts/myspell-it-20221123
@@ -4,9 +4,9 @@ DESCRIPTION=Italian dictionaries for myspell/hunspell
 EAPI=8
 HOMEPAGE=https://extensions.libreoffice.org/en/extensions/show/italian-dictionary-thesaurus-hyphenation-patterns
 INHERIT=myspell-r2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/z/874d181c_dict-it.oxt -> myspell-it-20221123.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=c501714ad49c0c215d0caeede29d2ae7
+_md5_=bdc42bd22ac2057d8c215fb8a67eb374
diff --git a/metadata/md5-cache/app-dicts/myspell-pl-20210428 b/metadata/md5-cache/app-dicts/myspell-pl-20210428
deleted file mode 100644
index d6c64b4f430c..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-pl-20210428
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install unpack
-DESCRIPTION=Polish dictionaries for myspell/hunspell
-EAPI=7
-HOMEPAGE=https://sjp.pl/slownik/en/
-INHERIT=myspell-r2
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=CC-SA-1.0 Apache-2.0 LGPL-2.1+ GPL-2+ MPL-1.1
-SLOT=0
-SRC_URI=https://github.com/scardracs/gentoo-packages/releases/download/pl-20210428/myspell-pl-20210428.tar.gz
-_eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=bcb629f20142c653e6f027aae79613b4
diff --git a/metadata/md5-cache/app-dicts/myspell-pl-20230101 b/metadata/md5-cache/app-dicts/myspell-pl-20230101
index 0b78ef3bc207..1ff5a8367b64 100644
--- a/metadata/md5-cache/app-dicts/myspell-pl-20230101
+++ b/metadata/md5-cache/app-dicts/myspell-pl-20230101
@@ -4,9 +4,9 @@ DESCRIPTION=Polish dictionaries for myspell/hunspell
 EAPI=8
 HOMEPAGE=https://sjp.pl/slownik/en/
 INHERIT=myspell-r2 unpacker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=CC-SA-1.0 Apache-2.0 LGPL-2.1+ GPL-2+ MPL-1.1
 SLOT=0
 SRC_URI=https://sjp.pl/sl/ort/sjp-myspell-pl-20230101.zip -> myspell-pl-20230101.zip
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=28b85b1fae01333f341c31dbe841737b
+_md5_=cdeaaee2e7b94b4ab89540c353df2afd
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-5.3.1 b/metadata/md5-cache/app-dicts/myspell-uk-5.3.1
deleted file mode 100644
index fff904c26e70..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-uk-5.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install unpack
-DESCRIPTION=Ukrainian dictionaries for myspell/hunspell
-EAPI=7
-HOMEPAGE=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus https://github.com/brown-uk/dict_uk
-INHERIT=myspell-r2
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3 LGPL-2.1 MPL-1.1
-SLOT=0
-SRC_URI=https://extensions.libreoffice.org/assets/downloads/521/dict-uk_UA-5.3.1.oxt
-_eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=b66f59c8ee3110623d5d913436ba5ef9
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-5.8.0 b/metadata/md5-cache/app-dicts/myspell-uk-5.8.0
deleted file mode 100644
index aaa8ca51c625..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-uk-5.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install unpack
-DESCRIPTION=Ukrainian dictionaries for myspell/hunspell
-EAPI=8
-HOMEPAGE=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus https://github.com/brown-uk/dict_uk
-INHERIT=myspell-r2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-3 LGPL-2.1 MPL-1.1
-SLOT=0
-SRC_URI=https://extensions.libreoffice.org/assets/downloads/521/1655471128/dict-uk_UA-5.8.0.oxt
-_eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=11a1fd64f2d54968d2dd8251303f21d6
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-5.9.0 b/metadata/md5-cache/app-dicts/myspell-uk-5.9.0
deleted file mode 100644
index 0ef5f9bf8131..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-uk-5.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install unpack
-DESCRIPTION=Ukrainian dictionaries for myspell/hunspell
-EAPI=8
-HOMEPAGE=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus https://github.com/brown-uk/dict_uk
-INHERIT=myspell-r2
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-3 LGPL-2.1 MPL-1.1
-SLOT=0
-SRC_URI=https://extensions.libreoffice.org/assets/downloads/521/1663686893/dict-uk_UA-5.9.0.oxt
-_eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=0e98062902da19aae5a3371a07509eb8
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-6.0.1 b/metadata/md5-cache/app-dicts/myspell-uk-6.0.1
index 2a82de95d24c..8c24d4cfe0ff 100644
--- a/metadata/md5-cache/app-dicts/myspell-uk-6.0.1
+++ b/metadata/md5-cache/app-dicts/myspell-uk-6.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=Ukrainian dictionaries for myspell/hunspell
 EAPI=8
 HOMEPAGE=https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus
 INHERIT=myspell-r2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/521/1672416120/dict-uk_UA-6.0.1.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=bb56d390a5fe298540f305843a80748d
+_md5_=b4c5016e3f8c70c9955889d68d251116
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index d7bf2c112301..2af893ae02ab 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/bluefish-2.2.12-r2 b/metadata/md5-cache/app-editors/bluefish-2.2.12-r2
index 108081576807..a03b9da381a8 100644
--- a/metadata/md5-cache/app-editors/bluefish-2.2.12-r2
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.12-r2
@@ -7,7 +7,7 @@ HOMEPAGE=https://bluefish.openoffice.nl/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools python-single-r1 xdg
 IUSE=gucharmap nls python spell python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=sys-libs/zlib x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) spell? ( app-text/enchant:2 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.12.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bfe527a34065b62d7c9a4eb1f2339dc5
+_md5_=78cef966b5acaae1b5d3f721d5c43d26
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 134a4112ad52..16cc794d3f4c 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2.3 b/metadata/md5-cache/app-portage/g-sorcery-0.2.3
new file mode 100644
index 000000000000..4e8877bfb436
--- /dev/null
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.3
@@ -0,0 +1,17 @@
+BDEPEND=bson? ( dev-python/pymongo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=framework for ebuild generators
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/g-sorcery.git
+INHERIT=distutils-r1 prefix
+IUSE=bson git test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=bson? ( dev-python/pymongo[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/g-sorcery.git/snapshot/g-sorcery-0.2.3.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=a395b8a6939e4e4c7fe603b06d055f58
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.2.2-r1 b/metadata/md5-cache/app-portage/gs-elpa-0.2.2-r1
deleted file mode 100644
index bfcdbb3d9c0b..000000000000
--- a/metadata/md5-cache/app-portage/gs-elpa-0.2.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-portage/g-sorcery[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sexpdata-0.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=g-sorcery backend for elisp packages
-EAPI=8
-HOMEPAGE=https://gitweb.gentoo.org/proj/gs-elpa.git https://github.com/jauhien/gs-elpa
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-portage/g-sorcery[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sexpdata-0.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/gs-elpa-0.2.2.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0c8fef2065346128302194c664be01b7
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.2.2-r2 b/metadata/md5-cache/app-portage/gs-elpa-0.2.2-r2
new file mode 100644
index 000000000000..622d2b13e7af
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gs-elpa-0.2.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/g-sorcery-0.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sexpdata-0.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=g-sorcery backend for elisp packages
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/gs-elpa.git
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-portage/g-sorcery-0.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sexpdata-0.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/gs-elpa-0.2.2.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f7bc14c1ec509657a3fdc7d3508c469e
diff --git a/metadata/md5-cache/app-portage/mgorny-dev-scripts-37 b/metadata/md5-cache/app-portage/mgorny-dev-scripts-37
new file mode 100644
index 000000000000..81a455117efd
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mgorny-dev-scripts-37
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Handy scripts for ebuild development and more
+EAPI=8
+HOMEPAGE=https://github.com/projg2/mgorny-dev-scripts/
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD-2
+RDEPEND=app-portage/gentoolkit app-portage/portage-utils dev-perl/URI dev-util/pkgcheck dev-vcs/git net-misc/wget sys-apps/portage x11-misc/xdg-utils
+SLOT=0
+SRC_URI=https://github.com/projg2/mgorny-dev-scripts/archive/v37.tar.gz -> mgorny-dev-scripts-37.tar.gz
+_md5_=b629f9355f58e115c31af9795edbaf43
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 2e971e9aea74..a255c7cc0ee7 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p16-r2 b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
index 7bf47e740324..cad7d88248bd 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p16-r2
+++ b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html
 INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig ) mirror://gnu//bash-5.1-patches/bash51-001 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ) mirror://gnu//bash-5.1-patches/bash51-002 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ) mirror://gnu//bash-5.1-patches/bash51-003 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ) mirror://gnu//bash-5.1-patches/bash51-004 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ) mirror://gnu//bash-5.1-patches/bash51-005 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ) mirror://gnu//bash-5.1-patches/bash51-006 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ) mirror://gnu//bash-5.1-patches/bash51-007 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ) mirror://gnu//bash-5.1-patches/bash51-008 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ) mirror://gnu//bash-5.1-patches/bash51-009 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ) mirror://gnu//bash-5.1-patches/bash51-010 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ) mirror://gnu//bash-5.1-patches/bash51-011 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ) mirror://gnu//bash-5.1-patches/bash51-012 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ) mirror://gnu//bash-5.1-patches/bash51-013 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ) mirror://gnu//bash-5.1-patches/bash51-014 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ) mirror://gnu//bash-5.1-patches/bash51-015 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ) mirror://gnu//bash-5.1-patches/bash51-016 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-016.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig ) https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.1_p16-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=39857971d30221b4466e8b1b9cae7357
+_md5_=016a0e4806aafffa3f41cccc1599570c
diff --git a/metadata/md5-cache/app-shells/bash-5.2_p15-r2 b/metadata/md5-cache/app-shells/bash-5.2_p15-r2
index 1d6327db5418..95b0dd8c7d29 100644
--- a/metadata/md5-cache/app-shells/bash-5.2_p15-r2
+++ b/metadata/md5-cache/app-shells/bash-5.2_p15-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
 INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
 IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +readline verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.2_p1:= )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.2.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2.tar.gz.sig ) mirror://gnu//bash-5.2-patches/bash52-001 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001.sig ) mirror://gnu//bash-5.2-patches/bash52-002 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002.sig ) mirror://gnu//bash-5.2-patches/bash52-003 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-003.sig ) mirror://gnu//bash-5.2-patches/bash52-004 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-004.sig ) mirror://gnu//bash-5.2-patches/bash52-005 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-005.sig ) mirror://gnu//bash-5.2-patches/bash52-006 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-006.sig ) mirror://gnu//bash-5.2-patches/bash52-007 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-007.sig ) mirror://gnu//bash-5.2-patches/bash52-008 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-008.sig ) mirror://gnu//bash-5.2-patches/bash52-009 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-009.sig ) mirror://gnu//bash-5.2-patches/bash52-010 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-010.sig ) mirror://gnu//bash-5.2-patches/bash52-011 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-011.sig ) mirror://gnu//bash-5.2-patches/bash52-012 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-012.sig ) mirror://gnu//bash-5.2-patches/bash52-013 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-013.sig ) mirror://gnu//bash-5.2-patches/bash52-014 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-014.sig ) mirror://gnu//bash-5.2-patches/bash52-015 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-015.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4870f1953e491e77a91d812c4a8b2fb9
+_md5_=16f73b18762943aaf6b5fd3e5daf92df
diff --git a/metadata/md5-cache/app-shells/bash-9999 b/metadata/md5-cache/app-shells/bash-9999
index 34061a208881..4b89b3b60b2e 100644
--- a/metadata/md5-cache/app-shells/bash-9999
+++ b/metadata/md5-cache/app-shells/bash-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
 SLOT=0
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=dd907b7a57780f77ec199df78edc036f
+_md5_=2746175d34a9438b172092aabc3ef5c9
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d52a145d428f..326367e49d26 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/hunspell-1.7.2 b/metadata/md5-cache/app-text/hunspell-1.7.2
index fbca48ccfe43..a4387c0be949 100644
--- a/metadata/md5-cache/app-text/hunspell-1.7.2
+++ b/metadata/md5-cache/app-text/hunspell-1.7.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hunspell.github.io/
 INHERIT=autotools flag-o-matic
 IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
 RDEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= )
 SLOT=0/1.7
 SRC_URI=https://github.com/hunspell/hunspell/releases/download/v1.7.2/hunspell-1.7.2.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=77568c4f188fa4d2c11a8ebcadd85ad8
+_md5_=1daf32044e57427b562b7d90f15993b3
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
index 3cab08dd81cd..a5c14f66af37 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
 INHERIT=autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
 IUSE=doc
-KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ia64 ppc ~sparc x86
 LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.82/linuxdoc-tools-0.9.82.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3f267fb32f631f992697de9c16c5e6ba
+_md5_=725f449837ca82885893e7f858e202f1
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1-r2 b/metadata/md5-cache/app-text/xiphos-4.2.1-r2
new file mode 100644
index 000000000000..bf36434623b3
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.2.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) app-arch/zip app-text/yelp-tools dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/glib-utils dev-util/itstool virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4.1 sys-libs/zlib[minizip] x11-libs/gtk+:3
+DESCRIPTION=A Gtk+-based Bible-study frontend for SWORD
+EAPI=8
+HOMEPAGE=https://xiphos.org/
+INHERIT=cmake xdg-utils
+IUSE=dbus debug
+KEYWORDS=~amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4.1 sys-libs/zlib[minizip] x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.xz https://dev.gentoo.org/~marecki/dists/app-text/xiphos/xiphos-4.2.1-disable_webkit_editor.patch.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=143a53d753efb5fbe7b1f18769e2c7d6
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 673aa3b35d82..5553d49544f0 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/highway-0.16.0-r1 b/metadata/md5-cache/dev-cpp/highway-1.0.3
index cbf9c11bfcdc..56762e8b59ad 100644
--- a/metadata/md5-cache/dev-cpp/highway-0.16.0-r1
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=Performance-portable, length-agnostic SIMD with runtime dispatch
 EAPI=8
 HOMEPAGE=https://github.com/google/highway
 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=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+IUSE=cpu_flags_arm_neon 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=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/google/highway/archive/refs/tags/0.16.0.tar.gz -> highway-0.16.0.tar.gz
+SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.3.tar.gz -> highway-1.0.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f0fc65ec166ba7b1359a4914a8fa1b34
+_md5_=a6208e8e01ec9f823cb8e2e02d1c830f
diff --git a/metadata/md5-cache/dev-cpp/highway-9999 b/metadata/md5-cache/dev-cpp/highway-9999
index 1fb029d47126..e880ef8f9568 100644
--- a/metadata/md5-cache/dev-cpp/highway-9999
+++ b/metadata/md5-cache/dev-cpp/highway-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=905ce8e579e3985a7cdfefe1fa94c927
+_md5_=a6208e8e01ec9f823cb8e2e02d1c830f
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 70a98f6d6f67..f8e8cd112672 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/execline-2.9.2.1 b/metadata/md5-cache/dev-lang/execline-2.9.2.1
new file mode 100644
index 000000000000..b8d9521ebd41
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/execline-2.9.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.13.0.0:=
+DESCRIPTION=A non-interactive scripting language
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/execline/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.13.0.0:=
+SLOT=0/2.9
+SRC_URI=https://www.skarnet.org/software/execline/execline-2.9.2.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=377bd6a09fe80d0d6c306302c0a4e4db
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index f5dac390d9e0..1e836c17183d 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/cglm-0.8.9 b/metadata/md5-cache/dev-libs/cglm-0.8.9
new file mode 100644
index 000000000000..f753c88b2648
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cglm-0.8.9
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=OpenGL Mathematics (glm) for C
+EAPI=8
+HOMEPAGE=https://github.com/recp/cglm
+INHERIT=meson
+IUSE=test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/recp/cglm/archive/refs/tags/v0.8.9.tar.gz -> cglm-0.8.9.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=97c59a6539faffd62d741aaf30f4df7a
diff --git a/metadata/md5-cache/dev-libs/confuse-3.3-r1 b/metadata/md5-cache/dev-libs/confuse-3.3-r1
index 790bc7c6eb82..f08704d7c268 100644
--- a/metadata/md5-cache/dev-libs/confuse-3.3-r1
+++ b/metadata/md5-cache/dev-libs/confuse-3.3-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://github.com/martinh/libconfuse
 INHERIT=multilib-minimal flag-o-matic
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=339098af6a865680812746f98ce123f9
+_md5_=011f1848eb84e1aac712ddfabf0b382c
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.5 b/metadata/md5-cache/dev-libs/libassuan-2.5.5
index 7bfd41bc7b72..73b8eb62e10c 100644
--- a/metadata/md5-cache/dev-libs/libassuan-2.5.5
+++ b/metadata/md5-cache/dev-libs/libassuan-2.5.5
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.17
+DEPEND=>=dev-libs/libgpg-error-1.28
 DESCRIPTION=IPC library used by GnuPG and GPGME
 EAPI=7
 HOMEPAGE=https://www.gnupg.org/related_software/libassuan/index.en.html
 INHERIT=libtool
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libgpg-error-1.17
+RDEPEND=>=dev-libs/libgpg-error-1.28
 SLOT=0
 SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.5.tar.bz2
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=281ff6fe67c06c4cbbbbfa061e1aa886
+_md5_=da1468e362b076db608c5d4513956b77
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.13 b/metadata/md5-cache/dev-libs/libjcat-0.1.13
new file mode 100644
index 000000000000..ad9fcb9c2f79
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.13
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) gtk-doc? ( dev-util/gtk-doc ) man? ( sys-apps/help2man ) test? ( net-libs/gnutls[tools] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
+DESCRIPTION=Library and tool for reading and writing Jcat files
+EAPI=8
+HOMEPAGE=https://github.com/hughsie/libjcat
+INHERIT=meson python-any-r1 vala xdg-utils
+IUSE=+gpg gtk-doc +introspection +man +pkcs7 test vala
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme:= dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) vala? ( dev-lang/vala:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.13.tar.gz -> libjcat-0.1.13.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4f09ff84e7922609afe2c51044d85bea
diff --git a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1 b/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
deleted file mode 100644
index 1d301e2e4db4..000000000000
--- a/metadata/md5-cache/dev-libs/libxdg-basedir-1.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Small library to access XDG Base Directories Specification paths
-EAPI=7
-HOMEPAGE=https://github.com/devnev/libxdg-basedir
-INHERIT=autotools
-IUSE=doc
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-1.2.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=192799c4f58b3f8fa6125c5870ea40af
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 30e328f09203..a2d65ff1ed50 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.6.0-r1 b/metadata/md5-cache/dev-ml/alcotest-1.6.0-r1
index 399c42602985..3ef18573a7f2 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.6.0-r1
+++ b/metadata/md5-cache/dev-ml/alcotest-1.6.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mirage/alcotest/
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=ISC
 RDEPEND=>=dev-ml/dune-2.8:= 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.6.0
 SRC_URI=https://github.com/mirage/alcotest/archive/1.6.0.tar.gz -> alcotest-1.6.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a27d86810916614ac38de7082c7711c8
+_md5_=990c741f34c60d1a2c8ecf92949bb68f
diff --git a/metadata/md5-cache/dev-ml/async-0.15.0 b/metadata/md5-cache/dev-ml/async-0.15.0
index 6052b8e95d4d..2b8f4d64f91d 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 ~x86
+KEYWORDS=~amd64 ~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	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=c318b5bef91cc31dafe0aa368abcf317
+_md5_=45d0a7f319c817ef1264c59fbb308580
diff --git a/metadata/md5-cache/dev-ml/async_kernel-0.15.0 b/metadata/md5-cache/dev-ml/async_kernel-0.15.0
index 5215689dbeab..d24a69498f05 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.15.0.tar.gz -> async_kernel-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=d881233d6b8dadb5d17d6aa053bb7f6b
+_md5_=3ddd8a33da1f1739251fb83100ac77ae
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 6e06a669f0a6..3b22a645bdc6 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 ~riscv ~x86
+KEYWORDS=~amd64 ~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	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=02b1fa3a9bbf0aecfe3bfc93b4315b3f
+_md5_=8cccbc90ae5b11973963eb442b622bba
diff --git a/metadata/md5-cache/dev-ml/async_unix-0.15.0 b/metadata/md5-cache/dev-ml/async_unix-0.15.0
index 1c09db0ce977..50a2c11176fb 100644
--- a/metadata/md5-cache/dev-ml/async_unix-0.15.0
+++ b/metadata/md5-cache/dev-ml/async_unix-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_unix
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:0/0.15 dev-ml/core_unix:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/async_unix/archive/v0.15.0.tar.gz -> async_unix-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=4a24175183804948e16e47daae3520f5
+_md5_=3282d654b8d8e58459b46d55b65e4277
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1 b/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
index 038274f0f3bf..499c4f231618 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/base_bigstring
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/int_repr:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.15.0.tar.gz -> base_bigstring-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=829c3e37c0c46eef9dc3e9b5b200ff56
+_md5_=d49a4c93f0a29b6a9a29a6a56f5ecd6d
diff --git a/metadata/md5-cache/dev-ml/core-0.15.1-r1 b/metadata/md5-cache/dev-ml/core-0.15.1-r1
index 21b813654c3a..f97623138bc6 100644
--- a/metadata/md5-cache/dev-ml/core-0.15.1-r1
+++ b/metadata/md5-cache/dev-ml/core-0.15.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.11 >=dev-ml/base-0.15.1:0/0.15 dev-ml/base_bigstring:0/0.15 dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/ppxlib:= dev-ml/ppx_bin_prot:= dev-ml/ppx_bench:= dev-ml/ppx_custom_printf:= dev-ml/ppx_disable_unused_warnings:= dev-ml/ppx_fields_conv:= dev-ml/ppx_fixed_literal:= dev-ml/ppx_let:= dev-ml/ppx_log:= dev-ml/ppx_jane:0/0.15 dev-ml/ppx_module_timer:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_string:= dev-ml/ppx_ignore_instrumentation:= dev-ml/typerep:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core/archive/v0.15.1.tar.gz -> core-0.15.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=39c14c23e28dd398fd72944cbb59adc5
+_md5_=18ebccae66e36b6d7f60c2b8dc7cf0a5
diff --git a/metadata/md5-cache/dev-ml/core_bench-0.15.0 b/metadata/md5-cache/dev-ml/core_bench-0.15.0
index fb6773ca02b9..b6c9663e8567 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.15.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_bench
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/textutils:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core_bench/archive/v0.15.0.tar.gz -> core_bench-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=d355ee50fccf794cfac2f05c11781aa1
+_md5_=da2ff1e7724ab06eaa248346bbbdcd26
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.15.0 b/metadata/md5-cache/dev-ml/core_kernel-0.15.0
index 520350a62967..85d495556e47 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.15.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/core:0/0.15 dev-ml/int_repr:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.15.0.tar.gz -> core_kernel-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=c2e554620eb4b3d24b899b532f038122
+_md5_=baebffdc39eaf446c06cfa3f681325c2
diff --git a/metadata/md5-cache/dev-ml/core_unix-0.15.2-r1 b/metadata/md5-cache/dev-ml/core_unix-0.15.2-r1
index ecc7482104fd..2ab1d2fd84fd 100644
--- a/metadata/md5-cache/dev-ml/core_unix-0.15.2-r1
+++ b/metadata/md5-cache/dev-ml/core_unix-0.15.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_unix
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.09 dev-ml/core:= dev-ml/core_kernel:0/0.15 dev-ml/expect_test_helpers_core:0/0.15 dev-ml/ocaml_intrinsics:0/0.15 dev-ml/spawn:0/0.15 dev-ml/timezone:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core_unix/archive/refs/tags/v0.15.2.tar.gz -> core_unix-0.15.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=574edcd3916d2dc5229885890cd5025b
+_md5_=a9516b8e3a32cb5ecbe3e0b535537f46
diff --git a/metadata/md5-cache/dev-ml/dune-2.9.3-r3 b/metadata/md5-cache/dev-ml/dune-2.9.3-r3
index 2bd30c400012..ebd3b0f97b67 100644
--- a/metadata/md5-cache/dev-ml/dune-2.9.3-r3
+++ b/metadata/md5-cache/dev-ml/dune-2.9.3-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=multiprocessing elisp-common
 IUSE=emacs test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08:= emacs? ( >=app-editors/emacs-23.1:* )
 RESTRICT=strip !test? ( test )
 SLOT=0/2.9.3
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.3.tar.gz -> dune-2.9.3.tar.gz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b1fbae0f42da1529af83347919e9f299
+_md5_=ee4d0fe6150eb3859b8eab773b686efc
diff --git a/metadata/md5-cache/dev-ml/dune-build-info-2.9.3 b/metadata/md5-cache/dev-ml/dune-build-info-2.9.3
index 2fb27213e89b..748a3c761cae 100644
--- a/metadata/md5-cache/dev-ml/dune-build-info-2.9.3
+++ b/metadata/md5-cache/dev-ml/dune-build-info-2.9.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.9.3
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.3.tar.gz -> dune-2.9.3.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=6a383f26340279b31b66470162aef595
+_md5_=57e9e9e3ac8f545331d244b9b1b5202a
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.9.3 b/metadata/md5-cache/dev-ml/dune-configurator-2.9.3
index 85def65f41fe..6c18a55339a3 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.9.3
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.9.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=~dev-ml/dune-private-libs-2.9.3:=[ocamlopt?] dev-ml/csexp:=[ocamlopt?] dev-ml/result:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.9.3
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.3.tar.gz -> dune-2.9.3.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7b1a78716dc2c3ccfc91fa351e419f90
+_md5_=a88dd5b054a1778d08a473b6c5da51a7
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.9.3 b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.3
index e6929c6a0d4c..81f818b74b8f 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.9.3
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune
 IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/csexp:=[ocamlopt?] dev-ml/findlib:=[ocamlopt?] >=dev-lang/ocaml-4.09:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/2.9.3
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.3.tar.gz -> dune-2.9.3.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ce45109491380746910b484ad0520e6f
+_md5_=d1f18fea7b7859e02e2740f4ef263d08
diff --git a/metadata/md5-cache/dev-ml/dune-site-2.9.3 b/metadata/md5-cache/dev-ml/dune-site-2.9.3
index 88282e587d81..5888def6fb60 100644
--- a/metadata/md5-cache/dev-ml/dune-site-2.9.3
+++ b/metadata/md5-cache/dev-ml/dune-site-2.9.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/ocaml/dune
 INHERIT=dune multiprocessing
 IUSE=+ocamlopt
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=~dev-ml/dune-private-libs-2.9.3:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.9.3
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.3.tar.gz -> dune-2.9.3.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=d24190f7088a7333883d8a54d5465daa
+_md5_=6a91e3096b2e5aa9331a3a11883cb238
diff --git a/metadata/md5-cache/dev-ml/expect_test_helpers_core-0.15.0-r1 b/metadata/md5-cache/dev-ml/expect_test_helpers_core-0.15.0-r1
index 549935f215d7..f43d5b4507cd 100644
--- a/metadata/md5-cache/dev-ml/expect_test_helpers_core-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/expect_test_helpers_core-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/expect_test_helpers_core
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:0/0.15 dev-ml/core:0/0.15 dev-ml/ppx_jane:0/0.15 dev-ml/stdio:0/0.15 dev-ml/sexp_pretty:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/expect_test_helpers_core/archive/refs/tags/v0.15.0.tar.gz -> expect_test_helpers_core-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b4279ab96713002949403ce582c128e5
+_md5_=4d4cfdfdcb8d683cfe3e3359923e6d6f
diff --git a/metadata/md5-cache/dev-ml/int_repr-0.15.0 b/metadata/md5-cache/dev-ml/int_repr-0.15.0
index cd1841eb425e..bec719dac590 100644
--- a/metadata/md5-cache/dev-ml/int_repr-0.15.0
+++ b/metadata/md5-cache/dev-ml/int_repr-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/int_repr
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppx_jane:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/int_repr/archive/refs/tags/v0.15.0.tar.gz -> int_repr-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=83c808f6fa394e27da2baa024fcae518
+_md5_=a5eb4e9cbf2d054c05cb22464f73937d
diff --git a/metadata/md5-cache/dev-ml/ocaml_intrinsics-0.15.2 b/metadata/md5-cache/dev-ml/ocaml_intrinsics-0.15.2
index edcce2a912ee..382f15b917ea 100644
--- a/metadata/md5-cache/dev-ml/ocaml_intrinsics-0.15.2
+++ b/metadata/md5-cache/dev-ml/ocaml_intrinsics-0.15.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ocaml_intrinsics/
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08 dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ocaml_intrinsics/archive/v0.15.2.tar.gz -> ocaml_intrinsics-0.15.2.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=31a227ad3c00c0aef559183fa8de05e6
+_md5_=28249cff69c10ee4bf61f0946aa67f75
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.10 b/metadata/md5-cache/dev-ml/opam-core-2.0.10
index 1f6ed44b893e..cf072053875d 100644
--- a/metadata/md5-cache/dev-ml/opam-core-2.0.10
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.10
@@ -9,6 +9,6 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.10
-SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz
 _eclasses_=opam	42c5d48985d3f77484fe405cfc69356d
-_md5_=773233cc49f7dd818acbe55d780a1b8f
+_md5_=0e597eb7c7bfe92bbe888dc5fe97313b
diff --git a/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.15.0-r1 b/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.15.0-r1
index 39b4b6995718..6f925f99d79a 100644
--- a/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_disable_unused_warnings-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_disable_unused_warnings
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:0/0.15 >=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ppx_disable_unused_warnings/archive/refs/tags/v0.15.0.tar.gz -> ppx_disable_unused_warnings-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=45802f04f99ef3415c3dab8ce522b60a
+_md5_=471ecaacf5125d8433d73d8122f7b42d
diff --git a/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1 b/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1
index 37e02741b34a..af1d8b3efd6c 100644
--- a/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_ignore_instrumentation-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_ignore_instrumentation
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ppx_ignore_instrumentation/archive/refs/tags/v0.15.0.tar.gz -> ppx_ignore_instrumentation-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=66b91a9daba3fbd934b240fcc9dfec4d
+_md5_=8d52573d90183d679cb832531c7020ff
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.15.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.15.0
index e6cc810736f2..3e9c6fbe525c 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.15.0
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_jane
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-ml/base_quickcheck:0/0.15 dev-ml/ppx_bin_prot:0/0.15 dev-ml/ppx_disable_unused_warnings:0/0.15 dev-ml/ppx_expect:0/0.15 dev-ml/ppx_fixed_literal:0/0.15 dev-ml/ppx_ignore_instrumentation:0/0.15 dev-ml/ppx_log:0/0.15 dev-ml/ppx_module_timer:0/0.15 dev-ml/ppx_optional:0/0.15 dev-ml/ppx_pipebang:0/0.15 dev-ml/ppx_stable:0/0.15 dev-ml/ppx_string:0/0.15 dev-ml/ppx_typerep_conv:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.15.0.tar.gz -> ppx_jane-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b85249406cfcfded050fb091aec9a479
+_md5_=5dc067f2fbc21c7ae10006d5e70cde9d
diff --git a/metadata/md5-cache/dev-ml/ppx_log-0.15.0-r1 b/metadata/md5-cache/dev-ml/ppx_log-0.15.0-r1
index eabb019f9856..b01f4e414880 100644
--- a/metadata/md5-cache/dev-ml/ppx_log-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_log-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/ppx_log
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppx_sexp_message:0/0.15 dev-ml/sexplib:0/0.15 >=dev-ml/ppxlib-0.23.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/ppx_log/archive/refs/tags/v0.15.0.tar.gz -> ppx_log-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=859bc31b74249f5b35f40e73573d8515
+_md5_=51b0c342b8ffb43e0865da0dac7cbcd7
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 f4b6c34833ae..df77e0e41556 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 ~riscv ~x86
+KEYWORDS=~amd64 ~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	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7f0a14acc98d013f5aca648a314f08a5
+_md5_=d05ed2d2d8cff89ccde7c2815870da22
diff --git a/metadata/md5-cache/dev-ml/sexp_pretty-0.15.1-r1 b/metadata/md5-cache/dev-ml/sexp_pretty-0.15.1-r1
index d21f90fa7eec..3ecb4fe10646 100644
--- a/metadata/md5-cache/dev-ml/sexp_pretty-0.15.1-r1
+++ b/metadata/md5-cache/dev-ml/sexp_pretty-0.15.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/sexp_pretty
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppxlib:= dev-ml/ppx_base:0/0.15 dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/re:= dev-ml/sexplib:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/sexp_pretty/archive/refs/tags/v0.15.1.tar.gz -> sexp_pretty-0.15.1.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=87865603f4b98f5cb03d4e83c11eed21
+_md5_=6673a6897bce9a7f128335649d35f496
diff --git a/metadata/md5-cache/dev-ml/textutils-0.15.0 b/metadata/md5-cache/dev-ml/textutils-0.15.0
index abb414bbcc32..f3811cccbd84 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.15.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/textutils
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/core_unix:0/0.15 dev-ml/textutils_kernel:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/textutils/archive/v0.15.0.tar.gz -> textutils-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=5e269a2999048fc27063af0d98b9b92b
+_md5_=372c4cef18931cb7a3a3694404a09198
diff --git a/metadata/md5-cache/dev-ml/textutils_kernel-0.15.0 b/metadata/md5-cache/dev-ml/textutils_kernel-0.15.0
index 6e7a83b75c89..0edf9477505b 100644
--- a/metadata/md5-cache/dev-ml/textutils_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/textutils_kernel-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/textutils_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/core:0/0.15 >=dev-ml/uutf-1.0.2:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/textutils_kernel/archive/refs/tags/v0.15.0.tar.gz -> textutils_kernel-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=3fded0ace520f73b6f006ee394fd8aa1
+_md5_=c3a9758c7789fc7cd5a33ea018518ce7
diff --git a/metadata/md5-cache/dev-ml/timezone-0.15.0 b/metadata/md5-cache/dev-ml/timezone-0.15.0
index ee47884e833d..2bc9d471d11c 100644
--- a/metadata/md5-cache/dev-ml/timezone-0.15.0
+++ b/metadata/md5-cache/dev-ml/timezone-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/timezone
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~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/timezone/archive/v0.15.0.tar.gz -> timezone-0.15.0.tar.gz
 _eclasses_=dune	77dc707d5b61b8d0b0fe46cefbdfec3a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=72056185bbf0c14039c9bc85c08cf807
+_md5_=b26a88557f6f22538202b564943747fc
diff --git a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0 b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
index c3a12f27756a..dfe0d87b0637 100644
--- a/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
+++ b/metadata/md5-cache/dev-perl/DBIx-Simple-1.370.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/DBIx-Simple
 INHERIT=perl-module
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0 EPL-1.0 ECL-2.0 EUPL-1.1 GPL-2 GPL-3 LGPL-2.1 LGPL-3 HPND IBM IPAfont ISC LPPL-1.3c 9base MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng )
 RDEPEND=>=dev-perl/DBI-1.210.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=e1e72a1742387d235e6cde6cbd474756
+_md5_=0f940c25c4434a1de446def3cf798b6f
diff --git a/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0 b/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
index cfcf2b40af07..683d780592e1 100644
--- a/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
+++ b/metadata/md5-cache/dev-perl/Email-Abstract-3.9.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Abstract
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Simple-1.998 dev-perl/MRO-Compat >=dev-perl/Module-Pluggable-1.500.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.009.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=9e6143dcf306c9e7a9af3096ea46404e
+_md5_=e935d83a086c72bdb816f77bef0cd070
diff --git a/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1 b/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
index 77ae06e0878e..9c40cc2680c9 100644
--- a/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-Address-1.912.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Address
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=cf310f22cab186dc90ed0638eb3b6b13
+_md5_=d41b9f17dbb6f4cb1a36b074c7b49899
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-1.952.0 b/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
index a1a3de0532e2..61005c0e0953 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-1.952.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-MIME
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Address-XS >=dev-perl/Email-MIME-ContentType-1.23.0 >=dev-perl/Email-MIME-Encodings-1.314.0 dev-perl/Email-MessageID >=dev-perl/Email-Simple-2.212.0 >=virtual/perl-Encode-1.980.100 virtual/perl-MIME-Base64 >=dev-perl/MIME-Types-1.130.0 dev-perl/Module-Runtime virtual/perl-Scalar-List-Utils virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.952.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=d733ff05a5c647e6ca9022bc9eeea3b1
+_md5_=b881c8107e584880d830ac29c160b2fe
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0 b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
index ede984320c6e..fd3352588590 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
+++ b/metadata/md5-cache/dev-perl/Email-MIME-ContentType-1.26.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-ContentType
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Encode-2.870.0 >=virtual/perl-Exporter-5.570.0 dev-perl/Text-Unidecode dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.026.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=40a3c292b4db0913c2db8516c9ca7ac8
+_md5_=22f257ff71e101b423323349b199c13a
diff --git a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2 b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
index 65606f97b7b8..b121b1b18a56 100644
--- a/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
+++ b/metadata/md5-cache/dev-perl/Email-MIME-Encodings-1.315.0-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-MIME-Encodings
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-MIME-Base64-3.50.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=412fd6c9249afe6253f628f4ea5459ce
+_md5_=afb226d8568720748b6cde848cbdd0d8
diff --git a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1 b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
index 3abfa3b74ae2..2dc641cb3e5b 100644
--- a/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
+++ b/metadata/md5-cache/dev-perl/Email-MessageID-1.406.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-MessageID
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=455e31e7ccb89c7f5d3800dba677f412
+_md5_=1bae35c0fab9be043739fbcf674d8f53
diff --git a/metadata/md5-cache/dev-perl/Email-Sender-2.500.0 b/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
index 7699842ff01d..c279a68f8942 100644
--- a/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
+++ b/metadata/md5-cache/dev-perl/Email-Sender-2.500.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Email-Sender
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Email-Abstract-3.6.0 dev-perl/Email-Address >=dev-perl/Email-Simple-1.998.0 >=virtual/perl-File-Path-2.60.0 virtual/perl-File-Spec >=virtual/perl-IO-1.110.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Module-Runtime >=dev-perl/Moo-2.0.0 >=dev-perl/MooX-Types-MooseLike-0.150.0 >=virtual/perl-libnet-3.70.0 dev-perl/Sub-Exporter >=dev-perl/Throwable-0.200.3 dev-perl/Try-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-2.500.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=5d151cc72e8d98e34ecbcff0537672dc
+_md5_=1825370710dbfc0a6ccda7c98bb9a573
diff --git a/metadata/md5-cache/dev-perl/Email-Simple-2.216.0 b/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
index 7e796ba043d8..f819cd4a1e00 100644
--- a/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
+++ b/metadata/md5-cache/dev-perl/Email-Simple-2.216.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/Email-Simple
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Email-Date-Format dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=060b10c44157c839e6b38b3180491ca2
+_md5_=9b1434431d7492d2637255025a5bbd39
diff --git a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1 b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
index 0e1de3ed67ed..42c8072393bf 100644
--- a/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
+++ b/metadata/md5-cache/dev-perl/Mail-DMARC-1.202.109.270-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-DMARC
 INHERIT=perl-module
 IUSE=minimal test
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Mail-DKIM dev-perl/Net-IMAP-Simple dev-perl/Net-SMTPS ) virtual/perl-Carp dev-perl/Config-Tiny >=dev-perl/DBD-SQLite-1.310.0 >=dev-perl/DBIx-Simple-1.350.0 virtual/perl-Data-Dumper dev-perl/Email-MIME >=dev-perl/Email-Sender-1.300.32 dev-perl/Email-Simple virtual/perl-Encode dev-perl/File-ShareDir virtual/perl-Getopt-Long virtual/perl-HTTP-Tiny virtual/perl-IO virtual/perl-IO-Compress dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/Mail-DKIM dev-perl/Net-DNS dev-perl/Net-HTTP dev-perl/Net-IDN-Encode dev-perl/Net-IP dev-perl/Net-SMTPS dev-perl/Net-SSLeay >=dev-perl/Net-Server-2 virtual/perl-Socket >=dev-perl/Socket6-0.230.0 virtual/perl-Sys-Syslog dev-perl/Test-File-ShareDir dev-perl/URI dev-perl/XML-LibXML virtual/perl-parent >=dev-perl/Regexp-Common-2013031301 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DMARC-1.20210927.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=792a0b3f4edb77247cf88ee8c07bd412
+_md5_=9520e0bc7b5fd5ff32de8a585b0743fe
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e06edbc6714e..49bc7fd694a5 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/MooX-Types-MooseLike-0.290.0-r1 b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0-r1
index 970134a97a09..c0deffd50037 100644
--- a/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0-r1
+++ b/metadata/md5-cache/dev-perl/MooX-Types-MooseLike-0.290.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/MooX-Types-MooseLike
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/strictures-2 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Moo-1.4.2 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=b2a666a18f546307280be46d1a486a2d
+_md5_=2110d3c2da13f8478ff7db05d9f8a486
diff --git a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200 b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
index 59f9456cc49b..3ea46314d391 100644
--- a/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
+++ b/metadata/md5-cache/dev-perl/Net-IMAP-Simple-1.221.200
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-IMAP-Simple
 INHERIT=perl-module
 IUSE=test examples
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-perl/Parse-RecDescent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JE/JETTERO/Net-IMAP-Simple-1.2212.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=84f03916ef0f698f14fa70b742629fcd
+_md5_=f65e55fdd6b4c9c5a905af66f4140a07
diff --git a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0 b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
index 249d31b93cce..269f3d2f01b3 100644
--- a/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
+++ b/metadata/md5-cache/dev-perl/Net-SMTPS-0.100.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SMTPS
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Authen-SASL-2.0.0 >=dev-perl/IO-Socket-SSL-1.0.0 >=virtual/perl-libnet-2.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOMO/src/Net-SMTPS-0.10.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=ff52f9af4f795da59d80b07544060638
+_md5_=ef84f16fbccd8e4341c3bf9bd17e7199
diff --git a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1 b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
index 9bc4a640b8e2..a0062e99ac28 100644
--- a/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
+++ b/metadata/md5-cache/dev-perl/Sub-Override-0.90.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Sub-Override
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=7199a77a5acf9c5661499d78c7e52338
+_md5_=0b53bd9b3189b1897a4a03d61c055b8e
diff --git a/metadata/md5-cache/dev-perl/Throwable-1.0.0 b/metadata/md5-cache/dev-perl/Throwable-1.0.0
index 7b2367152220..13038dc4db9f 100644
--- a/metadata/md5-cache/dev-perl/Throwable-1.0.0
+++ b/metadata/md5-cache/dev-perl/Throwable-1.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Throwable
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Devel-StackTrace-1.320.0 >=dev-perl/Module-Runtime-0.2.0 >=dev-perl/Moo-1.0.1 virtual/perl-Scalar-List-Utils dev-perl/Sub-Quote dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/Throwable-1.000.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=6ed8cd432c432bbfef9f9ee62ef49907
+_md5_=8b6e1599bd7f1514e0dfdc6df72654bc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index aee5dae5a73c..7fb9ae46e4c2 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/coverage-7.1.0 b/metadata/md5-cache/dev-python/coverage-7.1.0
index b3636ae810db..2655b98115b5 100644
--- a/metadata/md5-cache/dev-python/coverage-7.1.0
+++ b/metadata/md5-cache/dev-python/coverage-7.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://github.com/nedbat/coveragepy/ https://pypi.org/project/coverage/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-7.1.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9c0be17c64f1638188794f15a3092a98
+_md5_=3350aa703eea877cc59b947a8b760307
diff --git a/metadata/md5-cache/dev-python/hiredis-2.0.0-r2 b/metadata/md5-cache/dev-python/hiredis-2.0.0-r2
index d0215ab54434..e9d54acb1e6b 100644
--- a/metadata/md5-cache/dev-python/hiredis-2.0.0-r2
+++ b/metadata/md5-cache/dev-python/hiredis-2.0.0-r2
@@ -2,7 +2,7 @@ BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=system-libs? ( >=dev-libs/hiredis-1.0.0:= )
 DESCRIPTION=Python extension that wraps hiredis
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/redis/hiredis-py/
 INHERIT=distutils-r1
 IUSE=system-libs python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
@@ -12,5 +12,5 @@ RDEPEND=system-libs? ( >=dev-libs/hiredis-1.0.0:= ) python_targets_pypy3? ( >=de
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-2.0.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a61869b9de476b090f230ec2e8dfcd37
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=71b84d9ec8925b54ccdb06e81db7713b
diff --git a/metadata/md5-cache/dev-python/hiredis-2.2.2 b/metadata/md5-cache/dev-python/hiredis-2.2.2
new file mode 100644
index 000000000000..5b8eaeedf716
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hiredis-2.2.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=system-libs? ( >=dev-libs/hiredis-1.0.0:= )
+DESCRIPTION=Python extension that wraps hiredis
+EAPI=8
+HOMEPAGE=https://github.com/redis/hiredis-py/
+INHERIT=distutils-r1
+IUSE=system-libs python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=system-libs? ( >=dev-libs/hiredis-1.0.0:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hiredis/hiredis-2.2.2.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d305c482a9c9e102729e5035a7fa6668
diff --git a/metadata/md5-cache/dev-python/packaging-23.0-r1 b/metadata/md5-cache/dev-python/packaging-23.0-r1
index 7b6395e68e43..85a9b1e12da3 100644
--- a/metadata/md5-cache/dev-python/packaging-23.0-r1
+++ b/metadata/md5-cache/dev-python/packaging-23.0-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pypa/packaging/ https://pypi.org/project/packaging/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Apache-2.0 BSD-2 )
 RDEPEND=>=dev-python/pyparsing-3.0.7-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !<dev-python/setuptools-67 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/packaging/archive/23.0.tar.gz -> packaging-23.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=692ad6bf8e9ff037fe52e83e8dc5b732
+_md5_=ed19016d4eccd4d2c89f4a1d4d857e5b
diff --git a/metadata/md5-cache/dev-python/pathspec-0.10.3 b/metadata/md5-cache/dev-python/pathspec-0.10.3
deleted file mode 100644
index b1a2cdbcce72..000000000000
--- a/metadata/md5-cache/dev-python/pathspec-0.10.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utility library for gitignore style pattern matching of file paths
-EAPI=8
-HOMEPAGE=https://github.com/cpburnz/python-pathspec/ https://pypi.org/project/pathspec/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MPL-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pathspec/pathspec-0.10.3.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a90e1a4fade6950ed3f7ebc7690a683f
diff --git a/metadata/md5-cache/dev-python/pathspec-0.11.0 b/metadata/md5-cache/dev-python/pathspec-0.11.0
index baf864bedd42..77216fed65c7 100644
--- a/metadata/md5-cache/dev-python/pathspec-0.11.0
+++ b/metadata/md5-cache/dev-python/pathspec-0.11.0
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utility library for gitignore style pattern matching of file paths
 EAPI=8
 HOMEPAGE=https://github.com/cpburnz/python-pathspec/ https://pypi.org/project/pathspec/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MPL-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pathspec/pathspec-0.11.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9c9e86414a7fd972aeed13e8b74c0053
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-0.11.0.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=074dd227888d776fe89c686f11ef67b2
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.4.1 b/metadata/md5-cache/dev-python/pyproject-fmt-0.4.1
deleted file mode 100644
index 72c857820a17..000000000000
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-mock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Format your pyproject.toml file
-EAPI=8
-HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.4.1.tar.gz -> pyproject-fmt-0.4.1.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e80807db701ce94ce73f2f5e7ba5b9e8
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.5.0 b/metadata/md5-cache/dev-python/pyproject-fmt-0.5.0
deleted file mode 100644
index 5330cb0bebfa..000000000000
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-mock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Format your pyproject.toml file
-EAPI=8
-HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.5.0.tar.gz -> pyproject-fmt-0.5.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0accc111179ffea5a0ac5e6334a412bd
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.6.0 b/metadata/md5-cache/dev-python/pyproject-fmt-0.6.0
index e3a1b63abe22..572dc196b391 100644
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.6.0
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-0.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.6.0.tar.gz -> pyproject-fmt-0.6.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3a80d62f4c8a3849f29d163472570177
+_md5_=821e384de9b5f7d041d50c7398519c65
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.7.0 b/metadata/md5-cache/dev-python/pyproject-fmt-0.7.0
deleted file mode 100644
index 3ec86ca85a77..000000000000
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-mock-3.10[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Format your pyproject.toml file
-EAPI=8
-HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.7.0.tar.gz -> pyproject-fmt-0.7.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3a80d62f4c8a3849f29d163472570177
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.8.0 b/metadata/md5-cache/dev-python/pyproject-fmt-0.8.0
deleted file mode 100644
index e8cf56aadf28..000000000000
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-mock-3.10[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Format your pyproject.toml file
-EAPI=8
-HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-23[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/pyproject-fmt/archive/0.8.0.tar.gz -> pyproject-fmt-0.8.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3a80d62f4c8a3849f29d163472570177
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.8.1 b/metadata/md5-cache/dev-python/resolvelib-0.8.1
index 5d66f74d08f5..b9e2e4e284f9 100644
--- a/metadata/md5-cache/dev-python/resolvelib-0.8.1
+++ b/metadata/md5-cache/dev-python/resolvelib-0.8.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/commentjson[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/commentjson[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/packaging-22[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=provides a Resolver class that includes dependency resolution logic
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sarugaku/resolvelib/archive/0.8.1.tar.gz -> resolvelib-0.8.1.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5b9cca632929e6d41451dd9c55a2c0a5
+_md5_=3d55d48d346f63377c0d404f88eeec93
diff --git a/metadata/md5-cache/dev-python/resolvelib-0.9.0 b/metadata/md5-cache/dev-python/resolvelib-0.9.0
index 3a54c5a8ed72..e942f5366e2a 100644
--- a/metadata/md5-cache/dev-python/resolvelib-0.9.0
+++ b/metadata/md5-cache/dev-python/resolvelib-0.9.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/commentjson[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/commentjson[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/packaging-22[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Resolve abstract dependencies into concrete ones
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sarugaku/resolvelib/archive/0.9.0.tar.gz -> resolvelib-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a0079ab42f18ac3e2401337aedeb1cf8
+_md5_=5bee85698736078ea1ff01e918727221
diff --git a/metadata/md5-cache/dev-python/setuptools-67.2.0-r1 b/metadata/md5-cache/dev-python/setuptools-67.2.0-r1
index a91f517ed98f..8d94aee06613 100644
--- a/metadata/md5-cache/dev-python/setuptools-67.2.0-r1
+++ b/metadata/md5-cache/dev-python/setuptools-67.2.0-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
 INHERIT=distutils-r1 multiprocessing pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-67.2.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aa4e1f15fb6de21def85aa88ab6c8eaf
+_md5_=13b03c2be06a6bafabea66cae53fcdfa
diff --git a/metadata/md5-cache/dev-python/setuptools-67.3.1 b/metadata/md5-cache/dev-python/setuptools-67.3.1
deleted file mode 100644
index 7ada39bda31f..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-67.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing pypi
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-67.3.1.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aa4e1f15fb6de21def85aa88ab6c8eaf
diff --git a/metadata/md5-cache/dev-python/setuptools-67.3.2 b/metadata/md5-cache/dev-python/setuptools-67.3.2
deleted file mode 100644
index efac9989225e..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-67.3.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing pypi
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-67.3.2.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aa4e1f15fb6de21def85aa88ab6c8eaf
diff --git a/metadata/md5-cache/dev-python/setuptools-67.3.3 b/metadata/md5-cache/dev-python/setuptools-67.3.3
deleted file mode 100644
index b2af55f3be31..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-67.3.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools/ https://pypi.org/project/setuptools/
-INHERIT=distutils-r1 multiprocessing pypi
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-67.3.3.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=aa4e1f15fb6de21def85aa88ab6c8eaf
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 362c368f7ee2..0c1e98895f96 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/hpricot-0.8.6-r6 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
index 8f3a145297a6..21caad98327b 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r6
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-util/ragel ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A fast and liberal HTML parser for Ruby
 EAPI=7
-HOMEPAGE=https://wiki.github.com/hpricot/hpricot
+HOMEPAGE=https://github.com/hpricot/hpricot
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c8e2e76c15c05daf33656458a921f4a8
+_md5_=1754daadbe0e6bf8dd784dede418f5c8
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index edf346cb5f28..23e7853ebbaa 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/Tensile-5.1.3-r1 b/metadata/md5-cache/dev-util/Tensile-5.1.3-r2
index 88b5aecff59d..4f8a941d6436 100644
--- a/metadata/md5-cache/dev-util/Tensile-5.1.3-r1
+++ b/metadata/md5-cache/dev-util/Tensile-5.1.3-r2
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-devel/clang:15 dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 dev-util/hip !!sys-devel/llvm:0
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/msgpack-cxx dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/hip sys-devel/clang:15 >=dev-util/rocm-smi-4.3.0 !!sys-devel/llvm:0
 DESCRIPTION=Stretching GPU performance for GEMMs and tensor contractions
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/Tensile
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 llvm prefix
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-devel/clang:15 dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/msgpack-cxx dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/hip sys-devel/clang:15 >=dev-util/rocm-smi-4.3.0 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.1.3.tar.gz -> rocm-Tensile-5.1.3.tar.gz https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/Tensile-5.0.2-PR1419.patch.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a092191c19d1ab2821eb88317a23fae4
+_md5_=619855a3c60d272071896563a8af1187
diff --git a/metadata/md5-cache/dev-util/Tensile-5.4.2 b/metadata/md5-cache/dev-util/Tensile-5.4.2
deleted file mode 100644
index 6dd36f0dac00..000000000000
--- a/metadata/md5-cache/dev-util/Tensile-5.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-devel/clang:15 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 dev-util/hip !!sys-devel/llvm:0
-DESCRIPTION=Stretching GPU performance for GEMMs and tensor contractions
-EAPI=8
-HOMEPAGE=https://github.com/ROCmSoftwarePlatform/Tensile
-INHERIT=distutils-r1 llvm prefix
-IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-devel/clang:15 dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0/5.4
-SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.4.2.tar.gz -> rocm-Tensile-5.4.2.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=816a62e4640fa94301e180eab6aca0d1
diff --git a/metadata/md5-cache/dev-util/Tensile-5.4.2-r1 b/metadata/md5-cache/dev-util/Tensile-5.4.2-r1
new file mode 100644
index 000000000000..9ff67cd60cee
--- /dev/null
+++ b/metadata/md5-cache/dev-util/Tensile-5.4.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/msgpack-cxx dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/hip >=dev-util/rocm-smi-4.3.0 sys-devel/clang:15 !!sys-devel/llvm:0
+DESCRIPTION=Stretching GPU performance for GEMMs and tensor contractions
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/Tensile
+INHERIT=cmake distutils-r1 llvm prefix rocm
+IUSE=client python_targets_python3_10 python_targets_python3_11 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-cpp/msgpack-cxx dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/hip >=dev-util/rocm-smi-4.3.0 sys-devel/clang:15 python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=client? ( || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 amdgpu_targets_gfx1100 amdgpu_targets_gfx1101 amdgpu_targets_gfx1102 ) ) || ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0/5.4
+SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.4.2.tar.gz -> rocm-Tensile-5.4.2.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	distutils-r1	a9f2e2ae24bd496873c092a94cae1539	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8205fdc4414c772b63913f74c5336368
diff --git a/metadata/md5-cache/dev-util/bats-1.9.0 b/metadata/md5-cache/dev-util/bats-1.9.0
new file mode 100644
index 000000000000..1365dff3b18d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bats-1.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst test
+DEPEND=app-shells/bash:*
+DESCRIPTION=Bats-core: Bash Automated Testing System
+EAPI=8
+HOMEPAGE=https://github.com/bats-core/bats-core/
+INHERIT=multiprocessing optfeature
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=app-shells/bash:*
+SLOT=0
+SRC_URI=https://github.com/bats-core/bats-core/archive/v1.9.0.tar.gz -> bats-1.9.0.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac
+_md5_=3f492bec43b755d17f5f68ece1032553
diff --git a/metadata/md5-cache/dev-util/clion-2022.1.3-r1 b/metadata/md5-cache/dev-util/clion-2022.1.3-r1
deleted file mode 100644
index 97ef657ef984..000000000000
--- a/metadata/md5-cache/dev-util/clion-2022.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare
-DESCRIPTION=A complete toolset for C and C++ development
-EAPI=8
-HOMEPAGE=https://www.jetbrains.com/clion
-INHERIT=desktop wrapper
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB
-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 dev-util/cmake dev-util/ninja media-libs/alsa-lib media-libs/freetype:2 media-libs/mesa net-print/cups sys-apps/dbus sys-devel/gdb x11-libs/cairo x11-libs/pango sys-libs/zlib x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon
-RESTRICT=bindist mirror splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/cpp/CLion-2022.1.3.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=64e481316baf455a4674f730b8a3266e
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 4b7857b122da..a9c7edb5983b 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1 b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1
index 95eb94018e07..867f69ee272e 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1
+++ b/metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://spamassassin.apache.org/
 INHERIT=perl-functions systemd toolchain-funcs verify-sig
 IUSE=berkdb cron ipv6 ldap mysql postgres qmail sqlite ssl test verify-sig
-KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=acct-user/spamd acct-group/spamd dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Digest-SHA ssl? ( dev-libs/openssl:0= ) app-crypt/gnupg dev-perl/Archive-Zip dev-perl/BSD-Resource dev-perl/Digest-SHA1 dev-perl/Email-Address-XS dev-perl/Encode-Detect || ( dev-perl/GeoIP2 dev-perl/Geo-IP ) dev-perl/IO-String dev-perl/Mail-DKIM dev-perl/Mail-DMARC dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-LibIDN2 dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 dev-perl/Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2 verify-sig? ( https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-4.0.0.tar.bz2.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	perl-functions	c3fca037246e877693badea0df3b0ef8	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=ca6bb7fc228d106da702b300d2d2adfb
+_md5_=5b136c89e609b3a134130381bfa0e8c3
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 1e7ad3e2406a..d00dc2b161d6 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/courier-1.2.2-r1 b/metadata/md5-cache/mail-mta/courier-1.2.2-r1
new file mode 100644
index 000000000000..62d9d2babc97
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/courier-1.2.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=>=net-libs/courier-authlib-0.72.0 >=net-libs/courier-unicode-2.2.6:= net-dns/libidn2:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
+DESCRIPTION=An MTA designed specifically for maildirs
+EAPI=8
+HOMEPAGE=https://www.courier-mta.org/
+INHERIT=flag-o-matic
+IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3
+PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
+RDEPEND=>=net-libs/courier-authlib-0.72.0 >=net-libs/courier-unicode-2.2.6:= net-dns/libidn2:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/courier-imap !net-mail/cyrus-imapd
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-1.2.2.tar.bz2
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ad5e300deca0fb25c0af07dbd90add8b
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index b1e24372a7b3..6b38e16b000e 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/jetbrains-mono-2.225 b/metadata/md5-cache/media-fonts/jetbrains-mono-2.304
index f29c9fbf288f..ff08accb5e33 100644
--- a/metadata/md5-cache/media-fonts/jetbrains-mono-2.225
+++ b/metadata/md5-cache/media-fonts/jetbrains-mono-2.304
@@ -1,13 +1,13 @@
 BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
 DESCRIPTION=A free and open-source typeface for developers
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.jetbrains.com/lp/mono/
 INHERIT=font
 IUSE=X
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~loong ~riscv ~x86
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://github.com/JetBrains/JetBrainsMono/releases/download/v2.225/JetBrainsMono-2.225.zip -> jetbrains-mono-2.225.zip
+SRC_URI=https://github.com/JetBrains/JetBrainsMono/releases/download/v2.304/JetBrainsMono-2.304.zip -> jetbrains-mono-2.304.zip
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=119d3736a40a733f84e4fb2774c87b2d
+_md5_=7dc8bbb393b37bcc4fb78d7e432e851b
diff --git a/metadata/md5-cache/media-fonts/joypixels-6.6.0 b/metadata/md5-cache/media-fonts/joypixels-6.6.0
index c339b2e669a4..1695bb24efd3 100644
--- a/metadata/md5-cache/media-fonts/joypixels-6.6.0
+++ b/metadata/md5-cache/media-fonts/joypixels-6.6.0
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.joypixels.com/
 INHERIT=font readme.gentoo-r1
 IUSE=X
-KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~loong ~riscv x86
 LICENSE=JoyPixels
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://cdn.joypixels.com/distributions/gentoo-linux/font/6.6.0/joypixels-android.ttf -> joypixels-6.6.0.ttf
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=7d3b9012e63e6b9921b11e08fb3a0f61
+_md5_=a4514388ec820aad53ca24ac4b94b632
diff --git a/metadata/md5-cache/media-fonts/noto-20230201 b/metadata/md5-cache/media-fonts/noto-20230201
new file mode 100644
index 000000000000..27b0a814cddd
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-20230201
@@ -0,0 +1,15 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm setup
+DESCRIPTION=Google's font family that aims to support all the world's languages
+EAPI=8
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/notofonts/notofonts.github.io
+INHERIT=font
+IUSE=cjk +extra X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=OFL-1.1
+RDEPEND=cjk? ( media-fonts/noto-cjk )
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/notofonts/notofonts.github.io/archive/f589dbf1a59852047e5e506bf8f3ee93be8d6cce.tar.gz -> noto-20230201.tar.gz
+_eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
+_md5_=5b3641624a97f7ee0fae1da6c8095b47
diff --git a/metadata/md5-cache/media-fonts/noto-emoji-20220912-r1 b/metadata/md5-cache/media-fonts/noto-emoji-20220912-r1
new file mode 100644
index 000000000000..7f1f8be3f50e
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/noto-emoji-20220912-r1
@@ -0,0 +1,14 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DESCRIPTION=Google Noto Emoji fonts
+EAPI=8
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji
+INHERIT=font
+IUSE=icons X
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 OFL-1.1
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/googlefonts/noto-emoji/archive/e8073ab740292f8d5f19b5de144087ac58044d06.tar.gz -> noto-emoji-20220912.tar.gz
+_eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
+_md5_=08bf33188291f42ad560bc6116aa7ff9
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 0eff06fe6970..6499ab5789fe 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/gimp-2.10.34 b/metadata/md5-cache/media-gfx/gimp-2.10.34
new file mode 100644
index 000000000000..ce7f4a4910ad
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.34
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.100 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.42:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=8
+HOMEPAGE=https://www.gimp.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome2 toolchain-funcs virtualx
+IUSE=aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+ LGPL-3+
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-2.0.2:= >=media-libs/babl-0.1.100 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.42:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19:= >=media-libs/lcms-2.8:2 media-libs/libjpeg-turbo:= >=media-libs/libmypaint-1.6.1:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:= net-libs/glib-networking[ssl] sys-libs/zlib >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.9.1:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0:= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl:= ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0/2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.34.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ef2724a546378dec51e2f4f48c410a19
diff --git a/metadata/md5-cache/media-gfx/pngcheck-3.0.3 b/metadata/md5-cache/media-gfx/pngcheck-3.0.3
index 65abcc312a7b..a5fd45a89a84 100644
--- a/metadata/md5-cache/media-gfx/pngcheck-3.0.3
+++ b/metadata/md5-cache/media-gfx/pngcheck-3.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Verifies the integrity of PNG, JNG, and MNG files with internal chec
 EAPI=8
 HOMEPAGE=http://www.libpng.org/pub/png/apps/pngcheck.html
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=HPND GPL-2+
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.libpng.org/pub/png/src/pngcheck-3.0.3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=94524f6586b0d7b3faf5f8a6337e57fd
+_md5_=0b8206fd34bccf40df627570a6779ceb
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f4ca5c8fe270..8ab2332afc11 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/aalib-1.4_rc5-r10 b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r10
new file mode 100644
index 000000000000..0bb7feafda20
--- /dev/null
+++ b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r10
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gpm? ( >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( >=sys-libs/slang-2.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A ASCII-Graphics Library
+EAPI=8
+HOMEPAGE=https://aa-project.sourceforge.net/aalib/
+INHERIT=autotools multilib-minimal toolchain-funcs
+IUSE=X gpm slang 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
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gpm? ( >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( >=sys-libs/slang-2.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=54e3ce5f417e83cccfceb27d8f68a9a0
diff --git a/metadata/md5-cache/media-libs/aalib-1.4_rc5-r9 b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r9
index 14293544a98b..4508ee50cca4 100644
--- a/metadata/md5-cache/media-libs/aalib-1.4_rc5-r9
+++ b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r9
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gpm? ( >=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( >=sys-libs/slang-2.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig X? ( x11-base/xorg-proto )
 DESCRIPTION=A ASCII-Graphics Library
 EAPI=7
-HOMEPAGE=http://aa-project.sourceforge.net/aalib/
+HOMEPAGE=https://aa-project.sourceforge.net/aalib/
 INHERIT=autotools multilib-minimal toolchain-funcs
 IUSE=X slang gpm static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
@@ -12,4 +12,4 @@ RDEPEND=X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 SLOT=0
 SRC_URI=mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d0fc4e603cf4d989a92de9699d9bb449
+_md5_=863aaaeec24772013a06cfbc4ab64617
diff --git a/metadata/md5-cache/media-libs/babl-0.1.100 b/metadata/md5-cache/media-libs/babl-0.1.100
new file mode 100644
index 000000000000..acd2d2bea3f9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/babl-0.1.100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-1.72:= ) lcms? ( >=media-libs/lcms-2.13.1:2 )
+DESCRIPTION=A dynamic, any to any, pixel format conversion library
+EAPI=8
+HOMEPAGE=https://gegl.org/babl/
+INHERIT=meson gnome2-utils vala
+IUSE=introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-3
+RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.72:= ) lcms? ( >=media-libs/lcms-2.13.1:2 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://download.gimp.org/pub/babl/0.1/babl-0.1.100.tar.xz
+_eclasses_=gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6b1c95b1915f53a0e2ce3121230adbb0
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.42 b/metadata/md5-cache/media-libs/gegl-0.4.42
new file mode 100644
index 000000000000..141d47322c48
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.42
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pygobject-3.2:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.100[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) x11-base/xorg-proto
+DESCRIPTION=A graph based image processing framework
+EAPI=8
+HOMEPAGE=https://gegl.org/
+INHERIT=flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
+IUSE=cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-3+ LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.100[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=https://download.gimp.org/pub/gegl/0.4/gegl-0.4.42.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
+_md5_=36d64904b1d6601c46708a7796f7f624
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 87de36627393..7cab4121f732 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pygobject-3.2:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) ) ) vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.98[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+DEPEND=>=dev-libs/glib-2.68.2:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.98[introspection?,lcms?,vala?] media-libs/libjpeg-turbo media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) sdl2? ( >=media-libs/libsdl2-2.0.20 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:= ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) x11-base/xorg-proto
 DESCRIPTION=A graph based image processing framework
 EAPI=8
 HOMEPAGE=https://gegl.org/
@@ -13,4 +13,4 @@ REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.4
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=157523fc8ff31d259083b52b4d321788
+_md5_=8b7eb05cfc5d746592430c231f82b4bc
diff --git a/metadata/md5-cache/media-libs/mesa-22.3.6 b/metadata/md5-cache/media-libs/mesa-22.3.6
new file mode 100644
index 000000000000..1c9414473059
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-22.3.6
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ) vulkan? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+INHERIT=llvm meson-multilib python-any-r1 linux-info
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-22.3.6.tar.xz
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f93b284aff5dafb0b79a42994591d99c
diff --git a/metadata/md5-cache/media-libs/mesa-23.0.0 b/metadata/md5-cache/media-libs/mesa-23.0.0
new file mode 100644
index 000000000000..2cfed1ab4289
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-23.0.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ) vulkan? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+INHERIT=llvm meson-multilib python-any-r1 linux-info
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-23.0.0.tar.xz
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f93b284aff5dafb0b79a42994591d99c
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 3e96d2020797..d737415394d7 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/shotcut-22.04.25-r1 b/metadata/md5-cache/media-video/shotcut-22.04.25-r1
deleted file mode 100644
index c3b6cb651a81..000000000000
--- a/metadata/md5-cache/media-video/shotcut-22.04.25-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-7.6.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg dev-qt/qtconcurrent:5 dev-qt/qtx11extras:5
-DESCRIPTION=A free, open source, cross-platform video editor
-EAPI=8
-HOMEPAGE=https://www.shotcut.org/ https://github.com/mltframework/shotcut/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=qmake-utils xdg
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-7.6.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg dev-qt/qtgraphicaleffects:5 dev-qt/qtquickcontrols:5 virtual/jack
-SLOT=0
-SRC_URI=https://github.com/mltframework/shotcut/archive/v22.04.25.tar.gz -> shotcut-22.04.25.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d8b1b7869d93ca1756889d87e1fd2e54
diff --git a/metadata/md5-cache/media-video/shotcut-22.12.21 b/metadata/md5-cache/media-video/shotcut-22.12.21
new file mode 100644
index 000000000000..586c16e66b20
--- /dev/null
+++ b/metadata/md5-cache/media-video/shotcut-22.12.21
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-7.8.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg dev-qt/qtconcurrent:5 dev-qt/qtx11extras:5
+DESCRIPTION=A free, open source, cross-platform video editor
+EAPI=8
+HOMEPAGE=https://www.shotcut.org/ https://github.com/mltframework/shotcut/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic xdg
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/mlt-7.8.0[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg dev-qt/qtquickcontrols[widgets] dev-qt/qtgraphicaleffects:5 virtual/jack
+SLOT=0
+SRC_URI=https://github.com/mltframework/shotcut/archive/v22.12.21.tar.gz -> shotcut-22.12.21.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e626efceddbe426f5a73179bb06711dd
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index de0fe7bb5643..183257bb5193 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.10.1 b/metadata/md5-cache/net-fs/cvmfs-2.10.1
new file mode 100644
index 000000000000..8b665ccdd66d
--- /dev/null
+++ b/metadata/md5-cache/net-fs/cvmfs-2.10.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile config configure install prepare setup test
+DEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= virtual/pkgconfig
+DESCRIPTION=HTTP read-only file system for distributing software
+EAPI=7
+HOMEPAGE=https://cernvm.cern.ch/fs/
+INHERIT=cmake linux-info bash-completion-r1
+IUSE=server
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
+SLOT=0
+SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.10.1/source.tar.gz -> cvmfs-2.10.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=53cce35139e11545c04de201843a010f
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 3aacc1e25888..e38851fe8d15 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.8 b/metadata/md5-cache/net-ftp/proftpd-1.3.8
index 77bf15b959c8..9cde5138e039 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.8
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
 INHERIT=multilib systemd tmpfiles toolchain-funcs
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
 REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.8.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=33287427550e79cf4389fa18a58d64b3
+_md5_=ab859e8af7165287ac077a7d09a3deac
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 4883017c03e9..dca11f90f16a 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-6.6.0 b/metadata/md5-cache/net-im/signal-desktop-bin-6.7.0
index e4936327a3f6..9a948397470f 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-6.6.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-6.7.0
@@ -10,6 +10,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_6.6.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_6.7.0_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=93759a98a191e9543faf30502e970cda
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 4c7cd347354c..b131cb464308 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/grpc-1.52.0 b/metadata/md5-cache/net-libs/grpc-1.52.0
index 6f55a38140eb..153e8460d430 100644
--- a/metadata/md5-cache/net-libs/grpc-1.52.0
+++ b/metadata/md5-cache/net-libs/grpc-1.52.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.grpc.io
 INHERIT=cmake
 IUSE=doc examples test
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND==dev-cpp/abseil-cpp-20220623.1*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-3.18.1:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0/30.152
 SRC_URI=https://github.com/grpc/grpc/archive/v1.52.0.tar.gz -> grpc-1.52.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=769b0959388d9fb43f6467b164001550
+_md5_=d0e871ba4e8054e02e18452cc8025ce1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index cb9a56a1778e..34d0ea3ae13d 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/htpdate-1.3.6 b/metadata/md5-cache/net-misc/htpdate-1.3.6
index c53f75e8e388..c782235f7375 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.3.6
+++ b/metadata/md5-cache/net-misc/htpdate-1.3.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.vervest.org/htp/
 INHERIT=readme.gentoo-r1 toolchain-funcs
 IUSE=+ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/twekkel/htpdate/archive/refs/tags/v1.3.6.tar.gz -> htpdate-1.3.6.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ad6be22322940b8f380d4324a915fa9d
+_md5_=1228cc89a6b424c1fed4b97ebe0463ba
diff --git a/metadata/md5-cache/net-misc/mrouted-4.4 b/metadata/md5-cache/net-misc/mrouted-4.4
index d4be83e4a2c2..09e7302510a5 100644
--- a/metadata/md5-cache/net-misc/mrouted-4.4
+++ b/metadata/md5-cache/net-misc/mrouted-4.4
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://troglobit.com/projects/mrouted/
 INHERIT=toolchain-funcs systemd
 IUSE=rsrr test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Stanford GPL-2
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/troglobit/mrouted/releases/download/4.4/mrouted-4.4.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=35c86bc3fda21fd8a04d2d8e590a9c4f
+_md5_=ca410c3c8b682b24712ed09b93f24929
diff --git a/metadata/md5-cache/net-misc/oidc-agent-4.5.0-r1 b/metadata/md5-cache/net-misc/oidc-agent-4.5.0-r1
new file mode 100644
index 000000000000..4e89c2095c86
--- /dev/null
+++ b/metadata/md5-cache/net-misc/oidc-agent-4.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-libs/check )
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=app-crypt/libsecret dev-libs/cJSON:= dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= net-libs/webkit-gtk:4.1= net-misc/curl elibc_musl? ( sys-libs/argp-standalone )
+DESCRIPTION=Agent and tools for managing OpenID Connect tokens on the command line
+EAPI=8
+HOMEPAGE=https://github.com/indigo-dc/oidc-agent
+INHERIT=xdg-utils
+IUSE=test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=app-crypt/libsecret dev-libs/cJSON:= dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= net-libs/webkit-gtk:4.1= net-misc/curl elibc_musl? ( sys-libs/argp-standalone )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v4.5.0.tar.gz -> oidc-agent-4.5.0.tar.gz
+_eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=b10eacc0d779fe78c873a4233feb3387
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.4-r3 b/metadata/md5-cache/net-misc/rsync-3.2.4-r3
index 64334e6208e9..3d6ed0282177 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.4-r3
+++ b/metadata/md5-cache/net-misc/rsync-3.2.4-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://rsync.samba.org/
 INHERIT=autotools flag-o-matic prefix python-single-r1 systemd verify-sig
 IUSE=acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_9 python_single_target_python3_10 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=acl? ( virtual/acl ) examples? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl ) lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
 REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.4.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src/rsync-3.2.4.tar.gz.asc )
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e896dbf75673d7b6573ede8187a49088
+_md5_=be847e9a57e64a660b328aa41f8b59cc
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.7-r2 b/metadata/md5-cache/net-misc/rsync-3.2.7-r2
index a5ed74276b9e..522abe4afe50 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.7-r2
+++ b/metadata/md5-cache/net-misc/rsync-3.2.7-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://rsync.samba.org/
 INHERIT=flag-o-matic prefix python-single-r1 systemd verify-sig
 IUSE=acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-lang/perl ) lz4? ( app-arch/lz4:= ) rrsync? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/bracex[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bracex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/bracex[python_targets_python3_11(-)] ) ) ssl? ( dev-libs/openssl:= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( >=dev-libs/xxhash-0.8 ) zstd? ( >=app-arch/zstd-1.4:= ) iconv? ( virtual/libiconv )
 REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) rrsync? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz.asc )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=9ea2bd84d48694a6217556a898f28f9a
+_md5_=a94e9ef2e6102bde34941ff5b7f6a87c
diff --git a/metadata/md5-cache/net-misc/rsync-9999 b/metadata/md5-cache/net-misc/rsync-9999
index 189b16aff75f..bee15828d77e 100644
--- a/metadata/md5-cache/net-misc/rsync-9999
+++ b/metadata/md5-cache/net-misc/rsync-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/popt-1.5 acl? ( virtual/acl ) examples? ( python_single_targe
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) examples? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) rrsync? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9ea2bd84d48694a6217556a898f28f9a
+_md5_=a94e9ef2e6102bde34941ff5b7f6a87c
diff --git a/metadata/md5-cache/net-misc/stunnel-5.65-r2 b/metadata/md5-cache/net-misc/stunnel-5.65-r2
index 9a73c9076228..3b2e6e1466b8 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.65-r2
+++ b/metadata/md5-cache/net-misc/stunnel-5.65-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.stunnel.org/index.html
 INHERIT=ssl-cert systemd tmpfiles
 IUSE=selinux stunnel3 tcpd ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=acct-user/stunnel acct-group/stunnel dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-stunnel ) stunnel3? ( dev-lang/perl ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.stunnel.org/downloads/stunnel-5.65.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.65.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.65.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.65.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.65.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.65.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.65.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.65.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=47084e8ef17e99a6f9a18b319567555c
+_md5_=f96264ebb1367a4480d8a42f78cc9d6c
diff --git a/metadata/md5-cache/net-misc/wget-1.21.3-r1 b/metadata/md5-cache/net-misc/wget-1.21.3-r1
index 5ab4529118fe..ec278623a286 100644
--- a/metadata/md5-cache/net-misc/wget-1.21.3-r1
+++ b/metadata/md5-cache/net-misc/wget-1.21.3-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/wget/
 INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
 IUSE=cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( app-crypt/gpgme media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.21.3.tar.gz verify-sig? ( mirror://gnu/wget/wget-1.21.3.tar.gz.sig )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=94f3936c361f30f76f9865cfa502ea65
+_md5_=3f984074c4b060c065f833a815586fe2
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 640a691e8186..9b0c80ba9572 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/tin-2.6.2-r1 b/metadata/md5-cache/net-nntp/tin-2.6.2-r1
index 0b283c196529..841d75d6647a 100644
--- a/metadata/md5-cache/net-nntp/tin-2.6.2-r1
+++ b/metadata/md5-cache/net-nntp/tin-2.6.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.tin.org/
 INHERIT=optfeature toolchain-funcs
 IUSE=cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=dev-libs/icu:= dev-libs/libpcre2:= dev-libs/uulib sys-libs/ncurses:= virtual/libiconv cancel-locks? ( >=net-libs/canlock-3.0:= ) gpg? ( app-crypt/gnupg ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( libtls? ( dev-libs/libretls:= ) !libtls? ( dev-libs/openssl:= ) ) )
 SLOT=0
 SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.6.2.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c149e439acaf0bf66f38a9eba379db88
+_md5_=42fc54c13a0a02171e3c2b10eacb5102
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 43341243a55f..e5d391b3d76c 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/rocBLAS-5.1.3-r1 b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r2
index 3e7ecaa8da94..c95340b0b9f9 100644
--- a/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r1
+++ b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/rocm-cmake:0/5.1 dev-util/Tensile:0/5.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/hip <dev-libs/msgpack-5.0.0 test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
+DEPEND=dev-cpp/msgpack-cxx dev-util/hip test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
 DESCRIPTION=AMD's library for BLAS on ROCm
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocBLAS
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.1
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.1.3.tar.gz -> rocm-rocBLAS-5.1.3.tar.gz https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3090535e41374b3dde45c76e7eb51b9e
+_md5_=10feffdfe6bb828f9d8a346b9fd30bb8
diff --git a/metadata/md5-cache/sci-libs/rocBLAS-5.4.2-r1 b/metadata/md5-cache/sci-libs/rocBLAS-5.4.2-r2
index 4f235cb96d4e..5c8201dc15da 100644
--- a/metadata/md5-cache/sci-libs/rocBLAS-5.4.2-r1
+++ b/metadata/md5-cache/sci-libs/rocBLAS-5.4.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/rocm-cmake-5.3 dev-util/Tensile:0/5.4 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/hip <dev-libs/msgpack-5.0.0 test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
+DEPEND=dev-cpp/msgpack-cxx dev-util/hip test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
 DESCRIPTION=AMD's library for BLAS on ROCm
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocBLAS
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5.4
 SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.4.2.tar.gz -> rocm-rocBLAS-5.4.2.tar.gz https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	rocm	d027c5dabbfc98896a8fe0defa5a6c0a	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=02bbfc2c6898a310b167c9a136615247
+_md5_=7e2277aac750f7bc26de3c0de95a77dc
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index ebbd09388438..013835c9e091 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/root-6.26.08 b/metadata/md5-cache/sci-physics/root-6.26.08
index 6e0420ffb9a4..6f0ac69506f3 100644
--- a/metadata/md5-cache/sci-physics/root-6.26.08
+++ b/metadata/md5-cache/sci-physics/root-6.26.08
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6.26/08
 SRC_URI=https://root.cern/download/root_v6.26.08.source.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=57bbb2f740671d6bc798837e8ca53625
+_md5_=30c414a1e6d2aa66a3bb634c48258a50
diff --git a/metadata/md5-cache/sci-physics/root-6.26.9999 b/metadata/md5-cache/sci-physics/root-6.26.9999
index 29864618b3fd..b67b208fad9e 100644
--- a/metadata/md5-cache/sci-physics/root-6.26.9999
+++ b/metadata/md5-cache/sci-physics/root-6.26.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !o
 RESTRICT=test
 SLOT=6.26/9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=57bbb2f740671d6bc798837e8ca53625
+_md5_=30c414a1e6d2aa66a3bb634c48258a50
diff --git a/metadata/md5-cache/sci-physics/root-6.28.00 b/metadata/md5-cache/sci-physics/root-6.28.00
index 8cb957609ee7..435102d48de8 100644
--- a/metadata/md5-cache/sci-physics/root-6.28.00
+++ b/metadata/md5-cache/sci-physics/root-6.28.00
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6/6.28.00
 SRC_URI=https://root.cern/download/root_v6.28.00.source.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=00e9f162f7d6468c3b2b05fc7f006521
+_md5_=540eb582863da7af4d6cbac75d757caf
diff --git a/metadata/md5-cache/sci-physics/root-6.28.9999 b/metadata/md5-cache/sci-physics/root-6.28.9999
index 1520995ee7be..161368aa99c8 100644
--- a/metadata/md5-cache/sci-physics/root-6.28.9999
+++ b/metadata/md5-cache/sci-physics/root-6.28.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !o
 RESTRICT=test
 SLOT=6/6.28.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=00e9f162f7d6468c3b2b05fc7f006521
+_md5_=540eb582863da7af4d6cbac75d757caf
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index 920c18207545..d14c22b108c5 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !o
 RESTRICT=test
 SLOT=6/9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=00e9f162f7d6468c3b2b05fc7f006521
+_md5_=540eb582863da7af4d6cbac75d757caf
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 587439b0d039..ae0c97738140 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/pythonprop-0.30.1 b/metadata/md5-cache/sci-visualization/pythonprop-0.30.1
index 44b6e7c38f59..ec4ca2b01c89 100644
--- a/metadata/md5-cache/sci-visualization/pythonprop-0.30.1
+++ b/metadata/md5-cache/sci-visualization/pythonprop-0.30.1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-electronics/voacapl app-text/yelp-tools
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sci-electronics/voacapl app-text/yelp-tools
 DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
 EAPI=7
 HOMEPAGE=https://www.qsl.net/h/hz1jw/pythonprop
 INHERIT=autotools python-single-r1
-IUSE=python_single_target_python3_9 python_single_target_python3_10
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-electronics/voacapl
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/scipy[python_targets_python3_11(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] sci-electronics/voacapl
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/jawatson/pythonprop/archive/v0.30.1.tar.gz -> pythonprop-0.30.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c3091abcdf5f5b67603cf849f5537baa
+_md5_=06da17690540ff7f1f619ef2d64f8aa1
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a2e037b13fd1..653d633a733a 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/arch-chroot-28 b/metadata/md5-cache/sys-apps/arch-chroot-28
new file mode 100644
index 000000000000..77301f20828d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/arch-chroot-28
@@ -0,0 +1,12 @@
+BDEPEND=app-text/asciidoc
+DEFINED_PHASES=compile install test
+DESCRIPTION=Wraps the chroot command while ensuring that important filesystems are mounted
+EAPI=8
+HOMEPAGE=https://github.com/archlinux/arch-install-scripts
+INHERIT=bash-completion-r1
+KEYWORDS=amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/archlinux/arch-install-scripts/archive/refs/tags/v28.tar.gz -> arch-install-scripts-v28.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9cf62610eb8b575ff61af143c1054916
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.8 b/metadata/md5-cache/sys-apps/diffutils-3.8
index 3f54901cbb54..ea9e5b207a7a 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.8
+++ b/metadata/md5-cache/sys-apps/diffutils-3.8
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 INHERIT=flag-o-matic verify-sig
 IUSE=nls static verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.8.tar.xz https://alpha.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz verify-sig? ( mirror://gnu/diffutils/diffutils-3.8.tar.xz.sig https://alpha.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ab005c2271b525e9318c6be1b22f5d47
+_md5_=5aa8b3123e8c49b9cf72cbfe1df66e6d
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.9 b/metadata/md5-cache/sys-apps/diffutils-3.9
index ab622e75f3b4..af52b0ca3a10 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.9
+++ b/metadata/md5-cache/sys-apps/diffutils-3.9
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 INHERIT=flag-o-matic verify-sig
 IUSE=nls static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.9.tar.xz verify-sig? ( mirror://gnu/diffutils/diffutils-3.9.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=cc2d66d02fc9011f70dc8ae47ed7430b
+_md5_=0780840404f1c899a19b06c6d613043a
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.9-r1 b/metadata/md5-cache/sys-apps/diffutils-3.9-r1
index 1d1975968190..24cd762a09f1 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.9-r1
+++ b/metadata/md5-cache/sys-apps/diffutils-3.9-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 INHERIT=flag-o-matic verify-sig
 IUSE=nls static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.9.tar.xz verify-sig? ( mirror://gnu/diffutils/diffutils-3.9.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c8bd2500b1c9df15b5617c4fd8a76a48
+_md5_=4b7285fda2cf4166f195f7e2579f97f2
diff --git a/metadata/md5-cache/sys-apps/file-5.44-r3 b/metadata/md5-cache/sys-apps/file-5.44-r3
index 417e212a4b71..485febf2e864 100644
--- a/metadata/md5-cache/sys-apps/file-5.44-r3
+++ b/metadata/md5-cache/sys-apps/file-5.44-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.darwinsys.com/file/
 INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal verify-sig
 IUSE=bzip2 lzip lzma python seccomp static-libs zlib zstd python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=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(-)?] ) lzip? ( app-arch/lzlib ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( >=sys-libs/libseccomp-2.5.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.44.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.44.tar.gz.asc )
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=4ec1e237111203589ecc2054778d0c6a
+_md5_=3f5c8bebf43b7b54063e049f65c9f631
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 6d00ec8d0d14..1d6d806d7ff9 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -12,4 +12,4 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	a9f2e2ae24bd496873c092a94cae1539	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cc6c26fae8a5b72f0dee6045e9a9dd6a
+_md5_=184c0812cb53cf13ea4e5b0fcae67ee6
diff --git a/metadata/md5-cache/sys-apps/findutils-4.9.0-r2 b/metadata/md5-cache/sys-apps/findutils-4.9.0-r2
index ebda4be72f38..f9f35ddcc426 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.9.0-r2
+++ b/metadata/md5-cache/sys-apps/findutils-4.9.0-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/findutils/
 INHERIT=flag-o-matic python-any-r1 verify-sig
 IUSE=nls selinux static test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.9.0.tar.xz verify-sig? ( mirror://gnu/findutils/findutils-4.9.0.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=27e96a048088750bd83dff538af104fc
+_md5_=72fb771716912c3174aa55ee85e309ff
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.8.8-r1 b/metadata/md5-cache/sys-apps/fwupd-1.8.11
index 9a664dbbf252..a229b9f47ea2 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.8.8-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.8.11
@@ -10,9 +10,9 @@ IUSE=amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom g
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor:= ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) modemmanager? ( gusb ) spi? ( lzma ) synaptics? ( gnutls ) test? ( gusb ) uefi? ( gnutls )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) modemmanager? ( gusb ) spi? ( lzma ) synaptics? ( gnutls ) test? ( archive gusb ) uefi? ( gnutls )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/releases/download/1.8.8/fwupd-1.8.8.tar.xz
+SRC_URI=https://github.com/fwupd/fwupd/releases/download/1.8.11/fwupd-1.8.11.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=09ceaa542341379fc071734ae6f24c8b
+_md5_=2528a71c12ac5cb0b7365b5ec3690bf5
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.8.5 b/metadata/md5-cache/sys-apps/fwupd-1.8.5
deleted file mode 100644
index 8d7661924249..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.8.5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) >=dev-util/meson-0.60.0 virtual/pkgconfig gtk-doc? ( python_single_target_python3_9? ( >=dev-python/markdown-3.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/markdown-3.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/markdown-3.2[python_targets_python3_11(-)] ) >=dev-util/gi-docgen-2021.1 ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( dev-util/umockdev net-libs/gnutls[tools] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor:= ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection]
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=8
-HOMEPAGE=https://fwupd.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson python-single-r1 vala udev xdg
-IUSE=amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor:= ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) modemmanager? ( gusb ) spi? ( lzma ) synaptics? ( gnutls ) test? ( gusb ) uefi? ( gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/releases/download/1.8.5/fwupd-1.8.5.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=39584b0c436a826907cbcf061dd6ee95
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.8.7 b/metadata/md5-cache/sys-apps/fwupd-1.8.7
deleted file mode 100644
index 4714e077331f..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.8.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) >=dev-util/meson-0.60.0 virtual/pkgconfig gtk-doc? ( python_single_target_python3_9? ( >=dev-python/markdown-3.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/markdown-3.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/markdown-3.2[python_targets_python3_11(-)] ) >=dev-util/gi-docgen-2021.1 ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( dev-util/umockdev net-libs/gnutls[tools] ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor:= ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection]
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=8
-HOMEPAGE=https://fwupd.org
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson python-single-r1 vala udev xdg
-IUSE=amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor:= ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) modemmanager? ( gusb ) spi? ( lzma ) synaptics? ( gnutls ) test? ( gusb ) uefi? ( gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/releases/download/1.8.7/fwupd-1.8.7.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=389c1c9f4e625695510dc9fe26b5389e
diff --git a/metadata/md5-cache/sys-apps/gawk-5.2.1 b/metadata/md5-cache/sys-apps/gawk-5.2.1
index 6cb3429d0b3f..a261f4b2134e 100644
--- a/metadata/md5-cache/sys-apps/gawk-5.2.1
+++ b/metadata/md5-cache/sys-apps/gawk-5.2.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
 INHERIT=verify-sig
 IUSE=mpfr pma nls readline verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=mpfr? ( dev-libs/gmp:= dev-libs/mpfr:= ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-5.2.1.tar.xz verify-sig? ( mirror://gnu/gawk/gawk-5.2.1.tar.xz.sig )
 _eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=888b9d9e7d5191f963d646b9e267025a
+_md5_=24249c47b2415ce4cdaafb9b6813dcad
diff --git a/metadata/md5-cache/sys-apps/grep-3.7 b/metadata/md5-cache/sys-apps/grep-3.7
index a22379a2359a..29ab8b266c45 100644
--- a/metadata/md5-cache/sys-apps/grep-3.7
+++ b/metadata/md5-cache/sys-apps/grep-3.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/grep/
 INHERIT=flag-o-matic toolchain-funcs verify-sig
 IUSE=nls pcre static verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
 REQUIRED_USE=static? ( !sparc )
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.7.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.7.tar.xz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a9da6f12bce633ab7d51e8387a2ddd1a
+_md5_=5081ff7aedf367b6646936ad65de497a
diff --git a/metadata/md5-cache/sys-apps/grep-3.8-r1 b/metadata/md5-cache/sys-apps/grep-3.8-r1
index 07319f5989c4..84b432f59f1a 100644
--- a/metadata/md5-cache/sys-apps/grep-3.8-r1
+++ b/metadata/md5-cache/sys-apps/grep-3.8-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/grep/
 INHERIT=flag-o-matic verify-sig
 IUSE=+egrep-fgrep nls pcre static verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsigsegv ) ) nls? ( virtual/libintl ) virtual/libiconv
 REQUIRED_USE=static? ( !sparc )
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.8.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.8.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=3d6e3103798d6c2793cef78f88932906
+_md5_=9f16efad7d19825033d0c7dc8cbf3eca
diff --git a/metadata/md5-cache/sys-apps/grep-3.8_p20221230 b/metadata/md5-cache/sys-apps/grep-3.8_p20221230
index 26252e773816..8e8c128cb908 100644
--- a/metadata/md5-cache/sys-apps/grep-3.8_p20221230
+++ b/metadata/md5-cache/sys-apps/grep-3.8_p20221230
@@ -12,4 +12,4 @@ REQUIRED_USE=static? ( !sparc )
 SLOT=0
 SRC_URI=https://meyering.net/grep/grep-3.8.11-908f.tar.xz verify-sig? ( https://meyering.net/grep/grep-3.8.11-908f.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=bb8dc245b0174010a06d5a24b978dd3c
+_md5_=dc869a480b013bba0ccb66bb06bd0459
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.4 b/metadata/md5-cache/sys-apps/groff-1.22.4
index b56af7df2f18..9a71da476b73 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.4
+++ b/metadata/md5-cache/sys-apps/groff-1.22.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/groff/groff.html
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=examples uchardet X
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=uchardet? ( app-i18n/uchardet ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt )
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.4.tar.gz https://alpha.gnu.org/gnu/groff/groff-1.22.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=071846dc3a2b316a704af0b86913ca78
+_md5_=fe8df2c3ece515f550d305af3f59445f
diff --git a/metadata/md5-cache/sys-apps/groff-1.23.0_rc3 b/metadata/md5-cache/sys-apps/groff-1.23.0_rc3
index 941479c9c743..d009154f07a2 100644
--- a/metadata/md5-cache/sys-apps/groff-1.23.0_rc3
+++ b/metadata/md5-cache/sys-apps/groff-1.23.0_rc3
@@ -11,4 +11,4 @@ RDEPEND=uchardet? ( app-i18n/uchardet ) X? ( x11-libs/libICE x11-libs/libSM x11-
 SLOT=0
 SRC_URI=https://alpha.gnu.org/gnu/groff/groff-1.23.0.rc3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=117542226b6dc3c231569c5e48b31555
+_md5_=09ccbbd575e497d7c71106feda6059a3
diff --git a/metadata/md5-cache/sys-apps/less-608-r1 b/metadata/md5-cache/sys-apps/less-608-r1
index 0c57dc15b10a..ff3823a7bf3c 100644
--- a/metadata/md5-cache/sys-apps/less-608-r1
+++ b/metadata/md5-cache/sys-apps/less-608-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 INHERIT=autotools
 IUSE=pcre unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-608.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c655c63b7a5d7f8f16bc579dc14c8b52
+_md5_=64dbd4647e84d69204ee75c0b6f6275b
diff --git a/metadata/md5-cache/sys-apps/less-608-r2 b/metadata/md5-cache/sys-apps/less-608-r2
index b18f63f00bca..7bc5d89eb1db 100644
--- a/metadata/md5-cache/sys-apps/less-608-r2
+++ b/metadata/md5-cache/sys-apps/less-608-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 INHERIT=autotools
 IUSE=pcre unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-608.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cbd4ac2525dd82a3577c494d08eac97e
+_md5_=ef911d8b840eb4d5b9a78a9b935ba25c
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.12-r3 b/metadata/md5-cache/sys-apps/man-pages-5.12-r3
index 12385a71d4a4..686dfba6847b 100644
--- a/metadata/md5-cache/sys-apps/man-pages-5.12-r3
+++ b/metadata/md5-cache/sys-apps/man-pages-5.12-r3
@@ -3,11 +3,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=7
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_de l10n_es l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
-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 ~arm64-macos
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.12.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.12.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=6aa2b3e1e216ca563b5dd155fe7da1d2
+_md5_=53708fd6296b06b93184edf5dce99484
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.13-r2 b/metadata/md5-cache/sys-apps/man-pages-5.13-r2
index 8e7bd5a2fe2e..5f6472472c3b 100644
--- a/metadata/md5-cache/sys-apps/man-pages-5.13-r2
+++ b/metadata/md5-cache/sys-apps/man-pages-5.13-r2
@@ -3,11 +3,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=7
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_de l10n_es l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_zh-CN
-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 ~arm64-macos
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.13.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.13.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=67cb57a3d42dbe61b8e0c610b73f7031
+_md5_=8513bbb3ad76940950601562f9a7533e
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.01 b/metadata/md5-cache/sys-apps/man-pages-6.01
index 1caea4e92b82..8714f16f66a5 100644
--- a/metadata/md5-cache/sys-apps/man-pages-6.01
+++ b/metadata/md5-cache/sys-apps/man-pages-6.01
@@ -4,11 +4,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=8
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
-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 ~arm64-macos
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( || ( app-i18n/man-pages-l10n[l10n_ru(-)] app-i18n/man-pages-ru ) ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.01.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.01.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=035cd1d95a09fdf210e250443fdf060f
+_md5_=0ac4982c7d9f6ead7e018cb1eb61a48f
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.02-r1 b/metadata/md5-cache/sys-apps/man-pages-6.02-r1
index 5831ae6b3026..9c60043c415f 100644
--- a/metadata/md5-cache/sys-apps/man-pages-6.02-r1
+++ b/metadata/md5-cache/sys-apps/man-pages-6.02-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=8
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
-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 ~arm64-macos
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( || ( app-i18n/man-pages-l10n[l10n_ru(-)] app-i18n/man-pages-ru ) ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.02.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.02.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=5fe40347764fb3d2c20d43fa386a2208
+_md5_=336fb458ec7b3b33abe88bb368b55477
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.03 b/metadata/md5-cache/sys-apps/man-pages-6.03
index 7fee6f178f4c..7e2c9a85fe01 100644
--- a/metadata/md5-cache/sys-apps/man-pages-6.03
+++ b/metadata/md5-cache/sys-apps/man-pages-6.03
@@ -4,11 +4,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=8
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=l10n_ja l10n_ru l10n_zh-CN l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_sr l10n_sv l10n_uk l10n_vi
-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 ~arm64-macos
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( || ( app-i18n/man-pages-l10n[l10n_ru(-)] app-i18n/man-pages-ru ) ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) l10n_cs? ( app-i18n/man-pages-l10n[l10n_cs(-)] ) l10n_da? ( app-i18n/man-pages-l10n[l10n_da(-)] ) l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] ) l10n_el? ( app-i18n/man-pages-l10n[l10n_el(-)] ) l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] ) l10n_fi? ( app-i18n/man-pages-l10n[l10n_fi(-)] ) l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] ) l10n_hu? ( app-i18n/man-pages-l10n[l10n_hu(-)] ) l10n_id? ( app-i18n/man-pages-l10n[l10n_id(-)] ) l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] ) l10n_mk? ( app-i18n/man-pages-l10n[l10n_mk(-)] ) l10n_nb? ( app-i18n/man-pages-l10n[l10n_nb(-)] ) l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] ) l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] ) l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] ) l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] ) l10n_sr? ( app-i18n/man-pages-l10n[l10n_sr(-)] ) l10n_sv? ( app-i18n/man-pages-l10n[l10n_sv(-)] ) l10n_uk? ( app-i18n/man-pages-l10n[l10n_uk(-)] ) l10n_vi? ( app-i18n/man-pages-l10n[l10n_vi(-)] )
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.03.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.03.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=3ad01abdade5e006e972d1eec85fa39a
+_md5_=434af3e795978b2e7bdaaaee79b47e9f
diff --git a/metadata/md5-cache/sys-apps/man-pages-9999 b/metadata/md5-cache/sys-apps/man-pages-9999
index 2861ca4c6c1d..5923f8f881c3 100644
--- a/metadata/md5-cache/sys-apps/man-pages-9999
+++ b/metadata/md5-cache/sys-apps/man-pages-9999
@@ -13,4 +13,4 @@ RESTRICT=binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=04bb75db491c3f85dd36557e1a1c6b33
+_md5_=40d8d17c0b251344cac7e6165c00b527
diff --git a/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.1.1 b/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.1.1
new file mode 100644
index 000000000000..00b5ef79e4c6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.6.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.13.0.0:=
+DESCRIPTION=Set of tiny linux utilities
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-linux-utils/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.13.0.0:=
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.6.1.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9d02bdb2a3489681f0554575b74e40b1
diff --git a/metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.1 b/metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.1
new file mode 100644
index 000000000000..2a1c07887b3a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/skalibs-2.13.0.0:=
+DESCRIPTION=Set of tiny portable unix utilities
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-portable-utils/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/skalibs-2.13.0.0:=
+SLOT=0
+SRC_URI=https://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.3.0.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c131a4d098ee2b6c35219a9a60051b9d
diff --git a/metadata/md5-cache/sys-apps/s6-rc-0.5.4.1 b/metadata/md5-cache/sys-apps/s6-rc-0.5.4.1
new file mode 100644
index 000000000000..3c3168c1d032
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.5.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=dev-lang/execline:= dev-libs/skalibs:= >=sys-apps/s6-2.11.3.0:=[execline]
+DESCRIPTION=Service manager for the s6 supervision suite
+EAPI=8
+HOMEPAGE=https://www.skarnet.org/software/s6-rc/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=dev-lang/execline:= dev-libs/skalibs:= >=sys-apps/s6-2.11.3.0:=[execline]
+SLOT=0/0.5
+SRC_URI=https://www.skarnet.org/software/s6-rc/s6-rc-0.5.4.1.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=f6a502fc5699b271b9c03da606e1c2e1
diff --git a/metadata/md5-cache/sys-apps/sed-4.9 b/metadata/md5-cache/sys-apps/sed-4.9
index 152bf2c6e3d7..a69ae79cdb78 100644
--- a/metadata/md5-cache/sys-apps/sed-4.9
+++ b/metadata/md5-cache/sys-apps/sed-4.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/sed/
 INHERIT=flag-o-matic verify-sig
 IUSE=acl nls selinux 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 ~arm64-macos
 LICENSE=GPL-3+
 RDEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.9.tar.xz verify-sig? ( mirror://gnu/sed/sed-4.9.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=fd3fbd7fe43794f3d7615b00f8d188c9
+_md5_=7b2ce731de90ed75f049852aca4aa8b5
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 3c884a699533..18a4803282fe 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/fprintd-1.94.2 b/metadata/md5-cache/sys-auth/fprintd-1.94.2
index c156f70faef5..f98904a4577c 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.94.2
+++ b/metadata/md5-cache/sys-auth/fprintd-1.94.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/libfprint/fprintd
 INHERIT=meson pam python-any-r1 systemd
 IUSE=doc pam systemd test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd:= ) !systemd? ( sys-auth/elogind:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.94.2/fprintd-v1.94.2.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=249038327e21e5fd12a62ee01ab4c757
+_md5_=e0ddd5959cf19d4f08963e4334af49c9
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.94.5 b/metadata/md5-cache/sys-auth/libfprint-1.94.5
index ab184eba008d..acc9028c6dce 100644
--- a/metadata/md5-cache/sys-auth/libfprint-1.94.5
+++ b/metadata/md5-cache/sys-auth/libfprint-1.94.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint https://gitlab.freedesktop.org/libfprint/libfprint
 INHERIT=meson udev
 IUSE=examples gtk-doc +introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/libgudev dev-libs/nss dev-python/pygobject dev-libs/libgusb x11-libs/pixman examples? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 )
 SLOT=2
 SRC_URI=https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v1.94.5/libfprint-v1.94.5.tar.bz2 -> libfprint-1.94.5.tar.bz2
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=64c77748c9b6bd9b3c719d4d59077c7e
+_md5_=dc022fadbe53c55f8a35623c212a833c
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index ee0c4bbfc0cd..6b5905c601a3 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/gnuconfig-20221007 b/metadata/md5-cache/sys-devel/gnuconfig-20221007
index c659dd1a3b09..f5cc56d40937 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-20221007
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20221007
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Updated config.sub and config.guess file from GNU
 EAPI=7
 HOMEPAGE=https://savannah.gnu.org/projects/config
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-3+-with-autoconf-exception
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/gnuconfig/gnuconfig-20221007.tar.xz
-_md5_=8afcc16be46863a266c42df6c42a5128
+_md5_=e5d07f1cc72b6396aecf471f7ba65eec
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-99999999 b/metadata/md5-cache/sys-devel/gnuconfig-99999999
index 6721df5e8649..e207ac2ea661 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-99999999
+++ b/metadata/md5-cache/sys-devel/gnuconfig-99999999
@@ -8,4 +8,4 @@ LICENSE=GPL-3+-with-autoconf-exception
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=dbd175862bc235a8f65671ad3cacf8fd
+_md5_=8a21697534465b376df25c7638a0fe35
diff --git a/metadata/md5-cache/sys-devel/make-4.3 b/metadata/md5-cache/sys-devel/make-4.3
index c48654e0e14d..cc287f704297 100644
--- a/metadata/md5-cache/sys-devel/make-4.3
+++ b/metadata/md5-cache/sys-devel/make-4.3
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 INHERIT=flag-o-matic verify-sig
 IUSE=guile nls static verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.3.tar.gz verify-sig? ( mirror://gnu//make/make-4.3.tar.gz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=da2b0f40891afc6e8f80b57a9a1085a1
+_md5_=2675f6b93283ea0290a14fd59b301040
diff --git a/metadata/md5-cache/sys-devel/make-4.4 b/metadata/md5-cache/sys-devel/make-4.4
index 44d6a2b9a52d..d7c5f5641479 100644
--- a/metadata/md5-cache/sys-devel/make-4.4
+++ b/metadata/md5-cache/sys-devel/make-4.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/make/make.html
 INHERIT=flag-o-matic verify-sig
 IUSE=guile nls static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/make/make-4.4.tar.gz verify-sig? ( mirror://gnu/make/make-4.4.tar.gz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=81a8d5e78a3411add148146957c8e2d7
+_md5_=b0bf2556259d9472e10bd43b18371490
diff --git a/metadata/md5-cache/sys-devel/make-4.4.0.90 b/metadata/md5-cache/sys-devel/make-4.4.0.90
index 866bcb70cd13..eca17fd2c2fc 100644
--- a/metadata/md5-cache/sys-devel/make-4.4.0.90
+++ b/metadata/md5-cache/sys-devel/make-4.4.0.90
@@ -11,4 +11,4 @@ RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://alpha.gnu.org/gnu/make/make-4.4.0.90.tar.gz verify-sig? ( https://alpha.gnu.org/gnu/make/make-4.4.0.90.tar.gz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=011b47933408fc5d39f4a358112e7856
+_md5_=c5fc94c4f4d4a9eb1317263e26b27c48
diff --git a/metadata/md5-cache/sys-devel/make-4.4.0.91 b/metadata/md5-cache/sys-devel/make-4.4.0.91
index 04505692a587..d36a26aa8e62 100644
--- a/metadata/md5-cache/sys-devel/make-4.4.0.91
+++ b/metadata/md5-cache/sys-devel/make-4.4.0.91
@@ -11,4 +11,4 @@ RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://alpha.gnu.org/gnu/make/make-4.4.0.91.tar.gz verify-sig? ( https://alpha.gnu.org/gnu/make/make-4.4.0.91.tar.gz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=bb43e9f4b8d956956a3c01e668c4764a
+_md5_=8d4012292b4929532e94d97990652d1a
diff --git a/metadata/md5-cache/sys-devel/make-9999 b/metadata/md5-cache/sys-devel/make-9999
index 64d7ec6470e3..1b8ba28b50b0 100644
--- a/metadata/md5-cache/sys-devel/make-9999
+++ b/metadata/md5-cache/sys-devel/make-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=011b47933408fc5d39f4a358112e7856
+_md5_=c5fc94c4f4d4a9eb1317263e26b27c48
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r4 b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
index 4ed37c37b95d..00fad8b03cc2 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r4
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/patch/patch.html
 INHERIT=flag-o-matic verify-sig
 IUSE=static test xattr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=xattr? ( sys-apps/attr )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz verify-sig? ( mirror://gnu/patch/patch-2.7.6.tar.xz.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cc18fdb7e2fb5cff113b5ab3cd138a95
+_md5_=af4f1c26c646ed7b6f3e5692bb94b6c8
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r5 b/metadata/md5-cache/sys-devel/patch-2.7.6-r5
index e4c05d486583..36320a171fb4 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r5
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/patch/patch.html
 INHERIT=flag-o-matic verify-sig
 IUSE=static test xattr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
 RDEPEND=xattr? ( sys-apps/attr )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz verify-sig? ( mirror://gnu/patch/patch-2.7.6.tar.xz.sig )
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=2dfe342bc0444901012bf99d99d2faa6
+_md5_=33a95acf3a89301204a014dc5c8886f2
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index dbd23c0d1a1a..480b17f4e707 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/genfstab-24 b/metadata/md5-cache/sys-fs/genfstab-24
index 1837e6f3f92a..a6478dfdba6a 100644
--- a/metadata/md5-cache/sys-fs/genfstab-24
+++ b/metadata/md5-cache/sys-fs/genfstab-24
@@ -1,10 +1,12 @@
 BDEPEND=app-text/asciidoc
-DEFINED_PHASES=-
+DEFINED_PHASES=compile install
 DESCRIPTION=Genfstab - generate output suitable for addition to an fstab file
 EAPI=7
-HOMEPAGE=https://github.com/scardracs/genfstab https://man.archlinux.org/man/genfstab.8
+HOMEPAGE=https://github.com/archlinux/arch-install-scripts https://man.archlinux.org/man/genfstab.8
+INHERIT=bash-completion-r1
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=https://github.com/scardracs/genfstab/releases/download/24/genfstab-24.tar.gz
-_md5_=456fd865e4931e589ffcf21922ae92ec
+SRC_URI=https://github.com/archlinux/arch-install-scripts/archive/tags/v24.tar.gz -> genfstab-24.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=861851430a3790f9b05c3427df7ac745
diff --git a/metadata/md5-cache/sys-fs/genfstab-28-r1 b/metadata/md5-cache/sys-fs/genfstab-28-r1
index d8a94eaddde3..ffa14e76fafe 100644
--- a/metadata/md5-cache/sys-fs/genfstab-28-r1
+++ b/metadata/md5-cache/sys-fs/genfstab-28-r1
@@ -1,12 +1,14 @@
 BDEPEND=app-alternatives/awk app-text/asciidoc
-DEFINED_PHASES=test
+DEFINED_PHASES=compile install test
 DESCRIPTION=Genfstab - generate output suitable for addition to an fstab file
 EAPI=8
-HOMEPAGE=https://github.com/scardracs/genfstab https://man.archlinux.org/man/genfstab.8
+HOMEPAGE=https://github.com/archlinux/arch-install-scripts https://man.archlinux.org/man/genfstab.8
+INHERIT=bash-completion-r1
 IUSE=test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/scardracs/genfstab/releases/download/28/genfstab-28.tar.gz
-_md5_=2510e0a11295d5a6b64ce17b8a3f9706
+SRC_URI=https://github.com/archlinux/arch-install-scripts/archive/refs/tags/v28.tar.gz -> arch-install-scripts-v28.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=997f3309d33740576e8dd9641100ad27
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 62f948939838..483ca3488948 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/readline-8.1_p2-r1 b/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
index 98f10983322f..b204562a2587 100644
--- a/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
+++ b/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
 INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
 IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3:=[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(-)?]
 SLOT=0/8
 SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz verify-sig? ( mirror://gnu/readline/readline-8.1.tar.gz.sig ) mirror://gnu//readline-8.1-patches/readline81-001 verify-sig? ( mirror://gnu//readline-8.1-patches/readline81-001.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001.sig ) mirror://gnu//readline-8.1-patches/readline81-002 verify-sig? ( mirror://gnu//readline-8.1-patches/readline81-002.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-002.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9b46c9e3ace1465c49270b3530d873be
+_md5_=765e8a7e1a357242c6f9bc6318d20e30
diff --git a/metadata/md5-cache/sys-libs/readline-8.2_p1 b/metadata/md5-cache/sys-libs/readline-8.2_p1
index c54b67ea1194..622c76e2cead 100644
--- a/metadata/md5-cache/sys-libs/readline-8.2_p1
+++ b/metadata/md5-cache/sys-libs/readline-8.2_p1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git
 INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
 IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3:=[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(-)?]
 SLOT=0/8
 SRC_URI=mirror://gnu/readline/readline-8.2.tar.gz verify-sig? ( mirror://gnu/readline/readline-8.2.tar.gz.sig ) mirror://gnu//readline-8.2-patches/readline82-001 verify-sig? ( mirror://gnu//readline-8.2-patches/readline82-001.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.2-patches/readline82-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.2-patches/readline82-001.sig )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c8bd2a3e60d18dd63eb9473cb5f15cb3
+_md5_=28bac9bab79919d89dd67900500aa2fc
diff --git a/metadata/md5-cache/sys-libs/readline-9999 b/metadata/md5-cache/sys-libs/readline-9999
index 7b1db956572a..b80a9161088a 100644
--- a/metadata/md5-cache/sys-libs/readline-9999
+++ b/metadata/md5-cache/sys-libs/readline-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.9-r3:=[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(-)?]
 SLOT=0/8
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c8bd2a3e60d18dd63eb9473cb5f15cb3
+_md5_=28bac9bab79919d89dd67900500aa2fc
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 5525fe7fb061..a4133110bbdb 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/btop-1.2.13-r1 b/metadata/md5-cache/sys-process/btop-1.2.13-r1
index b1f35cadd487..cbcdc78af4b0 100644
--- a/metadata/md5-cache/sys-process/btop-1.2.13-r1
+++ b/metadata/md5-cache/sys-process/btop-1.2.13-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A monitor of resources
 EAPI=8
 HOMEPAGE=https://github.com/aristocratos/btop
 INHERIT=toolchain-funcs xdg-utils
-KEYWORDS=amd64 arm64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/aristocratos/btop/archive/refs/tags/v1.2.13.tar.gz -> btop-1.2.13.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9d1f65a8b619c7e3e302db9111cb1126
+_md5_=f74d9aa6a77afdabcff892c43f032831
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 8a066145a651..f6177603a546 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dev-manager-0-r2 b/metadata/md5-cache/virtual/dev-manager-0-r2
index ef10097cf6be..7d553824e754 100644
--- a/metadata/md5-cache/virtual/dev-manager-0-r2
+++ b/metadata/md5-cache/virtual/dev-manager-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the device filesystem manager
 EAPI=7
-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 ~arm64-macos
 RDEPEND=|| ( virtual/udev sys-apps/busybox[mdev] sys-fs/static-dev )
 SLOT=0
-_md5_=8656038e7d7e5c0e998caaef4931cdc7
+_md5_=4d374d498143b8efb72e9940ac5187a2
diff --git a/metadata/md5-cache/virtual/editor-0-r4 b/metadata/md5-cache/virtual/editor-0-r4
index cfad54009328..ac9ce2887160 100644
--- a/metadata/md5-cache/virtual/editor-0-r4
+++ b/metadata/md5-cache/virtual/editor-0-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for editor
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/ee app-editors/emacs:* app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/kakoune app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/moe app-editors/ne app-editors/neovim app-editors/ng app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/gvim app-editors/vis app-editors/xemacs app-editors/zile app-misc/mc[edit] dev-lisp/cmucl mail-client/alpine[-onlyalpine] )
 SLOT=0
-_md5_=3aada09beb2e68759bc16996eebe4539
+_md5_=7e87eb907870f45156de995de81db35f
diff --git a/metadata/md5-cache/virtual/libc-1-r1 b/metadata/md5-cache/virtual/libc-1-r1
index 1d52d76fc55b..a4865d429c9b 100644
--- a/metadata/md5-cache/virtual/libc-1-r1
+++ b/metadata/md5-cache/virtual/libc-1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the C library
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) !sys-libs/glibc !sys-libs/musl )
 SLOT=0
-_md5_=7e8cef0675ac56894b513bff27c2b352
+_md5_=4448bb08e918a02d918acc0f85bbfec6
diff --git a/metadata/md5-cache/virtual/man-0-r4 b/metadata/md5-cache/virtual/man-0-r4
index 42d02af684f6..7831904f061e 100644
--- a/metadata/md5-cache/virtual/man-0-r4
+++ b/metadata/md5-cache/virtual/man-0-r4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for man
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-apps/man-db >=app-text/mandoc-1.14.5-r1[system-man] )
 SLOT=0
-_md5_=db54a9e86e9d27803cd4a2fb07dfbbe8
+_md5_=0e3dbeae5d9325c14af7cc2dab2baa1b
diff --git a/metadata/md5-cache/virtual/os-headers-0-r2 b/metadata/md5-cache/virtual/os-headers-0-r2
index f4f00f47591c..651c28fad9bb 100644
--- a/metadata/md5-cache/virtual/os-headers-0-r2
+++ b/metadata/md5-cache/virtual/os-headers-0-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for operating system headers
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!prefix-guest? ( || ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) ) ) prefix-guest? ( !sys-kernel/linux-headers )
 SLOT=0
-_md5_=bb0bb63f587d2a5195dbe241ba619dcb
+_md5_=57ac5d76c9cf1c3882bd5c9af8024b5f
diff --git a/metadata/md5-cache/virtual/package-manager-1 b/metadata/md5-cache/virtual/package-manager-1
index 31fb84de6c9a..36b4417ff6a1 100644
--- a/metadata/md5-cache/virtual/package-manager-1
+++ b/metadata/md5-cache/virtual/package-manager-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the package manager
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-apps/portage sys-apps/pkgcore )
 SLOT=0
-_md5_=23a3b67be11c8d2affef12c04deda7a2
+_md5_=bc1cbd8c19add75283678f7e247b0c12
diff --git a/metadata/md5-cache/virtual/pager-0-r1 b/metadata/md5-cache/virtual/pager-0-r1
index d9c848b6a7c4..546738f7cfdc 100644
--- a/metadata/md5-cache/virtual/pager-0-r1
+++ b/metadata/md5-cache/virtual/pager-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for command-line pagers
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( sys-apps/less sys-apps/most sys-apps/util-linux[ncurses] app-text/lv app-editors/vim[vim-pager] )
 SLOT=0
-_md5_=888c2f2278cb75ec08d7c4c82eb85410
+_md5_=f60840f1ac5d64a273995068634dae98
diff --git a/metadata/md5-cache/virtual/service-manager-1-r1 b/metadata/md5-cache/virtual/service-manager-1-r1
index fddafac71912..7e18ae185b66 100644
--- a/metadata/md5-cache/virtual/service-manager-1-r1
+++ b/metadata/md5-cache/virtual/service-manager-1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for various service managers
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=prefix-guest? ( >=sys-apps/baselayout-prefix-2.2 ) !prefix-guest? ( || ( sys-apps/openrc kernel_linux? ( || ( sys-apps/s6-rc sys-apps/systemd sys-process/runit virtual/daemontools ) ) ) )
 SLOT=0
-_md5_=854a2a6c2bbaade7579bb3ffdb781915
+_md5_=4371ad661d2f4cbcb0f0791841ef10e0
diff --git a/metadata/md5-cache/virtual/ssh-0-r1 b/metadata/md5-cache/virtual/ssh-0-r1
index 1f98a270bd61..291ced528d29 100644
--- a/metadata/md5-cache/virtual/ssh-0-r1
+++ b/metadata/md5-cache/virtual/ssh-0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for SSH client and server
 EAPI=7
 IUSE=minimal
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=minimal? ( || ( net-misc/dropbear net-misc/openssh ) ) !minimal? ( || ( net-misc/openssh net-misc/dropbear ) )
 SLOT=0
-_md5_=7d2ac47545c4b639fbe119529318bc0e
+_md5_=4b7cfe2d04f2205c5ecdd8be48ca0f99
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 6a830f9190ca..ca6f39f4cbb5 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/piwigo-13.6.0 b/metadata/md5-cache/www-apps/piwigo-13.6.0
new file mode 100644
index 000000000000..d157c6603ad8
--- /dev/null
+++ b/metadata/md5-cache/www-apps/piwigo-13.6.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=app-admin/webapp-config
+DESCRIPTION=a photo gallery software for the web
+EAPI=8
+HOMEPAGE=http://piwigo.org/
+INHERIT=webapp
+IUSE=+exif +gd imagemagick vhosts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=imagemagick? ( virtual/imagemagick-tools ) dev-lang/php[ctype,exif?,gd?,filter,iconv,json(+),mysqli] >=virtual/mysql-5.0 virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( gd imagemagick )
+SLOT=13.6.0
+SRC_URI=http://piwigo.org/download/dlcounter.php?code=13.6.0 -> piwigo-13.6.0.zip
+_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=e2714eb1d0175ab798a8db625f896050
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index df9aa8adc7d0..70416e6bf471 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/lynx-2.9.0_pre11 b/metadata/md5-cache/www-client/lynx-2.9.0_pre11
index 04d8e60b4b49..000bd55895af 100644
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre11
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://lynx.invisible-island.net/
 INHERIT=verify-sig
 IUSE=brotli bzip2 cjk gnutls idn nls ssl verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( dev-libs/libgcrypt:= >=net-libs/gnutls-2.6.4:= ) )
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.11.tar.bz2 verify-sig? ( https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.11.tar.bz2.asc )
 _eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=c7d00986847de7b86b6ad8c23308ab82
+_md5_=d0826626d1e518fe6150d73cd10cabf7
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 2f195f77edf4..3b0248ec6c19 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.68 b/metadata/md5-cache/www-servers/lighttpd-1.4.68
index 6e397a86405e..9d02d98fe89e 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.68
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.68
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 INHERIT=lua-single meson readme.gentoo-r1 systemd tmpfiles
 IUSE=+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/lighttpd acct-user/lighttpd virtual/libcrypt:= brotli? ( app-arch/brotli:= ) dbi? ( dev-db/libdbi mysql? ( dev-db/libdbi-drivers[mysql] ) postgres? ( dev-db/libdbi-drivers[postgres] ) sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2.1.26:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) maxminddb? ( dev-libs/libmaxminddb ) mbedtls? ( net-libs/mbedtls ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) pcre? ( dev-libs/libpcre2 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:= ) system-xxhash? ( dev-libs/xxhash ) unwind? ( sys-libs/libunwind:= ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) mysql? ( dbi ) postgres? ( dbi ) sqlite? ( dbi ) webdav? ( sqlite )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.68.tar.xz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4be10793797e5d126056c2b974405bb0
+_md5_=1ec76f3aab087fe3b977576f6d2542f5
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 034adec9e6d8..825bea0dc2ba 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/guake-3.9.0 b/metadata/md5-cache/x11-terms/guake-3.9.0
index ecb5f743f993..8e87c6852bda 100644
--- a/metadata/md5-cache/x11-terms/guake-3.9.0
+++ b/metadata/md5-cache/x11-terms/guake-3.9.0
@@ -6,7 +6,7 @@ HOMEPAGE=http://guake-project.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 gnome2-utils optfeature plocale virtualx xdg
 IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) dev-libs/keybinder:3[introspection] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Guake/guake/archive/refs/tags/3.9.0.tar.gz -> guake-3.9.0.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	gnome2-utils	3eaa1386ddbbbbb3951256d4b170fba3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=82f40e67b3000163362de34d4debc49c
+_md5_=9833aa8442f2f2e8f32358b5f95eb486
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 08291bc2d0a8..70f01f6445a1 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/fvwm-2.7.0 b/metadata/md5-cache/x11-wm/fvwm-2.7.0
index bd846219f5ea..958bcc449fc9 100644
--- a/metadata/md5-cache/x11-wm/fvwm-2.7.0
+++ b/metadata/md5-cache/x11-wm/fvwm-2.7.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.fvwm.org/
 INHERIT=autotools flag-o-matic python-single-r1 desktop
 IUSE=bidi debug doc netpbm nls perl png readline stroke svg tk truetype +vanilla xinerama lock python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ FVWM
 RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv python_single_target_python3_9? ( dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyxdg[python_targets_python3_10(-)] ) bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-lang/perl sys-apps/debianutils perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) lock? ( x11-misc/xlockmore ) netpbm? ( media-libs/netpbm )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/fvwmorg/fvwm/releases/download/2.7.0/fvwm-2.7.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2aebe9225d9000fddd1aa9c217bca430
+_md5_=66129d305bba95fe63641555ab7c7964
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index abac7a0de685..5d1947778a86 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1 b/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1
index 2b306124c814..dc909126b683 100644
--- a/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1
+++ b/metadata/md5-cache/xfce-base/libxfce4windowing-4.19.1
@@ -5,10 +5,10 @@ DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=8
 HOMEPAGE=https://gitlab.xfce.org/xfce/libxfce4windowing/
 IUSE=+introspection wayland X
-KEYWORDS=~amd64 ~hppa ~ia64 ~loong ~ppc ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.68.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=x11-libs/gdk-pixbuf-2.40.0[introspection?] wayland? ( >=dev-libs/wayland-1.15 ) X? ( >=x11-libs/libwnck-3.14:3 )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/libxfce4windowing/4.19/libxfce4windowing-4.19.1.tar.bz2
-_md5_=50f2d8cfd56772fe3cfc9c909a093d40
+_md5_=78bcbbd7e99a21197f150a26b2f99d1d
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.19.0 b/metadata/md5-cache/xfce-base/xfce4-panel-4.19.0
index 8f1c6f38bcdb..b2731563a623 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.19.0
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.19.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfce4-panel/start https://gitlab.xfce.org/xfce/xfce4-panel/
 INHERIT=vala xdg-utils
 IUSE=+dbusmenu introspection vala wayland X
-KEYWORDS=~amd64 ~hppa ~ia64 ~loong ~ppc ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.72.0 >=x11-libs/cairo-1.16.0 >=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?] >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( >=dev-libs/gobject-introspection-1.66:= ) wayland? ( >=dev-libs/wayland-1.15 >=gui-libs/gtk-layer-shell-0.7.0 ) X? ( x11-libs/libX11 x11-libs/libwnck:3 )
 REQUIRED_USE=|| ( wayland X ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.19/xfce4-panel-4.19.0.tar.bz2
 _eclasses_=vala	2633382950a3a9ce912c9258150d5db8	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a7495c8342995217a9d3845ce226f92d
+_md5_=2890454dacb38d0078ecd655f33ce2b4
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.19.0 b/metadata/md5-cache/xfce-base/xfdesktop-4.19.0
index 69e1d084c6e6..d7c8259be2a6 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.19.0
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.19.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://docs.xfce.org/xfce/xfdesktop/start https://gitlab.xfce.org/xfce/xfdesktop/
 INHERIT=xdg-utils
 IUSE=libnotify +thunar wayland X
-KEYWORDS=~amd64 ~hppa ~ia64 ~loong ~ppc ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/cairo-1.16 >=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3[wayland?,X?] x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/libxfce4windowing-4.19.1:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-4.17.10:= ) wayland? ( >=gui-libs/gtk-layer-shell-0.7.0 )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.19/xfdesktop-4.19.0.tar.bz2
 _eclasses_=xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3d7bee5d5ff03f5ad42c432e220313a2
+_md5_=0a623fe26af1b8348d10dc0c7f68b901
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9debb28c3260..3bb82f2aaab2 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-24T15:09:56Z
+TIMESTAMP 2023-02-24T21:09:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP400RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP5J6ZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA3ORAAhX4qjVmKrgJBh7Pl6x4HDS/oQOPTKoUuxeZllRxNOQ7480pLNPR+hQmw
-OsdZuG/OnejA/RT9Yn/EnE7aWybdWRW3mb1EWL0ovTmQlMaucbqlrKilV1KnXNZ+
-LmfxruL0Ktd/K9+HqjuJpsjy0mH0FEjIeN6prRyIpyKLCPCrwC+4hUmdKZ78q6n3
-snqgFL1fQxylD4diHAStjCyK+ACybf3oRbPbI7afELx/w/fOWcAI4qOKFF6LFe+U
-QFeyKsLQetkHjN2pAKtGeLXsZrynh26/qBHgQg66sjZgncgfxc2Xbsk02xCKYhEE
-OFZ5hIlTFpWTPgk+hYyifPxDS/icpP+uM951ujrEP5O/VlyHTG896YVmWM8uzu0d
-iaK3tj0i5DXiACYHxxNp9xM+Qukquf1ldeq+3xZvLrZbjSBTddAqb7I7kgj1o/2c
-/xTWB5joRH5scoJg7Ywy3297Pd6yfXn5XN6k2Go/QsNdzms3u2HroKJG9Ov3HCtR
-sEQDPBxHIWsjSe0Ob0DdNV7OJx2fFZ2GH0ZpwA0oFfDMAvzNvk5+rBmaleiUfIXQ
-RQqLmKD1pMAphMaq/axHDEYGiRKdjKev6tl7dpIf7OWxhdpNHOom/vClMa2s5NVI
-lVQXhzHmht6wZ5nXwiFd+CHAd1V4J5QxRlDsjW3vGCXP/V5a6Dk=
-=I3LI
+klDSug//UAv27u3qBm/mkGubbcqVL0k2dUkKddxuGc8WIoGnazf69KVWMUd01AEI
+hAgUkh1SQd+HFb80tRN4uBd5vSqcIDwFXfU7i5+2fA1xQqzR0ShtBGCo5Jve5L48
+GPL2GRrkeSoHb8ZC6GyOL0oD4HvStcwIlA845AB4PcP/p6GGzyVn1gnL+kRwGD/o
+sXcQbJi8dO1cvhKIiDj5rCbBLMDkUdJ2Y6n52mrngqOv1HGA4PF9em1NXMq7Tjxl
+vSV5fWV/EB7PFcL8URUWqixNM+04a93VlBiWkUPCeb5QKwyEY/62J7Re3ziVGMKU
+W1l6np99x7A+8XnGi45Ohuc7dG3ymgPhBRjBiu4ZnayFd3e0el6upE0fGNA1D0Df
+tfDmPThX9YGcconnO0qDnWw6xQ+HjJaeCo11J1WdFC4bpVdIYyhj9mAvEBRpYNW6
+FiTue85R7oF1fByOJn7V8wVrp1nH3zgdELUarQahvYm2TMZYYQnDHzR4jQ4K506f
+JAtzfKys5ZwfTpcSfJmOUU1pUWLbei0sHJbIA+uVGlnRWDmLdSXp8fb7Ry3yrtpg
+LiFx38mWvxTzQmDvr3ydp80cTYAsSr9upqyOJUy5Y6VruDN8VH+Z3Kv06iS0dyjz
+OtbnMh5AYfX0gb/FzFq0qpJHiC7lepbcRlO/7GvJ70h0uvXcwfc=
+=Ebq4
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1d0b99d784b4..f7ee327bcd19 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 24 Feb 2023 15:09:53 +0000
+Fri, 24 Feb 2023 21:09:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 21d952c206bc..41a428e60621 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Feb 24 03:09:53 PM UTC 2023
+Fri Feb 24 09:09:53 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 00c4ed2d64e7..f1a4f5efe06d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 24 Feb 2023 15:15:01 +0000
+Fri, 24 Feb 2023 21:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 231df9731375..2aeb39aa8755 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4fb0b9197e3ea07848f28410ced2b9f1a1cbba84 1677251032 2023-02-24T15:03:52+00:00
+a533ab66e26b9e057aa21d50980be669a1ede3f3 1677272006 2023-02-24T20:53:26+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 120747d0c9f9..6bfc00b7f7fe 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1677251401 Fri 24 Feb 2023 03:10:01 PM UTC
+1677273002 Fri 24 Feb 2023 09:10:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1d0b99d784b4..f7ee327bcd19 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 24 Feb 2023 15:09:53 +0000
+Fri, 24 Feb 2023 21:09:53 +0000
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b1158b45a06a..f2bc6f57d26a 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index a89dcb8e22d4..653f70c72655 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,6 +1,9 @@
+AUX cvmfs-2.10.1-gentoo.patch 2835 BLAKE2B c87f24fece387faa48fa1f7ae46be6c0a8eb93ec2460a45abce26d1646948a9b0f606b4b174ef3a3fb1a36387dec943f2cae4f10bf4fa9aa825ba0d732e3ff71 SHA512 93e8e94da4cce7be896afd483a372bb164a803dea9cb035bdb5bfdce2089c250b2f6d857d1ac5d9769a0c53388f457adc5e215ce21bc1040d4cb269cc66262c9
 AUX cvmfs-2.7.2-builtins.patch 3672 BLAKE2B 80c5851c45150384a2c40b962f1e58b2bde5e1111c3b8c9f18aef126569ffd13461408abacd29d6990db3c5633e987440da34a09ecfb0193ec8e3e1d6c3c2328 SHA512 f064cf7d9c8cbbfec68fc67bac4c91c7266b8eabc0be28b30ce8402d39a1a95d15ef9c929a7ef5f887e3058914717c1906e2f0b749fec89475a7a68b1a7f1d54
 AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370db94d715e2ce97ddad22fbc16e85c8c602a2c561ae859e2eccb973144bd803d279029a14f9f591f641265ac9e89e89aa1 SHA512 3a525c50165c83a7079f7d1b51441e7a1e6c230ac76d742b7833506c98f13685339dcf86d1c8697086b195ff33775996e2f9d6e0d825cbdedc190aaa3ea427d0
 AUX cvmfs-2.9.2-include-ctime.patch 274 BLAKE2B c0c0aebb4e9b8bef114c06a3fbd2a6aa535ee469ce6b3967bc9cff4743eac9e923c6a4cde74cbd7e988aff70022fc151f7745230d7517d09060e8d62f2bfef91 SHA512 1518dee2b016b5c7bf8c99e0f86a5da87d5dcd37a3d25f6dfb5afc0906ea41e67747dd37360a7e6da8557f8e4aa8587c317a4f105c4954b227aeb28190524ef9
+DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f
 DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
+EBUILD cvmfs-2.10.1.ebuild 2269 BLAKE2B bcec1fccc44715015be412d9bc341f1fe5a68e04eb55982d2bf23c4fb17a5579c97aa1a2f7f14e888c400714a2798422d890da1057576fa1f1cecffa262731ef SHA512 436a0c94fe322e3951dfc2ac3a95fd5e0d94bdded90cb3759847a0a1b9e7b76679faa344805e1becfb215b7d9b0c277a0447d9152f05944e02b50e0fb443b4a5
 EBUILD cvmfs-2.9.4.ebuild 2363 BLAKE2B a34659b2ab8baab45598cf15f3b527f21c7175c6de9a17c617b138a53b98f1a001d13338cb7edd169980e131085cc01c577a77bf2f48ae20a3df015279dd1ca7 SHA512 2b48e0420b28f4368158366fac7debbc1f9c83df2eb6e12fea11febb38ed8f44f9e843a44fb33ba91fb3b09533c7d41cce6d44adf1a27f8d3af7e8cbe11b7c84
 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7
diff --git a/net-fs/cvmfs/cvmfs-2.10.1.ebuild b/net-fs/cvmfs/cvmfs-2.10.1.ebuild
new file mode 100644
index 000000000000..ed6c307e4adc
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.10.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+CDEPEND="
+	acct-group/cvmfs
+	acct-user/cvmfs
+	app-arch/libarchive
+	dev-cpp/gtest
+	dev-cpp/sparsehash
+	dev-db/sqlite:3=
+	<dev-libs/leveldb-1.23:0=
+	dev-libs/openssl:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/pacparser:0=
+	net-misc/curl:0[adns]
+	sys-apps/attr
+	sys-fs/fuse:0=
+	sys-fs/fuse:3=
+	sys-libs/libcap:0=
+	sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+	app-admin/sudo
+	net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-2.10.1-gentoo.patch
+)
+
+pkg_setup() {
+	if use server; then
+		CONFIG_CHECK="~OVERLAY_FS"
+		ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# gentoo stuff
+	rm bootstrap.sh || die
+	sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+	sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+		CMakeLists.txt || die
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILTIN_EXTERNALS=OFF
+		-DBUILD_CVMFS=ON
+		-DBUILD_LIBCVMFS=OFF # static library used only for development
+		-DBUILD_DOCUMENTATION=OFF
+		-DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+		-DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+		-DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+		-DBUILD_RECEIVER=OFF # for distributed publishers only
+		-DBUILD_SERVER=$(usex server)
+		-DINSTALL_BASH_COMPLETION=OFF
+		-DINSTALL_MOUNT_SCRIPTS=ON
+		-DINSTALL_PUBLIC_KEYS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
+	bashcomp_alias cvmfs_config cvmfs_server
+	dodoc doc/*.md
+	keepdir /var/lib/cvmfs
+	use server && keepdir /var/lib/cvmfs-server
+}
+
+pkg_config() {
+	einfo "Setting up CernVM-FS client"
+	cvmfs_config setup
+	einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+	einfo "and restart the autofs service"
+}
diff --git a/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch b/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch
new file mode 100644
index 000000000000..d988b6e67313
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch
@@ -0,0 +1,85 @@
+
+Patch to unbundle dependencies to build in Gentoo.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96d509739..1b214f5a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -337,6 +337,10 @@ endif ()
+ find_package (OpenSSL REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR})
+
++set(Libcrypto_LIBRARIES OpenSSL::Crypto)
++set(Libcrypto_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
++add_definitions(-DLIBRESSL_VERSION_NUMBER=1)
++
+ find_package (Libcrypto REQUIRED)
+ # We do not add the Libcrypto include directories to INCLUDE_DIRECTORIES
+ # to avoid a clash with the system openssl. We only use it for libcvmfs_crypto
+--
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,7 +343,7 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
+ find_package (GMock REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
+ 
+-find_package (VJSON REQUIRED)
++add_subdirectory(externals/vjson)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VJSON_INCLUDE_DIRS})
+ 
+ find_package (LibArchive REQUIRED)
+diff --git a/externals/vjson/CMakeLists.txt b/externals/vjson/CMakeLists.txt
+new file mode 100644
+index 000000000..c1f82ce03
+--- /dev/null
++++ b/externals/vjson/CMakeLists.txt
+@@ -0,0 +1,8 @@
++project(VJSON)
++
++add_library(cvmfs_vjson STATIC src/block_allocator.cpp src/json.cpp)
++set_property(TARGET cvmfs_vjson PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_vjson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
++set(VJSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src PARENT_SCOPE)
++set(VJSON_LIBRARY $<TARGET_FILE:cvmfs_vjson> PARENT_SCOPE)
++set(VJSON_LIBRARIES cvmfs_vjson PARENT_SCOPE)
+-- 
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -356,7 +356,7 @@ if (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR
+   find_package (ZLIB REQUIRED)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS})
+ 
+-  find_package (SHA3 REQUIRED)
++  add_subdirectory(externals/sha3)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA3_INCLUDE_DIRS})
+ endif ()
+ 
+diff --git a/externals/sha3/CMakeLists.txt b/externals/sha3/CMakeLists.txt
+new file mode 100644
+index 000000000..7efa79b65
+--- /dev/null
++++ b/externals/sha3/CMakeLists.txt
+@@ -0,0 +1,19 @@
++project(SHA3)
++
++add_library(cvmfs_sha3 STATIC
++  src/64opt/KeccakF-1600-opt64.c
++  src/KeccakHash.c
++  src/KeccakSponge.c
++  src/SnP-FBWL-default.c
++)
++
++set_property(TARGET cvmfs_sha3 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++
++target_include_directories(cvmfs_sha3 PUBLIC
++  ${CMAKE_CURRENT_SOURCE_DIR}/src
++  ${CMAKE_CURRENT_SOURCE_DIR}/src/64opt
++)
++
++set(SHA3_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/64opt PARENT_SCOPE)
++set(SHA3_LIBRARY $<TARGET_FILE:cvmfs_sha3> PARENT_SCOPE)
++set(SHA3_LIBRARIES cvmfs_sha3 PARENT_SCOPE)
+-- 
+
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index c517d874c322..e7211891240b 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index bf96d746d979..ee7ce01bdb68 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -19,6 +19,6 @@ DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.8.ebuild 8550 BLAKE2B 367c5950ca19a94709bb252dd07c28fe07b18ac11d264368ae996af396b71731d7aef13e983053d6481af51358fb1360d661d4053805405230e3ae76991f074b SHA512 3a96945e7bc38db005bed965545d731cd3c229ae7b66e590ef417a94a43edb81849fdfefa8b1a29f117b1f348c75f213f1c966000905a08946560ffe5aeede38
+EBUILD proftpd-1.3.8.ebuild 8545 BLAKE2B b70db29df4b9c44893d118651370406d2a3e2fd0eaa27fcfd675e1d83d7dadc07ee23c528c1f3e7afe65f86be3c1643670434af475a0661409393677affcfb52 SHA512 21d7d3b5fc787dc61a03d21481ba1b572a8a7abbf50b2caaa2d1e24f4eb590573e5b604647d8747bdbc8611e03883516db31c0966ac4b130a4b660b3df4b1c3f
 EBUILD proftpd-1.3.8_rc2-r2.ebuild 8544 BLAKE2B 9f439ee29ae6a3850e2d02c7ea73d661669811c7697ec4f466acf5a12ffe5e4b00280df0af29602ab35de14d5742ddb1c5d2784b08844e5687c17ad5e03b19f0 SHA512 bb4baeda34f50689b60d99efd8fb0b5efdce16ab6481223978a963a7d47b45028fa8ebfb33de73ff82a6d575c2da7a03df7b8fdfacacd646698f9654e3a50014
 MISC metadata.xml 2793 BLAKE2B fa59abf255f37e7fb5442f6cb3c0234ac2eb5590a633f82ed0c8af6a4f6c534ecd3fbab8497d40d3e2d7117b4ca92fa9f8dbbd4c093c45cb45ce5f06f97d6974 SHA512 623e38d9da86cd996b22fcddbc5a04bd43655fc4a84e601ce112bdc2fa35eb94a0476382e3dd65d3fad412b916b9673d0f9edd3f328b5b9ce73998c7312ba745
diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index 6671985169fb..5ddf7ae6c2c7 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.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
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 26bd66815f45..7c98222d4763 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index e2227c9cf4b9..c8a3fa05d1f3 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_6.6.0_amd64.deb 122765252 BLAKE2B ca709e15866fc764652c9e4262e71c71544a757dd45a5d284b4490c134bb01c63fe62a429ecf02af84e1af24f91e5b8a903113918bded5b0bb6d9ee279fe2110 SHA512 914c4b541d233e5995b02ad1ba802d1029da42c5f2ed03b9fa62a3d07b1ca4f3e1b483a20e725ee426d9bfb57b411fa37b5e614a0373cca3eac6fdc155b52dbc
-EBUILD signal-desktop-bin-6.6.0.ebuild 2364 BLAKE2B 7c84ce1504022bf755df2ac3d76a700d2151875db3b2ce94acd1a17f30c9f3adb8bfd98c194b713e5e0fe72746eb462228c5f4f48d246e3b6d6c0f28b2935c8f SHA512 916240972bdc6c6d005bbc7073e837a78a672dbfafac12ee8567262cc91158e81a50f4e01b22a85743bfa1f0ec10bd1f844abc3b98b742bc2c7a594e3f92442c
+DIST signal-desktop_6.7.0_amd64.deb 122751994 BLAKE2B 5169a9c0c7f8a9c8f3fa6489497c5bdb5834e59ecb3f5799a2eeed4fcbb15c91b4d455836476b3929dd476ae14cac7ed068113f63e06d2e51cab2927fe64da71 SHA512 e52b3628760cb91195bf673ae0b6b0fd520a51e603a4ff4863f97e371cf80e1010c8201f691c47232d7bcffc5ca979f416e47f5772a7f42f9f5bc23267c56358
+EBUILD signal-desktop-bin-6.7.0.ebuild 2364 BLAKE2B 7c84ce1504022bf755df2ac3d76a700d2151875db3b2ce94acd1a17f30c9f3adb8bfd98c194b713e5e0fe72746eb462228c5f4f48d246e3b6d6c0f28b2935c8f SHA512 916240972bdc6c6d005bbc7073e837a78a672dbfafac12ee8567262cc91158e81a50f4e01b22a85743bfa1f0ec10bd1f844abc3b98b742bc2c7a594e3f92442c
 MISC metadata.xml 486 BLAKE2B cfc118c5488c5c50b4de72443e6b836992a4ba7a6fb94358552c814006a49b00580b5ab0a57141b17809e1d2a898b9e23e6fee0837778edfa7f6de53ccc09d01 SHA512 4ab7dc5fd6fb03e7296164d0d924ab4eb11c6fd31c2fc651706892eda53b29be5db65cd94da8e6aa743e9b7ed10ee3e5f25f14dd2d1be99459daa11f529dbb95
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-6.6.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-6.7.0.ebuild
index 1b6e912201c3..1b6e912201c3 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-6.6.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-6.7.0.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7d9655ccec36..004b1e9efc8b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 4e6c4af75704..d289ca1ba22e 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -4,5 +4,5 @@ DIST grpc-1.52.0.tar.gz 8682080 BLAKE2B de1583401a70ec09cc30527346d18bc6d2272a61
 EBUILD grpc-1.43.0-r1.ebuild 2815 BLAKE2B 922f3cbaae5b654c27508698a134c7fee938025fdf5bf52eb484db9c1d144db6685a3f0610481dff8a143a9ad7015b1c6cb312862b66c76b2f7e42dcf6d4eddf SHA512 1d7331e933be3978c27c38956230048c8e7770565606af6c5003401027ca14b0a60ba8e82cb98058fd0acf259cc6f0266f747621f4cafa36935ff198838aa22d
 EBUILD grpc-1.43.0.ebuild 2684 BLAKE2B 0ae8a6757682d3ef8861f6ca1f27462a4341b537a75b55b443746339102bc7ac76360b924e2f76a7032b28f0469bab8c1d0d3709f04376b43775698f5614da5b SHA512 e6cc2f3dda42631beb3356b3699a0ea337268fd9f80e2d51bba6a89b165e64835edbae14d6bb62094460f9a8a3c48489a72a070f8b37baa7223f3146e954431c
 EBUILD grpc-1.51.1-r1.ebuild 2811 BLAKE2B ebe59fe4812a4b754cd3336fd1664129ea14ea99c56d52b03e202a29aed57e5ca24e8627dd5eb60c70e0ec15ee35f307d0f754cb60b362cd9df9b60a4b8d3b84 SHA512 2f72e5880faa1a0e060beb49a815ec60fac087f4217feb006f48a5d717c02ed6c50c4e54f7a74c536d6e13fce2b638edf75cefffee4027a0a757291765ba205c
-EBUILD grpc-1.52.0.ebuild 2800 BLAKE2B 8e5a2e8a2c951aa69d027c2880d265f4d78ec24e6b8d3ddbed51bfcf86add4aaf2bb44023da40a6504e58ee095d0fd50d94d3766075b5963c01abd1e092fb1d0 SHA512 011bd1c5be6dadcba63f0c6408bf316c371437c21813359fdb400490e20f6e04c11ae5cccee841304171e6edf39ebf42c7ef7f27836d6838fa62895f8c770900
+EBUILD grpc-1.52.0.ebuild 2805 BLAKE2B f359cc96ce0ab81fbb190d9012b1a669805dca14ec3a39b9ace0b595db393ed41f766d1c81e32bf7fda59c89b006044248ed717e6c3302c8f03f2ea7dee9258f SHA512 1d2f3f555213647b0cf003260251f63cf07532af1a5bac5baa303ac0cdef3778e430bcc215e0446e18c38d03c0ba0f915f60320f504a36bac1a64e3d1910198b
 MISC metadata.xml 564 BLAKE2B b28a7f5775062d33662cb139c3aec628dff54f720e6a47fb205cccb4527d21ad17460638038ac3c4534e76f1f2033078fbe8195f103428375129ec85ca21eda5 SHA512 50b7b91a7f97eb7507c523580bbe4bcbce421987826ac22d8e2fac47de69f30731cb9d5a3a1931e9caccba94066ef874e47934c053965e233f8e302a7d7e6d1e
diff --git a/net-libs/grpc/grpc-1.52.0.ebuild b/net-libs/grpc/grpc-1.52.0.ebuild
index 93523a5bfd23..1bc65a8edf87 100644
--- a/net-libs/grpc/grpc-1.52.0.ebuild
+++ b/net-libs/grpc/grpc-1.52.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/30.152"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1a47dcd1becd..d3cd06782c07 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 76241c8dddea..d76bc43aad86 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -3,6 +3,6 @@ AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba979979
 DIST htpdate-1.3.4.tar.gz 16312 BLAKE2B 9ebff6df6de69fa310a6459099cff2bf5ec28ac2bb486a29121b87b93505f6bb31b4debc510dc82b7d7b7cce217d9002ec7606fcf4fa863d7b2cfc78dfc6e8d5 SHA512 634317966f1e5c5d78a889a398e77f89505a5918efa076e2cd1184341f25d963b7f1c135afee7d5489bd8a20b2421d9dfea312e09b5e6bdd389626bfd4d2d960
 DIST htpdate-1.3.6.tar.gz 16683 BLAKE2B ad6e689f64a2cff3e5a832d8ed6bfc85acc7ea99d16e6da5c1ff9052009b46b5ee5dfd113232908df17eb837470c47063be6b5cc91270d6301b78efab8f71ce5 SHA512 41b9ed50e962bb5c207122c4929d919ae4491a2d527f29aafb4a3ef175c3c12e608c77632037d48b5440e48ff051c89caf3e923987ad53329056b83838943439
 EBUILD htpdate-1.3.4.ebuild 1414 BLAKE2B c0d0500c858a917c0347d868318134192322827a8f4ec16d73c46e42e678f2aadb491c192cde9c1b59917df36f5af23194efb54776da6b421e65e0baeaf35407 SHA512 e4b1952a585c5b9d78ec0086539685e06a9d62fbd32125777f3e3e1e193db3d663abf1d5510768ea84c8a4afc0ddd742e0a3a340372ffa5e24cac298247498ec
-EBUILD htpdate-1.3.6.ebuild 1420 BLAKE2B 26f54699425e974227af733fe6c5601d840878f1f6d66da93ae8b928148502f31cd7e6ce8cdf95a776e70a01f6f7db70f776a8bb77de811f6eb36fd8bbaf3bc4 SHA512 eb564d2713e81d294aea681c332a556040fb0b147d8a6457b6cbd9d05e6e205cc9d1b6f151a28770daeac63c2cedb747c3a3978649d90f108c2a8d2da867e005
+EBUILD htpdate-1.3.6.ebuild 1415 BLAKE2B ec831dba7ee8320c2cb234a18e9f461d88135b3473e155a1642904027e130f84d0acd94c13f48e176ed84987e0bd62a6c3c3fc44d0e3e0f00a057c68e88703fc SHA512 c3cdc837dc8ecff2c38276100fe0dd0790e840dbe3539cba04c134e68d364da1a121df54f459f5c3fbd33e1827470492c7cb49e5411e9b201876e4e5b624cc26
 EBUILD htpdate-9999.ebuild 1420 BLAKE2B 26f54699425e974227af733fe6c5601d840878f1f6d66da93ae8b928148502f31cd7e6ce8cdf95a776e70a01f6f7db70f776a8bb77de811f6eb36fd8bbaf3bc4 SHA512 eb564d2713e81d294aea681c332a556040fb0b147d8a6457b6cbd9d05e6e205cc9d1b6f151a28770daeac63c2cedb747c3a3978649d90f108c2a8d2da867e005
 MISC metadata.xml 248 BLAKE2B f5c045d2e881d6a26695acc21e8d807e3c2a728c0ea7b6ad9eabb8b12db116d77317d9aa4c70258f3bcac8417870aec65249dbadd1f708eaa20ef13f012c94de SHA512 6d323edff42767ba94ff43583a291a9d2133fc9a40563b112397f677ae458f729e160c7fbd93e4405575409c0f0e86ff2fac462ec6e14674ba577a9ac0fa326a
diff --git a/net-misc/htpdate/htpdate-1.3.6.ebuild b/net-misc/htpdate/htpdate-1.3.6.ebuild
index 409f146ff81c..b4d889e37643 100644
--- a/net-misc/htpdate/htpdate-1.3.6.ebuild
+++ b/net-misc/htpdate/htpdate-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/twekkel/htpdate"
 else
 	SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 61acc09a6651..69b5ac5b38ea 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -2,5 +2,5 @@ AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a94
 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
 DIST mrouted-4.4.tar.gz 316949 BLAKE2B c768f78588ef5a321b33a6444627db0eae36dfd1798f58672392729e0ce45392fbcaad074e55eccef43dcda5d29cfee24f30aa85eded130ad8d1a6a006e62411 SHA512 cadd4cb15674c04bd976daad36ac38ec93eb9d6d0e2888cb7b4b73d2802f58beb11c122de34c1c5214a58f74dc832f35bff0820265370f4636036813ff283c09
 EBUILD mrouted-4.2.ebuild 739 BLAKE2B 291cf2252eae768763b199f4c66bcd388f6b092b3dc6ee92e1e4ffe4d157855d9493694127e2c7eab61af7918e3c13a0399b856b84141c3f364e77dc533755f5 SHA512 1734be5ef7012a642f980d648dd8818c04506110b8e9dcc9003091f6c9e16f3c5449c558283e5d5a4936ee61deab0cd5c5ec7f76ad12f10e41d2e51da6d8c006
-EBUILD mrouted-4.4.ebuild 803 BLAKE2B 8380e42f8d68ce6c3992a3c317b900aab3ad6d6e6d4d3c9714ae5d0485d5bc5203f85229e27450a68fed8d695d4570f48e8940722e893ff97232a39d9f25848f SHA512 7f17459796b095042d6ec3a3568ade7d02875cd04f778c613bf77955d694232bbade94dc6ee81af37f3b9bb50b0163eac3326171b10ed40c5ff41746bbd2b0a4
+EBUILD mrouted-4.4.ebuild 801 BLAKE2B 8a1fa9b3144664f2ade26c82875737e5a74664ba96fc3c2ff6776b720448eb6021d10bad0b315e0d3efc5747c1cc0fd0de973aeaf31ac7510e87aa45b920ec76 SHA512 1194c12f8798196d7b0943f1577a4dc9e734e7648d6ad453a0cc0613624b42cfd3f5da93ea4e33c4f7378aa320e13ffc305302e4a17fd5b925f254d809f82471
 MISC metadata.xml 351 BLAKE2B 2cc58048ba632fa6ae2147b949a5ac8441b4e10c5cab17527369a1100a5d95cca3746d82c43a7d99b564f07ed68cd95114aa5a13bfd73b07befd1203a423cb3b SHA512 1ccf9c0699efed649eff70b1b2eaf588b9bad3838c1530609e8bb912ace18bd21f35571f7d731727e886cbd7027aae5b234cf3e4959da5d81991724679a815d0
diff --git a/net-misc/mrouted/mrouted-4.4.ebuild b/net-misc/mrouted/mrouted-4.4.ebuild
index 573500aacb93..b3c7eaed2c51 100644
--- a/net-misc/mrouted/mrouted-4.4.ebuild
+++ b/net-misc/mrouted/mrouted-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=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Stanford GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="rsrr test"
 
 # Needs unshare
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 2d1f8ec9a72f..c3b651cd765c 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -3,10 +3,12 @@ AUX oidc-agent-4.3.1_liblist-automagic.patch 427 BLAKE2B 05a0dd5f9671eb3535475bc
 AUX oidc-agent-4.3.1_prompt-user-ldflags.patch 254 BLAKE2B 3f734560136de87c8ffec760e5b1608c1e5d3326aba7a19e1907c13df72cec8835e0c818cf05c2bc53ed3e86627453701cf5d13163fbc1366f33d0876de54477 SHA512 38957ed8fb90c3f9cac0995ba125203b76476d427817163a6133b6fa1f312732c586b361a588b67f5fce961cc297918d3285570713be2d7afc7e9176680fd1ca
 AUX oidc-agent-4.4.0_deps-automagic.patch 471 BLAKE2B 83f909d57475a0895bb2305ec7ae1dbe4c54883331eb5e492084bb0816d074658f81ac9683cd375efb0ec51e419590374823e093c3eb5935061f8a2a36bf2184 SHA512 8a559f08bc0aacc4f8152429ca1dc186d88416061d4275780cd373cd92bd72a1ff1f6d667f497dd357eec5fce0caf32d0310644415a92368447c07dc59c6e5fa
 AUX oidc-agent-4.4.0_install-perms.patch 1848 BLAKE2B 787e803e7e62ec6f6f00563a82e571707d4b2febc3fa3967870497b6515ff90247be00408451f0fe0d6805ca07d13cf797330865b22cf05e4b339303d7af6234 SHA512 b5be70a9bdee0bd0e4f9fa3c04a1e3763a34a6785b66b1ab9f336939522593046dd6b3e833c6152a2f764adf0e035ac52857aeb4fd42188006c06d4f261c0c24
+AUX oidc-agent-4.5.0_webkit41.patch 294 BLAKE2B 45613429ee2eafcd61547f8d8de7bc0e7a3663e65adf196bb995ac754ccde7619fea5ba599d33429dd40c5f439c0ad73a3337802661f71cbe1de40aac3a6ab2b SHA512 e0fee550af136941832f304cd749c263f688105b7361e83555f49d635eed13cf35f587f7a21dcc76804b40438f3f455e9ceaa3cb0ed07119e17d0e117d58d391
 DIST oidc-agent-4.3.1.tar.gz 2124200 BLAKE2B 4108f50688fd0d2043105972a7a7fbab58a74b6a36e0d0a739be5b42a29c3b6bedb29b2273038d49b77fc3245a51f8cf998a12fee5e39096dd5e35ec72660b05 SHA512 3b598f760b1932a07bb243ce7c978a99c209ffbe5594cbb9e084c430c11c089ff0f7be113f73b165bd5f6b382d0ab30dd230c4c9fab6e210a327af20715e6d60
 DIST oidc-agent-4.4.0.tar.gz 1823801 BLAKE2B dd9dcecf825a3e0d52e74dff658bf23beea2327b3ec575257cab6636b56686a15a5d235bad5ee57a41f192292e3b8462918f6223c40a1687f648da55a443eac5 SHA512 668cb117a3bd11245967d6956d118d0821f5112d8841b3ccd71d3e911ad7b2ebc3ec749977fab8d35ddd1efecd447e8fa98395598b7f9dea79d02dfeb7563af7
 DIST oidc-agent-4.5.0.tar.gz 1823181 BLAKE2B d2023494689ec65837efcd67e325c690ec1b3a03f78dccce853d1c30e312a89d5d43476132830d10aa63ead7b5cfc91b99fcf78fdfa2d46c60e5a62030c77884 SHA512 23520dc5556ed54ad2dcf3a14a5183f04b1f8030aafd342cfb5f4e21683058da475335c7b29ae0727bd20405e42fad825614d1b7c86fca5a81e4bf3cae5f64c1
 EBUILD oidc-agent-4.3.1.ebuild 2216 BLAKE2B ae16e593d7441e6fab5d5c974eaa3e7a2cf1717b8158010bda31e711b2202704978899809c86e12876ac78ea99987a6eec240f3f71cf1cea5fea92f1415bfba5 SHA512 28be275cb6621d9b22e532e7bc4d5af0f5704e89a8a324a453ebe926f6e96b52f90714c1d9f73d9c47b582dbf6218c8ffef6c4d0de78a019497e9ebcbf3c9a6f
 EBUILD oidc-agent-4.4.0.ebuild 2257 BLAKE2B 138b180915dbdb7c958af0aa137bfc9ee536160e420a3a614c3523fd929ea6fca4b86c9636fd0fd88de9bc4a1f40632769ef36d96b76000cb358dd45cdeb523b SHA512 6ab165ebc30471c5418fa11c88cb52d482d70ddd042e1e25626ac76f03c7912db67da11cbb13b9587bf95c154ee2844ffaa3741887dc31165e4736ffed2c0feb
+EBUILD oidc-agent-4.5.0-r1.ebuild 2320 BLAKE2B a30fd549c5f58edf58e6892e8494d01c22c6791f203a8ad53f366b276d260ba7b58a4dbffe77184b39823d5c081bcc26e8f62aad1752a7184448f637786c01e4 SHA512 d753f533fee140306eed6fa65570164d789e4cd58c6628168c139c6f8f4b1b95f4f3a0a665ca9e66b3a6aac4be1a7dcb816633b94bf62b9e45bb47ce96e2f49d
 EBUILD oidc-agent-4.5.0.ebuild 2276 BLAKE2B ce0be43edf1ea437920f1678f916fb44158512fd9067ceb34951b6cc4aa81de72915bb42d3344c33d162df691b6610b509fd17ca1ad2ca1b5f09a03492ddad69 SHA512 195e78a55ac7a1deb17bd0d7cad33999ee166935d81f8d7f7be14793a2b4ca87b084133d0372fd780d2babb1371ca1eb21e78bb8289c5e0af3af9ccff7ed41ca
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch b/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch
new file mode 100644
index 000000000000..d445fafcb3c7
--- /dev/null
+++ b/net-misc/oidc-agent/files/oidc-agent-4.5.0_webkit41.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -179,7 +179,7 @@
+ CPPFLAGS += -fPIC
+ ifndef MAC_OS
+ ifndef ANY_MSYS
+-CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0) -lstdc++
++CPPFLAGS += $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.1) -lstdc++
+ endif
+ endif
+ ifndef MAC_OS
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
new file mode 100644
index 000000000000..459b2148429c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+	dev-libs/cJSON:=
+	dev-libs/libsodium:=
+	media-gfx/qrencode
+	net-libs/libmicrohttpd:=
+	net-libs/webkit-gtk:4.1=
+	net-misc/curl
+	elibc_musl? ( sys-libs/argp-standalone )"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0_deps-automagic.patch
+	"${FILESDIR}"/${PN}-4.4.0_install-perms.patch
+	"${FILESDIR}"/${PN}-4.5.0_webkit41.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+src_compile() {
+	local -x USE_CJSON_SO=1
+	use elibc_musl && local -x USE_ARGP_SO=1
+	emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
+	emake
+}
+
+src_install() {
+	emake \
+		PREFIX="${ED}" \
+		BIN_AFTER_INST_PATH="/usr" \
+		INCLUDE_PATH="${ED}"/usr/include \
+		LIB_PATH="${ED}"/usr/$(get_libdir) \
+		install
+
+	# This file is not compatible with Gentoo and in any case, we generally
+	# let the users load such agents themselves.
+	rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog
+		elog "You should use oidc-gen to initially generate your account configuration"
+		elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+		elog "consult the man page of oidc-gen, or full documentation at"
+		elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
+		elog
+	else
+		local new_major_ver old_ver
+		new_major_ver=$(ver_cut 1)
+		for old_ver in ${REPLACING_VERSIONS}; do
+			if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+				ewarn
+				ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+				ewarn "to make sure they are compatible with the updated clients."
+				ewarn
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 655d1b6bfad5..fbb85084b2b3 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -11,7 +11,7 @@ DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
 DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12dedd6857897de136d3617c68d38368ce05de13b9b0ef35a5452dca141ebdcdfb6af8456151d0ca0ad546452b504 SHA512 c2afba11a352fd88133f9e96e19d6df80eb864450c83eced13a7faa23df947bccf2ef093f2101df6ee30abff4cbbd39ac802e9aa5f726e42c9caff274fad8377
 DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3
-EBUILD rsync-3.2.4-r3.ebuild 4804 BLAKE2B 9e7ff8580e0bda3e5eb854b68454e38141934fa86d7754d3a2855d6b4c71e3a68444d24b0f910981cd938626418775c1d879d467c13c790e9b4b22d8fe934148 SHA512 35b3bd3648897b0f12b16033e406a8a3d12b49cdfd5b7c330dd115e94b02cc0ccde3b7c3ec0ece06692a7fa20c8ba314ff4e1b8bee3f0d4bf13574a6b7aadaca
-EBUILD rsync-3.2.7-r2.ebuild 5482 BLAKE2B f74f30eaaac6b77a8c7d45b519a5b5021eabfd9525327985718bf284ad3aa66cc914bbb51c30ce327fbbf9b7171dee7ef256f147ca4ffece416c9bcf4c08d660 SHA512 215bedf99964472111b68ca618dd6e26460604639bc9b64338e4296831cbbd54844e2d7fd20e2a183a3f27add8b7622a5bc41ae25f77c6b244293d9924e18924
-EBUILD rsync-9999.ebuild 5482 BLAKE2B f74f30eaaac6b77a8c7d45b519a5b5021eabfd9525327985718bf284ad3aa66cc914bbb51c30ce327fbbf9b7171dee7ef256f147ca4ffece416c9bcf4c08d660 SHA512 215bedf99964472111b68ca618dd6e26460604639bc9b64338e4296831cbbd54844e2d7fd20e2a183a3f27add8b7622a5bc41ae25f77c6b244293d9924e18924
+EBUILD rsync-3.2.4-r3.ebuild 4817 BLAKE2B 390b2c58dcf23c51ce3ca287c77f268aaddb5d7dba25dc5402a468c84b717a7e17ea8cf6895af30dc1180023cff3508f7d254739fad6adfa65a877090f076f56 SHA512 35decdd332becaf0da5ba76d2570acd0923c2060a9a727e44d1667cc0cbead01215f67258c1c7f0974d0f0fb1b53d0d001962dfe7e6aeabfe0e2f48f3f4dd151
+EBUILD rsync-3.2.7-r2.ebuild 5495 BLAKE2B d925a6ae6cce21388057f0edc311778b04bde520e7afdacd4b94d22b056f786dd30bbd29e956e74c2bf8756ad1c10ffa94897a7b754597a75dc16ce8d2a535c5 SHA512 366f0d8d8eb553cb96e48616dec0863729bb0a255e37fb9b178b6d8959fe92957d71b9c95725be2a0fae920c15b9d2e7dc16783d7eb5a5b997bd2335a4984078
+EBUILD rsync-9999.ebuild 5495 BLAKE2B d925a6ae6cce21388057f0edc311778b04bde520e7afdacd4b94d22b056f786dd30bbd29e956e74c2bf8756ad1c10ffa94897a7b754597a75dc16ce8d2a535c5 SHA512 366f0d8d8eb553cb96e48616dec0863729bb0a255e37fb9b178b6d8959fe92957d71b9c95725be2a0fae920c15b9d2e7dc16783d7eb5a5b997bd2335a4984078
 MISC metadata.xml 880 BLAKE2B b079b9b9cb5dcc93b50d49fa50723729b7c57c34ad0cdfd946821089a1f9788a460818cef8d6a4e9f603ad066f6b3a0c22c7becb950abc1eac8e2923adf18bac SHA512 215f0df65f53e2aca8d519c85111f87e95d592454b8a297f69058c1d87ff5650f32f3c937715c8a83dc9bef1ca1e70589cd3797ca595688806c1067462717c14
diff --git a/net-misc/rsync/rsync-3.2.4-r3.ebuild b/net-misc/rsync/rsync-3.2.4-r3.ebuild
index 927590cf6b40..f3c5fd9a0092 100644
--- a/net-misc/rsync/rsync-3.2.4-r3.ebuild
+++ b/net-misc/rsync/rsync-3.2.4-r3.ebuild
@@ -28,7 +28,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/rsync/rsync-3.2.7-r2.ebuild b/net-misc/rsync/rsync-3.2.7-r2.ebuild
index 4dc746f9c96a..75442fcd173a 100644
--- a/net-misc/rsync/rsync-3.2.7-r2.ebuild
+++ b/net-misc/rsync/rsync-3.2.7-r2.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 4dc746f9c96a..75442fcd173a 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 432d3e348581..75d59923e9ee 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -5,6 +5,6 @@ DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9
 DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781 SHA512 96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a
 DIST stunnel-5.68.tar.gz 884989 BLAKE2B e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40 SHA512 cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb
 EBUILD stunnel-5.64-r2.ebuild 2914 BLAKE2B 3983e2163da5f52ac0515eaf28ebe7d993a8c665ffbdd20f9823b57427a1409d5f1065903d503ee13f17b54cf3a12600f8bbe5b1a6e9d34e873dcf090da41ceb SHA512 6a3a22bbd63ee234a280df39dd97245b40dd8a4420e3956d32f8f1a2617fb6edcc2cbc7149734a515c750b98b747960212acd5ace9fd4a6c6e6ed02a836bdc12
-EBUILD stunnel-5.65-r2.ebuild 2894 BLAKE2B 9289a73af6b9e1b14d90287291985e398a6e0d0b53b0a25ad40eb768e76497faffa3953aa81b2c7fa046f083cf00cf3ba97854ef2f94d8cf376db1d98ecf97c6 SHA512 e86ff7399928275d4560b1a8205684c3b7493e49fe2f76e3de0055c69e173ed7d9361d84be79b436e86b8814cf78df31383963f2034127c4c5a6ce3aa22f236a
+EBUILD stunnel-5.65-r2.ebuild 2889 BLAKE2B 073d38f258486bd5308a8c2bc3b80f681404e5932df1afb69cd44743307cf3e80baef7c6ec9dabefae4be8a5288f77afc3fbdd032afb6f69b8b2370eff99ddf7 SHA512 f380445ac7be5cf46bb1e231b1825f2c3296af4aa23bccc6a9f42844db58d68e826bd73b56384e83aee8b2402968d57a0118ebe74d0805e21b51ff9acd33b2a3
 EBUILD stunnel-5.68.ebuild 2894 BLAKE2B 855818cda850df7cc5718a60a41115e010fd63b8636469abaf974a0cc1430364001b79383b0b82eb3f0f8ec171f4e2965d0e0f5e8503ef7bed88f7c84e0e2890 SHA512 4955a57b15754be383ac22ac7461c5f28b33685d50baf0f42b6346f9eeaa2e7eeff7a8db8e07b3a5c0b07bd654164c0dd65a71188f6b811384053414fd446922
 MISC metadata.xml 712 BLAKE2B abb0d57cf71591afbd71b86118435b149bb2a12ade506bac04e93fc0a334c7c458e58be0d428343582aa5738f2062307206bbfe4b79a809ab09e0e69e673459c SHA512 c6538a699b0135a536a8df4ab8355d7a8ca0ed25ff32e822a2e27dfdd896a2ba4b2a5398b75f692bcf5e77a88f9c64af358c14fdbaab213cafad882cb3f0deb3
diff --git a/net-misc/stunnel/stunnel-5.65-r2.ebuild b/net-misc/stunnel/stunnel-5.65-r2.ebuild
index 235b21faac92..94960aaac192 100644
--- a/net-misc/stunnel/stunnel-5.65-r2.ebuild
+++ b/net-misc/stunnel/stunnel-5.65-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
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="selinux stunnel3 tcpd"
 
 DEPEND="
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index bc110fb017a2..98c2d9cadedb 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,5 +1,5 @@
 AUX wget-1.21.3-hsts-type.patch 8463 BLAKE2B ebee8872161ba4a0288ee973d1edb5d38740dac09e5d6807627bed76d05f167aa4b0a79b48f45b0933bc8444c3977ddfa570591e590ea466149cfc81b5e35789 SHA512 983ce2e62bf8f4562072644d8583eecb491c27b703f2ff9eef818557ecb8d7c64d2f0b764f2dd41a270e52513455f0102b79e90e03420b46b868e832f28c6b4f
 DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718
 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f
-EBUILD wget-1.21.3-r1.ebuild 3262 BLAKE2B 83b19b5aff0b3671529e090a014446cb911502653266c718d094fb5a53094236d1151c24228ea839167367f02d92a789f5f38754a6e28a3d4b249d5351b1e4b7 SHA512 9302e703682df4dba6a0a856ced3da0d4384eb96a48e1d5666d6082c08818b0dd47193c1c1221a4534b2e016feefd26a52996b4a14ebea091003e98e5f9a38fd
+EBUILD wget-1.21.3-r1.ebuild 3275 BLAKE2B 302fb0daad0c0d3dfb15be7ab479df42aa42836ee19b9b3c0fb911b36645f47c038d56d1d5151afedeecac75b2c54f542433214fb23a732e06104fdd331bd465 SHA512 4dc75faa8308bf520e29d02ed22d6f0b9b4a9162fe02511d290adca5b97ca6654204b5300faabe2b86e195ceb52a84bed95d85ce7ef92df983e01b9a1ce281e1
 MISC metadata.xml 803 BLAKE2B 9bdb761fa36afd7a03f4631ed314230776de4af2c3e153a3631ee8f9e801233e44abe68ba5ec874bcfaef53d2cb1100a671768169d58d6e2c96387be5210abc9 SHA512 4ddbdc883a155f4eddeb5cd6e031b4824f1f50586ceaedd1b72a8d2ce9d3dffe440a0554e4a9a07f1295f79a5958bcb533ae324919c64daf77caff577318dfc1
diff --git a/net-misc/wget/wget-1.21.3-r1.ebuild b/net-misc/wget/wget-1.21.3-r1.ebuild
index d23a314397ba..f96719bf6592 100644
--- a/net-misc/wget/wget-1.21.3-r1.ebuild
+++ b/net-misc/wget/wget-1.21.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 60834839002b..c1bbf460f1a8 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index abe4ff71fb77..82f35a35f887 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -3,5 +3,5 @@ AUX tin-2.6.2-gnutls.patch 653 BLAKE2B fd5ad80b1f2e5c5307e28e513f2aaf9cbd17f1251
 DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
 DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
 EBUILD tin-2.6.1-r1.ebuild 2025 BLAKE2B 11841532f22a5b6c56c0e5261d24c501ec46f76edc062155d2385e63cc2052e369bae4c3d697e4c0811a63d84b693a112b5ce038e40520398a741c388421a388 SHA512 5cf5e4b1249df5eed6f124499aa3cb56623a5ec2b00e971fff58f4c44fcf91c737718618c56df5eef5923cf552c3fc8f5330af21792698aa526be9f1a2623fde
-EBUILD tin-2.6.2-r1.ebuild 2546 BLAKE2B 9c46b165c35e7f9df94b503a81a27b3b0f651d1f27060232f1fb4953b5c3e5ec1de423814d18d44d7df150a415a97122ee220f4caf4de8563277164583cbd3ce SHA512 e5e621ccb31270d2d287cfe19f74f6112fd1bf5df96f63f40e8b9ca07538715177078589787b019ced4c554be5c973a828f24c42ed109b5ea06bb015e7b0c29a
+EBUILD tin-2.6.2-r1.ebuild 2542 BLAKE2B 3e85ed92adaad4a235010fc228ff5bfbbd52ab62c6110b90e68182ce1a814f9a1d69a15ed0ba1cfd8e7167fa76155b95a81428df092afc7e778350b1c130711d SHA512 eda6496d230391c671e922a0d74276016779bcd568ab7ae429cffbe8f7872b75225e71a2ff48bde2e25e10c3fd8823c828aa7df867a0f63e2dc2d13f57c6db8d
 MISC metadata.xml 567 BLAKE2B 25916692a1170d644125e756c5165c39ae91c663bcb2cb6eee21e6aca3852acb4eedc7ac6b3efdd1506a474c3e3314496018e84c99e218d1e9a92d4bbe6c2b99 SHA512 eabaa6400110777a838ece4787f6978eb2c4dd1bdf4051e498190e0607550ad8bf18ac63fd946635d2ea19849ea015a383da9bed35cfc940a2cae9b7f1329c61
diff --git a/net-nntp/tin/tin-2.6.2-r1.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild
index b5e39382f92c..c550f29e48bd 100644
--- a/net-nntp/tin/tin-2.6.2-r1.ebuild
+++ b/net-nntp/tin/tin-2.6.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
 
 RDEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 941b2106a482..cb6bd5d584e6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 75beaa76ac96..7b4beb578e95 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,11 +33,52 @@
 
 #--- END OF EXAMPLES ---
 
-# Matt Turner <mattst88@gentoo.org> (2023-02-23)
-# Added by proxied maintainer who then quit (twice) and deleted the github repo
-# SRC_URI pointed at.
-# Removal on 2023-03-23.
-sys-fs/genfstab
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Unmaintained with multiple reported bugs.  Last release is a RC
+# from 2017, upstream recommends using trunk.
+# Removal on 2023-03-26.  Bug #855548.
+media-gfx/fim
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Unmaintained with reported build failure.  The last release is a beta
+# from 2019, the package had only marginal activity in 2020 and 2021.
+# Removal on 2023-03-26.  Bug #732194.
+app-editors/notepadqq
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Unmaintained.  Fails to build with current sys-libs/ncurses.  Homepage
+# gone, last release in 2002.
+# Removal on 2023-03-26.  Bug #776832.
+app-text/reed
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Unmaintained with multiple build failures reported.  The current
+# Gentoo version is from 2015, and is a few releases behind upstream.
+# Removal on 2023-03-26.  Bug #894626.
+dev-lang/regina-rexx
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Unmaintained with reported bugs.  Last release in 2004.
+# Removal on 2023-03-26.  Bug #740480.
+media-tv/nvtv
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Fails to build with setuptools-67.2.0.  Release from Aug 2020.
+# Upstream has made a number of releases since.  No revdeps.
+# Removal on 2023-03-26.  Bug #892347.
+dev-python/pygame_sdl2
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Fails to build with setuptools-67.2.0.  The current version is from
+# Jan 2021, upstream had a few releases in 2022.  Multiple other bugs..
+# Removal on 2023-03-26.  Bug #891757.
+dev-lang/hy
+
+# Michał Górny <mgorny@gentoo.org> (2023-02-24)
+# Unmaintained.  Does not build against the current version
+# of app-text/htmltidy.  Last upstream commit in 2013.
+# Removal on 2023-03-26.  Bug #806480.
+net-misc/cbugzilla
 
 # Mike Gilbert <floppym@gentoo.org> (2023-02-23)
 # Deprecated upstream. Use the progressive web app instead.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1dcac7746711..22dc3054aabb 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -260,6 +260,7 @@ app-backup/bacula:bacula-clientonly - Disable DB support, and just build a clien
 app-backup/bacula:bacula-nodir - Disable building of director
 app-backup/bacula:bacula-nosd - Disable building of storage daemon
 app-backup/bacula:batch-insert - Enable batch insert into data base
+app-backup/bacula:ipv6 - Support IPV6 protocol"
 app-backup/bacula:logwatch - Install support files for logwatch
 app-backup/bareos:ceph - Enable sys-cluster/ceph support
 app-backup/bareos:clientonly - Only install file-daemon (client)
@@ -2701,6 +2702,7 @@ dev-tex/abntex:lyx - Install with app-office/lyx layout
 dev-tex/biblatex:biber - Install the unicode compatible backend processor
 dev-tex/pythontex:highlighting - Syntax highlighting using dev-python/pygments
 dev-texlive/texlive-basic:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
+dev-util/Tensile:client - Build and install tensile_client executable to run benchmarks and tune GPU GEMM
 dev-util/bazel:tools - Install extra bazel tools to build from sources
 dev-util/bitcoin-tx:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
 dev-util/bpftool:caps - Use sys-libs/libcap to enable unprivileged run support
@@ -3851,8 +3853,9 @@ media-fonts/intlfonts:bdf - Install BDF fonts in addition to PCF
 media-fonts/liberation-fonts:fontforge - Use media-gfx/fontforge to build fonts from source
 media-fonts/montecarlo:bdf - Install BDF fonts in addition to PCF
 media-fonts/mplus-outline-fonts:ipafont - Generates new fonts merged with media-fonts/ja-ipafonts
-media-fonts/noto:extra - Install full upstream font set
+media-fonts/noto:extra - Install full upstream font set including condensed, semi-bold, extra-light variants
 media-fonts/noto-emoji:buildfont - Build Noto Emoji font with supplied images
+media-fonts/noto-emoji:icons - Install Noto Emoji icon theme
 media-fonts/sil-charis:compact - Use more compactly spaced font
 media-fonts/terminus-font:a-like-o - Changes view of letter 'a' - a looks like o (see homepage)
 media-fonts/terminus-font:center-tilde - Place the '~' character vertically centered on the line instead of to the top.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index de1d7901a4fe..d1384caff7a9 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index e92732a70c91..e049761588d2 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -10,6 +10,6 @@ DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fc
 DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53
 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f
 DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4
-EBUILD rocBLAS-5.1.3-r1.ebuild 3053 BLAKE2B cdaf0e314f82ea517cad6c0b40b99d4de6c3a139a9fadca87f2e8f84eb5e236bdecffbbefd797e620f7b3f81d5694c262a67e56169841c3927008470fa67046e SHA512 def4b29c88a500090ca40a843c72846fb5cabdf65b44aa0b9c5d75daae53922ac24771db79bab29b100c8259ae40dbbbe3d255389b54432d0350c6f69698fe06
-EBUILD rocBLAS-5.4.2-r1.ebuild 2684 BLAKE2B bed691dab1668260682de8f209e2c0f0bd8d17cd3ebdf26bc86766a95afb8cc15a84c255e423491a60b95bca7889b97eced67e7e7c757d75e1b3a3a2cc53dd6d SHA512 cb2b4a270414031d6eb19b31289831d97af2baa0ce3eb82afa48a59898d0f25146943537af35d6e8e73008843292557fb0e68767964c0260a492b5486bbb8f50
+EBUILD rocBLAS-5.1.3-r2.ebuild 3049 BLAKE2B dae96b6c0c2fed3f38d746f82a9300fb39df98654c5a02b464c0b2b2da3cbd1066e7723b9962ddb48f45cc2be4376d315018ded8af64cb3389d513c3d2a972ec SHA512 6e1da5e787c2f1559abe6f2ddd709e96bb0ca164c0821af2d48af4079e6af9bb7437bd103cb0d38b4088fde7fc50da064c149027da46461e44ac60cad6aedaf4
+EBUILD rocBLAS-5.4.2-r2.ebuild 2680 BLAKE2B 45ff077a2636071a8c2e1a6d6082ce356281a39a0c2bef802bd4152e9264564c2834c9897bb6260a62119394651ffbe18787c7a26b1def3ef6de6284f089b768 SHA512 1210fc5ddd561857c6e695115498195c6b09c75c02edb0293d4e1a6bf3ebc1f0ffcd9ac1ab975e600546ae73f8076146273a0ed353c655d0db13736db007fa1b
 MISC metadata.xml 739 BLAKE2B 38ace9571ca717a5bf7251888b4537522326f34778be98cfe717a06dbbd3a04a2bf905ec1cabafe9bbd3fea90adfb5c25c8b41e46c034a7793363ea5fc0c7f29 SHA512 60f1d5aa2a6ebe17cfcf24780529e1eef521bb7c838e48d18180a52d580cf91430ac1f4fdd0e70b9804ec5f0b5957dbd431149f6e0b0b9033cf8ad683510c582
diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r2.ebuild
index 0723e8244bf6..051609e9d1a3 100644
--- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r2.ebuild
@@ -28,8 +28,8 @@ BDEPEND="
 "
 
 DEPEND="
+	dev-cpp/msgpack-cxx
 	dev-util/hip
-	<dev-libs/msgpack-5.0.0
 	test? (
 		virtual/blas
 		dev-cpp/gtest
diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r2.ebuild
index 826e17c0e64b..9e141e24ef49 100644
--- a/sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-5.4.2-r2.ebuild
@@ -28,8 +28,8 @@ BDEPEND="
 "
 
 DEPEND="
+	dev-cpp/msgpack-cxx
 	dev-util/hip
-	<dev-libs/msgpack-5.0.0
 	test? (
 		virtual/blas
 		dev-cpp/gtest
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 3784c692b8ba..65bbc607fd91 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 8f4f12e85fde..c149ea24f7b3 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,9 +1,9 @@
 AUX root-6.12.06_cling-runtime-sysroot.patch 989 BLAKE2B 8202cc8f2bf72cc25642d0a03ba26c3969069b291a6a22188879dbedbf0c3c496149f79f671d0eb51d81d0ee36565660d136b4741f5d018c2b05325ff08381f0 SHA512 c96dee9843da1051c54bd6870ef0a04714944ffe1f86800c9a51b8eb8ef84107d3315d3a708dcc0b651248af4bec362c7f31695514505045aeda9c793d40dc58
 DIST root_v6.26.08.source.tar.gz 195225434 BLAKE2B e96870b701fbf25dd01c6ab1e39c40ee8fdce9bc6e58d2a6f48a8b3eae71b9eab0cef9a7a229d56efc00eb0d50f218eb2b26a2786641a484e4a08196007409c7 SHA512 5e8f7c6cbe0335a123e8154570582fcdbb1b6ca55ffd63c06e4d2bb85a03bb1a6b827f299b8aabff6699458cbf6bfecf5e4806889c43520a1df2cea12dde387b
 DIST root_v6.28.00.source.tar.gz 185318916 BLAKE2B 12161f91e9875f62104f3c74f043191a3035bda1b31f8f36898cbae6cada4423c2179057c49cc01b52bdb66ffcc15c2c4be4322d7cf45b8bd1fb37f0c1dd568c SHA512 0ef842fce1e4afb5fb732ef480e6b62135404678f6f80b7605ecb9fbddf2981c6069086af7e42ede9e1310b6b0135cdfbcd93e701fbc7262f49e1f1737805617
-EBUILD root-6.26.08.ebuild 8255 BLAKE2B 3e9b70ce94a0f3fc6a5da225696b697982c9eb02705e88ddaaa3afc15e39477ee25b449e02d51b6766258b8ce49dbae2c383cee9e27a8b10eeba588f5dedcbcf SHA512 158ad665b6f215f772a3d6a292efa07550667742b28e3ad5788bfc8ee071f27f66df0000fefea0a87e3fbe397a1957044d86cbbc28e6a957fc77fc2f7b03b218
-EBUILD root-6.26.9999.ebuild 8255 BLAKE2B 3e9b70ce94a0f3fc6a5da225696b697982c9eb02705e88ddaaa3afc15e39477ee25b449e02d51b6766258b8ce49dbae2c383cee9e27a8b10eeba588f5dedcbcf SHA512 158ad665b6f215f772a3d6a292efa07550667742b28e3ad5788bfc8ee071f27f66df0000fefea0a87e3fbe397a1957044d86cbbc28e6a957fc77fc2f7b03b218
-EBUILD root-6.28.00.ebuild 8622 BLAKE2B 91990171dfca14dd74e5fbbe220d70418e600fcf73f9e35f0a61a41f5789973d142bd506167c362a4d679db1d034fa72cc17ccd13897d237aeeb8e352e76c76e SHA512 b8ab8a54ec9cfda9f116cc03030f26215f622d9a7085bf99bdd3f87fc07aec5bc91505c4ca0aeb5cbae5d5f38bea6705fa5ae78f27df26206be045f34010b511
-EBUILD root-6.28.9999.ebuild 8622 BLAKE2B 91990171dfca14dd74e5fbbe220d70418e600fcf73f9e35f0a61a41f5789973d142bd506167c362a4d679db1d034fa72cc17ccd13897d237aeeb8e352e76c76e SHA512 b8ab8a54ec9cfda9f116cc03030f26215f622d9a7085bf99bdd3f87fc07aec5bc91505c4ca0aeb5cbae5d5f38bea6705fa5ae78f27df26206be045f34010b511
-EBUILD root-9999.ebuild 8622 BLAKE2B 91990171dfca14dd74e5fbbe220d70418e600fcf73f9e35f0a61a41f5789973d142bd506167c362a4d679db1d034fa72cc17ccd13897d237aeeb8e352e76c76e SHA512 b8ab8a54ec9cfda9f116cc03030f26215f622d9a7085bf99bdd3f87fc07aec5bc91505c4ca0aeb5cbae5d5f38bea6705fa5ae78f27df26206be045f34010b511
+EBUILD root-6.26.08.ebuild 8257 BLAKE2B 812f6aaf289ff4e937134a2c9aa54c68a844960fdeef0bd0590eecc03033f05741baf596cb2b77b17f5eeded7794667342a2713ae1365177e8065408e3f317a2 SHA512 b5bbc759ad79f505cf51621e95d483966a735393853ccc5c2654dd5705c709a6bff53f1de622b524542478c84a11f3cbe252b42b030abd4e922135dc25e85ee2
+EBUILD root-6.26.9999.ebuild 8257 BLAKE2B 812f6aaf289ff4e937134a2c9aa54c68a844960fdeef0bd0590eecc03033f05741baf596cb2b77b17f5eeded7794667342a2713ae1365177e8065408e3f317a2 SHA512 b5bbc759ad79f505cf51621e95d483966a735393853ccc5c2654dd5705c709a6bff53f1de622b524542478c84a11f3cbe252b42b030abd4e922135dc25e85ee2
+EBUILD root-6.28.00.ebuild 8624 BLAKE2B 0d1b66f72e59c0d2cd3465aff76c8883599031f4647a26fe2c5304dbbe138d9f9c2adc8f7819ba5ad240632a0bce7c15e66c6249f6073b01ef7cd3f8f8866179 SHA512 6f47a33e3879d2cf15ecbd460ced12731a5bf8d17ea76829109f30049a445ad0e76000ae72cae7b034a337088904a278ffa7996df9e1a513fad0a08bb216944d
+EBUILD root-6.28.9999.ebuild 8624 BLAKE2B 0d1b66f72e59c0d2cd3465aff76c8883599031f4647a26fe2c5304dbbe138d9f9c2adc8f7819ba5ad240632a0bce7c15e66c6249f6073b01ef7cd3f8f8866179 SHA512 6f47a33e3879d2cf15ecbd460ced12731a5bf8d17ea76829109f30049a445ad0e76000ae72cae7b034a337088904a278ffa7996df9e1a513fad0a08bb216944d
+EBUILD root-9999.ebuild 8624 BLAKE2B 0d1b66f72e59c0d2cd3465aff76c8883599031f4647a26fe2c5304dbbe138d9f9c2adc8f7819ba5ad240632a0bce7c15e66c6249f6073b01ef7cd3f8f8866179 SHA512 6f47a33e3879d2cf15ecbd460ced12731a5bf8d17ea76829109f30049a445ad0e76000ae72cae7b034a337088904a278ffa7996df9e1a513fad0a08bb216944d
 MISC metadata.xml 3125 BLAKE2B 05365d68925cc1f02e2be360d8f433de89c2d37d9a141a4ef71e0acd1ee7b1d345166c8253080082abb1a1a041c59871f3e3f1503ecc3bae33c88e3f05b42ea1 SHA512 4bffb1c5be76fc9a59b0ba593539a092f298329642d43994e339611f79d524543839f813040610bdac9d636e6a22adf0f06adf2b5a553175c2f0679ba82a067d
diff --git a/sci-physics/root/root-6.26.08.ebuild b/sci-physics/root/root-6.26.08.ebuild
index 2d2e1c21374b..ec8f9983775c 100644
--- a/sci-physics/root/root-6.26.08.ebuild
+++ b/sci-physics/root/root-6.26.08.ebuild
@@ -290,7 +290,7 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
+		"${EXTRA_ECONF}"
 	)
 
 	cmake_src_configure
diff --git a/sci-physics/root/root-6.26.9999.ebuild b/sci-physics/root/root-6.26.9999.ebuild
index 2d2e1c21374b..ec8f9983775c 100644
--- a/sci-physics/root/root-6.26.9999.ebuild
+++ b/sci-physics/root/root-6.26.9999.ebuild
@@ -290,7 +290,7 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
+		"${EXTRA_ECONF}"
 	)
 
 	cmake_src_configure
diff --git a/sci-physics/root/root-6.28.00.ebuild b/sci-physics/root/root-6.28.00.ebuild
index 84fee8efa756..e25434a11de7 100644
--- a/sci-physics/root/root-6.28.00.ebuild
+++ b/sci-physics/root/root-6.28.00.ebuild
@@ -307,7 +307,7 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
+		"${EXTRA_ECONF}"
 	)
 
 	# Needs to be here, otherwise gets overriden by cmake.eclass
diff --git a/sci-physics/root/root-6.28.9999.ebuild b/sci-physics/root/root-6.28.9999.ebuild
index 84fee8efa756..e25434a11de7 100644
--- a/sci-physics/root/root-6.28.9999.ebuild
+++ b/sci-physics/root/root-6.28.9999.ebuild
@@ -307,7 +307,7 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
+		"${EXTRA_ECONF}"
 	)
 
 	# Needs to be here, otherwise gets overriden by cmake.eclass
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 84fee8efa756..e25434a11de7 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -307,7 +307,7 @@ src_configure() {
 		-Dx11=$(usex X)
 		-Dxml=$(usex xml)
 		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
+		"${EXTRA_ECONF}"
 	)
 
 	# Needs to be here, otherwise gets overriden by cmake.eclass
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 338dc9c5d5cf..aa317bbef943 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index 9d3372c39a51..902fa98bffb4 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,4 +1,4 @@
 AUX pythonprop-drop-portland.patch 4249 BLAKE2B 6b7d2ce79db62d6343f68685383e8e60b8a97ef7dc932719218c8078dac4a058b3fc36b21c0a0db0855a766fbe23d575cd6785511fce15d497cbb5a4964508ff SHA512 b03ac440ae831ca8525f39915c2dbca91858d3a284c9ae4f36b1ac27594e00aab02aa2d090c08d0aeee7e273548e769138fc3a965801d462c181a00cb87aa959
 DIST pythonprop-0.30.1.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43
-EBUILD pythonprop-0.30.1.ebuild 1251 BLAKE2B 2506d07a624ca4ec1dba09aec2359d64c1a3d3d93af5d776b01a7801db738a30818ff89da6dbd251dc64eba505cafd9a52932ec43de673d53bda695de4bbdf9a SHA512 1ade80ffec321411de78080c7336f5ea4d21723d96c9e70ee3f5d0090a2d030da8ab4186e95730c03916a91d53c08f8bd4e92ee0cf3ee56e9355e8e63fd497b8
+EBUILD pythonprop-0.30.1.ebuild 1251 BLAKE2B 9c4f87caf090c4f2622f58d404fd0fd77969e1f5796efc8a5ef6f9fff563d4188a78fffaa0c84382f7de563160423213392fc5b1f2f441ffadbc928a1d3a5249 SHA512 380fa27955ad78889dcd3924bbb59788a2f8545f5f2f1d04650cdb4dcc281942d5a4a3f9d8c35e32ad73f70a3ed408d8da6857ef1758e05e7cd9bb64a65f9111
 MISC metadata.xml 464 BLAKE2B 51b9b066a69b6dbfb7eac1b069e1481106970d675c0ddafc8131551d4fe676cdda7828c36d50d30b82ea5a97d2f43385c0c420e1a843355dac09aa5b3eadbf93 SHA512 f10cc21761693cf0bd78c19283a8618c0fa7473bded1b87b5fa517ebd860d8d76977d78131af576b2d36cee6ef51d0788b151dbe89418efcd4bb64fc7acfdb92
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild
index a0d1559f57e0..b6679ac87b83 100644
--- a/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 83afa8864617..6f4e2ce5f34a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/arch-chroot/Manifest b/sys-apps/arch-chroot/Manifest
new file mode 100644
index 000000000000..3d1f197d432e
--- /dev/null
+++ b/sys-apps/arch-chroot/Manifest
@@ -0,0 +1,3 @@
+DIST arch-install-scripts-v28.tar.gz 19730 BLAKE2B 0ff5ba79b200ad642e049ec19217cc5c0794d627a28f42e03c0df2444fef4d8488a6ee011d26fb8fe958c1a1a2fa0a13920567e394b2389c772f516b1fe8f388 SHA512 09a027b04b70e01ccd1fd82e3a443c876bdf978b94a922de9dea4dbc187360460ea35720816724b72fc31b02338b11bf39b47ec9156518a8a3ade000530bf1df
+EBUILD arch-chroot-28.ebuild 806 BLAKE2B ab67004cad22d53edfa9c9c4cb49217bdb0dd8a5e67eac7c118de222914c645c4e0bf2001a08765a1a721f619723ff7a5d7a8e7d2c83226bd47ed48b652efee0 SHA512 36d12e66e823f95856ef3b1f86b47890460578a731ed851a6013f9f8b13423e0639b740d10d1f48a0664fb7e3d5daa63571f55061bad17b024a95ce9254baf0f
+MISC metadata.xml 660 BLAKE2B 563818fc11864a0cc992d1ae36b2da1d7419dbed8fc5c63428b64c073af630139c1154a4e818b4dacb2e9d56923338483d4c290ef943745401d5ee905276d518 SHA512 885e4cc9b4f1795445a394dc401270263da33c030a8233c6a8efb2d1ec034cf915fe40d94e93122dfe4db91205593eaef2e69439197d77208194bdeea0ba75c6
diff --git a/sys-apps/arch-chroot/arch-chroot-28.ebuild b/sys-apps/arch-chroot/arch-chroot-28.ebuild
new file mode 100644
index 000000000000..78f61c92ae6f
--- /dev/null
+++ b/sys-apps/arch-chroot/arch-chroot-28.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Wraps the chroot command while ensuring that important filesystems are mounted"
+HOMEPAGE="https://github.com/archlinux/arch-install-scripts"
+SRC_URI="https://github.com/archlinux/arch-install-scripts/archive/refs/tags/v${PV}.tar.gz -> arch-install-scripts-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+
+BDEPEND="app-text/asciidoc"
+
+S="${WORKDIR}/arch-install-scripts-${PV}"
+
+src_compile() {
+	emake MANS="doc/arch-chroot.8" BINPROGS="arch-chroot"
+}
+
+src_test() {
+	emake MANS="doc/arch-chroot.8" BINPROGS="arch-chroot" check
+}
+
+src_install() {
+	dobin arch-chroot
+	doman doc/arch-chroot.8
+	newbashcomp "completion/arch-chroot.bash" "arch-chroot"
+}
diff --git a/sys-apps/arch-chroot/metadata.xml b/sys-apps/arch-chroot/metadata.xml
new file mode 100644
index 000000000000..7350009d97ca
--- /dev/null
+++ b/sys-apps/arch-chroot/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+    <maintainer type="person" proxied="yes">
+      <email>cat@catcream.org</email>
+      <name>Alfred Persson</name>
+    </maintainer>
+    <maintainer type="person" proxied="yes">
+      <email>peeweep@0x0.ee</email>
+      <name>jinqiang zhang</name>
+    </maintainer>
+    <maintainer type="project" proxied="proxy">
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+      <remote-id type="github">archlinux/arch-install-scripts</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index fb2a3cc92dd9..528d981a1e63 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -6,7 +6,7 @@ DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
 DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed
-EBUILD diffutils-3.8.ebuild 1673 BLAKE2B e1af83d87e166a3d60f87ed13870240f9216ff72ffb99508780c7020fa466da05b2e3b8eeaaf8dbf244ee873059a004273bfb2e2ab6ddb4cf4f0e16542497f3b SHA512 17925dde918dc25fde6a42891b45c7a8f242aa5a81bf67974b01d03785f16251496912fb5ccfe0927cde4908432cf36532341d7b11f16b2ae5033169f466018f
-EBUILD diffutils-3.9-r1.ebuild 1900 BLAKE2B 9aea7e183d78d8f625d19f31c316c0876424cbf282f6e08fe92cfe1c57ea64b367d54775238978b9a264e1b4ce1d83295ff511b17d310f4d07ce0da046e63d37 SHA512 03c127915b962d68edf618d36eb868716763d47824f669588b066b8216e5c70d83a1afa980cf9806f46986e0bed3bacaa160696edd70a681c4aba4970a52376e
-EBUILD diffutils-3.9.ebuild 1738 BLAKE2B e77e1914a52c8ea0ba462abd13483525008028f8db677d0fa054c563e115900f7fcd6b4736927aa9d8192b15ed65e43bcd183651e373cbc469afa327d8bccaa9 SHA512 62ed34d6e9c18ba2e0831ad05cc48df9f0c787cf7e111a61b6ef5b781faa776645f53356d0b8c89a10df7a6c91e0fb95b467b8a5fc09d890080e8f7dc7ada194
+EBUILD diffutils-3.8.ebuild 1686 BLAKE2B bdbf22e16f3791a7a844ac98dc3a64ac56c53e2ba36fee9af0a58314055c324c1a2ecd0cebf005f711483453446b03a9e8313df4050b7819f497d6302b4904f6 SHA512 b3e3b0aa801fc6312416e735111bf73a5aca065f50d054d45eac224bfdd861c26147c540f7e6cfa9755846188805495ca2c10f815c7c80440b13bdc346af072f
+EBUILD diffutils-3.9-r1.ebuild 1913 BLAKE2B 22849028bb2818042bd2f2a2594fd504d0c1b271b24cad4c7f1bb9e31bbd9b5caa3d6e62beac577fbb4a8cfb990db07de929acb3c9dea2459b8bd3ff6c411a8d SHA512 708d65ddcc7fcfbd9995453acf479e9e463357e59ac12279dfdb1f43cccdaa0ff10e151a6c1c81ce3ecd8bc1ec886e84e1b6d3af4d2bf143934f3370e44cce06
+EBUILD diffutils-3.9.ebuild 1751 BLAKE2B 920df2d12ba5858fbb8c027dffe2882b8c0e1160a607d3bbeae755d7157f01f8f86b164066d39ce9c99b4b48e0b913cf28e2e56e2ebfb0c80998b8df33bdde79 SHA512 01f7f178edec54db25e661c33a5fe3dcc7b961184c98922653013e944fb002c31d5b38b3d034444d1a328d6f58109a389de1059362610c31298025e73e042a28
 MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25
diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
index 1591a6a87921..5d894b8165fa 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 7aebfc8cbfa7..f5712e1bb8c7 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild b/sys-apps/diffutils/diffutils-3.9.ebuild
index acce50bad293..5b4d12ed0b7f 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 03cb29e91ca0..b9f5bfb18b8e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,6 @@ AUX file-5.44-limits-solaris.patch 443 BLAKE2B d7481f0669b48d6c1a94e50706b652363
 AUX file-5.44-seccomp-utimes.patch 587 BLAKE2B c1d2a8861034e9de0d4b1d0440935bd1ce25b789de0ac7f573378a1ef5d409f4c879deb0fd8dc89c48674d5af795cf8b99f7da870c9e5d54cec7a2d400b803f5 SHA512 e41b80f2e858ecc3e100b128d41c2d2e948a334f87523ae5d0c3b50916c678f37d6f26948d0b51a1bbdea9b0ab2683a3955004df2736d1240dcf80ee14390d9f
 DIST file-5.44.tar.gz 1186437 BLAKE2B a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42 SHA512 26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
 DIST file-5.44.tar.gz.asc 195 BLAKE2B a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1 SHA512 1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
-EBUILD file-5.44-r3.ebuild 4109 BLAKE2B af6e9cf8077c5130ac8042da18f35ec376dc9f62dfab8dbe0569b49c879da7407c5e1862710fef8a499d21b5a635afb8ed64bdbd8eba2242d3653f4b889f2e6a SHA512 1d3de6105733c054ee18cc293d578ef9c9e9aac71cd5c092643095f633d8643718e0cf481f0692bad77063e0efd6ee3148ddb09d3120fe8178ac67ed0bfde9f1
-EBUILD file-9999.ebuild 3929 BLAKE2B 730c7603fb1fa540e120bb667079f31e9434a48458c6b95d6a79f5aded8826d6a4e96c0db0faeefe9a5a2ff2025504c819f5ed4689b2803c866f6f66d65eac37 SHA512 e95ed16bd46ccf86f8f0677f9f459ed5dc2be82bd1253125e1844d263a674c7f94edf47d81aa5c6e46c765b89a0304878e5d3b1917ee00e0272e74be00f27282
+EBUILD file-5.44-r3.ebuild 4122 BLAKE2B 46af34947f0a4bff884a4d1701cca75c3a35d50aaf3bb96330dcadf49f01654333fd0279d7db7481da9d50354ed6f88ce6113a2be39a924bd4a43c677b3de3e2 SHA512 d3bf7ebb9f3c327721b279cb2b0b44201f1ad17e5358c26a444a18a4c208bb7a04a48bd38857edf4321b91c94b976743bad1341056e8ddb00083603540babf79
+EBUILD file-9999.ebuild 3942 BLAKE2B cafb3a6bfbf5010a7718103e3f29131db46c77b76781598658c3c74335128849341e5f0ba2fa8d387556db9b821e334139b88510c7e59b8a9d2e3dda91ca7e60 SHA512 37e605cb70b1ff6179a15a2d295dbe6bd452999f746db15f6c24402c6d36d7ec59b05a46f0e6f9619a9ed24118bfbb4633f052b54187251d78bb45b4be7675e1
 MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19
diff --git a/sys-apps/file/file-5.44-r3.ebuild b/sys-apps/file/file-5.44-r3.ebuild
index a8a4f92d1f59..d62a1b406c2a 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 82884ca365e2..26babd17aba5 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
 fi
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index af5b1cb0552e..83a81886ddb4 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,4 +1,4 @@
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
-EBUILD findutils-4.9.0-r2.ebuild 2399 BLAKE2B af7bab88f922de21922270100102374f2382eb70d972b797e1a385fdb714e71ebb1c5b0d8f794e90a26586d86a44c9cbd0b0a24ce13ca9c189de2979cc62e554 SHA512 f3e52aefe3031dfee65fba3229d10df07e62cc6323e4f08cfaebf7e88d2f01b0fc4fe26db451d456863e26d862cd40b0fa1404466f52f7f8a47ab76e50c04498
+EBUILD findutils-4.9.0-r2.ebuild 2412 BLAKE2B 2f991a07202af514eb2eded55c61d0e453f1fa51b6476ec5eda7427c46d9d73d0d2044617c840c76cc1bacd4f246b9016dc2818b96fad5c5c22c3522e4c5ffa7 SHA512 ad31a2afd466883d787e2273f4ceaed845d414c4eaf3a4593600a0f0c4f2813a53f8e697f9d53f890f99740f071e0f70d0e1a1ce8ecdf87134216fdeb6d91d2f
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.9.0-r2.ebuild b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
index 29285eb548ce..c8fef6739a9b 100644
--- a/sys-apps/findutils/findutils-4.9.0-r2.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 44cb562653af..d875b79deb63 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,13 +1,8 @@
 AUX fwupd-1.8.10-installed_tests.patch 10892 BLAKE2B 27f52fd33ddcf9d64aecf40105413047668e538ace3efe25a87abfc3100c264515b238252b303aed43dde6ca6ddd788ada826f52ec0a0e7bc7b1e2fe47142025 SHA512 f581dfac2e2a94659751958b8c05a54eb2cfc0c23fd89dc1cf3e2a460e3079e15ee60898b5bdb6d399bdc997a82b5bb8a581f5db21cbf6830a94b6f01c443a5a
-AUX fwupd-1.8.4-installed_tests.patch 5999 BLAKE2B c59749549f7bf057129802ee534780967c09155ab247f5bc0293112908cd833f2700d92c5839efc1d09250bc2ac966d468c83f7a9e61622d2aa35d60d3b0115b SHA512 6158b56816bf7e5173f23fa29314f33effe5eb49a06201cdfa17743d22b3f0e3260f9aa2661687cc369f252e958ba193088fc96aa4de4d3c93d69658d145ab56
-AUX fwupd-1.8.6-installed_tests.patch 10375 BLAKE2B 2baf10a3a681dcd15ce1c99a3f4b3d59fea07864e57ca09526cd69c4922145779cbc50668a0264f65cf567d521d3e9d79ffc3c1fdd824a2c84b3d30bcb326951 SHA512 2338c2f23385b001edb6ce5ea8c4d54f31ba286eefde2df816eae719ed94046bb26905278ccb3d2c88d9c86f962b659854e67f767782c21c3a033decb48d4e6d
+AUX fwupd-1.8.11-installed_tests.patch 11562 BLAKE2B ae49094cf8b8312fa529424c5235cd12c68d368ab9a6b5f7520351683c31f71a824d50987869858454c27f6f6868df311042785618eb9bf18e424d5ea00ff987 SHA512 a4ddfd3c36dcb2ad47c4640180c301f0244f056d6812c2c722a84e33232694fd051305fb13600bea100e2ab5f692a039091238cf24d6aa29ca9044825b7dba35
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.8.10.tar.xz 3366400 BLAKE2B 891cade6c4a3a58d61c19ba6001d0161de046465729ebd349d04b2e2170146d2a7dc099285f60f7b1f7438d70a7792b5ff3921a2892e726cc6674f0628f9fabc SHA512 8437cdc93d553e42d33a037d14fcb09bb65b4c4d7d60add6a90c84dce0845097fe96005a1f6a9da7daf89df5b7dcd1b43a9fbba666cd18129b67ebe1c3ce7c97
-DIST fwupd-1.8.5.tar.xz 3289548 BLAKE2B d82845ad4a6faaee966d43b8d9d5be0d4522ac6f2455ac8ef9d9c90dd0141a4feb7dd28f5c79526a49fd2ac4b785f92328a913a0fd13073fa2357aa996dd0700 SHA512 96856a56cb10b789bbbb82a33b702473cf1bdc32a9fddca6e48313ba3fefbe2f63a12a7290e3b4bd11939844f6989a0e15e96a4c2911cb900cd9e8d9c6c13f15
-DIST fwupd-1.8.7.tar.xz 3335636 BLAKE2B 1c4e8f369581f826a710274e0789fbcfe735ce58407d1c0f7472721895bf426e0ddf0fd3d014a35efe39726f8891faa7960aaa455482b435138ea116bddbc142 SHA512 374339178a1fbf85bc25b47077d0db351b3664a02ec9478c4a5381228125f3bd65ef0be9eb526574bd09ab665aadd6cd9e39f01ebbfebbd338ec191ba24c5a36
-DIST fwupd-1.8.8.tar.xz 3341320 BLAKE2B 12804e59dbc1a2091e81109d0d4cd58b75240835249be546b423858419841cecdb93b4f50406924ccaa609fafb0c96349561b46345d79a66d97133956e4dfa29 SHA512 05c9527d5b9013937b106e5a79e0337b66e3d79578bb61ccb27763d95b7d2e93cd816c969a4712e1ca6e5d4b6bc166ea264520e6673ab105a7f6eb2122e69c17
+DIST fwupd-1.8.11.tar.xz 3389224 BLAKE2B d86b8776f78405384fcced78ebe1478585a4ca5127a184d357f2b8fc78f6437a58030c81f5bae672564e2a0df85d9b8512869b7eb1b82f5099bd0c4269acebc5 SHA512 f1fe648e33dc407bbb2ab438a29dee6e29ccdfa8cb6ca421b92cdfd724a3347254e6ddf35634b1e41e985558ea95166914b3fde927f61f1c0aa29800bf6ca6de
 EBUILD fwupd-1.8.10.ebuild 4877 BLAKE2B 374ad7b6b8f3332a00716dcd46d9904833ef7c52e95d9e269fde77fe810ef17cfb3a76c0bff112b2831b2d80b985b1257386c092363e9e542bcb53afaac8ffc4 SHA512 b1435e3079eae1f76433511b13473fc72665c09b095d21ddba889178ea636ffa53f30f5e8055db3f8c33149af7041e9741aa89d4a2c87aaf60a124253837afdd
-EBUILD fwupd-1.8.5.ebuild 4975 BLAKE2B 269da725271292aeca1accab387c65dfda239c193aecb0c47c62e78c5e8620ee3309619646da694cbde3718479b5b15044c6a41a59f686a62cd1412bcc0afd3e SHA512 6c766d1044d2250b5fd4d045aa6e284788d6ee943803df8fae04c1fb06d2ead38c904df3bfb278b4a12260271da54c14ce09f229153a8f343176205ca12fd829
-EBUILD fwupd-1.8.7.ebuild 4868 BLAKE2B 934db3177be02165f5d3f7c25d51aa6581268fa21e6b0b78ef08c303657d151db7f3785a6f646733494c9fe3eaac47047a4728c9c09e90968d2e3d9d10cf88a5 SHA512 855fa0e6c2d87ecfca9185be4f057f398d75ac7f73796b385b29b7517d2552fe64fa652971f60f068963b151964e0622349e0537b72a52260fc304bea445a047
-EBUILD fwupd-1.8.8-r1.ebuild 4870 BLAKE2B de8da6728e210cd5f6eeef10c4ffbe942eb17f936892c454999577a10d66b24bf74b7e4525cae54216ed2c2004bff519b9b7df2d594acfef5647c573a88cf301 SHA512 2c19be779e65b5c4df50095086765bcf99febc16c1217a68461b8430fb509fc74f24555bed24820a193704e769013fb6f815713b0465d5180718448230d83752
+EBUILD fwupd-1.8.11.ebuild 4879 BLAKE2B bcb4bc55a2db90ef65d1dfcf217ca677cd8f87790395828a7be8fc24c24557bf97b757bfe8ba21391a270cff7cf3993c6457f9bfee338eb95d86899254e0f00c SHA512 129634825e136cf9d4a243d3386f5f3d9e6d2b9a81ed1a55e92fbf1419b30f3f6a7bb3f123c915e5f059e81f1f048c799872ce270765b18323b03d78647d163d
 MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
index d82a326e0d08..819b6799ebdf 100644
--- a/sys-apps/fwupd/files/fwupd-1.8.6-installed_tests.patch
+++ b/sys-apps/fwupd/files/fwupd-1.8.11-installed_tests.patch
@@ -21,6 +21,33 @@
  if build_standalone
    install_data(['daemon.conf'],
      install_dir: join_paths(sysconfdir, 'fwupd')
+--- a/libfwupdplugin/meson.build
++++ b/libfwupdplugin/meson.build
+@@ -370,6 +370,7 @@
+   )
+   test('fwupdplugin-self-test', e, is_parallel: false, timeout: 180, env: env)
+ 
++  if false
+   install_data([
+       'tests/chassis_type',
+       'tests/sys_vendor',
+@@ -388,6 +389,7 @@
+     ],
+     install_dir: join_paths(installed_test_datadir, 'tests/dmi/tables64'),
+   )
++  endif
+ endif
+ 
+ fwupdplugin_incdir = include_directories('.')
+--- a/libfwupdplugin/tests/meson.build
++++ b/libfwupdplugin/tests/meson.build
+@@ -10,6 +10,5 @@
+   command: [
+     python3, '-m', 'zipfile', '-c', '@OUTPUT@', '@INPUT@',
+   ],
+-  install: true,
+   install_dir: installed_test_datadir,
+ )
 --- a/plugins/acpi-dmar/meson.build
 +++ b/plugins/acpi-dmar/meson.build
 @@ -28,7 +28,6 @@
@@ -92,7 +119,7 @@
    )
 --- a/plugins/ccgx/meson.build
 +++ b/plugins/ccgx/meson.build
-@@ -28,8 +28,6 @@
+@@ -29,8 +29,6 @@
  plugin_builtins += plugin_builtin_ccgx
  
  if get_option('tests')
@@ -101,7 +128,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -44,7 +42,6 @@
+@@ -45,7 +43,6 @@
        plugin_libs,
        plugin_builtin_ccgx,
      ],
@@ -121,7 +148,7 @@
    )
 --- a/plugins/elantp/meson.build
 +++ b/plugins/elantp/meson.build
-@@ -20,8 +20,6 @@
+@@ -22,8 +22,6 @@
  plugin_builtins += plugin_builtin_elantp
  
  if get_option('tests')
@@ -130,7 +157,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -36,7 +34,6 @@
+@@ -38,7 +36,6 @@
        plugin_libs,
        plugin_builtin_elantp,
      ],
@@ -140,7 +167,7 @@
    )
 --- a/plugins/linux-swap/meson.build
 +++ b/plugins/linux-swap/meson.build
-@@ -25,7 +25,6 @@
+@@ -28,7 +28,6 @@
        plugin_libs,
        plugin_builtin_linux_swap,
      ],
@@ -150,7 +177,7 @@
    )
 --- a/plugins/mtd/meson.build
 +++ b/plugins/mtd/meson.build
-@@ -27,7 +27,6 @@
+@@ -30,7 +30,6 @@
        plugin_libs,
        plugin_builtin_mtd,
      ],
@@ -160,7 +187,7 @@
    )
 --- a/plugins/nitrokey/meson.build
 +++ b/plugins/nitrokey/meson.build
-@@ -30,7 +30,6 @@
+@@ -33,7 +33,6 @@
        plugin_libs,
        plugin_builtin_nitrokey,
      ],
@@ -168,6 +195,16 @@
      install_rpath: libdir_pkg,
      install_dir: installed_test_bindir,
    )
+--- a/plugins/nvme/meson.build
++++ b/plugins/nvme/meson.build
+@@ -38,7 +38,6 @@
+       plugin_libs,
+       plugin_builtin_nvme,
+     ],
+-    install: true,
+     install_rpath: libdir_pkg,
+     install_dir: installed_test_bindir,
+   )
 --- a/plugins/pixart-rf/meson.build
 +++ b/plugins/pixart-rf/meson.build
 @@ -19,8 +19,6 @@
@@ -189,14 +226,16 @@
    )
 --- a/plugins/redfish/meson.build
 +++ b/plugins/redfish/meson.build
-@@ -40,14 +40,6 @@
+@@ -40,16 +40,6 @@
  )
  
  if get_option('tests')
 -  install_data(['tests/redfish-smbios.bin'],
 -    install_dir: join_paths(installed_test_datadir, 'tests'))
 -  install_data(['tests/redfish.conf'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
+-    install_dir: join_paths(installed_test_datadir, 'tests'),
+-    install_mode: 'rw-r-----',
+-  )
 -  install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
 -    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
 -  install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
@@ -204,7 +243,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -68,7 +60,6 @@
+@@ -70,7 +60,6 @@
        fwupdplugin,
        plugin_builtin_redfish,
      ],
@@ -271,7 +310,7 @@
    )
 --- a/plugins/uefi-capsule/meson.build
 +++ b/plugins/uefi-capsule/meson.build
-@@ -144,25 +144,6 @@
+@@ -146,25 +146,6 @@
      c_args: cargs
    )
    test('uefi-self-test', e, env: env)
@@ -297,6 +336,16 @@
  endif
  
  endif
+--- a/plugins/uefi-dbx/meson.build
++++ b/plugins/uefi-dbx/meson.build
+@@ -32,7 +32,6 @@
+       plugin_builtin_uefi_dbx,
+     ],
+     c_args: cargs,
+-    install: true,
+     install_rpath: libdir_pkg,
+     install_dir: installed_test_bindir,
+   )
 --- a/plugins/uf2/meson.build
 +++ b/plugins/uf2/meson.build
 @@ -18,8 +18,6 @@
@@ -318,7 +367,7 @@
    )
 --- a/plugins/vli/meson.build
 +++ b/plugins/vli/meson.build
-@@ -46,7 +46,6 @@
+@@ -49,7 +49,6 @@
        plugin_builtin_vli,
      ],
      c_args: cargs,
@@ -328,7 +377,7 @@
    )
 --- a/plugins/wacom-usb/meson.build
 +++ b/plugins/wacom-usb/meson.build
-@@ -22,8 +22,6 @@
+@@ -23,8 +23,6 @@
  plugin_builtins += plugin_builtin_wac
  
  if get_option('tests')
@@ -337,7 +386,7 @@
    env = environment()
    env.set('G_TEST_SRCDIR', meson.current_source_dir())
    env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -39,7 +37,6 @@
+@@ -40,7 +38,6 @@
        plugin_builtin_wac,
      ],
      c_args: cargs,
diff --git a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch b/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
deleted file mode 100644
index 1cb3b41cb728..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.8.4-installed_tests.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -10,20 +10,10 @@
-   subdir('fish-completion')
- endif
- 
--if get_option('tests')
--subdir('device-tests')
--endif
--
- if build_daemon
- subdir('motd')
- endif
- 
--if get_option('tests')
--  if build_daemon
--    subdir('installed-tests')
--  endif
--endif
--
- if build_standalone
-   install_data(['daemon.conf'],
-     install_dir: join_paths(sysconfdir, 'fwupd')
---- a/plugins/acpi-dmar/meson.build
-+++ b/plugins/acpi-dmar/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-dmar-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-facp/meson.build
-+++ b/plugins/acpi-facp/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-facp-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-ivrs/meson.build
-+++ b/plugins/acpi-ivrs/meson.build
-@@ -47,7 +47,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-ivrs-self-test', e, env: env)  # added to installed-tests
---- a/plugins/acpi-phat/meson.build
-+++ b/plugins/acpi-phat/meson.build
-@@ -53,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('acpi-phat-self-test', e, env: env)  # added to installed-tests
---- a/plugins/ata/meson.build
-+++ b/plugins/ata/meson.build
-@@ -53,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('ata-self-test', e, env: env)  # added to installed-tests
---- a/plugins/bcm57xx/meson.build
-+++ b/plugins/bcm57xx/meson.build
-@@ -35,8 +35,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/bcm57xx.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -63,7 +61,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('bcm57xx-self-test', e, env: env)
---- a/plugins/ccgx/meson.build
-+++ b/plugins/ccgx/meson.build
-@@ -37,8 +37,6 @@
- endif
- 
- if get_option('tests')
--  install_data(['tests/ccgx.builder.xml', 'tests/ccgx-dmc.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -64,7 +62,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('ccgx-self-test', e, env: env)
---- a/plugins/elantp/meson.build
-+++ b/plugins/elantp/meson.build
-@@ -33,8 +33,6 @@
- endif
- 
- if get_option('tests')
--  install_data(['tests/elantp.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -57,7 +55,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('elantp-self-test', e, env: env)
---- a/plugins/linux-swap/meson.build
-+++ b/plugins/linux-swap/meson.build
-@@ -44,7 +44,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('linux-swap-self-test', e)  # added to installed-tests
---- a/plugins/mtd/meson.build
-+++ b/plugins/mtd/meson.build
-@@ -46,7 +46,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('mtd-self-test', e)  # added to installed-tests
---- a/plugins/nitrokey/meson.build
-+++ b/plugins/nitrokey/meson.build
-@@ -47,7 +47,6 @@
-     link_with: [
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('nitrokey-self-test', e)  # added to installed-tests
---- a/plugins/pixart-rf/meson.build
-+++ b/plugins/pixart-rf/meson.build
-@@ -31,8 +31,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/pixart.builder.xml'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -55,7 +53,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('pxi-self-test', e, env: env)
---- a/plugins/redfish/meson.build
-+++ b/plugins/redfish/meson.build
-@@ -47,14 +47,6 @@
- )
- 
- if get_option('tests')
--  install_data(['tests/redfish-smbios.bin'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
--  install_data(['tests/redfish.conf'],
--    install_dir: join_paths(installed_test_datadir, 'tests'))
--  install_data(['tests/efi/efivars/RedfishIndications-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
--  install_data(['tests/efi/efivars/RedfishOSCredentials-16faa37e-4b6a-4891-9028-242de65a3b70'],
--    install_dir: join_paths(installed_test_datadir, 'tests', 'efi', 'efivars'))
-   env = environment()
-   env.set('G_TEST_SRCDIR', meson.current_source_dir())
-   env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-@@ -89,7 +81,6 @@
-       fwupd,
-       fwupdplugin,
-     ],
--    install: true,
-     install_dir: installed_test_bindir,
-   )
-   test('redfish-self-test', e, env: env)  # added to installed-tests
---- a/src/tests/host-emulate/meson.build
-+++ b/src/tests/host-emulate/meson.build
-@@ -8,7 +8,7 @@
-       output: '@0@.gz'.format(input_file),
-       capture: true,
-       command: [gzip, '-k', '--stdout', '@INPUT@'],
--      install: true,
-+      install: false,
-       install_dir: join_paths(datadir, 'fwupd', 'host-emulate.d'),
-     )
-   endforeach
diff --git a/sys-apps/fwupd/fwupd-1.8.8-r1.ebuild b/sys-apps/fwupd/fwupd-1.8.11.ebuild
index dfcb3a16a2f7..ae2c0c6958c2 100644
--- a/sys-apps/fwupd/fwupd-1.8.8-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.11.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	modemmanager? ( gusb )
 	spi? ( lzma )
 	synaptics? ( gnutls )
-	test? ( gusb )
+	test? ( archive gusb )
 	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
@@ -96,7 +96,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
+	"${FILESDIR}"/${PN}-1.8.11-installed_tests.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/fwupd/fwupd-1.8.5.ebuild b/sys-apps/fwupd/fwupd-1.8.5.ebuild
deleted file mode 100644
index e2c5b1bc22bf..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.5.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	fastboot? ( gusb )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	modemmanager? ( gusb )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	test? ( gusb )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-	gtk-doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-		')
-		>=dev-util/gi-docgen-2021.1
-	)
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		dev-util/umockdev
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=dev-libs/glib-2.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
-	dell? (
-		>=app-crypt/tpm2-tss-2.0
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.114 )
-	sqlite? ( dev-db/sqlite )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss:= )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.4-installed_tests.patch
-)
-
-src_prepare() {
-	default
-
-	vala_setup
-
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-
-	sed -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
-		-i docs/meson.build || die
-
-	python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
-	local plugins=(
-		-Dplugin_gpio="enabled"
-		$(meson_feature amt plugin_amt)
-		$(meson_feature dell plugin_dell)
-		$(meson_feature fastboot plugin_fastboot)
-		$(meson_feature flashrom plugin_flashrom)
-		$(meson_feature gusb plugin_uf2)
-		$(meson_feature logitech plugin_logitech_bulkcontroller)
-		$(meson_feature modemmanager plugin_modem_manager)
-		$(meson_feature nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_feature synaptics plugin_synaptics_mst)
-		$(meson_feature synaptics plugin_synaptics_rmi)
-		$(meson_feature tpm plugin_tpm)
-		$(meson_feature uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_feature uefi plugin_uefi_pk)
-	)
-	if use ppc64 || use riscv ; then
-		plugins+=( -Dplugin_msr="disabled" )
-	fi
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="disabled"
-		-Dcurl="enabled"
-		-Defi_binary="false"
-		-Dgresource_quirks="disabled"
-		-Dsupported_build="enabled"
-		-Dudevdir="${EPREFIX}$(get_udevdir)"
-		$(meson_feature archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_feature bluetooth bluez)
-		$(meson_feature cbor)
-		$(meson_feature elogind)
-		$(meson_feature gnutls)
-		$(meson_feature gtk-doc docs)
-		$(meson_feature gusb)
-		$(meson_feature lzma)
-		$(meson_use man)
-		$(meson_feature introspection)
-		$(meson_feature policykit polkit)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use minimal || udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use minimal || udev_reload
-}
diff --git a/sys-apps/fwupd/fwupd-1.8.7.ebuild b/sys-apps/fwupd/fwupd-1.8.7.ebuild
deleted file mode 100644
index 202260d525cc..000000000000
--- a/sys-apps/fwupd/fwupd-1.8.7.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit meson python-single-r1 vala udev xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	fastboot? ( gusb )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	modemmanager? ( gusb )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	test? ( gusb )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	>=dev-util/meson-0.60.0
-	virtual/pkgconfig
-	gtk-doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-		')
-		>=dev-util/gi-docgen-2021.1
-	)
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		dev-util/umockdev
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=dev-libs/glib-2.58:2
-	dev-libs/json-glib
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	net-misc/curl
-	archive? ( app-arch/libarchive:= )
-	cbor? ( dev-libs/libcbor:= )
-	dell? (
-		>=app-crypt/tpm2-tss-2.0
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.114 )
-	sqlite? ( dev-db/sqlite )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss:= )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
-)
-
-src_prepare() {
-	default
-
-	vala_setup
-
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-
-	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
-		-i docs/meson.build || die
-
-	python_fix_shebang "${S}"/contrib/*.py
-}
-
-src_configure() {
-	local plugins=(
-		-Dplugin_gpio="enabled"
-		$(meson_feature amt plugin_intel_me)
-		$(meson_feature dell plugin_dell)
-		$(meson_feature fastboot plugin_fastboot)
-		$(meson_feature flashrom plugin_flashrom)
-		$(meson_feature gusb plugin_uf2)
-		$(meson_feature logitech plugin_logitech_bulkcontroller)
-		$(meson_feature modemmanager plugin_modem_manager)
-		$(meson_feature nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_feature synaptics plugin_synaptics_mst)
-		$(meson_feature synaptics plugin_synaptics_rmi)
-		$(meson_feature tpm plugin_tpm)
-		$(meson_feature uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_feature uefi plugin_uefi_pk)
-	)
-	if use ppc64 || use riscv ; then
-		plugins+=( -Dplugin_msr="disabled" )
-	fi
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="disabled"
-		-Dcurl="enabled"
-		-Defi_binary="false"
-		-Dsupported_build="enabled"
-		-Dudevdir="${EPREFIX}$(get_udevdir)"
-		$(meson_feature archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_feature bluetooth bluez)
-		$(meson_feature cbor)
-		$(meson_feature elogind)
-		$(meson_feature gnutls)
-		$(meson_feature gtk-doc docs)
-		$(meson_feature gusb)
-		$(meson_feature lzma)
-		$(meson_use man)
-		$(meson_feature introspection)
-		$(meson_feature policykit polkit)
-		$(meson_feature sqlite)
-		$(meson_feature systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_test() {
-	LC_ALL="C" meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use minimal || udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use minimal || udev_reload
-}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index c33598c0c4a1..30661bf257ef 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,4 +1,4 @@
 DIST gawk-5.2.1.tar.xz 3411420 BLAKE2B 5dbbfe92ed4c11a38b2f995e9267dd2e392a9f393af1c63aaf3c5dd6d1681c01db900e05a118831125f914fcffe2218de7f30891ccc6f64abc5f572aef5feeff SHA512 f81da3e61987d1460326dc79fdbabacfd4660219bf66ec8ba18877500fd24e160761e401a5b868067f82bec46a6a808098f3f6a1f4c8b710e439cd3f99ffa56c
 DIST gawk-5.2.1.tar.xz.sig 488 BLAKE2B 5dcdc9ae90d4744a968cc750526a9c1c38915f85c56c2eca80b219ba8519c927ab55b7f569d55054b0499f7bf37d3413b97e9d3cf36f5573f9ecd4855663064e SHA512 97a9cfb069f235bef31892ec6e5c56ee6a8733129ae3d02e871d5407de4d7a6140fc0a87001b2b21e3cffd714d1b4d164876de47144dfdce6dea92c670ed0217
-EBUILD gawk-5.2.1.ebuild 3550 BLAKE2B 42af28d6b9328472ab2eeb9ca5c97b05a953c49f7c75315ab173a675c8400720d9cd2505ca70ea56e15d111d57ff492e10350d0341f3d5b4cc129af7bcb668e6 SHA512 8587410b52c39d994e724e478d5bfc75fb8fe50e3fdbdd9767cc6b3cb525fe2b63b086bbc8fc6df8ffd6da4707b6824baa99c8d6df39404b2dbb279eafd0db2c
+EBUILD gawk-5.2.1.ebuild 3563 BLAKE2B a991de67ab955d2d9f161d0fe98b89851781c77acea867e1cefa2f32b20f76ceea455193473a304851648fddf9cbe3149178f9c07653d5cf6a8a4f5d339eaa6a SHA512 6946e93fdd8dfa6c7313eaa5e98d8c7848c1227ae4cd4a3f91523d3b3478bd1e3fec7976e9070e4cb149f505692b7476b1368879ef1a8ffaf467f07df2d7f867
 MISC metadata.xml 654 BLAKE2B e04183a376da2006e727296257a18431f2e4f29fdabcee48edebb1c9dbf099c846af6bfe90d9e551ec4536c2dd034a80b47e6a1b8e442a89c1228929bef7d956 SHA512 9bb5a19c4b9a8ff7669c7ae7320a88d64eb68b4897f06d2046f71efe562a4846cb8c611bcc03b0111dfde19b40275f3357a5cd6285d4d5f0b4464a9c8b3eacb2
diff --git a/sys-apps/gawk/gawk-5.2.1.ebuild b/sys-apps/gawk/gawk-5.2.1.ebuild
index 20e0b2120e33..cea5fa83b978 100644
--- a/sys-apps/gawk/gawk-5.2.1.ebuild
+++ b/sys-apps/gawk/gawk-5.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=8
@@ -29,7 +29,7 @@ else
 	SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index d15a6f59a042..8e3fd1342965 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -6,7 +6,7 @@ DIST grep-3.8.11-908f.tar.xz 1658032 BLAKE2B d217a3b15f2597e2ffd54b941aae179c038
 DIST grep-3.8.11-908f.tar.xz.sig 833 BLAKE2B 460e7eb98f803995de43e919cae2d01e261380fde100c4570c50304035585573c358d0154e98102aafbfdd23ce726c15a59adbdfa3922408a4dada4095be13e4 SHA512 b4d9d517746633ee1fbbd8277fb22499634163b77e320be0721d1e48c4d8f1fbc4ec63177698cdac3f7d411403f51afbf7b7e302b78ccd7cf581361eb3963277
 DIST grep-3.8.tar.xz 1709536 BLAKE2B 24cf6f7aa35c85f59f508969ee9731c5be1e5c613e64e636f464bbdde917bb99ba739e4b82abf08da127ad0400d62e27d139f85142035745121d381982ec6c36 SHA512 2014519a80c6dcd799837e1bd7d9d5ebe8729ec54b0dc76981dac4755a9a8a9f200470cdcc911e2825bed8162e61da39e3dd60289f7393b48bf67314077d0c79
 DIST grep-3.8.tar.xz.sig 833 BLAKE2B 40f472389705375611015ba0eb85eb32643304b1a324877a75821d086a128a20d00df3d7cd960ec45709f40f21488bbcf993c6fe667ef23663688b33296e650b SHA512 8266b58485f225c2189814e3898c72e59d251b729e0c302d31f57abdb7ac2e6e28dde2c5c8095673b6f007b2a3ebc26db1dca910a7771aba80dad4b3c6761ee4
-EBUILD grep-3.7.ebuild 2274 BLAKE2B b847a17bfe835e573a6406c728e99c1af5687bc2e83bdb4c1b6103790f587210c5bd3f4121c7fb83d8c96805a6a7fc636f06050df1f8f591d95e931f2cfecbc9 SHA512 dace79b242b68187cf8d756b4c91a7873eb8c1b1a3f631b67bb07192a95c4c4af521db19e6a943ae03f1d885317c0d6f497e129c7644e36d5dc97963415396ee
-EBUILD grep-3.8-r1.ebuild 2863 BLAKE2B bd8defb445ed2291840d1511648c1fc9c0d3a76c43d4a9a433baa063ec4b841f5f901293e7a48556728750fb99d74f118e9dce858f1c1d71da13555e853a5301 SHA512 0ab0ccf314cbb3b2fd7b2e877e8ce9afdd4e7ff4dd50d45df42ea79823c17a1bab83b59a055d4e477ab1b64a69f1686eebf312f814677e347378b638b1484851
-EBUILD grep-3.8_p20221230.ebuild 2870 BLAKE2B 95027ad8262acaf8a2771f3ea0644cbc65380d511e3a00015b1f026747a3926812cf55000c30e6ab7f3a55d5ba6ae4cb88da66456cd88575fe8f58e8b35625cd SHA512 5bd00afd540781a082c77bf8758a3a5ec6a98fc6dead8bc062257955e3df4b2dd8ec85d5a8e6d6b1530b0dc821e331463079245411b97e06f06b1579bbec54a5
+EBUILD grep-3.7.ebuild 2287 BLAKE2B f8d7f163f327da9d4b933db81d759660b23b5c774acb690e2552ff28214a9d0b1c7aea0bf7bc571d0d5de807aa7f56721a311e8c2a71a906f39f30798fa97b9a SHA512 91a4e5d3aed32ed19bf8ad5996349073ff743bc31e73c2ee8b2e3714bac150da26202a840a4acad823d977071ac5d65e101e61327a2776725ce1db021a9f49a5
+EBUILD grep-3.8-r1.ebuild 2876 BLAKE2B 56615ffb9e6d0091bf29d4d419d13a15e73f51a9295cabc4996a314404b5fbad9e04a6a57e66728cf5cecb1cc14a17b18a67ed4c5980ad8110130520ab1ff972 SHA512 d765489a66eb7e3b54c8f993f133794120b469838c56a9e9409a6f9f5587466e14e97c285bcb9ad4bf38b001695c7ad1c543d4feceb5b930bdf3e92e1a633791
+EBUILD grep-3.8_p20221230.ebuild 2883 BLAKE2B bb797866333a82dbcd2dfeadc07d378db8285f90feea131b6962275977c81b3f63a92e7d1b1fa315f2f39259172499c159ad25ac1fa649cba80b9b24906ee6c9 SHA512 07975975af07741f4679012540d89aa93cd085a1c3597ef15b1e9a8a6709c9c9b0e234f52baa85d98787eea873d3940e0a3192804428c18699746a41ecae15a5
 MISC metadata.xml 666 BLAKE2B 0c90e38d5363234474093ece5c9e0cbb99c01731a80c52869d700b7367fd74eec23f355653174b315f91ca7b41b4c5c9f5645ffaba043b3918c3c22c2c817ea4 SHA512 8e46c5c28b55063a7c74dfc637eb59785dc35651027e144acf4aea7f0ad7a4e43a3692946252acdf0d4a66ff8bdcfa89664fdf8bae71f1db688c06014c2a6a0f
diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild
index 799ae9355ad6..5ea929a88bc6 100644
--- a/sys-apps/grep/grep-3.7.ebuild
+++ b/sys-apps/grep/grep-3.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=7
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 # We lack dev-libs/libsigsegv[static-libs] for now
diff --git a/sys-apps/grep/grep-3.8-r1.ebuild b/sys-apps/grep/grep-3.8-r1.ebuild
index 6544ccdddfb0..657b75021b1a 100644
--- a/sys-apps/grep/grep-3.8-r1.ebuild
+++ b/sys-apps/grep/grep-3.8-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/grep/grep-3.8_p20221230.ebuild b/sys-apps/grep/grep-3.8_p20221230.ebuild
index 2b397f18b09b..8324903211cd 100644
--- a/sys-apps/grep/grep-3.8_p20221230.ebuild
+++ b/sys-apps/grep/grep-3.8_p20221230.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 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index d9f43ff8059b..d0d97ee17a5b 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -2,6 +2,6 @@ AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b38
 AUX groff-1.22.4-skip-broken-diffutils-test.patch 1657 BLAKE2B 62a8b41cd02abf27368d818e63ff64eea737258f913d95fbf7e6b9a204809e03540efe3fb6f4e52c2f9134daa156696bdc091d21636b58b13a9e4875981275f4 SHA512 464047c451d60966295fed49e27f58efa481bd30edc038d3f954264f647de33d40a480b8efa8165ab84dd8a9d07dc80d0f2d3b0c0adcce297f23cbd9c117154e
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 DIST groff-1.23.0.rc3.tar.gz 7347387 BLAKE2B d61ccf18450816abb2436799c3ffac0ce0bc827ad4f262c94e172b0dbaae18593b7562576067e0380ff96cbc40b4fe63382082867659fbc6971cadc81e8dc36d SHA512 bfdc6761e02b698b7d7dac059c14c1f3de94057cda4952aca2fa41da3bd9657daef86bdddc46a392397ccb761f627d1652ce5f4a38890c480fbdb89f9926b662
-EBUILD groff-1.22.4.ebuild 2945 BLAKE2B b601a6584ed60f2983f31760a31281d013aa375ab9709fecf27cb596bdf2c63d8c1a06f78e047e1979c7fb031db0a0d64121b44bb9cead82a872040fd042463a SHA512 5b4a3f4c4430ed5ea0007bb4ce090b0b82c0a497bd95fa03f2be8dfda5eb6fba30d7f07fb732ad996d105b7321965d8d8e692b88062735680a6db9489a0d1f95
-EBUILD groff-1.23.0_rc3.ebuild 2652 BLAKE2B bc99534cb7172340773fda17ba7c71c402b2da7c153591e856bc998bd22a01ec81a68305e9fbcd199dd3e7f62c3b2dbfa60c44ac04e4475c88dfe884ec610ef0 SHA512 ffa6d7cc41c14f5d25a4d741fcd6374af414a59649052434e0098a17edb482501300c906c4a584d4279e70db5fd89107612fc96f3f4b57b4ba6d27872598a0f8
+EBUILD groff-1.22.4.ebuild 2958 BLAKE2B f99219190f92f1d4e02e5b6fba877d56a3617983de1ddc43b43cea6a9468f8610636963b69015423e8fac25e80962e8b94748510e27c540361bf52f86c56c249 SHA512 0719ddfa2ef41a7ab3733846a634d92e67b9a024ab5f0d8d354b50545c4f7b1ee6a4fb1eacf9a6250dda1b3af831202be67074c8e92c493071cdebbb2e0729df
+EBUILD groff-1.23.0_rc3.ebuild 2665 BLAKE2B 15f9648c394ee7e1979e858fbd7a1fc153ca6ab5ccd5e2bb7439b84c06377d46aab8582353f995346df1030c0ae1cc35b7944b4cd15e0e9a89e54c7be9ee9496 SHA512 fe626376ae37b01472a5c099ff766807a123f64e7c19c3791ddb09109cc039b65f75aa1dd7bf004e974cc7fca1c4921dfc69658ceea198b3822c2a442a9e10ff
 MISC metadata.xml 514 BLAKE2B 56bd1f6ff4a0082fd0148d0ba9c9fffb13e665f7550661b6625bc7b8589a9ebf1f37957d55ecb379f3e38b820574d068789ec5e8f2e1743e02acfe2f91abea2f SHA512 90796d8d5e32de1c47de855a1cfaad250c47a686f79586af0d79f9a3d2a4c2c64b589ea8f7ffe7f7473a10d9d11ecb43245e54714fcb18bebb73abd1db767d37
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index b07b4e2c08e6..6b5109bf0719 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples uchardet X"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.23.0_rc3.ebuild b/sys-apps/groff/groff-1.23.0_rc3.ebuild
index 0d90fdb18750..795366532403 100644
--- a/sys-apps/groff/groff-1.23.0_rc3.ebuild
+++ b/sys-apps/groff/groff-1.23.0_rc3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *_rc* ]] ; then
 	SRC_URI="https://alpha.gnu.org/gnu/groff/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 0cdda1d2bdf9..7ad93ec8190b 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -5,8 +5,8 @@ AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b884
 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
 DIST less-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280
 DIST less-623-beta.tar.gz 373094 BLAKE2B 661fdb129678a57ef2188b4cd89809b14eaae62b98bb8ec2394cb7b48faf10a3ccdb690f371178e9ed43548ebce1af840cb5042e9019fa747bcec2dca4158dc7 SHA512 60843c668f90ae47cdf4d10849a63481ab67af679b831cbe8955861ae9f238006322734ec3ae49d9aced7927018bf3e0d9fdab98077289b4ffc78f6075041667
-EBUILD less-608-r1.ebuild 1631 BLAKE2B 3c0bcfb98082e497b3ff75bf44c5bc39882d34f9852aacf410e0802aa8eb65bde5242bf70055a7a1726678ba6971dc01508e9c86ff74597cf2160fbafd2844bd SHA512 c82f4ea7446b40acc3aeb9b33796dc4a55db2e90b3b83e18f7dadc0c4c8a9a88f473ef6cfad524ac0921cd5dce7c4f202bafc06a0f8a269762e0ae046cca7b35
-EBUILD less-608-r2.ebuild 1678 BLAKE2B fa73cdbe4032bab1e5467e51e57eb73d673157cdbab42c8e121809e66838c1f3f8cc10455e77cc0074af706737a6db08066047ba14a95195d3a1edf3835cc53e SHA512 5ddd3699f3cc19bce35595984281b58d6a1c916d72f9eb4ae4d4241afc49a066b62f2233a461a44fc9c8fa1e32010d3d8fdb84118aecf893db4ccb6a7cd208d3
+EBUILD less-608-r1.ebuild 1644 BLAKE2B a985faac14059e82275b36c1122bd91da98c9959e816b9f1e8c97e484ce10b3013c915eeff3ea3ce695983eabb0fa71c1a49d5ec59daaec0f982d5ebec8d17ad SHA512 d8022242942862ef1229138d6dc21a3f54e95395510d23f694fec442fe336f2cea583a3ce3d7b5303d1bede89502c260fed51d7f6ea7c2ec401d5af85ade897a
+EBUILD less-608-r2.ebuild 1691 BLAKE2B 593af00b711b73345589db31b3765ca2de723db667de297a61356c09b919919355f9661a58738e47c92aa94933ee498d55240cbe87997fa912a8d443982639e8 SHA512 e5b372119ee823b4af84f9f747d7cb72ba990a83b5f41d95da6ca512c54cc27585e3fa3c8c2d934c3cd5814c041667487804bde52c568cca002284786ac39782
 EBUILD less-618_beta.ebuild 2026 BLAKE2B 132ce781ae09efae4fe177b311cd4dd57cb1ddc37a21b167f02262d490d981f94918e3a9ff81670f8febea14395d56e6316c32a6236cdf84756553800e17bff6 SHA512 633e22513a82228e2b8770d20bc25c7cf4604bcae161a7c4030fa97605d2ac92d9cc7165c6d03f728f7dc7e6d6f10e61c183bda40e1761dab7ff39f6e3d673e2
 EBUILD less-623_beta.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
 EBUILD less-9999.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
diff --git a/sys-apps/less/less-608-r1.ebuild b/sys-apps/less/less-608-r1.ebuild
index 0ad903424e2c..027deaf9c7cf 100644
--- a/sys-apps/less/less-608-r1.ebuild
+++ b/sys-apps/less/less-608-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://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-608-r2.ebuild b/sys-apps/less/less-608-r2.ebuild
index 8777d5546ac5..511bf7d52e63 100644
--- a/sys-apps/less/less-608-r2.ebuild
+++ b/sys-apps/less/less-608-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 8ab1ba393efd..f344151a010a 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -4,10 +4,10 @@ DIST man-pages-6.01.tar.xz 1789204 BLAKE2B 37005b45af798315992fe4836457982d42032
 DIST man-pages-6.02.tar.xz 1800876 BLAKE2B 005bc57d2abca18516502faa7ea31798e6fb992d4a2fa1ce83dbba2992d9cc29e3b48fef97f1faa55bc40eafcb4eedbafb113dc2561f4a438f0a7fa711e259f0 SHA512 124e5157c25b5a3c62d225be1da2879f436d7fd8fe2f116c11982178e34085d1e50ef47e13fde413a7bf16d1177cbe744d00b2a178be3dfe4c4828371812ea5a
 DIST man-pages-6.03.tar.xz 2184824 BLAKE2B 16eba629c5fcbac7b52fa0ecf32d30d0e07308653d3617d1edf7503b6f983aa3f5145b1af7c5fcc96cb5a64ad425af7fe9be9a0da74c92c52d2d9b8fc60c9661 SHA512 df9de826c8289869fb27928f14eb28040b0f5bdae18247dc2ea847e660dd8bff9eee5656f6b2b38330abc64b69cad7cd44681bdf49173dd49a53877eaf725dba
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.12-r3.ebuild 2227 BLAKE2B 3b3bd8ef026cdd916dd380a88a79e0bf79752309440629bfaed6791c18e09e86c7703b042f241e86c69d4bbd92b9cd37f9b450c05628555f2eb4d79a85026cb0 SHA512 7c054aeb1a8dee95e8f94ddc7226e83fb21fb8d8080111b0f20173c911fa37c6d63976af8db7cfaadfb6223ca205cc29fe33ec3c84aa7a78a71bf0b1a2034ed9
-EBUILD man-pages-5.13-r2.ebuild 2235 BLAKE2B 69ccf3e43c912486f4a10dd6a96a084eb51e2373d6eaf5fb2d1bdb1168d6b7c6a2157f97ebd3a30c9b3e562b1d047156f6ad92b1cf7aa593c84b3a2bcccc14f6 SHA512 9b48404aed7680bfecda777399c24c9e93d4415ec4585832e9a6eb2f621a9ed471e3773be86d798e96b45784b03b42df28528af7cea228f024fb1ca4586df26b
-EBUILD man-pages-6.01.ebuild 3392 BLAKE2B 0f8398df0b7672947b45c8828722855ab33363b7bdf46fc6f9c9d4ffa95e90fc2d4ab200fa5d5707231b410619d3448ee7b1a855862d9e5085d3aec700a3dc14 SHA512 7082fa2ad2e45ed0948354bc9e4360f82ef182a17adc0e8525fbc661386c60c54c7bb4a7d1298d09ccef4105799b49520a9edd259b2acde1d83008c85a07fe44
-EBUILD man-pages-6.02-r1.ebuild 3371 BLAKE2B 9ecbd1a5707cb9587529024730ecbf8307d44e9db384a127ca0be500630abb4fa2bd7fa10dafab1745d1e1967f3cf71d3bb96ca266a3748718cbfb0c36e9b7fd SHA512 d6fa94f7b8c96c68c12b464700d111f651ed351977145efa52d8294472faf9e560eda024f43bde10e1416a570025c9685de6fa9486b53edb4de84a67a313f40d
-EBUILD man-pages-6.03.ebuild 3379 BLAKE2B b0df0eed6006fa9db18088b6105a702f95ba231b339367675baa4ff927becd72bff8bb1bbdf410b1d1fbd4ac2466d49258aaaae55e1a3ea708e3f212248aec0e SHA512 2c46990ca15fa6081262331e1debe6b728556ff2ff38d65ee629a42c44b06e91c0bdde427f9f4c3a17a10ec867056cea6a46d5b91cf6cc73ae21990886e579be
-EBUILD man-pages-9999.ebuild 3331 BLAKE2B f2c4dc45fc55921d9469d70e22c0f8338a87323b034c85da25c2a5b75308a313c19ffa79b42900fb2d659daa45c54896f7913348e8f9b4f97f78653d73712abc SHA512 cc64c8a1208cbda742acb6edd48400ece591ac5b57b742c1a25edc3e4c1abc3b15e061654659cc931b4aa41ecce42a36dcc8d0e0f90ce27399e9572374229e1a
+EBUILD man-pages-5.12-r3.ebuild 2240 BLAKE2B 4a1280b41226eb5b98c8572e37ec4458db2fdc86b1b6e9cf71b38b467505553c5365314ae9825a80c19cce0488e7f0404d5837b185dc0262109a1dad6449cd8b SHA512 b883eb20e28aa3d398cfa65c08d40c570302bc7646151313df5b1f2c82829285cb479e19509fb16bb7cbe666f2f3c22a26261b5ff3c62c0f3b7fa5e801ac8fff
+EBUILD man-pages-5.13-r2.ebuild 2248 BLAKE2B 500770a4a21b8d236eadda9eaac53e581d9020ecb07585083ab65c770349dd504ac0382d3092a44e75cccf426c393c32f6397e1e3b8d4d5804af4c943beee80e SHA512 c5da6cc30b978e1307ddcb2a8d2092b79f9b5ae4a8fb489404fb8e575273f2dd5ce2dbd1151e9347c5956efc266b879661b56a8aed4e193d85b3c50686322da2
+EBUILD man-pages-6.01.ebuild 3405 BLAKE2B c8130de04784669488dab75485aafa711a3c6f649a6b0f9a5ad6d45fe12f63847fb3b6690e4862381aa5ccb5b22c2be1641b992f4031ab57b9452d3159e10be5 SHA512 e8364c65c48a3f6fa3e2d36b5a8b3ea70c7bc090d1c4f4fe03d55ea538ee248d85fd9d92c19683760d0e8c2f4b2718ce9e22b143aba1e718e886cb9f8bbdb777
+EBUILD man-pages-6.02-r1.ebuild 3384 BLAKE2B 2dcb051a1bae08360839c923125f5783abba112c923e98e3d707ac9768895e4a24af132b6b469858c8fc00e0ee73362758fd8d800f25eaccc368ab7af90f437e SHA512 0d58e0b646a4949e750d4a0444278930302d453b3829d72c9dcbeef2fcfbfcc817529e1e04feb708b10e5410bd27e0c248b7de95ba61370c700f0f9b1def6455
+EBUILD man-pages-6.03.ebuild 3392 BLAKE2B 92a00f25351e729e06a329eb69132638ebb4db356b5d17fd2c93093b54b6c8202220961ea66770e5f006b5bac45eee1cac90f330d64066e37ac09b0df0f9a6c8 SHA512 137dd7d96ab5fc8e96fe03df4e5ff7a8320714a16b085187b1f53ecd3807011ef3c18c2431c0426966c1824489bc365d42eaec0505da5c1587b5f72ae0acd37e
+EBUILD man-pages-9999.ebuild 3344 BLAKE2B 9969dcb2e3068fe54d7db1b2f7ff168fb6fa49d2023b19267c268d928555da2654335e2d6e24064ee43582ecd68ed716fe28f096090ee9718d782e3951edab84 SHA512 1c569bb5a2a31e90bf3565b7ffaf20e763adf69964b691c0c11e4c3ca17a7dbaf7b9cf5b8dc3c010a6a6b87f4fdd1678fbd7f87644c47bd53cca77e4142b666d
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-5.12-r3.ebuild b/sys-apps/man-pages/man-pages-5.12-r3.ebuild
index fc0a324bdb91..d8c374f4a6d7 100644
--- a/sys-apps/man-pages/man-pages-5.12-r3.ebuild
+++ b/sys-apps/man-pages/man-pages-5.12-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
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-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 ~arm64-macos"
 IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.13-r2.ebuild b/sys-apps/man-pages/man-pages-5.13-r2.ebuild
index e42088c5e35d..b96481cba056 100644
--- a/sys-apps/man-pages/man-pages-5.13-r2.ebuild
+++ b/sys-apps/man-pages/man-pages-5.13-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
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 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 ~arm64-macos"
 IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-6.01.ebuild b/sys-apps/man-pages/man-pages-6.01.ebuild
index 620361bb4149..7921c7d5d435 100644
--- a/sys-apps/man-pages/man-pages-6.01.ebuild
+++ b/sys-apps/man-pages/man-pages-6.01.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	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 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-6.02-r1.ebuild b/sys-apps/man-pages/man-pages-6.02-r1.ebuild
index 2b358544342e..c5309d217f13 100644
--- a/sys-apps/man-pages/man-pages-6.02-r1.ebuild
+++ b/sys-apps/man-pages/man-pages-6.02-r1.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	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 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-6.03.ebuild b/sys-apps/man-pages/man-pages-6.03.ebuild
index 36a5195a9ce7..023f08c0211a 100644
--- a/sys-apps/man-pages/man-pages-6.03.ebuild
+++ b/sys-apps/man-pages/man-pages-6.03.ebuild
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	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 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index f6d7d59817fe..da81a23a404a 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.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
@@ -40,7 +40,7 @@ else
 		"
 	fi
 
-	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 ~arm64-macos"
 fi
 
 SRC_URI+="
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 161f94bbe091..3f7c09601935 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,7 +1,9 @@
 DIST s6-linux-utils-2.6.0.0.tar.gz 39674 BLAKE2B 146b5ef47c00c4e96eb6ea697137cd11732087612df98781e45169ff8503fe3ba9b84cab06e6b96ba373f11c65902f4f5111322d51b0fdb395b3422ba092d836 SHA512 cecd745d473b200e10071d73191d5ec425533818a9775e882a2b8a2fbc98779f2309e17d41f844b171e0625b233804bc7af9585709e8e42dc73ff30afcee06e9
 DIST s6-linux-utils-2.6.0.1.tar.gz 40062 BLAKE2B 41aa8e3f6774383c1400f83c9b743c1abe106a46ae6213dfba799106cdd10ac2a7bac452c5af297e40081c109b043afa2011c194b50ea8aa53df6a96a632ef39 SHA512 52e10411ea2532534c397a07981e5bd79ce97c79c688efe0378edc4e696ce9dfdc4fd3eb942c4a75c06f16a5d7c10b2f8cd396c07d98620e94446fcd10bc5bae
 DIST s6-linux-utils-2.6.1.0.tar.gz 42798 BLAKE2B b3e858c5755ffc7604e23a8fc08344161a11cad7b52183f5c527cd155c0d15c50f004aa4365cbbb236c5c1e5a48ff8af7787084c10f7517ef0e81d4afcf12c8b SHA512 a9308cf6629439356c7379d7e07e79cd2fa780014f65fa997551b89fe8a7a9490145efea8612490ece4bdaf3b0ae06e07464ec157a1ed1509d4afee2d5722ec1
+DIST s6-linux-utils-2.6.1.1.tar.gz 42836 BLAKE2B 7651427c7ac452db66f20a7c01eaa1f559a9fa6c2478c758bcd47d0d398b6747756d7584c890c810c69719223cd3d76b9d441ae8c4980008c83f893687e32955 SHA512 da392c6ce698d0a59a6191c71e5c4ad80e9b15056aaf4791ce47601027bed58d5371be5bc31798fd29b42fbad4113ffa5faac0ff99dc0e3c160397aabc903a59
 EBUILD s6-linux-utils-2.6.0.0.ebuild 966 BLAKE2B a34447f3a84d3eed78eefc5f3c3e7fecc17d3b04ca198c4564e953b1194ef55e9f298338bd4e1e853af4151ba0b95c9208a484c6685c76499cfb28ea61317932 SHA512 9f0f3612ac4a528ccdeb03e7a73c5044a091faf486774c7a5996dd75dd0bd1890be1ee65424c5125879489c538529952438810a97a4abf100a2100ca8d087d71
 EBUILD s6-linux-utils-2.6.0.1.ebuild 988 BLAKE2B bf3af15622b397afc52ce8579c52948bd5bc3b66c50fad8a0b0811829617f62b53d954f56b7c5f3cfbd6e22d840b67fa3f133dd1687669b0ae5447c96016973f SHA512 1c739301b8066ba67624d094af453415702657c4928eae6fe83dceef8789129e873d212c37329d63425ae58be7ac22f4d1535da13f998a77063aa02b9616121e
 EBUILD s6-linux-utils-2.6.1.0.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
+EBUILD s6-linux-utils-2.6.1.1.ebuild 990 BLAKE2B 482ec79b9d2b931e968fd1617119773763d8354df95fc79f76ce94d95b10a462c4e5c835b4ace9a345722673646fd427069ad3f3c4c6fccc80ec284ae0b5d1e5 SHA512 33e61eaeea16c99b784df48b76048f1b1ce3456be6c9d99454eadf015bbaf897550f744d42eec39a3b4efde9483f24a1f2bc65bc6ca6b65814bde2745f426209
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
new file mode 100644
index 000000000000..43ea27b14a6a
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.6.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index b578373d2807..47d989893854 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,7 +1,9 @@
 DIST s6-portable-utils-2.2.5.0.tar.gz 50911 BLAKE2B e79d803544e8df6b791ecd22bd61b7c9535945c5557a25d7bc5488f5015967c4a750f1c0a136cc49b30ddd5bf3fbc17927e5ec01184106e44d0c08643e98e41a SHA512 2e90a1390140818268bd83629579098552c22160537874a90d4be94fae157cb9cdb864859c40847e8588fa9f62fb5af7bf89aa12561f1e6678a7cffc0f0a6d68
 DIST s6-portable-utils-2.2.5.1.tar.gz 51814 BLAKE2B ce4f38d7fb7c632f0e8c10c2990d10eb4f5af38330f29aa3b6e6b97fcce5687eb06a7ee241be5f92f093d5edf5a523da993f140c697ec0dbcef46aacb7f88f87 SHA512 814ab6467034657d3b46e5b933786a2eab1f9cb630c6d67c91ee635facac7d82b5871b94e53445d57fd466c98cc21ea2df4b74c8d48acc0f0c96e14fb827f613
 DIST s6-portable-utils-2.3.0.0.tar.gz 51712 BLAKE2B a0a26d2b287629789861df1380ff2903a356a0f461356746c7793b1b99daf5158202b95ee2bdded9a290d3bed8a94286252301329a1d491f47dde44000ab9390 SHA512 1ef0b937e2f698fb1b98440a84be0310e9be44763969ca812744ebc0a91fe75c50d5082067b6bb07c1acd9df1540f71b6d20254b97e4851bb28937815073298c
+DIST s6-portable-utils-2.3.0.1.tar.gz 51746 BLAKE2B 50190c7c55a4e5d79a55a7a9edfa948931ecce3f6e33d2f95113a8e8ea3a5587dfcf7a98b54236eb66488976044d0b319ce0a45c0eb3a1b7399be299bab711fc SHA512 46f4a09d124e44b9b2ac3b8fa8f7b4492207f0a03a052e7b15309aeea175682f7366ff74fbd8a2732952c8f3bbb2fcc69b4bca89609b690e91d167bd25c16b90
 EBUILD s6-portable-utils-2.2.5.0.ebuild 970 BLAKE2B db0e01d27af55c7790a0704819648ddfa12ff7378e408b93f740090605e0d9c2a66a6bfbc6c5e6eff3427144dac4555641019b0edf0b6f2e0cb0204e1833d2c1 SHA512 62c7aff22c7ae80799ae3a46e2d83c3e6cb296f97892980244d34d971cb37998f4716effe158cd2475e84b42991446ddebe7e065b18c41070b066ae647eda4ef
 EBUILD s6-portable-utils-2.2.5.1.ebuild 992 BLAKE2B 014e826b0dd2af2bc51120e75a89d162cdc0b2836c6446ff0e8aa4312e0b27d5b943bb069b2aba678f83c6d90f00779b1cd383431241dfbac6d19ca2465206d4 SHA512 3c82d15f5fec8e08e5c766fc790548b4ed32d7bf24a3279645080941bcdf77b622fe15a2594d1b1c6c29813b8008916b7188ab3e02d8ca51c271a2c494b75443
 EBUILD s6-portable-utils-2.3.0.0.ebuild 994 BLAKE2B 7b2c678672b91cfd59de582900ebc76fcc6dc792323789ec5ff166abfa07657de10281f91e9aa186ea3bb2399321b517840ee495379740663f8d94b62380dd9e SHA512 f442fedab4fade4fc2846e0755bebf0099b88f87c4cb7a7c023e530d80a41edf218768c4c2c6a54bd84bcb65d5a159b16cfaa74dec4ce5cd773081ca65bbf2c6
+EBUILD s6-portable-utils-2.3.0.1.ebuild 994 BLAKE2B 7b2c678672b91cfd59de582900ebc76fcc6dc792323789ec5ff166abfa07657de10281f91e9aa186ea3bb2399321b517840ee495379740663f8d94b62380dd9e SHA512 f442fedab4fade4fc2846e0755bebf0099b88f87c4cb7a7c023e530d80a41edf218768c4c2c6a54bd84bcb65d5a159b16cfaa74dec4ce5cd773081ca65bbf2c6
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
new file mode 100644
index 000000000000..84d119227fea
--- /dev/null
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.3.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Set of tiny portable unix utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-libs/skalibs-2.13.0.0:="
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index b651cbee10bb..8edd5d0c74a0 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,7 +1,9 @@
 DIST s6-rc-0.5.3.2.tar.gz 99249 BLAKE2B 5719823edf9e9bece6a3efdb5072c4555fc796c48144a0d1da52c609aef8d7437afc9c30924636891a829a307c30017a85140644fb7836b380adb8afbd49b35b SHA512 72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051
 DIST s6-rc-0.5.3.3.tar.gz 100554 BLAKE2B b7ce91c27da4ded6a18879c1034fd9b7a9dbe50b4bf81b8e7ad8c932895124f0fad2d3f96c879841e51467549ee0beef2a9d35c0231d0f4a9a8352660ee3df3e SHA512 9ff86c1490c3ccb904126ad745a45628104880e04f3e95e2d899c8e5cc951d52f38885e85a4edc1f6962a741ca229aba6bf7878b1ef193efe2f307eeda8f262b
 DIST s6-rc-0.5.4.0.tar.gz 101034 BLAKE2B b3b8a5c3bfdb76870aad4f4bb100a3c0b48ec30c9edd24c87c990d3274e48dc05ef3fd765471509886daa8a123a98bb9aeb455c25510f8efd6ea545b5b4d26b4 SHA512 04e5fb73fca713f2dd01113fa70fc9a0f1d4bb600c7cbb0cbd6133a5d6641c07ce8774ce07f78854de5baae5be93b106f38a0687a07fff5e62744261a4d4ea70
+DIST s6-rc-0.5.4.1.tar.gz 101078 BLAKE2B d85a194712ab63369cb71cbe4c59efd8cbe507a5e74c6bdb1bbe9a0e9123b8b1179850a8abdb0dbc67ef3c09764c9a6fb11c5b366590ecf4922b0d5a0115bc14 SHA512 6b61df9fa1d9bd24430bab4c11bfba009ca79c62a32dd2db3b79a1057645da9f92db4058c66c35bb068d805d958bfdf024399d240559dfdee62f9a6a30cf2086
 EBUILD s6-rc-0.5.3.2.ebuild 1497 BLAKE2B fd9d5b56b05c9f1b44625b3af94e8740f41094924e2e398e83858fac3e50022ba8aca12eb95997b3b42d1a77a44a101300bf6c0827ad8f0d17dfd964574d62e1 SHA512 775808ecfe3c2a577fd9bbab7371d9b1a912e0bdd54d37d1f77cf55391ece8edc63acc373b74324e79a9ee583a494ebea68f6002a7ffb5a4706ee9dc5f999963
 EBUILD s6-rc-0.5.3.3.ebuild 1530 BLAKE2B 7804a8eb8ccccf4f80fa7d540622d4b138df5b1c4cadf4a96c299f3a567c285d551b2141d7c3cfdb941cc460eef1b3986bbc034962b2d233821dac2ab074e45f SHA512 efa73a1c1016a9ec8fa8dee910ad36b9ce372991e1b057d08eebee98d9401fee83905660a4e411f082ac4f10fe6336cc8da6cc6713ce00b7dbd25dd7649265d3
 EBUILD s6-rc-0.5.4.0.ebuild 1559 BLAKE2B e890a4cea424776f5ad320d9672b522dd26af218c100ae4076e7b677cb2e6200314399a9c3521137c1295d627f3bb5cfc9eed8b66c8292f8e0fe2d6d42c0cfa5 SHA512 06597688ad3b06f1b0d46e90bf37953926df9617404c677084c82a95b5f1b578c09465d2b659f3a447a3a05cfae33fd741e685883f52154cc1a05184052d2f09
+EBUILD s6-rc-0.5.4.1.ebuild 1559 BLAKE2B e890a4cea424776f5ad320d9672b522dd26af218c100ae4076e7b677cb2e6200314399a9c3521137c1295d627f3bb5cfc9eed8b66c8292f8e0fe2d6d42c0cfa5 SHA512 06597688ad3b06f1b0d46e90bf37953926df9617404c677084c82a95b5f1b578c09465d2b659f3a447a3a05cfae33fd741e685883f52154cc1a05184052d2f09
 MISC metadata.xml 624 BLAKE2B 6bb21b1df5c53a8811ff8a98d86fc5c12343ea057c772ec1f287d38b9ae50a0e758179f7f17ba6f3b243853e0ede843b424803d46a47c4cf359f2026c8305e05 SHA512 6848575ab57d2e24f8efcd0d30e8226574098c4c01d751ed7a9a307a029fb5c6812ddece36c7f8c296c933f0e2fab4ded376bb1d9f6132803ceba0fb3ce70f07
diff --git a/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
new file mode 100644
index 000000000000..30a021e291ff
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.5.4.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-lang/execline:=
+	dev-libs/skalibs:=
+	>=sys-apps/s6-2.11.3.0:=[execline]
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir="/$(get_libdir)"
+		--libdir="/usr/$(get_libdir)/${PN}"
+		--libexecdir=/lib/s6
+		--with-dynlib="/$(get_libdir)"
+		--with-lib="/usr/$(get_libdir)/execline"
+		--with-lib="/usr/$(get_libdir)/s6"
+		--with-lib="/usr/$(get_libdir)/skalibs"
+		--with-sysdeps="/usr/$(get_libdir)/skalibs"
+		--enable-shared
+		--disable-allstatic
+		--disable-static
+		--disable-static-libc
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${ver}" -lt "0.5.4.0"; then
+			elog "Location of helper utilities was changed from /usr/libexec to /lib/s6 in"
+			elog "version 0.5.4.0. It is necessary to recompile and update s6-rc database and"
+			elog "restart s6rc-oneshot-runner service because you are upgrading from older"
+			elog "version."
+		fi
+	done
+}
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 13142bee570d..80b0584ef999 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,4 +1,4 @@
 DIST sed-4.9.tar.xz 1397092 BLAKE2B 6c7c7dc782b87c3bd0b5e826ba46c2f1dc7bd8c1159945fcf14b394711742964628774cf9f27d844b672721d7849e6c31992d82fafb9ed4118b7feb60406d1e1 SHA512 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc
 DIST sed-4.9.tar.xz.sig 833 BLAKE2B 256bb112aa3aec1a8d40544ef1b0a7570f35d66369047ed3d261c57f938042dcb4a169137eaed6639bcfb472e4a6fc6ebec2de243b2c4d4c0ba0e9081f92556d SHA512 ceb235850184b99017783486e182ade9db38313d20b2b34d23f54d8affe180f7a191139b993e8ec7718ca33eff732f547ca4b3b59aaf865feaae611dfeae5c46
-EBUILD sed-4.9.ebuild 1300 BLAKE2B 081ed00219acebe1d28a97bff2c0bf1bc676cccd5c50d76403a5d832addc83cfb1d19c9b65ce12df7e825f4b0491ae5f8cbae7bd18f3189b77ad3ee42681c331 SHA512 fef401a2d439d2317881395929762fa3e9735e62d86188bb5728d1201078144b9c2cd2a9f677e97fe02bd1d42ddb69b793bb2f98d9d36e143893ece9e3bf92e3
+EBUILD sed-4.9.ebuild 1313 BLAKE2B 5907d678b35e5ecfa024402c12e090179ea0693b3a3830151edab5655af7452ae9a975f0165e36d70c27b3b7ede548f724f116c9e72fa506b147a15ebcbe2ab1 SHA512 e34ca363ee0e2a47ca74a5eaa5c2f47b3d0128bcda52e8e6edece9dd2fdd9788823a840c660699714c6d5e5db0de61c76949a5f8d1c0cfb64c035f8a8879aa82
 MISC metadata.xml 379 BLAKE2B 1be9eff00cdbbcf916d5e9d1c2d1bc698d4b0a040d45578a218b43049f7d6e6c2080d987c994006c734838ca744497d815c9177f91455c49248c0de3ac435134 SHA512 464326d075bd875f7dd540bb969486415fd006a6fa779a773b6b7d6048fe2017c932f959e992fa93c7266aa6e70c96e267cb55b21e7955fa4155ffcb7ef53c00
diff --git a/sys-apps/sed/sed-4.9.ebuild b/sys-apps/sed/sed-4.9.ebuild
index 7e3eeeeee600..9eca0e443be2 100644
--- a/sys-apps/sed/sed-4.9.ebuild
+++ b/sys-apps/sed/sed-4.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
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 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 ~arm64-macos"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 22b4e055883b..c39d1b65c47b 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 5bc1f05c5edb..e8a6d8ab09ec 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -5,5 +5,5 @@ AUX tests-Fix-dbusmock-AddDevice-calls-to-include-optional-ar.patch 3749 BLAKE2B
 DIST fprintd-v1.94.1.tar.bz2 658149 BLAKE2B 734da268e308b08b04cbc661d889f52c4e8b2dd61d7a67961eaba5a6aa130f6972525820a17e8b6dd53d38508629139a5a0be20b69eaea45430cc60da5cd9a27 SHA512 ff22087e09ab9f75e458e71f595d611ea97240596a25bd96f41a0fb1de865336f8c2edbd49d5e7c8132a7e554d8311337ec02991dde358cba1962d4cb182447d
 DIST fprintd-v1.94.2.tar.bz2 657989 BLAKE2B 5855ab453ae6d73e08c60c699a95609262fd121ab020f9ffeafb8d1891a60f761f47e4acd11554179b6d9cbed8a734aafb012a4b6de3e9ad67d4160534a0e6c6 SHA512 0b5ebc595b617fbe9167c41a80e31ae74e7bdc87350b0420839e1a6229d7709e51ff2836858c46d8d30549a1f0811b0f697034fcdd09512b5c1099f0f0a3b112
 EBUILD fprintd-1.94.1.ebuild 2325 BLAKE2B 87156acbb51ce61066016825a2335d09bf81cffd7d7ddf23725a24465c5e976eb0d3edd7fe05297cf545c15dc112aff6e571b8b41caf767e1ef1b7ff5297cc3b SHA512 1fcdfb11651e60eec891d55132dc70dd9d12a6061fb8e91a2becd8c4ab70e94c6acd9272c0df428aced54af402329552f98d51f163cbb4d39b2b43cf608b5251
-EBUILD fprintd-1.94.2.ebuild 2204 BLAKE2B 7be73231aa185461ad57d1da8448487e7e86caaf6fdd21b35f10cca25f247b71f45e8b32945de8916a8637867f19f92d6ecd77be5fcf41dd057fb0a938eba7b3 SHA512 fcccbcd5ad72a48a080fc158455a2ed7fde10f85e02e91ec0e423722d055434127e99c9d7e340139c6b61f8baaf3af5b20318e5735682f82def4df7fd645b24e
+EBUILD fprintd-1.94.2.ebuild 2197 BLAKE2B 58a77c145b8a10f5d52adc1588957e014cd8af0c903533519b4ad9d5d95569651f4f979c802b7c036166ffb4760eeca344dbbfaf98e39f4eec8cac11dcb54b56 SHA512 99ded5b8b77ff16351f25baa862c3d44fac6d6a438e0fad998f6af56ca1f8a385ffd5938e6ecee31451a98e4d36855d51094c44c2824193bfc8e23ecd1d5f3a8
 MISC metadata.xml 339 BLAKE2B 40a177278acf7a0553a21bc7d14f2330e0249b2406d72b9b907a069cbdf2e9e464eb01a3b9466f080f6a55f77d2f2ee1863e399f138688e1189e50fbe262f822 SHA512 8aeee1522333ffd70de55c07a2db7bd12c3f90dade4c83d2c4d6a5f76e49969da6d4a797b4304716b5849fe738a8c41dd58c15733b55471efe63007cbba397d1
diff --git a/sys-auth/fprintd/fprintd-1.94.2.ebuild b/sys-auth/fprintd/fprintd-1.94.2.ebuild
index 65065793fd36..fb78a5dd004a 100644
--- a/sys-auth/fprintd/fprintd-1.94.2.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.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
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 9ec0dbc054a8..1ce380979093 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -5,5 +5,5 @@ DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8ea
 DIST libfprint-1.94.5.tar.bz2 8922994 BLAKE2B b79292dc77426d76e5e9cb1cbf8662867224f19ff9cf2434d000689d02e7d4609c9ca94a016185f71500e4a58e9522a7647684e1eaa841c02a40f27e0d22055e SHA512 6a73b3d05bd61b5c74e64d52eba7dab6e97dcf149e32c882e05f15dc7241fd8e78f115957ed52a9657ff0b21642ec633c27cc905cbd4697ed41369508957c989
 EBUILD libfprint-1.94.3.ebuild 1388 BLAKE2B 548dbde6c835bcbeff3b31daf812a9cd926f2df1b052bad503bbdbf4aaa32a3ad20723701105deaae14e2c1775994335fe748fe37becc92ebb81d11e48529d98 SHA512 aa9e8f5570e8daa2c4881d5eedb5b45c8879a42b32da79c7f274488c4a28e4662f7648ab59c6ec474ce0b7fec78e377e353e096d79fe1bd001ada43111b5ce9e
 EBUILD libfprint-1.94.4.ebuild 1351 BLAKE2B c285fdec8fb854dcdb37f6c4643500737aef2e65ea1872e3d899360bc47cd9a25024fbdf00415627440ff822d0f649201f2cbf3eb63fc5653ec148fa674de102 SHA512 0bd34ceb88f728e362761a084d6373ca1f2974f44be8e2f21b0bdf47ee540bf3235daebb60d3293fbb78e501d6ac26ed4e8e0bd75ee0efea47f0efae5e1b99e5
-EBUILD libfprint-1.94.5.ebuild 1297 BLAKE2B c49a306e455006308ae6e9606c931f4f260e3dff04eca3d5332d61b3a568bb4ec22a846ec1f713e5780abc5405eba28325b0a2d092f7b318c9b649c1e3579051 SHA512 26ee3f76c99cb718fb46af845ac6fbff4b0f098712bb441022360de1ae68e4b1b66e163c5f936815ddc6b32e1dfde5f414dc882ef0b56b12d83f7c2e1d1ac548
+EBUILD libfprint-1.94.5.ebuild 1290 BLAKE2B f5304d66d9c64782d380d3614f438cb693174af647af821a2cc6ae23d93d8a39b46e3812ad0f95de32bd10b22affcfbbfc7748f0a9420665752da294a63ab538 SHA512 17ebc2571d41ff9e1ca22e9faa59b94a1633755c879f2e63b42e30c7bd22ffa88eb04269d0ebd4868f17f87168af8933650c69d6f3f55647c62555ad23086d29
 MISC metadata.xml 346 BLAKE2B 54a3a50cd32196635fac291bfb7f97d50081ca48cbe69df0b94dace16f2b5deae07020f417898d9ca30804cc3f971f093bea5313f9cc4ce8ec6625abe6b12426 SHA512 886d673717825d64b20a63e247ba7d4451d8d15607c6fdff94cbd02f3e5dc1d4d4d6954b92b2df5f09365db80eb4d01a0acc22bc5b977c01f3b45f574e35220a
diff --git a/sys-auth/libfprint/libfprint-1.94.5.ebuild b/sys-auth/libfprint/libfprint-1.94.5.ebuild
index 13f4c1ce816b..3a9e78876af3 100644
--- a/sys-auth/libfprint/libfprint-1.94.5.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.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
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples gtk-doc +introspection"
 
 RDEPEND="
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 32a455877402..2d8096dc01b6 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 2d189a1a3cd7..fbf0c7a6ad46 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,5 +1,5 @@
 AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1756 BLAKE2B f53d7a968df0d995988f84364f669595beb06d9919d628f37b25b54ddf6757a76b9630e78a6ae89293a7de70e0bda70b6a677c0cec4849f884228c73f4af6ba8 SHA512 151c0c7c0bfca5c4e7d1dd3c39659e29c0ed1ae49d84e8782793201cb92626111637315393e0b6217bd2ccb2126cfdf9c0ac9e238e70c43f2068510aaa885f30
 DIST gnuconfig-20221007.tar.xz 71208 BLAKE2B 9112bd82af083043d5eae3a5ffde8174df842f3a817b1b42c17e3202a9189cff8e9f422e956e1cdd82e326949a23e27a353f72f98a6f63818e5a67096f650fed SHA512 91ca2faca02d5d78f937da70a4af026b1ba585519b9eaa2463cacd79f0f6a85ef6e1f7e0bed4243474b6e880c0b6387ca09f00eb2d40a27c3a26b6817b1bb70a
-EBUILD gnuconfig-20221007.ebuild 1312 BLAKE2B 29491de815b3ebe94e08760702b78f8ccc9aa59cc2bfbbe7f4ae36147a47959856017efdd39073400451cedc991c7ea48da4390ba0d2045bd06d22384de77bba SHA512 bb96170896fd97e03bc33df3ef3cac6423c50f15f77788da52da71626c91bf8ff98c9ed35dcb80f4dcf2c05f4a0d549754cc19ec32cf461b31562b3be0205f39
-EBUILD gnuconfig-99999999.ebuild 1320 BLAKE2B fe712d8d30b9a738071f0322a079051785051674e4cc1bd04bcd201d46833347e971e3834e1acbbea92a29e4b06b98024250acb49986475c3b169d0e06afe582 SHA512 358da59ba76f3c499da5591d41a61e9a69de07ab13b6417a388e31952865f9ebce36a0a8a86e2e2e2c790d1a95acd0c5b509eed591236dccaeef2df5818a767c
+EBUILD gnuconfig-20221007.ebuild 1325 BLAKE2B e7c4a794fb7e810cfed34c9445e54cb2c1441157e89a3ddbdbebeec33dbfa3069c73990c643d1cfca18636634e101fb15ecec4e916f01c21333a99c83fd98ceb SHA512 d189878d823a90e46c1ef8bec5f42ff0126eda53c01e252561239b920a1affb55ec7cd5616c2206e9a580eb2ccb4b3f9dc8a1bf72151d742729bf79225a5307c
+EBUILD gnuconfig-99999999.ebuild 1333 BLAKE2B 44e87551946ee52b25ceaa76391357e9ffb7c74d9afdb3df7141fa2811ae3da7e12bd320c29f9087a45116d331c44b3a13d720ee59a77287326ab556747c6cb0 SHA512 2ec493f6e42b8ebf7b42d671e903df8532520b724b505b7d14cd666c110a8199cad927999b339f8beda5cc6ce60e87807d43be03326bf814fbe30dbbf5f8bc09
 MISC metadata.xml 347 BLAKE2B 06b801ace1e56e47232a0efa9ae446193955866c1232d576729d4419932a4d338e7840408ef1ecfbabe4f518a18dc25abad921b4d185f5e7a9bd8b46bdb75b32 SHA512 14cbe44269cf0ffffc3c133172b84c6ebb5d17e7bb42f1dd9339abf009005b5a716cdae32c52867246d5f1b5e96a2b16a9e97f25b6d502e0380ceed7ed590fbe
diff --git a/sys-devel/gnuconfig/gnuconfig-20221007.ebuild b/sys-devel/gnuconfig/gnuconfig-20221007.ebuild
index 135754812a30..2768957ae2fa 100644
--- a/sys-devel/gnuconfig/gnuconfig-20221007.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20221007.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 @@ if [[ ${PV} == 99999999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index 712d8c0126e5..a5dfaf70c853 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.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 @@ if [[ ${PV} == 99999999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 3858f9b66ef4..ce09f146394c 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -9,9 +9,9 @@ DIST make-4.4.0.91.tar.gz 2345140 BLAKE2B 3e28fa6e74684329f41aab69aa3558e45381b6
 DIST make-4.4.0.91.tar.gz.sig 833 BLAKE2B 7d86e8cfb5018ab32701379b7b04777c032d40d0fe02469ddb2113f3878079ee3e99a69636c5a2a42d0a20e43f833f88709d456255418ae4007fb18ebda4ab0d SHA512 950e11c5c27d198846d0c871f5e3d9b4bd3afa43aa9819cd293c3c97083b7df4c5b7cc5959b17c488433bba3e64a53ab51805bad5788b106d462fb97f7ea2fb2
 DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f
 DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6
-EBUILD make-4.3.ebuild 1931 BLAKE2B 84d538027ac0a84300ccce7f1b446407796a10a9314e016850b092f7e2d5d62dfcf96cc68d013f6b12d682cc3bf94ba4a97a7b0a6247314fee10d864e8ebf6b6 SHA512 2f764ad5b425038139fec36c56a194284ed34c0f2991d0d4c94cc81ea111ef6662646c3ba96968c2d13debbcdede5a0000abe091ff970b67c13cc49958d113e8
-EBUILD make-4.4.0.90.ebuild 1960 BLAKE2B dfa4f6945510882c3db0fe4a860ea4820fae1a24592c81518578f7af9067ff9080b4ab624eda00da0b9242463a75178a1893b104277df82dd27469a4d9f87081 SHA512 124335d012cc9a316c1d9fbd8d7dea64baef0407b11ccd1ce2ac4b5b00d84cbb3d0b84173f6aa57af815c43273a06189a6e6ee2cb5fade960fe2a3aab3f4ba8b
-EBUILD make-4.4.0.91.ebuild 1906 BLAKE2B a09f61448b1298c4edf202cff26876957aebd0b35ece91c150ecaf8c05cc78fb14c27b0ba6083ec5fa28650255c85e48210dca53f1dbf27b76dfb610b5983570 SHA512 cf6888ee91fbcc20604b2572e479cd50157fe4bddfc3da1cd6386f9f2bde4125e1e1909181a09ff572da6504a0be91aa837ccba425087d3368487b23f6cf793f
-EBUILD make-4.4.ebuild 1937 BLAKE2B e63f3a30b3032769736d408691c594cc08b40c0cd06fc0f548ebf62dcca4e67f793a6fa42c89ec40f329af2551fbb2928eb6c21ca1e704c802f4b0ff86318173 SHA512 158e77869d70fc1e0c00d4f1df036bf66a85273900c19c67626701986e9eb36e0a8c1899cd22c7af091eaccfe6a334f20f03e47ec6fafb3225f5740999f1d790
-EBUILD make-9999.ebuild 1960 BLAKE2B dfa4f6945510882c3db0fe4a860ea4820fae1a24592c81518578f7af9067ff9080b4ab624eda00da0b9242463a75178a1893b104277df82dd27469a4d9f87081 SHA512 124335d012cc9a316c1d9fbd8d7dea64baef0407b11ccd1ce2ac4b5b00d84cbb3d0b84173f6aa57af815c43273a06189a6e6ee2cb5fade960fe2a3aab3f4ba8b
+EBUILD make-4.3.ebuild 1944 BLAKE2B 875fb1c002402057904152c634ee5e588b02bee4149ab4a5a19d6fbf0f5bc1faecd19e14209951ff5908cc40f7791030d66cf8c03392c8eab62d748272b5dca3 SHA512 37e56423a20def1b5c4f929ae92fcb84988edb55799dfd17634d76ae57cf454cb26649d2c3a25a80b8c0ff3e3447cac7b01ad20f4bea262e17812b5c2ceca87a
+EBUILD make-4.4.0.90.ebuild 1973 BLAKE2B 5342090aa938b96483d992cdc123d819d53f2f4ed797c1f95cab44307bf007c7775080a7bc7fbec58358301fe1adab9075738fb753edfefa2a4bb0c0fcfe7b57 SHA512 f616c84ec9b3a4d54c55506dde14751b140d57d4c54af8cc65a0bbf58c6b5395bdddbecc64c2c71eb38c8d6a35128df291c1b00e53725cf307f041be2ad0fae4
+EBUILD make-4.4.0.91.ebuild 1919 BLAKE2B 3f9296fbdad81fd3685f3630053f0728ae64325ca4048d5137901ee3ed987ab7c336e921f4a98c36ba49baf3cb965e95f190d111c574ff3ccb997a499dfa76dc SHA512 f3a2527c436de16d70d91d69c5bcc6dfa18c77de20cb16c425325ac30d28ea28c22a8cdff7422f50fd5bb73377b21f904739d2521c3ad8eb646c7aed9383e78f
+EBUILD make-4.4.ebuild 1950 BLAKE2B e8d77136880668d8eb0cf266bef44d1e566a370f5167bd2d7b391118d164868c9374dcd0ba1afe001f1a74b9c69116fd88201870889f75215e3dfff895525eb7 SHA512 f69d397d4b68c417586a75b8190a55a0fc2caa5d200597c0ff3ac2a3374cb22c92773ea0f5faa187cc5faacd3bbf528e10867935c9e5321a4e2116645b6b40a9
+EBUILD make-9999.ebuild 1973 BLAKE2B 5342090aa938b96483d992cdc123d819d53f2f4ed797c1f95cab44307bf007c7775080a7bc7fbec58358301fe1adab9075738fb753edfefa2a4bb0c0fcfe7b57 SHA512 f616c84ec9b3a4d54c55506dde14751b140d57d4c54af8cc65a0bbf58c6b5395bdddbecc64c2c71eb38c8d6a35128df291c1b00e53725cf307f041be2ad0fae4
 MISC metadata.xml 335 BLAKE2B 5b17214450a474af84b5015059fed4edc919e53bfd407cedf0816746d95a3258aa90fb851a7d013f1ef10b61d689ead735f8ed35b109e12b45e7a4efab22abe3 SHA512 72ff31b31e5d9bf55124d570d8ff4911eecd2272492988919fc073e5864d4282e4acc3101c367076c1009e3af086792993fa96562c25699f1b537b88fed40a1f
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index e924bf762998..c219f5ff1bee 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.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
@@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/make/make-4.4.0.90.ebuild b/sys-devel/make/make-4.4.0.90.ebuild
index abb820aa6eb6..f161e636a1f8 100644
--- a/sys-devel/make/make-4.4.0.90.ebuild
+++ b/sys-devel/make/make-4.4.0.90.ebuild
@@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/make/make-4.4.0.91.ebuild b/sys-devel/make/make-4.4.0.91.ebuild
index 27cc510be3c6..de7a808ae4c1 100644
--- a/sys-devel/make/make-4.4.0.91.ebuild
+++ b/sys-devel/make/make-4.4.0.91.ebuild
@@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/make/make-4.4.ebuild b/sys-devel/make/make-4.4.ebuild
index 73a2aedb6375..995022126a40 100644
--- a/sys-devel/make/make-4.4.ebuild
+++ b/sys-devel/make/make-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=8
@@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/make/make-9999.ebuild b/sys-devel/make/make-9999.ebuild
index abb820aa6eb6..f161e636a1f8 100644
--- a/sys-devel/make/make-9999.ebuild
+++ b/sys-devel/make/make-9999.ebuild
@@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
 else
 	SRC_URI="mirror://gnu/make/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index c12d99c650d3..aaaafbe060ef 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -12,6 +12,6 @@ AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c44
 AUX patch-2.7.6-fix-test-suite.patch 3006 BLAKE2B 4b00c743f880f3cd672d6d37ff89d691d34d38b9652a9434544db10c3e28adf412071a14b5f6e4fcb1cead5e6ec0c20f786b061c96eb3fed4d9e8744a18bb02a SHA512 626256394ca2df1fadfb6cfaaa4458b86912ba70debac88d959ce3c34d2f5791284fb2b9b38b88b3e38a50a1e0f6585f0c860a9866f27c40be4884e95d7d83f2
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
 DIST patch-2.7.6.tar.xz.sig 801 BLAKE2B 8f2decb10402ecf0208d05ea7cce3bae565d31ee2bb2a118367c117d25b158d8bd525cae654ec0c0e2c036cc8f47a331edc1bb10b100683ade64dfa3b651988b SHA512 1302a1110dcda4f3d83b5263415d72be55c46dae0efb1c123e9c346154e09def5657004bbe7249e2d014555349410e7a5217140dd8852331235f75bcc757351b
-EBUILD patch-2.7.6-r4.ebuild 1810 BLAKE2B fa83066043ee859735774069feda3aadadd1d0c5fa1d80e8c4d5230fe02299f0dd8a4df50936cb69129c02bc1e5e1a627d73b0358b4b971f0c9fddeb41370d9e SHA512 8b23ef0402619209c5eb37c31b0278d306a1684c3e6a73954252f4f0f64c89376261166cc312b694818c4fb333b7f54d6101d89c2011699658fa1413f77cc8ac
-EBUILD patch-2.7.6-r5.ebuild 2014 BLAKE2B 265863dc4df3349044aaea420d49af6d582c0c8fde69d47cb37e10c32dc0b57bb1fd7cfb9d048bdd71cb2306917cd156e96e00cf17d32f9f668a71b091e70baa SHA512 387be980999781fadb37282c00f957d9a54c8cc0f82943fe44e2a70a918b1845b3438d4c8172d8afffc41839eb1159d6680b940460f030909f81a66850af82e8
+EBUILD patch-2.7.6-r4.ebuild 1823 BLAKE2B 32fa478287f50631bb0624a11b83f2bf1ccd889c686bcadfb79433a41398202b122d113ede53cb23e91ee4dd4e1d12b1dc14ed2945d018f555a3c3f6b493bce6 SHA512 91f9c83b9d720a069828a92bd163ee983e54ad6b7a5f7030720b93092ce885f4b96cedb9933a574720825badaef33d4402a8cb614f10540960654da9abb510c5
+EBUILD patch-2.7.6-r5.ebuild 2027 BLAKE2B ae0ba6f7a7703863e0aa7128aecc8493fe983098ffe5cef5a77d96e8e5859f148e8fbdeb9781e09e92fa06805dc14912fa3190b21fa3c3b41adfd669bb7c54eb SHA512 4ca85adf6ae2645ba7ba81ece0e453f8e61eb6cdbce82a4d311ce0fd8f6fde86e1da3e48d18477c2bffc226b9657c7eb8ba226260a47d99247aa98b6e7293238
 MISC metadata.xml 329 BLAKE2B ac0ac5e4a422955e2e1cc040d03ab9df083c70d0275145366ffe47c04fb08ac5e9c1cf776ab9c96e023910a0f66a7ff3cfd8377574d8e282cd78c435a6d8bdd2 SHA512 a0c5d5bc2d111a6d22afa4bae0e56ac7f927798122fed5373dd64a214d7b51dc436482bf21eb2ef32073c2f4004cb6dd6449afd58b7ab6936ed3c2e3a4c39872
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
index 25e164eeee97..154e5382e772 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-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"
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild
index e93ac48c3848..271c14d9875e 100644
--- a/sys-devel/patch/patch-2.7.6-r5.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 8e58e2021614..86f712c5df78 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
index 383d2cf379d2..38fd9bd558da 100644
--- a/sys-fs/genfstab/Manifest
+++ b/sys-fs/genfstab/Manifest
@@ -1,5 +1,5 @@
-DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661
-DIST genfstab-28.tar.gz 15221 BLAKE2B b389387dc590bf12ab2adb6ebc3656c0b7da30a28196586c051a97be0b79d073510243f6326f76e039e299f1262454d7f6de8df6b9f630d29198cacc8c0f79d9 SHA512 886d34cec807a1112c39c6cdf8163ac270504e183d3a249df227616af8a2837579282ed3f59f7a371e45ad3ba942b6e327ee5aae55345fb486570d972c1d3b35
-EBUILD genfstab-24.ebuild 464 BLAKE2B 6e0989fd9e46db6a2035abd662ab21c5790a14af1b7a73380292afe0cf5bef3a055e3e2472cbcc9bc5764d1fe588be53e8af01ff7a7dd19a5ccf05ed8770d6b2 SHA512 afb99b5feb77ba970cf0515213b9adc6c3bc94642f539fa3583228128aeba442beb729dd5e44b85a1471abc63c53e29cd715d982dd2f960ccdc4abbd772b29d0
-EBUILD genfstab-28-r1.ebuild 560 BLAKE2B ae1e5e984b8065a478bf0cf3021db3b471aeaa14a43e3e7672f1d48552e58f29d97ab8fcf39bb4de665cf1a3d1fb7f7afe0f83bbba505b175e0e2c5a99c7b903 SHA512 4b71dfce5720a32dcc10a002c71ee3e88800bf898127962590fb4bc3488dcf843f0683f2e1767c1dcbc89adfe7782f1600f000fd5dae77f2c3eab1bfc9504081
-MISC metadata.xml 1311 BLAKE2B 86ece33d2466dcaf3c510911a465ceea229f2a5b764d215e97126be3535c0711beebae1b615c25d9595817c342c9c82cf423fdcd79f8e4a98d1af1a623df59ad SHA512 3c4aac6e890146a968a3c3c045ab7706046f747a7f6a2dae2562bd8999655fa719f4ad1124b9b267ef8bc8fd8b0336b7c632e503d28604dfd2a725d28c7f443a
+DIST arch-install-scripts-v28.tar.gz 19730 BLAKE2B 0ff5ba79b200ad642e049ec19217cc5c0794d627a28f42e03c0df2444fef4d8488a6ee011d26fb8fe958c1a1a2fa0a13920567e394b2389c772f516b1fe8f388 SHA512 09a027b04b70e01ccd1fd82e3a443c876bdf978b94a922de9dea4dbc187360460ea35720816724b72fc31b02338b11bf39b47ec9156518a8a3ade000530bf1df
+DIST genfstab-24.gh.tar.gz 17916 BLAKE2B 07246efbde341dce7dc624c467e3f0bd849bccec46cd27f90f132960526674f44554b1ae7ac89e2d1f603567db4058f8dd465f54297071e89f65845ba07c6499 SHA512 0391bf93fc7c6ef0acefc3a0ce314d8c52542d519e4f88198734d90db9fc9ef23310c0c414c0940703fb6c0f74f6d8f23d1795bb3eed2b2a8ff5a594f00b63e4
+EBUILD genfstab-24.ebuild 730 BLAKE2B 652429dfceb2b898edd837cee2041745bb445a60094aec09b8a18abca62f2bfadbcc0dd08143094d7928c18a66b1f887349d94c2f30b5f3626889e1afec1a42b SHA512 3ea27e37d366c24fbb0a3b40f9ba0b0acde4b87e85dfaaf6b3b3b71e29502a5bf37e0c9939b5233bd514bd806e19af66bce8fe264939da97cddfb14cf891db15
+EBUILD genfstab-28-r1.ebuild 888 BLAKE2B f597dd409bf7cd1a2d8a1bae8d9d2e77f97c713bf5e84dc9b5a70eafaaac6e0ed339639cfb9f75839451d0c47cd0b2c186e0886b9a2c3a8f3c5507b452325e49 SHA512 5a976c8c9cf3021df24c601067b53bae6eb232dd78dfafccaf1dbf1e34fb24bde6d5c4bc3ee9868517d3fe5eab3e7a236991a5dccea13f7bf802aec2ddfe9c91
+MISC metadata.xml 1565 BLAKE2B 8d626783bdc31b51fc7b7646caa2ced71bc073daac7db23be5af62d1a90615b40f56577a215022f19244948c454138a58493bd27b0439b6c4e7c1b9432ae6b90 SHA512 0c628d93740c0c2263acadd77888d7689dd4e4fb2d46fe613aef9a2da2a802b671684d1e52cb66aa5b0342972f0e3fae2b10223f20953fd2b32917f9ee64f2c9
diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild
index a3a79dc071e4..702066b4d0b9 100644
--- a/sys-fs/genfstab/genfstab-24.ebuild
+++ b/sys-fs/genfstab/genfstab-24.ebuild
@@ -1,15 +1,27 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit bash-completion-r1
+
 DESCRIPTION="Genfstab - generate output suitable for addition to an fstab file"
-HOMEPAGE="https://github.com/scardracs/genfstab https://man.archlinux.org/man/genfstab.8"
-SRC_URI="https://github.com/scardracs/genfstab/releases/download/${PV}/${P}.tar.gz"
-S="${WORKDIR}"
+HOMEPAGE="https://github.com/archlinux/arch-install-scripts https://man.archlinux.org/man/genfstab.8"
+SRC_URI="https://github.com/archlinux/arch-install-scripts/archive/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/arch-install-scripts-tags-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 
 BDEPEND="app-text/asciidoc"
+
+src_compile() {
+	emake MANS="doc/genfstab.8" BINPROGS="genfstab"
+}
+
+src_install() {
+	dobin genfstab
+	doman doc/genfstab.8
+	newbashcomp completion/genfstab.bash genfstab
+}
diff --git a/sys-fs/genfstab/genfstab-28-r1.ebuild b/sys-fs/genfstab/genfstab-28-r1.ebuild
index a80ba66d79d3..2c8386747b9b 100644
--- a/sys-fs/genfstab/genfstab-28-r1.ebuild
+++ b/sys-fs/genfstab/genfstab-28-r1.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+inherit bash-completion-r1
+
 DESCRIPTION="Genfstab - generate output suitable for addition to an fstab file"
-HOMEPAGE="https://github.com/scardracs/genfstab https://man.archlinux.org/man/genfstab.8"
-SRC_URI="https://github.com/scardracs/genfstab/releases/download/${PV}/${P}.tar.gz"
-S="${WORKDIR}"
+HOMEPAGE="https://github.com/archlinux/arch-install-scripts https://man.archlinux.org/man/genfstab.8"
+SRC_URI="https://github.com/archlinux/arch-install-scripts/archive/refs/tags/v${PV}.tar.gz -> arch-install-scripts-v${PV}.tar.gz"
+
+S="${WORKDIR}/arch-install-scripts-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,5 +23,15 @@ BDEPEND="
 "
 
 src_test() {
-	emake check
+	emake MANS="doc/genfstab.8" BINPROGS="genfstab" check
+}
+
+src_compile() {
+	emake MANS="doc/genfstab.8" BINPROGS="genfstab"
+}
+
+src_install() {
+	dobin genfstab
+	doman doc/genfstab.8
+	newbashcomp completion/genfstab.bash genfstab
 }
diff --git a/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml
index 6395552d0d8c..8bc558614eca 100644
--- a/sys-fs/genfstab/metadata.xml
+++ b/sys-fs/genfstab/metadata.xml
@@ -2,13 +2,21 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>scardracs-gentoo@proton.me</email>
-		<name>Marco Scardovi</name>
+		<email>peeweep@0x0.ee</email>
+		<name>jinqiang zhang</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>cat@catcream.org</email>
+		<name>Alfred Persson</name>
 	</maintainer>
 	<maintainer type="person" proxied="proxy">
 		<email>mattst88@gentoo.org</email>
 		<name>Matt Turner</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		genfstab helps fill in an fstab file by autodetecting all the current
 		mounts below a given mountpoint and printing them in fstab-compatible
@@ -25,6 +33,6 @@
 		l'installazione iniziale e la configurazione di un sistema operativo.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">scardracs/genfstab</remote-id>
+		<remote-id type="github">archlinux/arch-install-scripts</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index a954ae197f72..e698811a2d5e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 7ad5d356dde2..77432e4b7bdb 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -14,7 +14,7 @@ DIST readline81-002 1242 BLAKE2B 4ef0404561bd8fc5559e8e5f675ae3f12c467178a8954f5
 DIST readline81-002.sig 95 BLAKE2B f85d8a65a7326d6e18b32a603c8082952e4b81c53b6a1bd1668c7b0064ecce6ef04a41e2a042f100424dbf152e4db32c0e07ff166d528aa4ac4a9bd7daf4c7a9 SHA512 9ffb6cc697499f57df133f5ebaa5e43e24d33df5eb450d94a02144e94c833424218594c366f21101bc63331c1d532299c9327bd447d0a9849b0bbedce206a5b7
 DIST readline82-001 1198 BLAKE2B 2e8f3d2aa14c4c4c4f9621f80f4ffae9bbd6f46c3561e87aaf684c759ffd82e3c46843cf4c4224533b28a847d83f7b8b254813f8a306d438e9f7cb457516c4e0 SHA512 ea3800a62e992b3e594d78e77b6c4b662fb8c501b81010277e478656bb3b56db7747ba40c6c3d68c3ec5ab8e9e41be104788ec52268135d7e642ff40dea421a8
 DIST readline82-001.sig 94 BLAKE2B 542ac331a7da3702b47f4828b3264bc7bf996f473807d675044beeb9688c4ca3645bcba0898d3ea9447c1cde540eb8a6b1934008b0a11baef33235e43f44c6c7 SHA512 01ad9769fee42dc601b511c87bd39e15c74226e1747c4ae8914e303213706005780135add180dbfe538fe847533dc56cfe8f51a3ad9ec55d1fde2cb2e096bfb5
-EBUILD readline-8.1_p2-r1.ebuild 6485 BLAKE2B caa2a68b55108bacd6279720ff134b44adb16d8ce825d9c9fc876596538b002c0aa8069a5a8c9f91f6aa2c65fac6ce21decba4fe1ec3933ca58e17bbb54570b5 SHA512 ea2ab2b573fb31893e161a2f88bf574a8eea6b8a13471e6bebee39fbe30ff0d67df71b960cc011e1b530a396152e64e3f464d65bc9e70abb9d97d17bd1b0a89f
-EBUILD readline-8.2_p1.ebuild 7140 BLAKE2B e7261c466ab1c6d5e3b065fd975fc43f7cfb6a23705f04495cb0f5c5703c46f88adb4da54c5a1914203759c8ef8511f9fb414e756a8ad00178775af825c0259d SHA512 f26d4f79a78cb5f674b2cd98aac61cc58c64a2789ebd3514e57dc1f976c422d1d1e95e4e0a3e8909ee38bb1990e2516084ccc780086393f85b0f24d78d3e89cd
-EBUILD readline-9999.ebuild 7140 BLAKE2B e7261c466ab1c6d5e3b065fd975fc43f7cfb6a23705f04495cb0f5c5703c46f88adb4da54c5a1914203759c8ef8511f9fb414e756a8ad00178775af825c0259d SHA512 f26d4f79a78cb5f674b2cd98aac61cc58c64a2789ebd3514e57dc1f976c422d1d1e95e4e0a3e8909ee38bb1990e2516084ccc780086393f85b0f24d78d3e89cd
+EBUILD readline-8.1_p2-r1.ebuild 6498 BLAKE2B 3be39ef6465a374fc3b7db4dc043f9af1b0bdc12f2b42ba94c0fb8291b8c8fbd39ec47cf05a32c65d30fdd71ef41b9366fb1fe98e877113322f22786af92d7d9 SHA512 b73f6a17976d755cd6af0d3cd41c0b0ab510b1e5a2bc5f42070985746c6206e56b07ceb290bd111a8b580d8b29c193c92a9b2fc303f5a49c5029a697bbeb3b67
+EBUILD readline-8.2_p1.ebuild 7153 BLAKE2B 814be24958d8501495df8a00cd60eb56f58494ee41845bc49b55211b0f71967af58e7262ecdbcc27f45420fd1b5dd4884cc94dbe04f16c8f44a131d7676309c7 SHA512 3b4eec0abec150bfaa8526672a4fc006521e416c9bdf81c814dd1ccc89ead1c258fda28e00466c2df46854ce2b9389c5b3d9892d9ae7d1e54afe252bc782a925
+EBUILD readline-9999.ebuild 7153 BLAKE2B 814be24958d8501495df8a00cd60eb56f58494ee41845bc49b55211b0f71967af58e7262ecdbcc27f45420fd1b5dd4884cc94dbe04f16c8f44a131d7676309c7 SHA512 3b4eec0abec150bfaa8526672a4fc006521e416c9bdf81c814dd1ccc89ead1c258fda28e00466c2df46854ce2b9389c5b3d9892d9ae7d1e54afe252bc782a925
 MISC metadata.xml 533 BLAKE2B 2324b38d79697509a98d761cb8f91e08934b419f71bfd65cf09149773e3f44e8ff153d173cb1af80ccc4c10c7c65103bba5ca797f3b18b96c13132ffd777049e SHA512 5d66a8a464db16ea8afebeca7102632629486ccd4d348821ef693abde571c8a70a6aa38e9b563ddcfe93950afc38f63d2cb4239c645d97e92138a0c1e5c67f00
diff --git a/sys-libs/readline/readline-8.1_p2-r1.ebuild b/sys-libs/readline/readline-8.1_p2-r1.ebuild
index 21cc3483f2e8..051b82ae2288 100644
--- a/sys-libs/readline/readline-8.1_p2-r1.ebuild
+++ b/sys-libs/readline/readline-8.1_p2-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
@@ -54,7 +54,7 @@ esac
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
 [[ ${PV} == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs +unicode utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/readline/readline-8.2_p1.ebuild b/sys-libs/readline/readline-8.2_p1.ebuild
index dfd3b540f41f..b20dee17fef6 100644
--- a/sys-libs/readline/readline-8.2_p1.ebuild
+++ b/sys-libs/readline/readline-8.2_p1.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
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
 if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="static-libs +unicode utils"
 
diff --git a/sys-libs/readline/readline-9999.ebuild b/sys-libs/readline/readline-9999.ebuild
index dfd3b540f41f..b20dee17fef6 100644
--- a/sys-libs/readline/readline-9999.ebuild
+++ b/sys-libs/readline/readline-9999.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
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0/8"  # subslot matches SONAME major
 if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="static-libs +unicode utils"
 
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 6dcd1fb74c77..97b12e13e33e 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index d7d5dedd9a70..88472d734a48 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -1,6 +1,6 @@
 AUX btop-1.2.13-fix-makefile-deps.patch 1289 BLAKE2B adde21eb39016350f48fddfd98655074c6c29b3116ea5c7f19bc0373ef464ab611e6a183a8f3fd25b10eea944e6e3809596b988364796fcf26991837826444f8 SHA512 10fb0b76eac61e510bcfed4f7eda368d3e4d2935462ebe67a0355e38df0b4f503e95fe0cbf619fc3ef640ecea4d80d622d445ef57c5da16add6f89765f602a36
 AUX btop-1.2.13-verbose-mkdir.patch 669 BLAKE2B f8d4ae11816a511302a206e7ca4a32ac7704a739df69b45dd925e1fe2e572b7fc00a36c8f2c4c26f4adabddf794b478c02ba4f029a5831acbb66e5dcd31e2bdc SHA512 ef4b43c30bc286f6f96602934df32645e2b28706e824f3312fab8134a99c49cf4b8c634fadb76bc86e3e6bb9a2ef865bdcfbc0bd09933d9d833dfb4cc137089f
 DIST btop-1.2.13.tar.gz 982660 BLAKE2B 053c1ef87203b894c2cbe6007c3b5962dca232733d28f97d82a2f70e771d4cc92fe4c49d3582c80cb79974d65329d3e95e758b9e8a7fa51a2ff0cdbf6cbd9a75 SHA512 324e572d43e57e5e65e646aa743f7730e6d535fdc52e848aeb55d60c8d73945850c5b89fe0b541e98495ddf2bae71427a6ec8fe8a495b41cef885c535d01019b
-EBUILD btop-1.2.13-r1.ebuild 1376 BLAKE2B 4a88233c246c0f06b2323fb22391f767c1a6ff4a263ba94f5ec9af2954602fb7511d84f1f19679ad92f1cabe2e19b76fa97cfc2dfdf90ceca863ab382304ea30 SHA512 0d5c2e5f995fd891ff3501211f95cde53d8d32c20ed9c4353ca7847d2b068fb444000a94943c852d93c221c0490d8085778344c0a7cce45f0b68ce9c3ae0042c
+EBUILD btop-1.2.13-r1.ebuild 1381 BLAKE2B b0f0e42b904849edaa77731c26a326dea3d0031f8e0746e79f965965aa77f6b315e53f613b96134613bf8e504264fd30074db2ce3dd77e49374401cdff089143 SHA512 f0d3db6f89c16f050fd8ff45fa3eaf31047a889cf6defa68357f2e2fbbfd91315cc8a5c4d64d030216d61c5e556abf0b8ab343acd3303698bef16e4cc6ff4b2a
 EBUILD btop-1.2.13.ebuild 1186 BLAKE2B a32f46e360180e5ffa670093905d89935c5112201cd7b563f4b3549c307b3860f5a8dff0e0e4ff3d67852d919d359153ec5aa83ccef458fd30f2edc0a1165b80 SHA512 317625f55c5b140d1c9c4a33d6595b850ed76719fdc37860d2128c82403bc301d02a21d93bf3c458c1e957dd08bff74a4698635772e8fa599907f0c4729717e9
 MISC metadata.xml 548 BLAKE2B 74762cdc63011b363a4c06de8190541f862d70f0006461c7a1cf2d734caf20601ba0769dc067e261957fe42a64bdaf26297bf3d080c3c08203eabd73165f2f8c SHA512 bb16944df9321001ca5c9e9fff49ea39069386117f0cfde67e8f19e3f44c13d360effb578d2c44c67f792d1ff574830f13cb9ef183f594e39ad3669083f2cf41
diff --git a/sys-process/btop/btop-1.2.13-r1.ebuild b/sys-process/btop/btop-1.2.13-r1.ebuild
index 6451ce359cdb..232bd533a13a 100644
--- a/sys-process/btop/btop-1.2.13-r1.ebuild
+++ b/sys-process/btop/btop-1.2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aristocratos/btop/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
 
 BDEPEND="
 	>=sys-devel/gcc-8
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 8e3897e9a26c..5df0f27f936c 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dev-manager/Manifest b/virtual/dev-manager/Manifest
index ea8b40846c14..443cf0ede496 100644
--- a/virtual/dev-manager/Manifest
+++ b/virtual/dev-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD dev-manager-0-r2.ebuild 357 BLAKE2B f696a9dd83e5b97cbfaba7b8a1df30230be9ada6b0cafd3f0f17fd67f77e3ff6e92ad759bb034d52d3738a3eacda60f1853ba0440f6de1a90f34d422b3ea60c6 SHA512 b532ff27f3af3e01a04e9d9bb31d67b629e695c6cc1bb5d9910ca58d7aa810ca05619415d7d568fcffbe00534cfc2f83066fbe6db77107bdcbd9d4688c82fbfa
+EBUILD dev-manager-0-r2.ebuild 370 BLAKE2B b7f822caafd9773f4d6cd61754a05368f69ae7c6cf93ccc7d1f9182999f7e5ff3f781f73c8fa11d97a88961b9e6db63e85070ca5d65b4b9af6a787708c5c5e56 SHA512 16234f5b1cd91e5a1e2e26f1ac2c67408e7680d87cb219d64325e86f4ba920c7529660906fff8b5dac72b205ec69f983813611b4d78efd7ba95555b23810f6a8
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/virtual/dev-manager/dev-manager-0-r2.ebuild b/virtual/dev-manager/dev-manager-0-r2.ebuild
index 511e22d22f1c..992720c81ad9 100644
--- a/virtual/dev-manager/dev-manager-0-r2.ebuild
+++ b/virtual/dev-manager/dev-manager-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=7
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for the device filesystem manager"
 
 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 ~arm64-macos"
 
 RDEPEND="
 	|| (
diff --git a/virtual/editor/Manifest b/virtual/editor/Manifest
index 3216d08290b1..5383fd353349 100644
--- a/virtual/editor/Manifest
+++ b/virtual/editor/Manifest
@@ -1,2 +1,2 @@
-EBUILD editor-0-r4.ebuild 1343 BLAKE2B a4354530ecb94ef383463f07deb8c8c8eac94bc67d7d8aa0c9cea9632320fd771fccd570de78cb8aba2b2ae7303b2f6b16cc710afd576e0cf37fdfacadd87cb5 SHA512 5e8a80c2ba3196268113f5f54af5b5b23ef78aae49c8ff6996857ed5e341bf365f6adddafa0869e3c418d28a8ffc4bd66721262c35a29f2a0359abdec807c458
+EBUILD editor-0-r4.ebuild 1356 BLAKE2B 4facf93d7b0ab0852a5e2886f4ae76d1764ac461dd93425a903bc0db5458bf970a689acd1deb153505c8e93ef09687b62bc3780758438edf5faad8bc0699d79b SHA512 d39319e157135f2897a31357b4cffadb900aacaf34cac0fbdc1064de804e14bf6be3a33aa6afbed33feee57b9456fbf75d9242f8ba745193658521c33ae54d78
 MISC metadata.xml 506 BLAKE2B 7df34ceb29085d73e46507a3a1f3c98421d5b04c440213f83a13e4cd943bcecae0cfecdf2d2c44c2204e4b4a1494a4e15a283409a95bc3cd802fcd2d8f19afd9 SHA512 529738c09d3153d7245caf17fdcc9015705c8c69edfe352ae7cc44e9bd53e78513326b2c85e4d80dc99954d08fe3120587bb3aced8f3ca801400aa4b093b510f
diff --git a/virtual/editor/editor-0-r4.ebuild b/virtual/editor/editor-0-r4.ebuild
index f48464988a5b..60f2fe10b0df 100644
--- a/virtual/editor/editor-0-r4.ebuild
+++ b/virtual/editor/editor-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=7
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for editor"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Add a package to RDEPEND only if the editor:
 # - can edit ordinary text files,
diff --git a/virtual/libc/Manifest b/virtual/libc/Manifest
index 6209136abf3b..01d90464f4a7 100644
--- a/virtual/libc/Manifest
+++ b/virtual/libc/Manifest
@@ -1,2 +1,2 @@
-EBUILD libc-1-r1.ebuild 715 BLAKE2B ac59ac8dbe162fb5749313573d7dfff2978a6a6430b5afa8ec623262e156c450a2fd5fc72ca616e70f02fa284f50fdbd5a9e84916503e3efa49c3f9e93c79be5 SHA512 228455ec7187f1199a069c2ab011a52cd78b48502c65ccd94548e1eae4ea173f706f38a4d086246adb5cd1c7a07397574416182888adb8386c872b6c2a36e4e5
+EBUILD libc-1-r1.ebuild 728 BLAKE2B 6e8e9f9eafc74374120a2cd4d4f43bc2f7d9c739063aa8081219767106da1dc4926afda55a7874b7a5adf54f797f1cfbd4bf6ea744a4c527137482f4d50ec293 SHA512 bc87d869218d79e756addf68ee4ad3f2665a3e2d15196884be356e14596e3740444624920e387d5f80426ac7151d81335f89b6fd1bd6c3393da8f220cef0c9fd
 MISC metadata.xml 398 BLAKE2B 90695fdaf057f6dda31542bdc48e326bd1aee662100b0b18ae6dabd6fc1abd1a23eebd2cfba8f59b6be927663cfc55666a30fb2397947ac8540d24369c80381d SHA512 ea449835073a84f61207f194de20d49f7e7b30e163f59a8f568f14e0748fbd081e3a0c6ac279bf7e505d5a73e63b9e6d11b09cc7125c4f7541d3d33abc3e8e41
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index fb0bfc410223..6b6c8d191ffd 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for the C library"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # explicitly depend on SLOT 2.2 of glibc, because it sets
 # a different SLOT for cross-compiling
diff --git a/virtual/man/Manifest b/virtual/man/Manifest
index 918c62beec78..88004573fbed 100644
--- a/virtual/man/Manifest
+++ b/virtual/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-0-r4.ebuild 447 BLAKE2B 649498d09c097964a8555a2131d0235a2f3c5cbb60431ce0810c7d6c8041f697ca78bc13165ce56e90a6590481242dbb11f04e83f949768e14607bcd440b490a SHA512 18346307ad05d291aeda6e19aff4fa67e49df8f8b14300116fd396fcbd9b2389f900d341dccc8fb0c3f64bcd3d307ece57a516236e1e985e3ad0f0177d7a7b10
+EBUILD man-0-r4.ebuild 460 BLAKE2B f97e5e97e086c97fd829916d444b76a0586896ef84cac95bde51322e94aca1de3d4422384dc64cf57b7e0d5256bef01dafb3a5e90d3f32e5664b77e33a7bf609 SHA512 84fbc35b4daca66a176b0d40b4e16bbb1bb6d1f0d149b026473d1b02e051733a81f79a1a117f3a99bfa9b5f21d46773bb136e1c4179df2f9530bdcb1e796e8dd
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/virtual/man/man-0-r4.ebuild b/virtual/man/man-0-r4.ebuild
index d2d7a1e4a60f..3c626fcb7e1f 100644
--- a/virtual/man/man-0-r4.ebuild
+++ b/virtual/man/man-0-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for man"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/os-headers/Manifest b/virtual/os-headers/Manifest
index c0407fb509fd..bd8965cb5104 100644
--- a/virtual/os-headers/Manifest
+++ b/virtual/os-headers/Manifest
@@ -1,2 +1,2 @@
-EBUILD os-headers-0-r2.ebuild 700 BLAKE2B 0589fb39c0cd67a2030b7a961810d0da4733fe7f7f72d2a86a2a6fe56cbaa6dca9c95bf66c1db520fca9185796f33b5e00f4f4ce1aab7617e9ee911d82d1542f SHA512 4dd020da56875263df1def9aed167d48065df690d6d6cba0046c98d7c4ce680f01982d5bb3c106264b193ec565e5251fbf45b4dc0e67eec53a180b0cd1a5c4a1
+EBUILD os-headers-0-r2.ebuild 713 BLAKE2B 0e5f77f464475dcac529eae66fba3fffba5b7638de9165c94c1abaadffce6d48f56bab8eb83e99ea2d43eb6380670736d417a57fbe42bb34a79c549d2413058c SHA512 6ca1f41e09a30117da0213b71e1e37db753cb7e6a717443a30d2331193e3605cbf800a6fdf83ea1b8355440b6a9c4edf5ca927f8bd3ad95527490b7782539401
 MISC metadata.xml 286 BLAKE2B e2e007d7accebf84a8ce85442aab8f854639e308b3ddbfefa75c26e3b02b92a67526dcd177e619df1030a0f7ac52be3deb62be1c218bf34b01b76ca3cae4d0e7 SHA512 9d65bbb0c878ae150fcc102b1d81810bfc91025a375da3c6905bd56a2cefcc4f939540ca504547642e98d837b63ac4a6674328449547a883a93964a1487503c5
diff --git a/virtual/os-headers/os-headers-0-r2.ebuild b/virtual/os-headers/os-headers-0-r2.ebuild
index 6ea5a5b2b874..e8c56e3918c8 100644
--- a/virtual/os-headers/os-headers-0-r2.ebuild
+++ b/virtual/os-headers/os-headers-0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for operating system headers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # depend on SLOT 0 of linux-headers, because kernel-2.eclass
 # sets a different SLOT for cross-building
diff --git a/virtual/package-manager/Manifest b/virtual/package-manager/Manifest
index 9e1e4d817d76..70bdb3f2408b 100644
--- a/virtual/package-manager/Manifest
+++ b/virtual/package-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD package-manager-1.ebuild 440 BLAKE2B 1856b3728d5db6f8709ab2e20f0e3b86fbaf7960542544e0330e4cd6a72e1e3a22fdc253acc51a2e198552ca8125dd21d39a2854b4d3fec13bd2edd8098be927 SHA512 3e58383a324e89a7b3c7a577989d6e6e3d2bb6be62900fb2b6bde791638dfb38b9c815479faa1d225dc401dee48247750d81a9f44920c1f1ad39c05be833158d
+EBUILD package-manager-1.ebuild 453 BLAKE2B ae121a70e4fc33b3feaeaf164e9e1655f453c29c0393c4dd4c063739ea03e32df41cd0de73e39d2820b741fb2da52aa78651e76d95a19b800875e26cde41f8ab SHA512 f172a33454796eaa8373c6462026118e1b0372040eaed6aea09c9a50e835eb83d3dcf994459905cf831d9ac95252b6c9aca7a6c28ae1e3fca127f8efb3edde1f
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/virtual/package-manager/package-manager-1.ebuild b/virtual/package-manager/package-manager-1.ebuild
index 118366e3845f..4323f8e9c2b2 100644
--- a/virtual/package-manager/package-manager-1.ebuild
+++ b/virtual/package-manager/package-manager-1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for the package manager"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/pager/Manifest b/virtual/pager/Manifest
index 181d30b5845a..e9edd938afaf 100644
--- a/virtual/pager/Manifest
+++ b/virtual/pager/Manifest
@@ -1,2 +1,2 @@
-EBUILD pager-0-r1.ebuild 499 BLAKE2B 740874bd8ca3478cc6a44dd7f49450eed3df9d0f758af01f2ad5a2e303091c35735e2977f2b459df768d474e6093c940e52a7563b9309265a9867de2a11990e8 SHA512 a97718d6916035d149eeca64ce5ac01e01d51d8eb7917701801c59d32c3af945a5fee72c89c0ac683b3c1e08edb3373e04762df3333a1e302de202a43157f81c
+EBUILD pager-0-r1.ebuild 512 BLAKE2B 4aef0e87c05e2e45c90cac293deb7d5135b0fcef76e57be8384e3f2496dd2b1335500931fa66f5fe5fba5a10a7ffd4baef249875162abbf59b1f7cae945597eb SHA512 1f305854b642dd424b766be2a93923cc303cab242608a1e0d53d396357333dfb1d80af4122c59c4732c2532a6a066a8cf788b4315555433a11af15930d6a0540
 MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/virtual/pager/pager-0-r1.ebuild b/virtual/pager/pager-0-r1.ebuild
index 8780d640a9ab..8aa703caedd3 100644
--- a/virtual/pager/pager-0-r1.ebuild
+++ b/virtual/pager/pager-0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for command-line pagers"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| ( sys-apps/less
 	sys-apps/most
diff --git a/virtual/service-manager/Manifest b/virtual/service-manager/Manifest
index 75b737565bc1..a3b14f2e26df 100644
--- a/virtual/service-manager/Manifest
+++ b/virtual/service-manager/Manifest
@@ -1,2 +1,2 @@
-EBUILD service-manager-1-r1.ebuild 642 BLAKE2B c06878bf4ae46fb9da848655e1cb60643fb7418983632ed19d4739b8abf108948de30059218814fe9f22f2f85e169c80534d876279e309e9c49710e4f82d217a SHA512 57a1b638f8cb5996603ebf86b23a6aba20b1f78d06a89773ed908a8aa97a455a87210f1743dcb14ca8878b81ff2dedd47dca9d85e0a64a3ebb2585c02b98ab1b
+EBUILD service-manager-1-r1.ebuild 655 BLAKE2B ddb15609616a156f804c6fecf9771ed702ef197f701b335a83a8df96bcb0d8e949e251215661dc7f647aa50a6e815ff96952fd52c18b4ed69905306e334cc3c3 SHA512 dea0b79c49d45b250dcc9d4a6e5029306b90231b7822595df0c08dc38f33f3af7fc26b0cb2cfdb9c13b2e42d73937e23c5a2f07461787852fbddf92a00c3d17c
 MISC metadata.xml 282 BLAKE2B 85c3312405ada57a85e03b06a59523c8d4069551f91e6b70f182d5af92ffc26b946c2987554001649eb41d605864a5cb3c172ebbb02f3c1a11ca1ed805889550 SHA512 5eac09aed8093684086d644c321b236d5da019a650ad322d33236b543bd5641edfc43cbdeee4654e093f9f6393eae034110ca51eb560b87a178fba74244d7fdb
diff --git a/virtual/service-manager/service-manager-1-r1.ebuild b/virtual/service-manager/service-manager-1-r1.ebuild
index f75fe8b737b2..6b274cdfddde 100644
--- a/virtual/service-manager/service-manager-1-r1.ebuild
+++ b/virtual/service-manager/service-manager-1-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
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for various service managers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	prefix-guest? ( >=sys-apps/baselayout-prefix-2.2 )
diff --git a/virtual/ssh/Manifest b/virtual/ssh/Manifest
index 2ff4662f94d1..842e0485cbf0 100644
--- a/virtual/ssh/Manifest
+++ b/virtual/ssh/Manifest
@@ -1,2 +1,2 @@
-EBUILD ssh-0-r1.ebuild 530 BLAKE2B 9c859af695d5135bd3033ad162cbd9e4118aa8182e6c8b2f211412f081f1cf69983ac96742b9b3e872afe7aaf782a4cc3d95325a5ffe284b62d1fd240fc2d18e SHA512 4652a51185f50ca97671cb2cc614b10f9b8b3be0f8a9d9e843eeacb43e627155f5538023129a9598a85635d0bdcf7021864e1632f48348603b84814216846eb8
+EBUILD ssh-0-r1.ebuild 543 BLAKE2B 70cd3defcff6ee2d3b4e4a75c7848f843e2eb6d0eed9c58f3b8866eed82f00b5fca8a19183f774bc83a7dd121c223a49a9b8bab1d970af7178ce158f567732fc SHA512 4dc3a05a2d9f80b9ebbeec77701fe511c0a217309a20226700c4b787192f240dcdac8866606e5c88a888c3803329bd8fb36133a1720b8c68c3cbf24ef9b4f37c
 MISC metadata.xml 508 BLAKE2B 2c8da81bab03143ba5f1bb49d7b85918d97972327850acde930e4985b02430c0b1dca98882f9eeb26b58730297315d1b085cd743abd90ae7c3839e5bb47ccc23 SHA512 4067c569c9bcf82d3ed8b13875f9292d1619d12d81e26084e696be3513ec05f15710ca17629db371f0e42e9205ebef1259c41dacc17341067058dbce119240ef
diff --git a/virtual/ssh/ssh-0-r1.ebuild b/virtual/ssh/ssh-0-r1.ebuild
index 4a138b3a0bcd..1418327c32cd 100644
--- a/virtual/ssh/ssh-0-r1.ebuild
+++ b/virtual/ssh/ssh-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
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for SSH client and server"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index a309d9588afc..cb5da71c5ee9 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/piwigo/Manifest b/www-apps/piwigo/Manifest
index d9312ae49513..66ee18f990b3 100644
--- a/www-apps/piwigo/Manifest
+++ b/www-apps/piwigo/Manifest
@@ -1,3 +1,5 @@
 DIST piwigo-13.5.0.zip 18298794 BLAKE2B 6fc432a3c2b4e70c3b3864047593aa91e0e4fe802db4f6d3b825c5467e7a062ae1e5ca85136c2c6660c50a05b9d2b76a80e802f5fd5c27f1733e5e32925f3fff SHA512 1020cc45f69e4af56761df84c1094ef3a81e1117fffede2ec3a15f52891ce2ef6e580c19a2228511e4a6c730e9d5aac3e0780166042a4907af85ee092e38957a
+DIST piwigo-13.6.0.zip 18292976 BLAKE2B 492230974533587742a0b1c9b344cef846f38fd3b6d756a1a0208afdef36ea7630b24e81f8de21280223030c3811112628f5f385ad083a20b802703a460f25ff SHA512 2c322af7dd74768b3192156ab5f59929de1f5a75061e00a628910253bab4f567f9d1d596d7fc648ccd12a9cd28b0ee8ac3d1fb71fc53002d142f62fabaab0724
 EBUILD piwigo-13.5.0.ebuild 1149 BLAKE2B b1c073e52efa1c925f6a906a319761aa2216d599e6988627c93ab94c19fade8f9bee03aa44ffa07de244836b1b125352ae61c73a6aefbf73e9742da15089d7d9 SHA512 7ad61e6fe9be8f6fd26300df2e3db13a5bfc35accc4d9dfd02d1c0951789a739f58650cbf3a1a0f096a5c5a62e2a55f9dd3a4c1ab66cae83b5b725613ec43d0a
+EBUILD piwigo-13.6.0.ebuild 1149 BLAKE2B b1c073e52efa1c925f6a906a319761aa2216d599e6988627c93ab94c19fade8f9bee03aa44ffa07de244836b1b125352ae61c73a6aefbf73e9742da15089d7d9 SHA512 7ad61e6fe9be8f6fd26300df2e3db13a5bfc35accc4d9dfd02d1c0951789a739f58650cbf3a1a0f096a5c5a62e2a55f9dd3a4c1ab66cae83b5b725613ec43d0a
 MISC metadata.xml 1023 BLAKE2B 7527436138cbd57c7c74dae7c03fbfb7b5badd46f9de14c72cfc5e324647ef4d5c3ccbfc7ab72e874331ff0c47560287dec2e784bfd2854abf5c276ed70f3d18 SHA512 1bcf676625a9f44aefd3eab32ff788c94ce6f8cbbb16927d3c76478aa19064be12d689d5e62b8cf88bb69d28667e5824bf78357f01e0f925b27892ae10553722
diff --git a/www-apps/piwigo/piwigo-13.6.0.ebuild b/www-apps/piwigo/piwigo-13.6.0.ebuild
new file mode 100644
index 000000000000..825f7096685f
--- /dev/null
+++ b/www-apps/piwigo/piwigo-13.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit webapp
+
+DESCRIPTION="a photo gallery software for the web"
+HOMEPAGE="http://piwigo.org/"
+SRC_URI="http://piwigo.org/download/dlcounter.php?code=${PV} -> ${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +gd imagemagick"
+
+DEPEND=""
+RDEPEND="
+	imagemagick? ( virtual/imagemagick-tools )
+	dev-lang/php[ctype,exif?,gd?,filter,iconv,json(+),mysqli]
+	>=virtual/mysql-5.0
+	virtual/httpd-php"
+BDEPEND="app-arch/unzip"
+
+REQUIRED_USE="|| ( gd imagemagick )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# Local configuration, and parts that can be updated
+	webapp_serverowned "${MY_HTDOCSDIR}"/_data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/galleries
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/language
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/local
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/plugins
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/template-extension
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/themes
+	webapp_serverowned "${MY_HTDOCSDIR}"/upload
+
+	webapp_src_install
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8b7ba26e2984..47e3ed65807f 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 45836a7bb835..71fa05ebe9d1 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -7,6 +7,6 @@ DIST lynx2.9.0dev.11.tar.bz2.asc 729 BLAKE2B 7eda78aa36b8f4cb8fd72e107e74ad95977
 DIST lynx2.9.0dev.12.tar.bz2 2762036 BLAKE2B 93bf762271b0419be73b11066b68dcf65e59f4eb1a5c221f0482bc0cad5e88e1cc83eb24c4c40316c37183c37db1178985d4478a2659c9e1b8322e8b6a4c6ff0 SHA512 9dd85d335a0b2c4c28f362cbcbe6499662696286fcc78e827bfafe2787d4a7fcd3faec78a115df8c14ea6e4314a5ea272f5b6353cb13224ecaebb61ae271701b
 DIST lynx2.9.0dev.12.tar.bz2.asc 729 BLAKE2B 0e24df945b714acafc17974a908ca0246e4e4f506416cdb4fedb50a0b081fb87ac2b5e272fc27bbb1eee0aeef69ebb99b75583184e434e017b0edae3d9bde4d8 SHA512 fecfcbbf41f83285019a93b59d3ee38263aa0b8fc03914d41af1f9f3f77e1e376c8c686754d3e1a777d6aa853b4f3cfdca5d2a4ffa2ab3fe6ae4952e61a22e16
 EBUILD lynx-2.9.0_pre10.ebuild 2695 BLAKE2B dbf58061c92a73147206afb929c5962703c0407243cd8ddd6230d9d8d8a9d303ecf1201f327f8edda2b1749992b7cf58079ca5be2ff900165230c9ef8bd6c06a SHA512 6201d9667ed747b82eb80cb56c066eb62c434dfbd3a0fbe8c829cccb5c43b3e58f2456362fc9afb82056e0fb4477b0ee83eb396f2d5e5298371c02b2a6c8aada
-EBUILD lynx-2.9.0_pre11.ebuild 2762 BLAKE2B c0935a629ab2861a462118058c698fbd745ae695a0c0bd737c3e13bfa77035ec291ed18015a61bb1962299794c5edf81d870d0caf47aa1a592e607c9d96dd5dc SHA512 302d1d04d79c9993f23eca653f19d12a2d1156d8d10707c20d303b793cf5a41df85a189012ace7636d1b364c45030409d42050853dbebe0e5134f3e2fe455183
+EBUILD lynx-2.9.0_pre11.ebuild 2756 BLAKE2B c8cbc05fe1dc91f4f7587a669ef8612affc776eb818c0e756198f0755a46a00e6bcf17dd7644367552dee7153f3717317d84c7431545ee8c87edde65a60413c7 SHA512 dddaabeb9274f205b185567559e5dedfd45d8b3cb4a55f4776d48ab21cada221801e6cbe02d55070ae386b473d27370057569261653cefde5720063eac1e0e98
 EBUILD lynx-2.9.0_pre12-r1.ebuild 2763 BLAKE2B 8d3e48613e7885b0164eee9dc84a872e46d28f8aa16a1781834228da01223642abddb3361d2ba403c4213ffedef911c7d4b4e9c03b7d8c36755a19d85f40145a SHA512 bb3c99d8fdf71c8cff1abd813bfc446ef8659e34475787c8d761430308695809098c6d180dd10ceec295a27077b7106940aabc99fa6549b7c0c2d9dc2b373f0f
 MISC metadata.xml 590 BLAKE2B adc522d9ee7c5057d7846d9a5c166cede154be095dd386f89f16380da06e790d614c7760e04ca1b9968ea2781fa821b4dd3ee9d377979bff55db78a3ea00f9fb SHA512 232fcdad4dd9a31ca9b84afb21311116ada39ed9cc2b5c4910822d20ee164c1eceb1fdbb202ebe47638499334466c23051a1252a2c218c91a6e5bf72ca1c0c5f
diff --git a/www-client/lynx/lynx-2.9.0_pre11.ebuild b/www-client/lynx/lynx-2.9.0_pre11.ebuild
index 645aea9979ea..7ee4c3489530 100644
--- a/www-client/lynx/lynx-2.9.0_pre11.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre11.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 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 97e25c07c771..eb04a9d7820e 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index c1ac5b35e6ef..fa7bc7b854e5 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -12,6 +12,6 @@ DIST lighttpd-1.4.67.tar.xz 1039872 BLAKE2B e8e32970fe8b6e36fbee0c5104c8f42f8465
 DIST lighttpd-1.4.68.tar.xz 1030612 BLAKE2B 5682194a9e124598daf22bca56826535ac48f1c89087238f2a455cd4cb0f12287ce79ab5a7b6ca966003772335e6a14d484658300e401c098b4e87a7207198c4 SHA512 137cf62e3c7b07d1dc4af50318f1ec67bbf60058ad1a4fef0b1c94668916e23cfcdf85fe9cd728163e55c1b21f4831b9ab922fcf6b6ba8e2a03b2f73a9694189
 DIST lighttpd-1.4.69.tar.xz 1045516 BLAKE2B 4b9c15bd69db5afcf40c3df41831d2fcecbb4149a8cfef582e7dfe80328d515a1021baa32c17e0f89d81c9726dbbe8480d9d319684d38a11961b28d2d0224e9c SHA512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f
 EBUILD lighttpd-1.4.67.ebuild 6001 BLAKE2B 2716620d5461d8cd94e8970b15bf201180045755dfd5a9a34cf6f3c730eb11fa4f8f014a2d22a80b6ca308e4e4f2e0db54bf0c7434bda1f318baed9d97ff0270 SHA512 00ea9635270477fec723574927e26b3540e164fc6636505e7754789335c3289dbd56324a5e15bca025fed9fa9019d89e10e94a54e812037c84a9c017bbb0c168
-EBUILD lighttpd-1.4.68.ebuild 6140 BLAKE2B 4f90dc1c11a8d30f66466664e614ea36b2c33b645d9dd92acbe0ddd87f04c1c78cc1d4d4198529788d120b3fd0ea184a14dc05cd6e3050d09abf703d588b85cf SHA512 53ca9af5eac99f6d40c397de922663a23328fb36baf61f230b11cf5ce130a394883832c5c6f58475bec9ab97de7834fd8af07683c3ac411133acefaf6e295073
+EBUILD lighttpd-1.4.68.ebuild 6135 BLAKE2B 0ad68946b0072be0a5a0e5160838c31ae928833d5ed71fdea5a6f1d48faa5ff930e2679d2e48191a6a936baf4e8987c94a8f48ddc971ffe900e502ec8644c1f4 SHA512 360e55db90c120bc1d23420a4a288b9273fcd496b0c3a39334592af09f0adab77a5e3f344334c96319251c4ec0f99a516c53516df1601018df9aca23d609146f
 EBUILD lighttpd-1.4.69.ebuild 6076 BLAKE2B a7839c7b76ebf861d3c02202d1622ae790eb3242ce5cf01b57d0726c92b690c3fc2b55cc415ce51ce77186b72cb3318f887c889ff5271761d4338cd8c6bef4bb SHA512 ac7e2031314135e8b80f97aca63e8f5306d4cd666633f55ae1fa97c3a326edbc54de275cd0124d2acbdda598f6c79a759aa33b68660b1be81facf2792a21d523
 MISC metadata.xml 1763 BLAKE2B 906a9cf10ee127ce19e5184188158a0a82f79fb33dea289a74fbe24465a119893cdda65223dbae31ced1692ab9837e0cf591495e859de63ebafb198f4acc2fcc SHA512 c71be3ada914e18f6303fef04edae206237a41aa0b2c82dbc7e05a6dbdfd57d26762cf27f156c52a0e054802f98f5a242fb1b28f53e699c8ec363a36f4099ca0
diff --git a/www-servers/lighttpd/lighttpd-1.4.68.ebuild b/www-servers/lighttpd/lighttpd-1.4.68.ebuild
index d8cedebef1d8..ca80b451af8f 100644
--- a/www-servers/lighttpd/lighttpd-1.4.68.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.68.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-$(ver_cut 1-2).x/${P}.t
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite +system-xxhash test unwind webdav xattr +zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index c239553dee3b..2a3cf75c88ce 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 71924d303cbf..9ef2454dc2f8 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,5 +1,5 @@
 DIST guake-3.8.5.gh.tar.gz 1112897 BLAKE2B 221e6a388c3a5904cd20a762e6a669e30b59a742a550e5c2a411534c3b0730c7622f42c67fdc72785fac199c432a297beb9fb53be2b5e2b7545a5b03c2b8b545 SHA512 40605fadb3a0149ea488a7e93f1b7e4f5250f62fe058292f2c02f03f837f22e13171b28c4a9d1a14c2e4897c0066a683cae547e03862397310bc650d149181fb
 DIST guake-3.9.0.gh.tar.gz 1118696 BLAKE2B 0c9fdcc5ff11d2f7263154594060a2145cefe678410cebb562dfd355a375019870a240ba4fb3868e69fdb5cf5bf49e73c3c5c2a1acef00251f68feebd8efdeba SHA512 d90e8a12285cd7488fe1132dc5af05d5eccec19a43ae98202631a15d12dfd21c3bda542e5f31ec409481d987a1bd013892c9343e7a74405a784e530efbd83503
 EBUILD guake-3.8.5-r1.ebuild 2320 BLAKE2B 26872f816ed222a6cdc63506b8e70573f648ee4d4ad900075c5b9816fff98d90ba911ae1c92828b1824d5c6da1cea3a7f66f5f3727224165cc811efe1390f690 SHA512 fad17805eb7cee1f161e6b797bcaef275581562a4c94a26526d47fa946a599899ce7d79a049af362c2f790c437d6444e739907ed0d7854b8ebdef23182fb30e4
-EBUILD guake-3.9.0.ebuild 2380 BLAKE2B b29002bf01ddcd7f8ee1ebcab2ea3de8e40517b15af2b83e9345c967d5a509a7a56334af09d4ac88f635b702f61c9159225f682bcf75a4db578bae4bafc48a36 SHA512 4c1efc0c577003075030d352752a945125bc4fe527a9582aa368347d8631f6c2baa07afccf54f593e7af0a34a3f5dbd3549538533da5cb4e09a65c3c750cd96b
+EBUILD guake-3.9.0.ebuild 2377 BLAKE2B 7bf7fd4e49f51b5496223da6886952a5e79da356a52fa10eb403bcd0a15193b70e5e9e15edd5e1ea221f4f55ae29cf34bc5d1c603cb74ed9e3c13ef6278c2dd6 SHA512 2de2908071aa1d80f39c603bf0338afa6554c7112ec8eab18765db7eda5547150f204b9caafe34ec0e4298e8b7d8b5bcf0420437c54bdda0462a1180206afca2
 MISC metadata.xml 418 BLAKE2B 4eaf1e46ca71463bf5e7c54f31941d391851b2415872e06e41bc97b8d2278ac58c544ff869a5050e4d20abc670c20d4c7d364a8d68a7d9fb21baae2fa061af69 SHA512 52a8f383fc6bd2757dfc41fd0758c2b47ee177ecf49bf840a4e8ee8b32421a8f3c6a08270fa72f8cd2d87f8bfe663390ae18f17ea9ad18715099fe575de726d1
diff --git a/x11-terms/guake/guake-3.9.0.ebuild b/x11-terms/guake/guake-3.9.0.ebuild
index 737722966865..e94c4013126b 100644
--- a/x11-terms/guake/guake-3.9.0.ebuild
+++ b/x11-terms/guake/guake-3.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Guake/guake/archive/refs/tags/${PV}.tar.gz -> ${P}.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index e5bec5eb9a08..7f6f0cbe8e2b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index f788569a92bf..d5b1c594aa4d 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -7,5 +7,5 @@ AUX fvwm-2.7.0-clang16.patch 1821 BLAKE2B b8acc1740eb820128625a1aab94c00faf9ba22
 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
 DIST fvwm-2.7.0.tar.gz 3933529 BLAKE2B b4be7083c2946cb2a0c48673271d490a49aba5aec8407169bedc5a35f55fe8cd2724a9f6570c5e7ea110652c04956570c874256f96fa5d920a2a1ede152c0c25 SHA512 fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808
 EBUILD fvwm-2.6.9.ebuild 4034 BLAKE2B 603b739468c0c94f41348b62014245fd465da01622079f0bbaa68f4f3c736bce79b716ad8a3d7d6787bcbf3245340827e6308f7a5e0948afaffc0c2566676a5b SHA512 2e30f69354c6070e8b47992435a8368bc636d50498cb90f4413328703b79c9f69d5e633df9c6056c2ef7e019db1d9e020e14bf0d2e6f254c1a96c94912a440f5
-EBUILD fvwm-2.7.0.ebuild 4259 BLAKE2B 945f5b666d7f3f6644afe8414dfb4ce4490e44feb8b9e335150b27da01f30ce2008c0a83d482bafa6f7251989d5587ff1a4afc9c6550f320bd3b808c3c4bb8d2 SHA512 07f6f9c813777e4558366157d24760d6c01bb8f37a05c82aa72ff65c9c754fd308835688cd47d367f7734e1242c8e91c41daf10f7b589e5b55e1e4c9bb37d189
+EBUILD fvwm-2.7.0.ebuild 4256 BLAKE2B 259ef0d2535f2fb4e2ef38c521d07784eff38ae31f601f9a961b5ddc514ee59d55009e5e252de409c9edec52f3913dfe0516aaf3a6cc923c91419e87268f6000 SHA512 1b963c5b948200d025aae333177b7cb80eb5b901ae7d900f0b247f6315979254ba0a0f9d7fccc176309efe92c174e4335d07e9f364e1a315a0b99305844fdf4a
 MISC metadata.xml 736 BLAKE2B c9ff0661b5a87747a83a9d0f88f2a994e23e9e741e669fab4bd42351f74eb9dd8d55ae7d9a56d3a865eef344484a489f08359cc0e44874787fed0538f977c159 SHA512 5b06fe1d24d811fe7c408f38849c06360a5e59d98e5076214cdf041f95f5ed5ae4b625331337ce7c0d00db62fd4db6ca78f6cb2902409f340ba47d8204ab5692
diff --git a/x11-wm/fvwm/fvwm-2.7.0.ebuild b/x11-wm/fvwm/fvwm-2.7.0.ebuild
index 5d56c236acd2..9e9ac48190bd 100644
--- a/x11-wm/fvwm/fvwm-2.7.0.ebuild
+++ b/x11-wm/fvwm/fvwm-2.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FVWM"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="bidi debug doc netpbm nls perl png readline stroke svg tk truetype +vanilla xinerama lock"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 5778611b0dbb..099f94d4f8a8 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4windowing/Manifest b/xfce-base/libxfce4windowing/Manifest
index ec357f47c031..a83a97a4f5e1 100644
--- a/xfce-base/libxfce4windowing/Manifest
+++ b/xfce-base/libxfce4windowing/Manifest
@@ -1,4 +1,4 @@
 AUX libxfce4windowing-4.19.1-no-x.patch 718 BLAKE2B 3e4dfc00cc9437774f335b52ccfed81573c7c62cd40f7fd39f82c1b40999907ba24d6e8dd1d05ecc15d5f1b8c496677e98c03be79b06929f59c193e2e6330def SHA512 010b6a0105864e4140d8587239043ccd0ede664b5cc79d733802fdd1e27eaf3cc72272ac5838ef30152ab8a685f3cca890abee7e1975d9e6ed989722ce7ba55b
 DIST libxfce4windowing-4.19.1.tar.bz2 452748 BLAKE2B 0fbf8ec5bb1d1857dfbe2851ef25a63dca57315c9f9dd5e3d870ae86c5fa054e3f4915d7cef1c98a5ac909ff29e8ad47b5b2754d1c8b2199320ee4a5efcf2eae SHA512 4666ff3a0142f584fb62cff8e6271a73bc3da8f1cd6dad629e3075a5a2552f54d56abb44bc6d9b2c1b4a1c8ed131bd6aa875714191cffd28958a2edf09a90729
-EBUILD libxfce4windowing-4.19.1.ebuild 1203 BLAKE2B 02c4690334099171e9acd99c1aa93d4b6c63f31fcf21f82b7ef18b5ea72e517e6d0d10e746ee79dad3c932d5904141f92d37ea0bd8d10d378d2752cc7c89b55c SHA512 b08a40c795f752483f4dcbe188a0844e2e1f51011a81873227112bce78b9d62565fcd43225ba6c61cc7cb586c76eeca88b33a7104e5e341ecfb6cc7f1d4e34be
+EBUILD libxfce4windowing-4.19.1.ebuild 1208 BLAKE2B dd549829f702db0d6a64c1b2fcc63cc9b19a2898501f19a2473d90049a6ea08c5d332e663f804ecd1057d48efa8b64d21d2ff9498fd24675215449ea10f521dc SHA512 4edf7b99d6a0bf7f21c762a99422c3c6e1e94f1aed086d78769e817030ae8f06396efdc24d2d5c85f1dcc57770a7a667a3dbf988a06cee6222f3877087cfd389
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild b/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild
index 1ab29bd297ee..99aaaf1973a5 100644
--- a/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild
+++ b/xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~loong ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86"
 IUSE="+introspection wayland X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 1c9ed10e0ec1..c56aa10d9b8b 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -9,5 +9,5 @@ EBUILD xfce4-panel-4.16.6.ebuild 1511 BLAKE2B f3e24b8299e0e84c1553445c8b825058cb
 EBUILD xfce4-panel-4.18.0.ebuild 1596 BLAKE2B 6c2a566c4e4725f05d56fd15e6fdf13899b56f465f6d2430a2fd5efd7d904240027b8385dfbe93445e68a4a541adf987f23c95ee731fa773b4c56955b3691f7c SHA512 a6f20cd9f93f89265d41f512e22868390009e0cd636dd0c6736177b2382c9ad9d0b931dce571d742a72aefdea9437119b3dc139a113bc437044c29a449d13164
 EBUILD xfce4-panel-4.18.1.ebuild 1592 BLAKE2B 884d225894ef9b0c1ef1264fad2ea3b075db9feb60cb6fc05e7d234fdc67e5b0fe03eb95e814312b4feba015d6c126b28bde9dc02c0d1fe0e923439e0f757184 SHA512 20cc51221cc641110738234caff57f1dbf9845b964f863743f631e2d6125f54c244d817f3c05786e039aab00a3aa05fdc8c040a8f3312e659bbb20cca3f98498
 EBUILD xfce4-panel-4.18.2.ebuild 1596 BLAKE2B c3a1b270c82b55831e96da1a09ca5b7a4d0bc3f94968ec59619ba085bbc802bed69e1a7135d0f4dfefdb601390e90550cf67d9a56032eaf46ef18209140e4422 SHA512 66035ad611a7c795d5f362f30539bc8868b703775c9431297b37c89710f72f99fd918b15088092137e01dddafaed31599334b779f01208358f49d65b25f5a7fb
-EBUILD xfce4-panel-4.19.0.ebuild 1821 BLAKE2B eb4a2619a747ad7fb4570700dfaf2a15c44f8d2309d65ec11daea44ccbe7dba5598a1b47bcc5b98f11330d532b2a8fc7a4d2cb273a00019dfedb657d957f879b SHA512 9972686996e17cd907e7cc03c56b6ba4ac3c4908893cf4ecc845bbcb7bc33bd77db97928022c6d5995bf9a92b67265a09fc33f254953be23182825057084a4dd
+EBUILD xfce4-panel-4.19.0.ebuild 1826 BLAKE2B 0a8407966507b07e8c34073d3c88e8d46f713b8e5bf24a14a007a3f51e108468b1eefe1aac65f7b45321480debfe371bd19bec2951f2a01cde3c59354a83a46b SHA512 f20c5910fc8c732e3db02ae9f57a5f58356bfec42767d9943f6deee803ebdaee414553f202fd3fb1f7f18c1100ef5a7350b040485de633dba73c92b68f7cdb88
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild
index 09f8fbc5833c..63e77476edd0 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~loong ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86"
 IUSE="+dbusmenu introspection vala wayland X"
 REQUIRED_USE="
 	|| ( wayland X )
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index e0db0b13b31d..a3097dc776ff 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -5,5 +5,5 @@ DIST xfdesktop-4.19.0.tar.bz2 2145725 BLAKE2B 18ed97b8bb9ee769de29490383fd089eb8
 EBUILD xfdesktop-4.16.1.ebuild 1177 BLAKE2B d4d5846b53a75b05f07e762e2e8f1f05517c873443de32f529f95dd5c7768748019fb26f19bec1c32510b45e00af1966df660925eca6ad4e2af21808466bb75f SHA512 c5e7d0e6c532aaa980f3477a2e6a7e7e2f2e69c0c76d088905a37b9303c251cc44597a7339f472321edcef54f8b001e6eb377b2b333defde76f65d8a7d614ae8
 EBUILD xfdesktop-4.18.0.ebuild 1248 BLAKE2B 81a722121173ba40b2da39129eaa9dafb48d0e3674dbdd1d7f90f2f41ab55e5189a586098373ae26242c10f2337dca42bd3385a681582b9f836bcff36266aebb SHA512 1a059a651021f931b9c4ba423113efa7cea3951e85f7453f9f71dc58260fb909076af812b72abbd34bcd3b28cac2c8592a4c3854dd761841b9289bbc01bb5222
 EBUILD xfdesktop-4.18.1.ebuild 1244 BLAKE2B b0a89198e6bf65a8753316bb80dd832e080fca928ca5391a85202c869e891ea59eb7222eea0e38aedb98a6995e25c5a3d29f26cc354910ab9718975077cf7fe2 SHA512 a8beae8b39215be8919215756f17e57ce1b8a770cddd4e55d276a03721cfc24cf232bb58311709a8de4b86215310c686bde223c51d38fe7702310e78fefd6a59
-EBUILD xfdesktop-4.19.0.ebuild 1373 BLAKE2B cdc7637b6904754889ca3f560f53f19d4d7bc49d773933fe6a12fd0d22383ec4fa8d6a5f2aee8bf2c0dbe889e113d7bdeef679858baf50f00567fbb245f1fb1a SHA512 82ce457d4be3828a17f1b959d0ebb1c1a9582e7cf36f3a7e16abde90adbcd492500e144eae5c5f39488cfc3d0e20b4217057788c76b13c6185aa4f57e1bdcfc7
+EBUILD xfdesktop-4.19.0.ebuild 1378 BLAKE2B 70bc59dec410fbb97171a861a63b3a8641dc7d62c2d73ecdb4ac004e217673f53e8e24fff5b94d88d4112006bec8c23353a7cd18483584059b0dfe14a8e1d5fa SHA512 d0c11f2a9d66f847265364a6a6e974bea73b0b5c06fc6cc964263fdfc23c5ba46dbced41f850a79e53690e31c2ee5135cd1698884c94cb0c7c98b410dab1deba
 MISC metadata.xml 365 BLAKE2B 3cd0b2d7af4ed8e4fd437c2943ca6324fe0b3ba74f92ef24adf0d2891cd650ca7007827b55d4a0d2ce9684219c417933055db293aa79c8834ca1cefe2a9bcccb SHA512 90ca4f491f2281bdee066d39066cc99e738a7fba87fc4d7ea435462ca7f7dd7bf451f4f6658b0f5d46690058de94ad98c2c6074baa94398d6d26d2950decd574
diff --git a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
index a582f165f02f..7531d42c2c2b 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.19.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~loong ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~loong ~ppc ~riscv ~x86"
 IUSE="libnotify +thunar wayland X"
 REQUIRED_USE="|| ( wayland X )"